Revert HasModifiers() change in behaviour, add HasAnyModifiers().

[wxWidgets.git] / include / wx / osx / private.h

diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h
index 75cf558a221f9a048b4647010b68ce9c6d0b06d3..5b33475f99690c59c587c459461bcb48a33fa2ac 100644 (file)
--- a/include/wx/osx/private.h
+++ b/include/wx/osx/private.h
@@ -1,7 +1,16 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/private.h"
-#elif defined(__WXOSX_IPHONE__)
-#include "wx/mac/corefoundation/private.h"
-#else
-#include "wx/mac/carbon/private.h"
+#ifndef _WX_PRIVATE_OSX_H_
+#define _WX_PRIVATE_OSX_H_
+
+#include "wx/osx/core/private.h"
+
+#if wxOSX_USE_IPHONE
+    #include "wx/osx/iphone/private.h"
+#elif wxOSX_USE_CARBON
+    #include "wx/osx/carbon/private.h"
+#elif wxOSX_USE_COCOA
+    #include "wx/osx/cocoa/private.h"
+#elif wxUSE_GUI
+    #error "Must include wx/defs.h first"
+#endif
+
 #endif