don't do anything in SetWindowMenu() if we're setting the same menu as we already...

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

diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h
index 75cf558a221f9a048b4647010b68ce9c6d0b06d3..d3a75084d502a7b1dc7a2506b18b63767c779c7e 100644 (file)
--- a/include/wx/osx/private.h
+++ b/include/wx/osx/private.h
@@ -1,7 +1,18 @@
-#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"
+/* 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_
+
+#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"
+#endif
+
+#endif
\ No newline at end of file