guarding agains NULL

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

diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h
index 89cc04313e01cadd14c20af5b876434f7ad4c2fe..5b33475f99690c59c587c459461bcb48a33fa2ac 100644 (file)
--- a/include/wx/osx/private.h
+++ b/include/wx/osx/private.h
@@ -1,8 +1,7 @@
-/* common warning snippet for all osx direct includes */
+#ifndef _WX_PRIVATE_OSX_H_
+#define _WX_PRIVATE_OSX_H_

 
 

-#ifndef wxOSX_USE_CARBON
-#error "this files should only be included after platform.h was included
-#endif
+#include "wx/osx/core/private.h"

 
 #if wxOSX_USE_IPHONE
     #include "wx/osx/iphone/private.h"
 
 #if wxOSX_USE_IPHONE
     #include "wx/osx/iphone/private.h"


@@ -10,4 +9,8 @@
     #include "wx/osx/carbon/private.h"
 #elif wxOSX_USE_COCOA
     #include "wx/osx/cocoa/private.h"
     #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