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 0e4c851ca1ed8ce33596ec9945ba2b80d60c6a32..f8f478d5f937a68c4f17fcc21a049a67924d4f5c 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -31,7 +31,7 @@
 
 // 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)
 
 // 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)

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 


@@ -152,10 +152,10 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
             dc.SetPen(*wxBLACK_PEN);
             dc.DrawLine(xpos, ypos, pt.x, pt.y);
         }
             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 wxUSE_STATUSBAR
     wxString buf;