Move wxCocoa's wxFontRefData from the header to the implementation file.

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

diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index 7911b1338f77bd18b10295afaa3c43d917614ea1..1b9f8b04cede331fa8819b936854cf4745c2daef 100644 (file)
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -1,37 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxJoystick class
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxJoystick class
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "joystick.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if defined(__BORLANDC__)
-#pragma hdrstop
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include <windows.h>
+#if wxUSE_JOYSTICK

 
 

-#ifndef __GNUWIN32__
-#include <mmsystem.h>
-#endif
+#include "wx/joystick.h"

 
 

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

 #endif
 
 #endif
 

-#ifdef __GNUWIN32__
-#include <wx/msw/gnuwin32/extra.h>
+#include "wx/msw/private.h"
+
+#if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
+    #include <mmsystem.h>

 #endif
 
 // Why doesn't BC++ have joyGetPosEx?
 #endif
 
 // Why doesn't BC++ have joyGetPosEx?


@@ -39,24 +36,77 @@ typedef UINT MMRESULT;
 #define NO_JOYGETPOSEX
 #endif
 
 #define NO_JOYGETPOSEX
 #endif
 

-#include <wx/msw/joystick.h>
+#include "wx/msw/registry.h"
+
+#include <regstr.h>

 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes
 ////////////////////////////////////////////////////////////////////////////
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
 
 // Attributes
 ////////////////////////////////////////////////////////////////////////////
 

