X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58614078c466cffaf0e5d0369741706f130fb793..c0ab6adfedf92aa4457821422e77c19b80f10bee:/include/wx/gtk1/region.h

diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 9ba3f50125..0a88482937 100644
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -55,15 +55,18 @@ class wxRegion : public wxGDIObject
     wxRegion( long x, long y, long w, long h );
     wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
     wxRegion( const wxRect& rect );
-    wxRegion(void);
-    ~wxRegion(void);
+    wxRegion();
+    ~wxRegion();
 
-    inline wxRegion( const wxRegion& r ) 
+    inline wxRegion( const wxRegion& r ): wxGDIObject()
       { Ref(r); }
     inline wxRegion& operator = ( const wxRegion& r )
       { Ref(r); return (*this); }
 
-    void Clear(void);
+    bool operator == ( const wxRegion& region );
+    bool operator != ( const wxRegion& region );
+    
+    void Clear();
 
     bool Union( long x, long y, long width, long height );
     bool Union( const wxRect& rect );
@@ -82,9 +85,10 @@ class wxRegion : public wxGDIObject
     bool Xor( const wxRegion& region );
 
     void GetBox( long& x, long& y, long&w, long &h ) const;
-    wxRect GetBox(void) const ;
+    wxRect GetBox() const ;
 
-    bool Empty(void) const;
+    bool Empty() const;
+    bool IsEmpty() const { return Empty(); }
 
     wxRegionContain Contains( long x, long y ) const;
     wxRegionContain Contains( long x, long y, long w, long h ) const;
@@ -94,38 +98,38 @@ class wxRegion : public wxGDIObject
   public:
   
     wxList    *GetRectList() const;    
-    GdkRegion *GetRegion(void) const;
+    GdkRegion *GetRegion() const;
 };
 
 class wxRegionIterator: public wxObject 
 {
-  DECLARE_DYNAMIC_CLASS(wxRegionIterator);
-  
-  public:
-  
-    wxRegionIterator(void);
+public:
+    wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
 
-    void Reset(void) { m_current = 0; }
+    void Reset() { m_current = 0; }
     void Reset(const wxRegion& region);
 
-    operator bool (void) const;
-    bool HaveRects(void) const;
+    operator bool () const;
+    bool HaveRects() const;
 
-    void operator ++ (void);
+    void operator ++ ();
     void operator ++ (int);
 
-    long GetX(void) const;
-    long GetY(void) const;
-    long GetW(void) const;
-    long GetWidth(void) const { return GetW(); }
-    long GetH(void) const;
-    long GetHeight(void) const { return GetH(); }
+    wxCoord GetX() const;
+    wxCoord GetY() const;
+    wxCoord GetW() const;
+    wxCoord GetWidth() const { return GetW(); }
+    wxCoord GetH() const;
+    wxCoord GetHeight() const { return GetH(); }
+    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 
-  private:
-  
-   long       m_current;
-   wxRegion   m_region;
+private:
+    long       m_current;
+    wxRegion   m_region;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator);
 };