adding OnLaunched

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

diff --git a/include/wx/region.h b/include/wx/region.h
index eede02e6174dec282ba79ebeb709fc18a5e546f7..c81d1cddaf0e6e89a9efa760dff2157e5c2bac22 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
@@ -67,7 +67,7 @@ public:
     wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
-    wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE);
+    wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
     wxRegion(const wxBitmap& bmp);
     wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0);
 #endif // 0
@@ -82,9 +82,6 @@ public:
     // 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(); }
@@ -184,14 +181,13 @@ protected:
 // some ports implement a generic Combine() function while others only
 // implement individual wxRegion operations, factor out the common code for the
 // ports with Combine() in this class
-#if defined(__WXPALMOS__) || \
-    defined(__WXMSW__) || \
-    defined(__WXMAC__) || \
+#if defined(__WXMSW__) || \
+    ( defined(__WXMAC__) && wxOSX_USE_COCOA_OR_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
@@ -216,9 +212,7 @@ protected:
 
 #endif // ports with wxRegion::Combine()
 
-#if defined(__WXPALMOS__)
-    #include "wx/palmos/region.h"
-#elif defined(__WXMSW__)
+#if defined(__WXMSW__)
     #include "wx/msw/region.h"
 #elif defined(__WXGTK20__)
     #include "wx/gtk/region.h"
@@ -226,12 +220,10 @@ protected:
     #include "wx/gtk1/region.h"
 #elif defined(__WXMOTIF__) || defined(__WXX11__)
     #include "wx/x11/region.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/region.h"
 #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__)