wxTheColourDatabase->Find() can fail.

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

diff --git a/include/wx/mac/carbon/region.h b/include/wx/mac/carbon/region.h
index 923a0014ad02b7315760d6affa8b687f83dea63f..ce3a08204a087ef8efafac528bc8b5d9e65f2b85 100644 (file)
--- a/include/wx/mac/carbon/region.h
+++ b/include/wx/mac/carbon/region.h
@@ -12,10 +12,6 @@
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "region.h"
-#endif
-

 #include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 #include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"


@@ -37,7 +33,7 @@ wxRGN_XOR           // Creates the union of two combined regions except for any
 };
 
 class WXDLLEXPORT wxRegion : public wxGDIObject {
 };
 
 class WXDLLEXPORT wxRegion : public wxGDIObject {

-DECLARE_DYNAMIC_CLASS(wxRegion);
+DECLARE_DYNAMIC_CLASS(wxRegion)

     friend class WXDLLEXPORT wxRegionIterator;
 public:
     wxRegion(long x, long y, long w, long h);
     friend class WXDLLEXPORT wxRegionIterator;
 public:
     wxRegion(long x, long y, long w, long h);


@@ -58,17 +54,13 @@ public:
 
     ~wxRegion();
 
 
     ~wxRegion();
 

-    //# Copying
-    wxRegion(const wxRegion& r)
-        : wxGDIObject()
-    { Ref(r); }
-    wxRegion& operator = (const wxRegion& r)
-    { Ref(r); return (*this); }
-

     //# Modify region
     // Clear current region
     void Clear();
 
     //# Modify region
     // Clear current region
     void Clear();
 

+    // Move the region
+    bool Offset(wxCoord x, wxCoord y);
+

     // Union rectangle or region with this.
     bool Union(long x, long y, long width, long height)
         { return Combine(x, y, width, height, wxRGN_OR); }
     // Union rectangle or region with this.
     bool Union(long x, long y, long width, long height)
         { return Combine(x, y, width, height, wxRGN_OR); }