fixed compilation and added support for all 4 images (as a side effect) to the

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

diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 282904708ab5c4a3bf60911c75c82651c9d13f5d..b61066a2083b6d664a2cc425432f5e3e1c880af4 100644 (file)
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -2,9 +2,8 @@
 // Name:        region.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        region.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -59,11 +58,14 @@ class wxRegion : public wxGDIObject
     wxRegion(void);
     ~wxRegion(void);
 
     wxRegion(void);
     ~wxRegion(void);
 

-    inline wxRegion( const wxRegion& r ) 
+    inline wxRegion( const wxRegion& r ): wxGDIObject()

       { Ref(r); }
     inline wxRegion& operator = ( const wxRegion& r )
       { Ref(r); return (*this); }
 
       { Ref(r); }
     inline wxRegion& operator = ( const wxRegion& r )
       { Ref(r); return (*this); }
 

+    bool operator == ( const wxRegion& region );
+    bool operator != ( const wxRegion& region );
+    

     void Clear(void);
 
     bool Union( long x, long y, long width, long height );
     void Clear(void);
 
     bool Union( long x, long y, long width, long height );


@@ -89,11 +91,47 @@ class wxRegion : public wxGDIObject
 
     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;

+    wxRegionContain Contains(const wxPoint& pt) const;
+    wxRegionContain Contains(const wxRect& rect) const;

     
   public:
     
   public:

-    
+  
+    wxList    *GetRectList() const;    

     GdkRegion *GetRegion(void) const;
 };
 
     GdkRegion *GetRegion(void) const;
 };
 

+class wxRegionIterator: public wxObject 
+{
+  DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+  
+  public:
+  
+    wxRegionIterator(void);
+    wxRegionIterator(const wxRegion& region);
+
+    void Reset(void) { m_current = 0; }
+    void Reset(const wxRegion& region);
+
+    operator bool (void) const;
+    bool HaveRects(void) const;
+
+    void operator ++ (void);
+    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(); }
+    wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
+
+  private:
+  
+   long       m_current;
+   wxRegion   m_region;
+};
+
+

 #endif
        // __REGIONH__
 #endif
        // __REGIONH__