osx regrouping

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-29 20:22:57 +00:00
parent 052e5ec5f3
commit ac9e3f1f1c
9 changed files with 38 additions and 13 deletions
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -183,7 +183,7 @@ protected:
 // ports with Combine() in this class
 #if defined(__WXPALMOS__) || \
    defined(__WXMSW__) || \
-    defined(__WXMAC__) || \
+    ( defined(__WXMAC__) && wxOSX_USE_CARBON ) || \
    defined(__WXPM__)

 #define wxHAS_REGION_COMBINE