made wxCommandEvent::GetInt() return int, not long (patch 1473771)

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

diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp
index 5f2110557e8012622a3e3f5c7be85a9c06f9080c..6fef9a01160ea1cf1cf1eb5e3cfa9df056649fee 100644 (file)
--- a/src/os2/joystick.cpp
+++ b/src/os2/joystick.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        joystick.cpp
+// Name:        src/os2/joystick.cpp
 // Purpose:     wxJoystick class
 // Author:      David Webster
 // Modified by:
@@ -14,8 +14,6 @@
 //
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #if wxUSE_JOYSTICK
 
 #include "wx/string.h"
@@ -25,8 +23,8 @@
 
 #define NO_JOYGETPOSEX
 
-#include <wx/window.h>
-#include <wx/joystick.h>
+#include "wx/window.h"
+#include "wx/joystick.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
@@ -101,7 +99,7 @@ bool wxJoystick::IsOk() const
     return false;
 }
 
-int wxJoystick::GetNumberJoysticks() const
+int wxJoystick::GetNumberJoysticks()
 {
     // TODO
     return 0;
@@ -122,7 +120,7 @@ int wxJoystick::GetProductId() const
 wxString wxJoystick::GetProductName() const
 {
     // TODO
-    return wxString("");
+    return wxEmptyString;
 }
 
 int wxJoystick::GetXMin() const