aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/src/gen/wxHtmlWindow.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-02-05 16:32:00 +0000
committerErlang/OTP <[email protected]>2010-02-05 16:32:00 +0000
commite76fa2fb451a111196128afbc372d3b8b1e3dfad (patch)
treee45dc19f5be68d6074035363fae30e207a69bed1 /lib/wx/src/gen/wxHtmlWindow.erl
parent2e6ff4b8c161c358cf496b2ebb5f2dbbaa04aabd (diff)
parentcfd2ba46158ad1ac6798e48150d18c969966a152 (diff)
downloadotp-e76fa2fb451a111196128afbc372d3b8b1e3dfad.tar.gz
otp-e76fa2fb451a111196128afbc372d3b8b1e3dfad.tar.bz2
otp-e76fa2fb451a111196128afbc372d3b8b1e3dfad.zip
Merge branch 'dgud/wx_list_ctrl' into ccase/r13b04_dev
* dgud/wx_list_ctrl: Generate without trailing spaces Fix correct starting copyright year Do not emit trailing whitespace Added tests for wxListCtrl:getItem/2. Added wxListCtrl:getEditCtrl (not available on Mac) OTP-8408 Added wxListCtrl:getEditCtrl/1 (not available on Mac).
Diffstat (limited to 'lib/wx/src/gen/wxHtmlWindow.erl')
-rw-r--r--lib/wx/src/gen/wxHtmlWindow.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/wx/src/gen/wxHtmlWindow.erl b/lib/wx/src/gen/wxHtmlWindow.erl
index 745f52e0ea..ba8278ff56 100644
--- a/lib/wx/src/gen/wxHtmlWindow.erl
+++ b/lib/wx/src/gen/wxHtmlWindow.erl
@@ -18,7 +18,7 @@
%% This file is generated DO NOT EDIT
%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html">wxHtmlWindow</a>.
-%% <p>This class is derived (and can use functions) from:
+%% <p>This class is derived (and can use functions) from:
%% <br />{@link wxScrolledWindow}
%% <br />{@link wxPanel}
%% <br />{@link wxWindow}
@@ -297,11 +297,11 @@ toText(#wx_ref{type=ThisT,ref=ThisRef}) ->
%% @spec (This::wxHtmlWindow()) -> ok
%% @doc Destroys this object, do not use object again
-destroy(Obj=#wx_ref{type=Type}) ->
+destroy(Obj=#wx_ref{type=Type}) ->
?CLASS(Type,wxHtmlWindow),
wxe_util:destroy(?DESTROY_OBJECT,Obj),
ok.
- %% From wxScrolledWindow
+ %% From wxScrolledWindow
%% @hidden
setTargetWindow(This,Target) -> wxScrolledWindow:setTargetWindow(This,Target).
%% @hidden
@@ -330,10 +330,10 @@ calcUnscrolledPosition(This,Pt) -> wxScrolledWindow:calcUnscrolledPosition(This,
calcScrolledPosition(This,X,Y) -> wxScrolledWindow:calcScrolledPosition(This,X,Y).
%% @hidden
calcScrolledPosition(This,Pt) -> wxScrolledWindow:calcScrolledPosition(This,Pt).
- %% From wxPanel
+ %% From wxPanel
%% @hidden
initDialog(This) -> wxPanel:initDialog(This).
- %% From wxWindow
+ %% From wxWindow
%% @hidden
warpPointer(This,X,Y) -> wxWindow:warpPointer(This,X,Y).
%% @hidden
@@ -682,7 +682,7 @@ center(This) -> wxWindow:center(This).
captureMouse(This) -> wxWindow:captureMouse(This).
%% @hidden
cacheBestSize(This,Size) -> wxWindow:cacheBestSize(This,Size).
- %% From wxEvtHandler
+ %% From wxEvtHandler
%% @hidden
disconnect(This,EventType, Options) -> wxEvtHandler:disconnect(This,EventType, Options).
%% @hidden