Added DECLARE_LOCAL_EVENT_TYPE which doesn't use WXDLLEXPORT. This is

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

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 457ecbd4ddb445fe7831bc84c866a9207f2cb398..7369192305fbbe78871d9e3b9a9bb70cd83c9790 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -30,16 +30,19 @@ class wxRegion;
 
 enum wxRegionContain
 {
 
 enum wxRegionContain
 {

-  wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
+    wxOutRegion = 0, 
+    wxPartRegion = 1, 
+    wxInRegion = 2

 };
 
 // So far, for internal use only
 };
 
 // So far, for internal use only

-enum wxRegionOp {
-wxRGN_AND,          // Creates the intersection of the two combined regions.
-wxRGN_COPY,         // Creates a copy of the region identified by hrgnSrc1.
-wxRGN_DIFF,         // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
-wxRGN_OR,           // Creates the union of two combined regions.
-wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.
+enum wxRegionOp 
+{
+   wxRGN_AND,          // Creates the intersection of the two combined regions.
+   wxRGN_COPY,         // Creates a copy of the region identified by hrgnSrc1.
+   wxRGN_DIFF,         // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
+   wxRGN_OR,           // Creates the union of two combined regions.
+   wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -48,10 +51,7 @@ wxRGN_XOR           // Creates the union of two combined regions except for any
 
 class wxRegion : public wxGDIObject
 {
 
 class wxRegion : public wxGDIObject
 {

-  DECLARE_DYNAMIC_CLASS(wxRegion);
-
-  public:
-
+public:

     wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h );
     wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
     wxRegion( const wxRect& rect );
     wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h );
     wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
     wxRegion( const wxRect& rect );


@@ -95,10 +95,12 @@ class wxRegion : public wxGDIObject
     wxRegionContain Contains(const wxPoint& pt) const;
     wxRegionContain Contains(const wxRect& rect) const;
 
     wxRegionContain Contains(const wxPoint& pt) const;
     wxRegionContain Contains(const wxRect& rect) const;
 

-  public:
-
+public:

     wxList    *GetRectList() const;
     GdkRegion *GetRegion() const;
     wxList    *GetRectList() const;
     GdkRegion *GetRegion() const;

+    
+private:
+  DECLARE_DYNAMIC_CLASS(wxRegion);

 };
 
 class wxRegionIterator: public wxObject
 };
 
 class wxRegionIterator: public wxObject


@@ -107,7 +109,7 @@ public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
 
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
 

-    void Reset() { m_current = 0; }
+    void Reset() { m_current = 0u; }

     void Reset(const wxRegion& region);
 
     operator bool () const;
     void Reset(const wxRegion& region);
 
     operator bool () const;


@@ -125,8 +127,8 @@ public:
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 
 private:
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 
 private:

-    long       m_current;
-    wxRegion   m_region;
+    size_t   m_current;
+    wxRegion m_region;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxRegionIterator);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRegionIterator);