projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed unused var warning
[wxWidgets.git]
/
src
/
mac
/
carbon
/
joystick.cpp
diff --git
a/src/mac/carbon/joystick.cpp
b/src/mac/carbon/joystick.cpp
index 5a39ba118be58a1b68276499a04eed5b14e5d7a1..c56cf2001ac456c465ae792df6327c7c10f3b046 100644
(file)
--- a/
src/mac/carbon/joystick.cpp
+++ b/
src/mac/carbon/joystick.cpp
@@
-6,18
+6,16
@@
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "joystick.h"
-#endif
+#include "wx/wxprec.h"
-#i
nclude "wx/setup.h"
+#i
f wxUSE_JOYSTICK
-#i
nclude "wx/joystick.h"
+#i
f !defined (__WXMAC_OSX__)
-#i
f wxUSE_JOYSTICK
+#i
nclude "wx/joystick.h"
IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
@@
-92,7
+90,7
@@
bool wxJoystick::IsOk() const
return FALSE;
}
return FALSE;
}
-int wxJoystick::GetNumberJoysticks()
const
+int wxJoystick::GetNumberJoysticks()
{
// TODO
return 0;
{
// TODO
return 0;
@@
-113,7
+111,7
@@
int wxJoystick::GetProductId() const
wxString wxJoystick::GetProductName() const
{
// TODO
wxString wxJoystick::GetProductName() const
{
// TODO
- return wxString(
""
);
+ return wxString(
wxT("")
);
}
int wxJoystick::GetXMin() const
}
int wxJoystick::GetXMin() const
@@
-281,6
+279,8
@@
bool wxJoystick::ReleaseCapture()
return FALSE;
}
return FALSE;
}
+#endif
+ // !OSX
#endif
#endif
-
// wxUSE_JOYSTICK
+ // wxUSE_JOYSTICK