diff options
| author | Erlang/OTP <[email protected]> | 2010-02-05 16:32:00 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-02-05 16:32:00 +0000 |
| commit | e76fa2fb451a111196128afbc372d3b8b1e3dfad (patch) | |
| tree | e45dc19f5be68d6074035363fae30e207a69bed1 /lib/wx/src/gen/wxJoystickEvent.erl | |
| parent | 2e6ff4b8c161c358cf496b2ebb5f2dbbaa04aabd (diff) | |
| parent | cfd2ba46158ad1ac6798e48150d18c969966a152 (diff) | |
| download | otp-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/wxJoystickEvent.erl')
| -rw-r--r-- | lib/wx/src/gen/wxJoystickEvent.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxJoystickEvent.erl b/lib/wx/src/gen/wxJoystickEvent.erl index cf4cd0fcaf..2c2d7f3968 100644 --- a/lib/wx/src/gen/wxJoystickEvent.erl +++ b/lib/wx/src/gen/wxJoystickEvent.erl @@ -22,7 +22,7 @@ %% <dd><em>joy_button_down</em>, <em>joy_button_up</em>, <em>joy_move</em>, <em>joy_zmove</em></dd></dl> %% See also the message variant {@link wxEvtHandler:wxJoystick(). #wxJoystick{}} event record type. %% -%% <p>This class is derived (and can use functions) from: +%% <p>This class is derived (and can use functions) from: %% <br />{@link wxEvent} %% </p> %% @type wxJoystickEvent(). An object reference, The representation is internal @@ -153,7 +153,7 @@ isZMove(#wx_ref{type=ThisT,ref=ThisRef}) -> wxe_util:call(?wxJoystickEvent_IsZMove, <<ThisRef:32/?UI>>). - %% From wxEvent + %% From wxEvent %% @hidden stopPropagation(This) -> wxEvent:stopPropagation(This). %% @hidden |