osx regrouping

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h
index ce2ed5c6f803f05ae8c37f98939965dd31816655..89cc04313e01cadd14c20af5b876434f7ad4c2fe 100644 (file)
--- a/include/wx/osx/private.h
+++ b/include/wx/osx/private.h
@@ -1,7 +1,13 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/private.h"
-#elif defined(__WXOSX_IPHONE__)
-#include "wx/osx/core/private.h"
-#else
-#include "wx/osx/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
+
+#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

diff --git a/include/wx/osx/region.h b/include/wx/osx/region.h
index 8109c46c54f971c355d5d6db2811e64cbce67501..ea68dd8757f590bb62dbf9392ca8770169d2472f 100644 (file)
--- a/include/wx/osx/region.h
+++ b/include/wx/osx/region.h
@@ -1,5 +1,8 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/region.h"
-#else
+#if wxOSX_USE_CARBON
 #include "wx/osx/carbon/region.h"
+#else
+#define wxRegionGeneric wxRegion
+#define wxRegionIteratorGeneric wxRegionIterator
+
+#include "wx/generic/region.h"
 #endif