refactoring in preparation for further changes: moved data in a private struct, let...

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

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 0d0a0d0751905bc11e9a881311aceb588ea449d3..d09e443a91e228b5c81a4a0fa91a13abd284ab6d 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "joystick.h"
 #endif
 
@@ -32,14 +32,8 @@
 typedef UINT MMRESULT;
 #endif
 
-#ifndef __TWIN32__
-#ifdef __GNUWIN32_OLD__
-#include "wx/msw/gnuwin32/extra.h"
-#endif
-#endif
-
 // Why doesn't BC++ have joyGetPosEx?
-#if !defined(__WIN32__) || defined(__BORLANDC__) || defined(__TWIN32__)
+#if !defined(__WIN32__) || defined(__BORLANDC__)
 #define NO_JOYGETPOSEX
 #endif
 
@@ -52,34 +46,34 @@ IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 ////////////////////////////////////////////////////////////////////////////
 
 /**
-       johan@linkdata.se 2002-08-20:
-       Now returns only valid, functioning
-       joysticks, counting from the first
-       available and upwards.
+    johan@linkdata.se 2002-08-20:
+    Now returns only valid, functioning
+    joysticks, counting from the first
+    available and upwards.
 */
 wxJoystick::wxJoystick(int joystick)
 {
     JOYINFO joyInfo;
-       int i, maxsticks;
-
-       maxsticks = joyGetNumDevs();
-       for( i=0; i<maxsticks; i++ )
-       {
-           if( joyGetPos(i, & joyInfo) == JOYERR_NOERROR )
-           {
-               if( !joystick )
-               {
-                       /* Found the one we want, store actual OS id and return */
-                       m_joystick = i;
-                       return;
-               }
-               joystick --;
-           }
-       }
-
-       /* No such joystick, return ID 0 */
-       m_joystick = 0;
-       return;
+    int i, maxsticks;
+
+    maxsticks = joyGetNumDevs();
+    for( i=0; i<maxsticks; i++ )
+    {
+        if( joyGetPos(i, & joyInfo) == JOYERR_NOERROR )
+        {
+            if( !joystick )
+            {
+                /* Found the one we want, store actual OS id and return */
+                m_joystick = i;
+                return;
+            }
+            joystick --;
+        }
+    }
+
+    /* No such joystick, return ID 0 */
+    m_joystick = 0;
+    return;
 };
 
 wxPoint wxJoystick::GetPosition() const
@@ -89,7 +83,7 @@ wxPoint wxJoystick::GetPosition() const
     if (res == JOYERR_NOERROR )
         return wxPoint(joyInfo.wXpos, joyInfo.wYpos);
     else
-        return wxPoint(0, 0);
+        return wxPoint(0,0);
 }
 
 int wxJoystick::GetZPosition() const
