Make a couple virtuals protected so they can be overridden.

[wxWidgets.git] / samples / joytest / joytest.cpp

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index e5abd60f970fb5b4f4478cff4d0492110712afeb..f8f478d5f937a68c4f17fcc21a049a67924d4f5c 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -29,6 +29,12 @@
 
 #include "joytest.h"
 
+// the application icon (under Windows and OS/2 it is in resources and even
+// though we could still include the XPM here it would be unused)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"
+#endif
+
 MyFrame *frame = NULL;
 
 IMPLEMENT_APP(MyApp)
@@ -89,8 +95,6 @@ bool MyApp::OnInit()
     frame->CenterOnScreen();
     frame->Show(true);
 
-    SetTopWindow(frame);
-
     return true;
 }
 
@@ -115,46 +119,50 @@ MyCanvas::~MyCanvas()
 
 void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
 {
-    wxClientDC dc(this);
-
-    wxPoint pt(event.GetPosition());
-
-    // if negative positions are possible then shift everything up
-    int xmin = wxGetApp().m_minX;
-    int xmax = wxGetApp().m_maxX;
-    int ymin = wxGetApp().m_minY;
-    int ymax = wxGetApp().m_maxY;
-    if (xmin < 0) {
-        xmax += abs(xmin);
-        pt.x += abs(xmin);
-    }
-    if (ymin < 0) {
-        ymax += abs(ymin);
-        pt.y += abs(ymin);
-    }
-
-    // Scale to canvas size
-    int cw, ch;
-    GetSize(&cw, &ch);
-
-    pt.x = (long) (((double)pt.x/(double)xmax) * cw);
-    pt.y = (long) (((double)pt.y/(double)ymax) * ch);
-
-    if (xpos > -1 && ypos > -1 && event.IsMove() && event.ButtonIsDown())
+    // We don't have valid (x, y) coordinates for z-move events.
+    if ( !event.IsZMove() )
     {
-        dc.SetPen(*wxBLACK_PEN);
-        dc.DrawLine(xpos, ypos, pt.x, pt.y);
+        wxClientDC dc(this);
+
+        wxPoint pt(event.GetPosition());
+
+        // if negative positions are possible then shift everything up
+        int xmin = wxGetApp().m_minX;
+        int xmax = wxGetApp().m_maxX;
+        int ymin = wxGetApp().m_minY;
+        int ymax = wxGetApp().m_maxY;
+        if (xmin < 0) {
+            xmax += abs(xmin);
+            pt.x += abs(xmin);
+        }
+        if (ymin < 0) {
+            ymax += abs(ymin);
+            pt.y += abs(ymin);
+        }
+
+        // Scale to canvas size
+        int cw, ch;
+        GetSize(&cw, &ch);
+
+        pt.x = (long) (((double)pt.x/(double)xmax) * cw);
+        pt.y = (long) (((double)pt.y/(double)ymax) * ch);
+
+        if (xpos > -1 && ypos > -1 && event.IsMove() && event.ButtonIsDown())
+        {
+            dc.SetPen(*wxBLACK_PEN);
+            dc.DrawLine(xpos, ypos, pt.x, pt.y);
+        }
+
+        xpos = pt.x;
+        ypos = pt.y;
     }
 
-    xpos = pt.x;
-    ypos = pt.y;
-
 #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)