rename gsockmsw files to sockmsw

[wxWidgets.git] / include / wx / region.h

diff --git a/include/wx/region.h b/include/wx/region.h
index e2c82500b4d6f0ec7285291513ab2d216142a113..38c61ccf9c95979c70bb2cb9f51c4e07149f1f7d 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -55,7 +55,7 @@ enum wxRegionOp
 // wxRegionBase defines wxRegion API
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxRegionBase : public wxGDIObject
+class WXDLLIMPEXP_CORE wxRegionBase : public wxGDIObject
 {
 public:
     // ctors
@@ -183,12 +183,12 @@ 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
 
-class WXDLLEXPORT wxRegionWithCombine : public wxRegionBase
+class WXDLLIMPEXP_CORE wxRegionWithCombine : public wxRegionBase
 {
 public:
     // these methods are not part of public API as they're not implemented on
@@ -228,7 +228,7 @@ protected:
 #elif defined(__WXDFB__)
     #include "wx/dfb/region.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/region.h"
+    #include "wx/osx/region.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/region.h"
 #elif defined(__WXPM__)