#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"
// 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)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("joyicon"));
#endif
#ifdef __X__
if (event.GetActive() && canvas)
canvas->SetFocus();
}
-
-bool MyFrame::OnClose(void)
-{
- return TRUE;
-}
\ No newline at end of file