-wxPoint wxJoystick::GetPosition(void) const
+/**
+    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;
+}
+
+wxPoint wxJoystick::GetPosition() const

 {
     JOYINFO joyInfo;
     MMRESULT res = joyGetPos(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
         return wxPoint(joyInfo.wXpos, joyInfo.wYpos);
     else
 {
     JOYINFO joyInfo;
     MMRESULT res = joyGetPos(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
         return wxPoint(joyInfo.wXpos, joyInfo.wYpos);
     else

-        return wxPoint(0, 0);
+        return wxPoint(0,0);
+}
+
+int wxJoystick::GetPosition(unsigned axis) const
+{
+    switch (axis) {
+    case 0:
+        return GetPosition().x;
+    case 1:
+        return GetPosition().y;
+    case 2:
+        return GetZPosition();
+    case 3:
+        return GetRudderPosition();
+    case 4:
+        return GetUPosition();
+    case 5:
+        return GetVPosition();
+    default:
+        return 0;
+    }

 }
 
 }
 

-int wxJoystick::GetZPosition(void) const
+int wxJoystick::GetZPosition() const

 {
     JOYINFO joyInfo;
     MMRESULT res = joyGetPos(m_joystick, & joyInfo);
 {
     JOYINFO joyInfo;
     MMRESULT res = joyGetPos(m_joystick, & joyInfo);


@@ -66,12 +116,19 @@ int wxJoystick::GetZPosition(void) const
         return 0;
 }
 
         return 0;
 }
 

-int wxJoystick::GetButtonState(void) const
+/**
+    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

 {
     JOYINFO joyInfo;
     MMRESULT res = joyGetPos(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {
 {
     JOYINFO joyInfo;
     MMRESULT res = joyGetPos(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {

+        return joyInfo.wButtons;
+#if 0

         int buttons = 0;
 
         if (joyInfo.wButtons & JOY_BUTTON1)
         int buttons = 0;
 
         if (joyInfo.wButtons & JOY_BUTTON1)


@@ -82,51 +139,72 @@ int wxJoystick::GetButtonState(void) const
             buttons |= wxJOY_BUTTON3;
         if (joyInfo.wButtons & JOY_BUTTON4)
             buttons |= wxJOY_BUTTON4;
             buttons |= wxJOY_BUTTON3;
         if (joyInfo.wButtons & JOY_BUTTON4)
             buttons |= wxJOY_BUTTON4;

+

         return buttons;
         return buttons;

+#endif

     }
     else
         return 0;
 }
 
     }
     else
         return 0;
 }
 

-int wxJoystick::GetPOVPosition(void) const
+bool wxJoystick::GetButtonState(unsigned id) const
+{
+    if (id > sizeof(int) * 8)
+        return false;
+
+    return (GetButtonState() & (1 << id)) != 0;
+}
+
+/**
+    JLI 2002-08-20:
+    Returns -1 to signify error.
+*/
+int wxJoystick::GetPOVPosition() const

 {
 #ifndef NO_JOYGETPOSEX
     JOYINFOEX joyInfo;
     joyInfo.dwFlags = JOY_RETURNPOV;
 {
 #ifndef NO_JOYGETPOSEX
     JOYINFOEX joyInfo;
     joyInfo.dwFlags = JOY_RETURNPOV;

+    joyInfo.dwSize = sizeof(joyInfo);

     MMRESULT res = joyGetPosEx(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {
         return joyInfo.dwPOV;
     }
     else
     MMRESULT res = joyGetPosEx(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {
         return joyInfo.dwPOV;
     }
     else

-        return 0;
+        return -1;

 #else
 #else

-    return 0;
+    return -1;

 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetPOVCTSPosition(void) const
+/**
+    johan@linkdata.se 2002-08-20:
+    Returns -1 to signify error.
+*/
+int wxJoystick::GetPOVCTSPosition() const

 {
 #ifndef NO_JOYGETPOSEX
     JOYINFOEX joyInfo;
     joyInfo.dwFlags = JOY_RETURNPOVCTS;
 {
 #ifndef NO_JOYGETPOSEX
     JOYINFOEX joyInfo;
     joyInfo.dwFlags = JOY_RETURNPOVCTS;

+    joyInfo.dwSize = sizeof(joyInfo);

     MMRESULT res = joyGetPosEx(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {
         return joyInfo.dwPOV;
     }
     else
     MMRESULT res = joyGetPosEx(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {
         return joyInfo.dwPOV;
     }
     else

-        return 0;
+        return -1;

 #else
 #else

-    return 0;
+    return -1;

 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetRudderPosition(void) const
+int wxJoystick::GetRudderPosition() const

 {
 #ifndef NO_JOYGETPOSEX
     JOYINFOEX joyInfo;
     joyInfo.dwFlags = JOY_RETURNR;
 {
 #ifndef NO_JOYGETPOSEX
     JOYINFOEX joyInfo;
     joyInfo.dwFlags = JOY_RETURNR;

+    joyInfo.dwSize = sizeof(joyInfo);

     MMRESULT res = joyGetPosEx(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {
     MMRESULT res = joyGetPosEx(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {


@@ -139,11 +217,12 @@ int wxJoystick::GetRudderPosition(void) const
 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetUPosition(void) const
+int wxJoystick::GetUPosition() const

 {
 #ifndef NO_JOYGETPOSEX
     JOYINFOEX joyInfo;
     joyInfo.dwFlags = JOY_RETURNU;
 {
 #ifndef NO_JOYGETPOSEX
     JOYINFOEX joyInfo;
     joyInfo.dwFlags = JOY_RETURNU;

+    joyInfo.dwSize = sizeof(joyInfo);

     MMRESULT res = joyGetPosEx(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {
     MMRESULT res = joyGetPosEx(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {


@@ -156,11 +235,12 @@ int wxJoystick::GetUPosition(void) const
 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetVPosition(void) const
+int wxJoystick::GetVPosition() const

 {
 #ifndef NO_JOYGETPOSEX
     JOYINFOEX joyInfo;
     joyInfo.dwFlags = JOY_RETURNV;
 {
 #ifndef NO_JOYGETPOSEX
     JOYINFOEX joyInfo;
     joyInfo.dwFlags = JOY_RETURNV;

+    joyInfo.dwSize = sizeof(joyInfo);

     MMRESULT res = joyGetPosEx(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {
     MMRESULT res = joyGetPosEx(m_joystick, & joyInfo);
     if (res == JOYERR_NOERROR )
     {


@@ -173,7 +253,7 @@ int wxJoystick::GetVPosition(void) const
 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetMovementThreshold(void) const
+int wxJoystick::GetMovementThreshold() const

 {
     UINT thresh = 0;
     MMRESULT res = joyGetThreshold(m_joystick, & thresh);
 {
     UINT thresh = 0;
     MMRESULT res = joyGetThreshold(m_joystick, & thresh);


@@ -194,19 +274,39 @@ void wxJoystick::SetMovementThreshold(int threshold)
 // Capabilities
 ////////////////////////////////////////////////////////////////////////////
 
 // Capabilities
 ////////////////////////////////////////////////////////////////////////////
 

-bool wxJoystick::IsOk(void) const
+/**
+    johan@linkdata.se 2002-08-20:
+    Now returns the number of connected, functioning
+    joysticks, as intended.
+*/
+int wxJoystick::GetNumberJoysticks()

 {
     JOYINFO joyInfo;
 {
     JOYINFO joyInfo;

-    MMRESULT res = joyGetPos(m_joystick, & joyInfo);
-    return ((joyGetNumDevs() > 0) || (res == JOYERR_NOERROR));
+    int i, maxsticks, actualsticks;
+    maxsticks = joyGetNumDevs();
+    actualsticks = 0;
+    for( i=0; i<maxsticks; i++ )
+    {
+        if( joyGetPos( i, & joyInfo ) == JOYERR_NOERROR )
+        {
+            actualsticks ++;
+        }
+    }
+    return actualsticks;

 }
 
 }
 

-int wxJoystick::GetNumberJoysticks(void) const
+/**
+    johan@linkdata.se 2002-08-20:
+    The old code returned true if there were any
+    joystick capable drivers loaded (=always).
+*/
+bool wxJoystick::IsOk() const

 {
 {

-    return joyGetNumDevs();
+    JOYINFO joyInfo;
+    return (joyGetPos(m_joystick, & joyInfo) == JOYERR_NOERROR);

 }
 
 }
 

-int wxJoystick::GetManufacturerId(void) const
+int wxJoystick::GetManufacturerId() const

 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)


@@ -215,7 +315,7 @@ int wxJoystick::GetManufacturerId(void) const
         return joyCaps.wMid;
 }
 
         return joyCaps.wMid;
 }
 

-int wxJoystick::GetProductId(void) const
+int wxJoystick::GetProductId() const

 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)


@@ -224,16 +324,29 @@ int wxJoystick::GetProductId(void) const
         return joyCaps.wPid;
 }
 
         return joyCaps.wPid;
 }
 

-wxString wxJoystick::GetProductName(void) const
+wxString wxJoystick::GetProductName() const

 {
 {

+    wxString str;
+#ifndef __WINE__

     JOYCAPS joyCaps;
     JOYCAPS joyCaps;

-    if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
-        return wxString("");
-    else
-        return wxString(joyCaps.szPname);
+    if (joyGetDevCaps(m_joystick, &joyCaps, sizeof(joyCaps)) != JOYERR_NOERROR)
+        return wxEmptyString;
+
+    wxRegKey key1(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s\\%s"),
+                   REGSTR_PATH_JOYCONFIG, joyCaps.szRegKey, REGSTR_KEY_JOYCURR));
+
+    key1.QueryValue(wxString::Format(wxT("Joystick%d%s"),
+                                     m_joystick + 1, REGSTR_VAL_JOYOEMNAME),
+                    str);
+
+    wxRegKey key2(wxString::Format(wxT("HKEY_LOCAL_MACHINE\\%s\\%s"),
+                                        REGSTR_PATH_JOYOEM, str.c_str()));
+    key2.QueryValue(REGSTR_VAL_JOYOEMNAME, str);
+#endif
+    return str;

 }
 
 }
 

-int wxJoystick::GetXMin(void) const
+int wxJoystick::GetXMin() const

 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)


@@ -242,7 +355,7 @@ int wxJoystick::GetXMin(void) const
         return joyCaps.wXmin;
 }
 
         return joyCaps.wXmin;
 }
 

-int wxJoystick::GetYMin(void) const
+int wxJoystick::GetYMin() const

 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)


@@ -251,7 +364,7 @@ int wxJoystick::GetYMin(void) const
         return joyCaps.wYmin;
 }
 
         return joyCaps.wYmin;
 }
 

-int wxJoystick::GetZMin(void) const
+int wxJoystick::GetZMin() const

 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)


@@ -260,7 +373,7 @@ int wxJoystick::GetZMin(void) const
         return joyCaps.wZmin;
 }
 
         return joyCaps.wZmin;
 }
 

-int wxJoystick::GetXMax(void) const
+int wxJoystick::GetXMax() const

 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)


@@ -269,7 +382,7 @@ int wxJoystick::GetXMax(void) const
         return joyCaps.wXmax;
 }
 
         return joyCaps.wXmax;
 }
 

-int wxJoystick::GetYMax(void) const
+int wxJoystick::GetYMax() const

 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)


@@ -278,7 +391,7 @@ int wxJoystick::GetYMax(void) const
         return joyCaps.wYmax;
 }
 
         return joyCaps.wYmax;
 }
 

-int wxJoystick::GetZMax(void) const
+int wxJoystick::GetZMax() const

 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)


@@ -287,7 +400,7 @@ int wxJoystick::GetZMax(void) const
         return joyCaps.wZmax;
 }
 
         return joyCaps.wZmax;
 }
 

-int wxJoystick::GetNumberButtons(void) const
+int wxJoystick::GetNumberButtons() const

 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)


@@ -296,9 +409,9 @@ int wxJoystick::GetNumberButtons(void) const
         return joyCaps.wNumButtons;
 }
 
         return joyCaps.wNumButtons;
 }
 

