projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug introduced by previous commit (Swapped if/else order).
[wxWidgets.git]
/
src
/
msw
/
joystick.cpp
diff --git
a/src/msw/joystick.cpp
b/src/msw/joystick.cpp
index 0d0a0d0751905bc11e9a881311aceb588ea449d3..ac154cde1bf3d76f6e1eed25370a12ba7131ff91 100644
(file)
--- a/
src/msw/joystick.cpp
+++ b/
src/msw/joystick.cpp
@@
-9,7
+9,7
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "joystick.h"
#endif
#pragma implementation "joystick.h"
#endif
@@
-32,14
+32,12
@@
typedef UINT MMRESULT;
#endif
typedef UINT MMRESULT;
#endif
-#ifndef __TWIN32__
#ifdef __GNUWIN32_OLD__
#include "wx/msw/gnuwin32/extra.h"
#endif
#ifdef __GNUWIN32_OLD__
#include "wx/msw/gnuwin32/extra.h"
#endif
-#endif
// Why doesn't BC++ have joyGetPosEx?
// Why doesn't BC++ have joyGetPosEx?
-#if !defined(__WIN32__) || defined(__BORLANDC__)
|| defined(__TWIN32__)
+#if !defined(__WIN32__) || defined(__BORLANDC__)
#define NO_JOYGETPOSEX
#endif
#define NO_JOYGETPOSEX
#endif
@@
-376,7
+374,7
@@
int wxJoystick::GetNumberButtons() const
int wxJoystick::GetNumberAxes() 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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0;
@@
-389,7
+387,7
@@
int wxJoystick::GetNumberAxes() const
int wxJoystick::GetMaxButtons() 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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0;
@@
-402,7
+400,7
@@
int wxJoystick::GetMaxButtons() const
int wxJoystick::GetMaxAxes() 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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0;
@@
-433,7
+431,7
@@
int wxJoystick::GetPollingMax() const
int wxJoystick::GetRudderMin() 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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0;
@@
-446,7
+444,7
@@
int wxJoystick::GetRudderMin() const
int wxJoystick::GetRudderMax() 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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0;
@@
-459,7
+457,7
@@
int wxJoystick::GetRudderMax() const
int wxJoystick::GetUMin() 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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0;
@@
-472,7
+470,7
@@
int wxJoystick::GetUMin() const
int wxJoystick::GetUMax() 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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0;
@@
-485,7
+483,7
@@
int wxJoystick::GetUMax() const
int wxJoystick::GetVMin() 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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0;
@@
-498,7
+496,7
@@
int wxJoystick::GetVMin() const
int wxJoystick::GetVMax() 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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return 0;
@@
-512,7
+510,7
@@
int wxJoystick::GetVMax() const
bool wxJoystick::HasRudder() 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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE;
@@
-525,7
+523,7
@@
bool wxJoystick::HasRudder() const
bool wxJoystick::HasZ() const
{
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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE;
@@
-538,7
+536,7
@@
bool wxJoystick::HasZ() const
bool wxJoystick::HasU() const
{
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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE;
@@
-551,7
+549,7
@@
bool wxJoystick::HasU() const
bool wxJoystick::HasV() const
{
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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE;
@@
-564,7
+562,7
@@
bool wxJoystick::HasV() const
bool wxJoystick::HasPOV() const
{
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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE;
@@
-577,7
+575,7
@@
bool wxJoystick::HasPOV() const
bool wxJoystick::HasPOV4Dir() const
{
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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE;
@@
-590,7
+588,7
@@
bool wxJoystick::HasPOV4Dir() const
bool wxJoystick::HasPOVCTS() const
{
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;
JOYCAPS joyCaps;
if (joyGetDevCaps(m_joystick, & joyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
return FALSE;
projects / wxWidgets.git / blobdiff