diff options
| author | Hans Bolinder <[email protected]> | 2011-09-27 09:07:20 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2011-09-27 09:07:20 +0200 |
| commit | 67e216c86754e7076ffdbb87fec8b48ab0d28e56 (patch) | |
| tree | 9e9b66077d72e611083e66bba35f3270990ca14d /lib/wx | |
| parent | 0e132c07e92835811e01bec415399916afc3e44d (diff) | |
| parent | adeb8abaca990e6084ee101656832e115579a8ba (diff) | |
| download | otp-67e216c86754e7076ffdbb87fec8b48ab0d28e56.tar.gz otp-67e216c86754e7076ffdbb87fec8b48ab0d28e56.tar.bz2 otp-67e216c86754e7076ffdbb87fec8b48ab0d28e56.zip | |
Merge branch 'dev' into major
* dev:
Improve the generation of man pages
Correct XML files
Diffstat (limited to 'lib/wx')
| -rw-r--r-- | lib/wx/src/gen/wxRegion.erl | 4 | ||||
| -rw-r--r-- | lib/wx/src/gen/wxWindow.erl | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/wx/src/gen/wxRegion.erl b/lib/wx/src/gen/wxRegion.erl index 0ceba1d203..4e8d98a54f 100644 --- a/lib/wx/src/gen/wxRegion.erl +++ b/lib/wx/src/gen/wxRegion.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 @@ -48,7 +48,7 @@ new() -> %% new(Bmp::wxBitmap:wxBitmap()) -> wxRegion() </c> %% </p> %% <p><c> -%% new(Rect::{X::integer(),Y::integer(),W::integer(),H::integer()}) -> wxRegion() </c> +%% new(Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> wxRegion() </c> %% </p> new(#wx_ref{type=BmpT,ref=BmpRef}) -> ?CLASS(BmpT,wxBitmap), diff --git a/lib/wx/src/gen/wxWindow.erl b/lib/wx/src/gen/wxWindow.erl index 33665a0ad6..031314bfe2 100644 --- a/lib/wx/src/gen/wxWindow.erl +++ b/lib/wx/src/gen/wxWindow.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 @@ -1144,10 +1144,10 @@ setCaret(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CaretT,ref=CaretRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetclientsize">external documentation</a>. %% <br /> Alternatives: %% <p><c> -%% setClientSize(This::wxWindow(), Size::{W::integer(),H::integer()}) -> ok </c> +%% setClientSize(This::wxWindow(), Size::{W::integer(), H::integer()}) -> ok </c> %% </p> %% <p><c> -%% setClientSize(This::wxWindow(), Rect::{X::integer(),Y::integer(),W::integer(),H::integer()}) -> ok </c> +%% setClientSize(This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok </c> %% </p> setClientSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH}) when is_integer(SizeW),is_integer(SizeH) -> |