aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/src/gen/wxJoystickEvent.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2011-11-18 08:55:33 +0100
committerDan Gudmundsson <[email protected]>2011-11-18 08:56:54 +0100
commit1d4c9de4304de621a41dcbe5eef866d449b03a12 (patch)
tree071f151cd2e32e33580b2c15128e3dbbdd2ed7ae /lib/wx/src/gen/wxJoystickEvent.erl
parent1a2d7fd6f8fd88f2dad49152fb10f30b952709ce (diff)
parent5cd8a13c24cbb9e3c514807b56460bb90a777235 (diff)
downloadotp-1d4c9de4304de621a41dcbe5eef866d449b03a12.tar.gz
otp-1d4c9de4304de621a41dcbe5eef866d449b03a12.tar.bz2
otp-1d4c9de4304de621a41dcbe5eef866d449b03a12.zip
Merge branch 'dgud/wx/system_opts/OTP-9702'
* dgud/wx/system_opts/OTP-9702: [wx] Change libGL loading [wx] Fix deadlock in callback handling [wx] Add wxSystemOptions [wx] Fix whitespaces OTP-9725
Diffstat (limited to 'lib/wx/src/gen/wxJoystickEvent.erl')
-rw-r--r--lib/wx/src/gen/wxJoystickEvent.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxJoystickEvent.erl b/lib/wx/src/gen/wxJoystickEvent.erl
index 2c2d7f3968..2f149a50f8 100644
--- a/lib/wx/src/gen/wxJoystickEvent.erl
+++ b/lib/wx/src/gen/wxJoystickEvent.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
@@ -118,7 +118,7 @@ getJoystick(#wx_ref{type=ThisT,ref=ThisRef}) ->
wxe_util:call(?wxJoystickEvent_GetJoystick,
<<ThisRef:32/?UI>>).
-%% @spec (This::wxJoystickEvent()) -> {X::integer(),Y::integer()}
+%% @spec (This::wxJoystickEvent()) -> {X::integer(), Y::integer()}
%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventgetposition">external documentation</a>.
getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
?CLASS(ThisT,wxJoystickEvent),