diff options
| author | Dan Gudmundsson <[email protected]> | 2011-11-18 08:55:33 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-11-18 08:56:54 +0100 |
| commit | 1d4c9de4304de621a41dcbe5eef866d449b03a12 (patch) | |
| tree | 071f151cd2e32e33580b2c15128e3dbbdd2ed7ae /lib/wx/src/gen/wxSplashScreen.erl | |
| parent | 1a2d7fd6f8fd88f2dad49152fb10f30b952709ce (diff) | |
| parent | 5cd8a13c24cbb9e3c514807b56460bb90a777235 (diff) | |
| download | otp-1d4c9de4304de621a41dcbe5eef866d449b03a12.tar.gz otp-1d4c9de4304de621a41dcbe5eef866d449b03a12.tar.bz2 otp-1d4c9de4304de621a41dcbe5eef866d449b03a12.zip | |
Merge branch 'dgud/wx/system_opts/OTP-9702'
* dgud/wx/system_opts/OTP-9702:
[wx] Change libGL loading
[wx] Fix deadlock in callback handling
[wx] Add wxSystemOptions
[wx] Fix whitespaces
OTP-9725
Diffstat (limited to 'lib/wx/src/gen/wxSplashScreen.erl')
| -rw-r--r-- | lib/wx/src/gen/wxSplashScreen.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxSplashScreen.erl b/lib/wx/src/gen/wxSplashScreen.erl index 8806d07018..79ef8e413a 100644 --- a/lib/wx/src/gen/wxSplashScreen.erl +++ b/lib/wx/src/gen/wxSplashScreen.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -100,7 +100,7 @@ new(Bitmap,SplashStyle,Milliseconds,Parent,Id) new(Bitmap,SplashStyle,Milliseconds,Parent,Id, []). %% @spec (Bitmap::wxBitmap:wxBitmap(), SplashStyle::integer(), Milliseconds::integer(), Parent::wxWindow:wxWindow(), Id::integer(), [Option]) -> wxSplashScreen() -%% Option = {pos, {X::integer(),Y::integer()}} | {size, {W::integer(),H::integer()}} | {style, integer()} +%% Option = {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplashscreen.html#wxsplashscreenwxsplashscreen">external documentation</a>. new(#wx_ref{type=BitmapT,ref=BitmapRef},SplashStyle,Milliseconds,#wx_ref{type=ParentT,ref=ParentRef},Id, Options) when is_integer(SplashStyle),is_integer(Milliseconds),is_integer(Id),is_list(Options) -> |