Use "_x64" instead of "amd64" for x64 MSW makefile builds.

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

diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h
index ba09d4087288085f2ff05c98fad6b5bd6b6e7ebb..5b33475f99690c59c587c459461bcb48a33fa2ac 100644 (file)
--- a/include/wx/osx/private.h
+++ b/include/wx/osx/private.h
@@ -1,18 +1,16 @@
-/* common warning snippet for all osx direct includes */
-
-#ifndef wxOSX_USE_CARBON
-#error "this files should only be included after platform.h was included
-#endif
-

 #ifndef _WX_PRIVATE_OSX_H_
 #define _WX_PRIVATE_OSX_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"
 #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
 

-#endif
\ No newline at end of file
+#endif