Set Z-position correctly for wxEVT_JOY_ZMOVE events.

Z-move events don't have (x, y) position, but they do have Z-position which
needs to be set.

Also don't use (x, y) position for these events in the sample.

See #748.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/changes.txt

@@ -475,6 +475,7 @@ MSW:
 - Fixed regression with initial focus in the dialogs in 2.9.3.
 - Added support for wxEXEC_MAKE_GROUP_LEADER to wxExecute (tteras).
 - Set wxMenu being closed in wxEVT_MENU_CLOSE events (Marcin Malich).
+- Fix coordinates and Z-position for joystick events (Markus Juergens).
 
 OSX:
 

interface/wx/event.h

@@ -1662,11 +1662,15 @@ public:
 
     /**
         Returns the x, y position of the joystick event.
+
+        These coordinates are valid for all the events except wxEVT_JOY_ZMOVE.
     */
     wxPoint GetPosition() const;
 
     /**
         Returns the z position of the joystick event.
+
+        This method can only be used for wxEVT_JOY_ZMOVE events.
     */
     int GetZPosition() const;
 

samples/joytest/joytest.cpp

@@ -119,6 +119,9 @@ MyCanvas::~MyCanvas()
 
 void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
 {
+    // We don't have valid (x, y) coordinates for z-move events.
+    if ( !event.IsZMove() )
+    {
         wxClientDC dc(this);
 
         wxPoint pt(event.GetPosition());
@@ -149,6 +152,7 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
             dc.SetPen(*wxBLACK_PEN);
             dc.DrawLine(xpos, ypos, pt.x, pt.y);
         }
+    }
 
     xpos = pt.x;
     ypos = pt.y;
@@ -156,9 +160,9 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
 #if wxUSE_STATUSBAR
     wxString buf;
     if (event.ButtonDown())
-        buf.Printf(wxT("Joystick (%d, %d) #%i Fire!"), pt.x, pt.y, event.GetButtonChange());
+        buf.Printf(wxT("Joystick (%d, %d) #%i Fire!"), xpos, ypos, event.GetButtonChange());
     else
-        buf.Printf(wxT("Joystick (%d, %d)  "), pt.x, pt.y);
+        buf.Printf(wxT("Joystick (%d, %d)  "), xpos, ypos);
 
 /*
     for(int i = 0; i < nButtons; ++i)

src/msw/window.cpp

@@ -5950,6 +5950,9 @@ bool wxWindowMSW::HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags)
     }
 
     wxJoystickEvent event(eventType, buttons, joystick, change);
+    if ( eventType == wxEVT_JOY_ZMOVE )
+        event.SetZPosition(x);
+    else
         event.SetPosition(wxPoint(x, y));
     event.SetEventObject(this);