-int wxJoystick::GetNumberAxes(void) const
+int wxJoystick::GetNumberAxes() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;


@@ -309,9 +422,9 @@ int wxJoystick::GetNumberAxes(void) const
 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetMaxButtons(void) const
+int wxJoystick::GetMaxButtons() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;


@@ -322,9 +435,9 @@ int wxJoystick::GetMaxButtons(void) const
 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetMaxAxes(void) const
+int wxJoystick::GetMaxAxes() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;


@@ -335,7 +448,7 @@ int wxJoystick::GetMaxAxes(void) const
 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetPollingMin(void) const
+int wxJoystick::GetPollingMin() const

 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)


@@ -344,7 +457,7 @@ int wxJoystick::GetPollingMin(void) const
         return joyCaps.wPeriodMin;
 }
 
         return joyCaps.wPeriodMin;
 }
 

-int wxJoystick::GetPollingMax(void) const
+int wxJoystick::GetPollingMax() const

 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
 {
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)


@@ -353,9 +466,9 @@ int wxJoystick::GetPollingMax(void) const
         return joyCaps.wPeriodMax;
 }
 
         return joyCaps.wPeriodMax;
 }
 

-int wxJoystick::GetRudderMin(void) const
+int wxJoystick::GetRudderMin() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;


@@ -366,9 +479,9 @@ int wxJoystick::GetRudderMin(void) const
 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetRudderMax(void) const
