aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/src/gen/wxFlexGridSizer.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2011-09-28 11:13:59 +0200
committerBjörn Gustavsson <bjorn@erlang.org>2011-09-28 11:13:59 +0200
commitbe8538809c571441e6543a677db58501634b7572 (patch)
tree25b9229f4c16064d4831e357cb3dbde256331322 /lib/wx/src/gen/wxFlexGridSizer.erl
parent6bdf396b23219af136a217276308212913ca0aed (diff)
parentb83073436a39553da458b19ef572ded9cd051611 (diff)
downloadotp-be8538809c571441e6543a677db58501634b7572.tar.gz
otp-be8538809c571441e6543a677db58501634b7572.tar.bz2
otp-be8538809c571441e6543a677db58501634b7572.zip
Merge branch 'dev' into major
* dev: distribution_SUITE:bulk_send_bigbig/1: Fail with more information distribution_SUITE: Use unique slave node names beam_lib: Handle rare race in the crypto key server functionality busy_port_SUITE: Avoid crash in register/2 [wx] Re-generate code [wx] Remove optional shadowing clauses [wx] Remove warning [wx] Fix trailing whitespace [wx] Test colors in textctrl [wx] Fix cleanup memory references
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