diff options
| author | Erlang/OTP <[email protected]> | 2010-02-05 16:32:00 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-02-05 16:32:00 +0000 |
| commit | e76fa2fb451a111196128afbc372d3b8b1e3dfad (patch) | |
| tree | e45dc19f5be68d6074035363fae30e207a69bed1 /lib/wx/src/gen/wxSplashScreen.erl | |
| parent | 2e6ff4b8c161c358cf496b2ebb5f2dbbaa04aabd (diff) | |
| parent | cfd2ba46158ad1ac6798e48150d18c969966a152 (diff) | |
| download | otp-e76fa2fb451a111196128afbc372d3b8b1e3dfad.tar.gz otp-e76fa2fb451a111196128afbc372d3b8b1e3dfad.tar.bz2 otp-e76fa2fb451a111196128afbc372d3b8b1e3dfad.zip | |
Merge branch 'dgud/wx_list_ctrl' into ccase/r13b04_dev
* dgud/wx_list_ctrl:
Generate without trailing spaces
Fix correct starting copyright year
Do not emit trailing whitespace
Added tests for wxListCtrl:getItem/2.
Added wxListCtrl:getEditCtrl (not available on Mac)
OTP-8408 Added wxListCtrl:getEditCtrl/1 (not available on Mac).
Diffstat (limited to 'lib/wx/src/gen/wxSplashScreen.erl')
| -rw-r--r-- | lib/wx/src/gen/wxSplashScreen.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/wx/src/gen/wxSplashScreen.erl b/lib/wx/src/gen/wxSplashScreen.erl index c7c5d5cf90..8806d07018 100644 --- a/lib/wx/src/gen/wxSplashScreen.erl +++ b/lib/wx/src/gen/wxSplashScreen.erl @@ -18,7 +18,7 @@ %% This file is generated DO NOT EDIT %% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplashscreen.html">wxSplashScreen</a>. -%% <p>This class is derived (and can use functions) from: +%% <p>This class is derived (and can use functions) from: %% <br />{@link wxFrame} %% <br />{@link wxTopLevelWindow} %% <br />{@link wxWindow} @@ -130,11 +130,11 @@ getTimeout(#wx_ref{type=ThisT,ref=ThisRef}) -> %% @spec (This::wxSplashScreen()) -> ok %% @doc Destroys this object, do not use object again -destroy(Obj=#wx_ref{type=Type}) -> +destroy(Obj=#wx_ref{type=Type}) -> ?CLASS(Type,wxSplashScreen), wxe_util:destroy(?DESTROY_OBJECT,Obj), ok. - %% From wxFrame + %% From wxFrame %% @hidden setToolBar(This,Toolbar) -> wxFrame:setToolBar(This,Toolbar). %% @hidden @@ -171,7 +171,7 @@ createToolBar(This) -> wxFrame:createToolBar(This). createStatusBar(This, Options) -> wxFrame:createStatusBar(This, Options). %% @hidden createStatusBar(This) -> wxFrame:createStatusBar(This). - %% From wxTopLevelWindow + %% From wxTopLevelWindow %% @hidden showFullScreen(This,Show, Options) -> wxTopLevelWindow:showFullScreen(This,Show, Options). %% @hidden @@ -218,7 +218,7 @@ getTitle(This) -> wxTopLevelWindow:getTitle(This). getIcons(This) -> wxTopLevelWindow:getIcons(This). %% @hidden getIcon(This) -> wxTopLevelWindow:getIcon(This). - %% From wxWindow + %% From wxWindow %% @hidden warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y). %% @hidden @@ -569,7 +569,7 @@ center(This) -> wxWindow:center(This). captureMouse(This) -> wxWindow:captureMouse(This). %% @hidden cacheBestSize(This,Size) -> wxWindow:cacheBestSize(This,Size). - %% From wxEvtHandler + %% From wxEvtHandler %% @hidden disconnect(This,EventType, Options) -> wxEvtHandler:disconnect(This,EventType, Options). %% @hidden |