Initial commit for Laurent Humbertclaude's Windows slave.

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

diff --git a/include/wx/region.h b/include/wx/region.h
index eede02e6174dec282ba79ebeb709fc18a5e546f7..38c61ccf9c95979c70bb2cb9f51c4e07149f1f7d 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -55,7 +55,7 @@ enum wxRegionOp
 // wxRegionBase defines wxRegion API
 // ----------------------------------------------------------------------------
 
 // wxRegionBase defines wxRegion API
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxRegionBase : public wxGDIObject
+class WXDLLIMPEXP_CORE wxRegionBase : public wxGDIObject

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -82,9 +82,6 @@ public:
     // accessors
     // ---------
 
     // accessors
     // ---------
 

-    bool Ok() const { return IsOk(); }
-    bool IsOk() const { return m_refData != NULL; }
-

     // Is region empty?
     virtual bool IsEmpty() const = 0;
     bool Empty() const { return IsEmpty(); }
     // Is region empty?
     virtual bool IsEmpty() const = 0;
     bool Empty() const { return IsEmpty(); }


@@ -186,12 +183,12 @@ protected:
 // ports with Combine() in this class
 #if defined(__WXPALMOS__) || \
     defined(__WXMSW__) || \
 // ports with Combine() in this class
 #if defined(__WXPALMOS__) || \
     defined(__WXMSW__) || \

-    defined(__WXMAC__) || \
+    ( defined(__WXMAC__) && wxOSX_USE_CARBON ) || \

     defined(__WXPM__)
 
 #define wxHAS_REGION_COMBINE
 
     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
 {
 public:
     // these methods are not part of public API as they're not implemented on


@@ -231,7 +228,7 @@ protected:
 #elif defined(__WXDFB__)
     #include "wx/dfb/region.h"
 #elif defined(__WXMAC__)
 #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__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/region.h"
 #elif defined(__WXPM__)