Moved #if wxUSE_COMBOBOX after real wx/wxprec.h include.

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

diff --git a/src/palmos/joystick.cpp b/src/palmos/joystick.cpp
index ac874f113d453f8486336a101a0c19cc6f1e4d65..8295c07fa786ce8bf4db079a50349d5f939c9952 100644 (file)
--- a/src/palmos/joystick.cpp
+++ b/src/palmos/joystick.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        joystick.cpp
+// Name:        src/palmos/joystick.cpp

 // Purpose:     wxJoystick class
 // Purpose:     wxJoystick class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -21,12 +21,6 @@
 #endif
 
 #include "wx/string.h"
 #endif
 
 #include "wx/string.h"

-#include "wx/window.h"
-
-#if !defined(__WIN32__) && !defined(_MMRESULT_)
-typedef UINT MMRESULT;
-#endif
-

 #include "wx/window.h"
 #include "wx/palmos/joystick.h"
 
 #include "wx/window.h"
 #include "wx/palmos/joystick.h"
 


@@ -113,7 +107,7 @@ int wxJoystick::GetProductId() const
 
 wxString wxJoystick::GetProductName() const
 {
 
 wxString wxJoystick::GetProductName() const
 {

-    return wxString("");
+    return wxEmptyString;

 }
 
 int wxJoystick::GetXMin() const
 }
 
 int wxJoystick::GetXMin() const