aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/src/gen/wxFlexGridSizer.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-10-11 10:38:48 +0200
committerMicael Karlberg <[email protected]>2011-10-11 10:38:48 +0200
commit8490c3a413ca4a89c0a2f37e8723b2105cbe2406 (patch)
tree8dbae16e97b8f5872f7feae2c983ef8e43b0903e /lib/wx/src/gen/wxFlexGridSizer.erl
parentadacb706e77b90a9284c3f4d8c828992c9acebf8 (diff)
parent6ca6dd3c670fb8185ebb9a20c2a731a7375c1cac (diff)
downloadotp-8490c3a413ca4a89c0a2f37e8723b2105cbe2406.tar.gz
otp-8490c3a413ca4a89c0a2f37e8723b2105cbe2406.tar.bz2
otp-8490c3a413ca4a89c0a2f37e8723b2105cbe2406.zip
Merge branch 'master' of super:otp into bmk/inets/inets58_integration
Diffstat (limited to 'lib/wx/src/gen/wxFlexGridSizer.erl')
-rw-r--r--lib/wx/src/gen/wxFlexGridSizer.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/wx/src/gen/wxFlexGridSizer.erl b/lib/wx/src/gen/wxFlexGridSizer.erl
index 9471cc8a01..910cc78894 100644
--- a/lib/wx/src/gen/wxFlexGridSizer.erl
+++ b/lib/wx/src/gen/wxFlexGridSizer.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
@@ -222,7 +222,7 @@ prepend(This,Width,Height, Options) -> wxSizer:prepend(This,Width,Height, Option
%% @hidden
prepend(This,Width,Height) -> wxSizer:prepend(This,Width,Height).
%% @hidden
-prepend(This,Window) -> wxSizer:prepend(This,Window).
+prepend(This,Item) -> wxSizer:prepend(This,Item).
%% @hidden
layout(This) -> wxSizer:layout(This).
%% @hidden
@@ -238,7 +238,7 @@ insert(This,Index,Width,Height, Options) -> wxSizer:insert(This,Index,Width,Heig
%% @hidden
insert(This,Index,Width,Height) -> wxSizer:insert(This,Index,Width,Height).
%% @hidden
-insert(This,Index,Window) -> wxSizer:insert(This,Index,Window).
+insert(This,Index,Item) -> wxSizer:insert(This,Index,Item).
%% @hidden
hide(This,Window, Options) -> wxSizer:hide(This,Window, Options).
%% @hidden