aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/src/gen/wxSplitterWindow.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2011-11-18 08:55:33 +0100
committerDan Gudmundsson <[email protected]>2011-11-18 08:56:54 +0100
commit1d4c9de4304de621a41dcbe5eef866d449b03a12 (patch)
tree071f151cd2e32e33580b2c15128e3dbbdd2ed7ae /lib/wx/src/gen/wxSplitterWindow.erl
parent1a2d7fd6f8fd88f2dad49152fb10f30b952709ce (diff)
parent5cd8a13c24cbb9e3c514807b56460bb90a777235 (diff)
downloadotp-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/wxSplitterWindow.erl')
-rw-r--r--lib/wx/src/gen/wxSplitterWindow.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/wx/src/gen/wxSplitterWindow.erl b/lib/wx/src/gen/wxSplitterWindow.erl
index 9e27be7475..b17fed3151 100644
--- a/lib/wx/src/gen/wxSplitterWindow.erl
+++ b/lib/wx/src/gen/wxSplitterWindow.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-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
@@ -91,7 +91,7 @@ new(Parent)
new(Parent, []).
%% @spec (Parent::wxWindow:wxWindow(), [Option]) -> wxSplitterWindow()
-%% Option = {id, integer()} | {pos, {X::integer(),Y::integer()}} | {size, {W::integer(),H::integer()}} | {style, integer()}
+%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowwxsplitterwindow">external documentation</a>.
new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
when is_list(Options) ->
@@ -112,7 +112,7 @@ create(This,Parent)
create(This,Parent, []).
%% @spec (This::wxSplitterWindow(), Parent::wxWindow:wxWindow(), [Option]) -> bool()
-%% Option = {id, integer()} | {pos, {X::integer(),Y::integer()}} | {size, {W::integer(),H::integer()}} | {style, integer()}
+%% Option = {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()}
%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowcreate">external documentation</a>.
create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Options)
when is_list(Options) ->