fixed bug in mouse handling

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

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 6ec7c6fa53cdeeca9569151a61b3d3479e0ce978..900fe3b6861a80a00b3523b882d88a90b7c0b88b 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -20,8 +20,8 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#include <wx/msw/wave.h>
-#include <wx/msw/joystick.h>
+#include <wx/wave.h>
+#include <wx/joystick.h>

 
 #include "joytest.h"
 
 
 #include "joytest.h"
 


@@ -52,10 +52,10 @@ bool MyApp::OnInit(void)
   // Create the main frame window
 
   frame = new MyFrame(NULL, "Joystick Demo", wxPoint(0, 0), wxSize(500, 400),
   // Create the main frame window
 
   frame = new MyFrame(NULL, "Joystick Demo", wxPoint(0, 0), wxSize(500, 400),

-   wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL);
+   wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);

 
   // Give it an icon (this is ignored in MDI mode: uses resources)
 
   // Give it an icon (this is ignored in MDI mode: uses resources)

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   frame->SetIcon(wxIcon("joyicon"));
 #endif
 #ifdef __X__
   frame->SetIcon(wxIcon("joyicon"));
 #endif
 #ifdef __X__


@@ -164,8 +164,3 @@ void MyFrame::OnActivate(wxActivateEvent& event)
   if (event.GetActive() && canvas)
     canvas->SetFocus();
 }
   if (event.GetActive() && canvas)
     canvas->SetFocus();
 }

-
-bool MyFrame::OnClose(void)
-{
-  return TRUE;
-}
\ No newline at end of file