]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2301e28)
Fix cvs conflict.
authorRobert Roebling <robert@roebling.de>
Sat, 26 May 2001 21:11:10 +0000 (21:11 +0000)
committerRobert Roebling <robert@roebling.de>
Sat, 26 May 2001 21:11:10 +0000 (21:11 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/joystick.cpp patch | blob | blame | history
src/mac/joystick.cpp patch | blob | blame | history

diff --git a/src/mac/carbon/joystick.cpp b/src/mac/carbon/joystick.cpp
index 49b1e38e9438afd2db824faaf65e67d453dd7249..2aecad336df3734e09d441d8a4d691fd98933376 100644 (file)
--- a/src/mac/carbon/joystick.cpp
+++ b/src/mac/carbon/joystick.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "joystick.h"
 #endif
 
+#include <wx/setup.h>
+
 #include <wx/joystick.h>
 
 #if wxUSE_JOYSTICK
diff --git a/src/mac/joystick.cpp b/src/mac/joystick.cpp
index 49b1e38e9438afd2db824faaf65e67d453dd7249..2aecad336df3734e09d441d8a4d691fd98933376 100644 (file)
--- a/src/mac/joystick.cpp
+++ b/src/mac/joystick.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "joystick.h"
 #endif
 
+#include <wx/setup.h>
+
 #include <wx/joystick.h>
 
 #if wxUSE_JOYSTICK
wxWidgets (Impactor)