+int wxJoystick::GetRudderMax() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;


@@ -379,9 +492,9 @@ int wxJoystick::GetRudderMax(void) const
 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetUMin(void) const
+int wxJoystick::GetUMin() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;


@@ -392,9 +505,9 @@ int wxJoystick::GetUMin(void) const
 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetUMax(void) const
+int wxJoystick::GetUMax() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;


@@ -405,9 +518,9 @@ int wxJoystick::GetUMax(void) const
 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetVMin(void) const
+int wxJoystick::GetVMin() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;


@@ -418,9 +531,9 @@ int wxJoystick::GetVMin(void) const
 #endif
 }
 
 #endif
 }
 

-int wxJoystick::GetVMax(void) const
+int wxJoystick::GetVMax() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
         return 0;


@@ -432,94 +545,94 @@ int wxJoystick::GetVMax(void) const
 }
 
 
 }
 
 

-bool wxJoystick::HasRudder(void) const
+bool wxJoystick::HasRudder() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)

-        return FALSE;
+        return false;

     else
         return ((joyCaps.wCaps & JOYCAPS_HASR) == JOYCAPS_HASR);
 #else
     else
         return ((joyCaps.wCaps & JOYCAPS_HASR) == JOYCAPS_HASR);
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 

-bool wxJoystick::HasZ(void) const
+bool wxJoystick::HasZ() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)

