Fixed a crash when GetMonthControl returns NULL

[wxWidgets.git] / src / gtk / joystick.cpp

diff --git a/src/gtk/joystick.cpp b/src/gtk/joystick.cpp
index 810ebb4a5951f1fad8d77f47fb435a5decda2fce..eaf094acdf6df4875e867644dd18e067ea0933db 100644 (file)
--- a/src/gtk/joystick.cpp
+++ b/src/gtk/joystick.cpp
@@ -12,8 +12,13 @@
 #ifdef __GNUG__
 #pragma implementation "joystick.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "joystick.h"
 #endif

+
+#include "wx/defs.h"
+

 #if wxUSE_JOYSTICK
 
 #if wxUSE_JOYSTICK
 

+#include "wx/joystick.h"
+

 #include <linux/joystick.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <linux/joystick.h>
 #include <sys/types.h>
 #include <sys/stat.h>


@@ -21,9 +26,9 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>

+

 #include "wx/event.h"
 #include "wx/window.h"
 #include "wx/event.h"
 #include "wx/window.h"

-#include "wx/gtk/joystick.h"

 
 #define JOYSTICK_AXE_MAX 32767
 #define JOYSTICK_AXE_MIN -32767
 
 #define JOYSTICK_AXE_MAX 32767
 #define JOYSTICK_AXE_MIN -32767


@@ -342,7 +347,7 @@ bool wxJoystick::HasPOVCTS(void) const
 // Operations
 ////////////////////////////////////////////////////////////////////////////
 
 // Operations
 ////////////////////////////////////////////////////////////////////////////
 

-bool wxJoystick::SetCapture(wxWindow* win, int pollingFreq = 0)
+bool wxJoystick::SetCapture(wxWindow* win, int pollingFreq)

 {
   m_catchwin = win;
   m_polling = pollingFreq;
 {
   m_catchwin = win;
   m_polling = pollingFreq;


@@ -355,5 +360,5 @@ bool wxJoystick::ReleaseCapture(void)
   m_polling = 0;
   return TRUE;
 }
   m_polling = 0;
   return TRUE;
 }

-#endif
+#endif  // wxUSE_JOYSTICK