@@ -103,9 +97,9 @@ int wxJoystick::GetZPosition() const
 }
 
 /**
-       johan@linkdata.se 2002-08-20:
-       Return a bitmap with all button states in it,
-       like the GTK version does and Win32 does.
+    johan@linkdata.se 2002-08-20:
+    Return a bitmap with all button states in it,
+    like the GTK version does and Win32 does.
 */
 int wxJoystick::GetButtonState() const
 {
@@ -113,7 +107,7 @@ int wxJoystick::GetButtonState() const
     MMRESULT res = joyGetPos(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {
-       return joyInfo.wButtons;
+        return joyInfo.wButtons;
 #if 0
         int buttons = 0;
 
@@ -134,8 +128,8 @@ int wxJoystick::GetButtonState() const
 }
 
 /**
-       JLI 2002-08-20:
-       Returns -1 to signify error.
+    JLI 2002-08-20:
+    Returns -1 to signify error.
 */
 int wxJoystick::GetPOVPosition() const
 {
@@ -156,8 +150,8 @@ int wxJoystick::GetPOVPosition() const
 }
 
 /**
-       johan@linkdata.se 2002-08-20:
-       Returns -1 to signify error.
+    johan@linkdata.se 2002-08-20:
+    Returns -1 to signify error.
 */
 int wxJoystick::GetPOVCTSPosition() const
 {
@@ -253,30 +247,30 @@ void wxJoystick::SetMovementThreshold(int threshold)
 ////////////////////////////////////////////////////////////////////////////
 
 /**
-       johan@linkdata.se 2002-08-20:
-       Now returns the number of connected, functioning
-       joysticks, as intended.
+    johan@linkdata.se 2002-08-20:
+    Now returns the number of connected, functioning
+    joysticks, as intended.
 */
 int wxJoystick::GetNumberJoysticks()
 {
     JOYINFO joyInfo;
-       int i, maxsticks, actualsticks;
-       maxsticks = joyGetNumDevs();
-       actualsticks = 0;
-       for( i=0; i<maxsticks; i++ )
-       {
-               if( joyGetPos( i, & joyInfo ) == JOYERR_NOERROR )
-               {
-                       actualsticks ++;
-               }
-       }
+    int i, maxsticks, actualsticks;
+    maxsticks = joyGetNumDevs();
+    actualsticks = 0;
+    for( i=0; i<maxsticks; i++ )
+    {
+        if( joyGetPos( i, & joyInfo ) == JOYERR_NOERROR )
+        {
+            actualsticks ++;
+        }
+    }
     return actualsticks;
 }
 
 /**
-       johan@linkdata.se 2002-08-20:
-       The old code returned true if there were any
-       joystick capable drivers loaded (=always).
+    johan@linkdata.se 2002-08-20:
+    The old code returned true if there were any
+    joystick capable drivers loaded (=always).
 */
 bool wxJoystick::IsOk() const
 {
@@ -376,7 +370,7 @@ int wxJoystick::GetNumberButtons() const
 
 int wxJoystick::GetNumberAxes() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
@@ -389,7 +383,7 @@ int wxJoystick::GetNumberAxes() const
 
 int wxJoystick::GetMaxButtons() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
@@ -402,7 +396,7 @@ int wxJoystick::GetMaxButtons() const
 
 int wxJoystick::GetMaxAxes() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
@@ -433,7 +427,7 @@ int wxJoystick::GetPollingMax() const
 
 int wxJoystick::GetRudderMin() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
@@ -446,7 +440,7 @@ int wxJoystick::GetRudderMin() const
 
 int wxJoystick::GetRudderMax() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
@@ -459,7 +453,7 @@ int wxJoystick::GetRudderMax() const
 
 int wxJoystick::GetUMin() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
@@ -472,7 +466,7 @@ int wxJoystick::GetUMin() const
 
 int wxJoystick::GetUMax() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
@@ -485,7 +479,7 @@ int wxJoystick::GetUMax() const
 
 int wxJoystick::GetVMin() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
@@ -498,7 +492,7 @@ int wxJoystick::GetVMin() const
 
 int wxJoystick::GetVMax() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
@@ -512,92 +506,92 @@ int wxJoystick::GetVMax() const
 
 bool wxJoystick::HasRudder() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
-        return FALSE;
+        return false;
     else
         return ((joyCaps.wCaps & JOYCAPS_HASR) == JOYCAPS_HASR);
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
 bool wxJoystick::HasZ() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
-        return FALSE;
+        return false;
     else
         return ((joyCaps.wCaps & JOYCAPS_HASZ) == JOYCAPS_HASZ);
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
 bool wxJoystick::HasU() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
-        return FALSE;
+        return false;
     else
         return ((joyCaps.wCaps & JOYCAPS_HASU) == JOYCAPS_HASU);
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
 bool wxJoystick::HasV() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
-        return FALSE;
+        return false;
     else
         return ((joyCaps.wCaps & JOYCAPS_HASV) == JOYCAPS_HASV);
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
 bool wxJoystick::HasPOV() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
-        return FALSE;
+        return false;
     else
         return ((joyCaps.wCaps & JOYCAPS_HASPOV) == JOYCAPS_HASPOV);
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
 bool wxJoystick::HasPOV4Dir() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
-        return FALSE;
+        return false;
     else
         return ((joyCaps.wCaps & JOYCAPS_POV4DIR) == JOYCAPS_POV4DIR);
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
 bool wxJoystick::HasPOVCTS() const
 {
-#if defined(__WIN32__) && !defined(__TWIN32__)
+#if defined(__WIN32__)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
-        return FALSE;
+        return false;
     else
         return ((joyCaps.wCaps & JOYCAPS_POVCTS) == JOYCAPS_POVCTS);
 #else
-    return FALSE;
+    return false;
 #endif
 }