projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Better wxFile support, warning fixes and minor source cleaning.
[wxWidgets.git]
/
src
/
mac
/
carbon
/
joystick.cpp
diff --git
a/src/mac/carbon/joystick.cpp
b/src/mac/carbon/joystick.cpp
index 8136d9e59b35a08a1bd17ffc7f2e8e9e0000a983..83ef3bf68dabbe2383d1bd0cd0bb68fdf2658ce3 100644
(file)
--- a/
src/mac/carbon/joystick.cpp
+++ b/
src/mac/carbon/joystick.cpp
@@
-17,6
+17,8
@@
#if wxUSE_JOYSTICK
+#if !defined (__WXMAC_OSX__)
+
#include "wx/joystick.h"
IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
@@
-281,6
+283,8
@@
bool wxJoystick::ReleaseCapture()
return FALSE;
}
+#endif
+ // !OSX
#endif
// wxUSE_JOYSTICK