diff options
| author | Dan Gudmundsson <[email protected]> | 2011-09-28 10:26:42 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-09-28 10:26:42 +0200 |
| commit | 4d910fc9b179cc630912165998d41a4a047148af (patch) | |
| tree | 14bf4b1f2d07ec960f58d975da83f5dd2f496e2d /lib/wx/src/gen/wxBoxSizer.erl | |
| parent | bab81645605fef5e6c65637cbbd30f9cb30f68a4 (diff) | |
| parent | 9299708cb88b5ed000cf2278df420a23e249159a (diff) | |
| download | otp-4d910fc9b179cc630912165998d41a4a047148af.tar.gz otp-4d910fc9b179cc630912165998d41a4a047148af.tar.bz2 otp-4d910fc9b179cc630912165998d41a4a047148af.zip | |
Merge branch 'dgud/wx/wx-bugs' into dev
* dgud/wx/wx-bugs:
[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/wxBoxSizer.erl')
| -rw-r--r-- | lib/wx/src/gen/wxBoxSizer.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/wx/src/gen/wxBoxSizer.erl b/lib/wx/src/gen/wxBoxSizer.erl index 1d5b1cf2fa..e6287945a9 100644 --- a/lib/wx/src/gen/wxBoxSizer.erl +++ b/lib/wx/src/gen/wxBoxSizer.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 @@ -102,7 +102,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 @@ -118,7 +118,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 |