-        return FALSE;
+        return false;

     else
         return ((joyCaps.wCaps & JOYCAPS_HASZ) == JOYCAPS_HASZ);
 #else
     else
         return ((joyCaps.wCaps & JOYCAPS_HASZ) == JOYCAPS_HASZ);
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 

-bool wxJoystick::HasU(void) const
+bool wxJoystick::HasU() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)

-        return FALSE;
+        return false;

     else
         return ((joyCaps.wCaps & JOYCAPS_HASU) == JOYCAPS_HASU);
 #else
     else
         return ((joyCaps.wCaps & JOYCAPS_HASU) == JOYCAPS_HASU);
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 

-bool wxJoystick::HasV(void) const
+bool wxJoystick::HasV() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)

-        return FALSE;
+        return false;

     else
         return ((joyCaps.wCaps & JOYCAPS_HASV) == JOYCAPS_HASV);
 #else
     else
         return ((joyCaps.wCaps & JOYCAPS_HASV) == JOYCAPS_HASV);
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 

-bool wxJoystick::HasPOV(void) const
+bool wxJoystick::HasPOV() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)

-        return FALSE;
+        return false;

     else
         return ((joyCaps.wCaps & JOYCAPS_HASPOV) == JOYCAPS_HASPOV);
 #else
     else
         return ((joyCaps.wCaps & JOYCAPS_HASPOV) == JOYCAPS_HASPOV);
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 

-bool wxJoystick::HasPOV4Dir(void) const
+bool wxJoystick::HasPOV4Dir() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)

-        return FALSE;
+        return false;

     else
         return ((joyCaps.wCaps & JOYCAPS_POV4DIR) == JOYCAPS_POV4DIR);
 #else
     else
         return ((joyCaps.wCaps & JOYCAPS_POV4DIR) == JOYCAPS_POV4DIR);
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 

-bool wxJoystick::HasPOVCTS(void) const
+bool wxJoystick::HasPOVCTS() const

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__)

     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
     JOYCAPS joyCaps;
     if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)

-        return FALSE;
+        return false;

     else
         return ((joyCaps.wCaps & JOYCAPS_POVCTS) == JOYCAPS_POVCTS);
 #else
     else
         return ((joyCaps.wCaps & JOYCAPS_POVCTS) == JOYCAPS_POVCTS);
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -533,9 +646,10 @@ bool wxJoystick::SetCapture(wxWindow* win, int pollingFreq)
     return (res == JOYERR_NOERROR);
 }
 
     return (res == JOYERR_NOERROR);
 }
 

-bool wxJoystick::ReleaseCapture(void)
+bool wxJoystick::ReleaseCapture()

 {
     MMRESULT res = joyReleaseCapture(m_joystick);
     return (res == JOYERR_NOERROR);
 }
 
 {
     MMRESULT res = joyReleaseCapture(m_joystick);
     return (res == JOYERR_NOERROR);
 }
 

+#endif // wxUSE_JOYSTICK