Added wxStrnicmp and to wchar.h, not yet for Unicode mode.

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

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 33af4087c35bc0f0f87f13d6fd8b6c037eeefccc..0a8848293731d91b72c09a1084d05fbfc3975d61 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/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( 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 ): wxGDIObject()
       { Ref(r); }
     inline wxRegion& operator = ( const wxRegion& r )
       { Ref(r); return (*this); }
 
 
     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 );
 
     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;
     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;
 
     wxRegionContain Contains( long x, long y ) const;
     wxRegionContain Contains( long x, long y, long w, long h ) const;


@@ -94,39 +98,38 @@ class wxRegion : public wxGDIObject
   public:
   
     wxList    *GetRectList() const;    
   public:
   
     wxList    *GetRectList() const;    

-    GdkRegion *GetRegion(void) const;
+    GdkRegion *GetRegion() const;

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

-  DECLARE_DYNAMIC_CLASS(wxRegionIterator);
-  
-  public:
-  
-    wxRegionIterator(void);
+public:
+    wxRegionIterator();

     wxRegionIterator(const wxRegion& region);
 
     wxRegionIterator(const wxRegion& region);
 

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

     void Reset(const wxRegion& region);
 
     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);
 
     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()); }
 
     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);

 };
 
 
 };