Move wxBell() from base to core library.

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

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 71f47a47aa06c491a8717d16a955c61421cd4e7f..a00a0af6740924bae69db12ddad1c6401db99d8c 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -35,8 +35,10 @@ public:
         InitRect(rect.x, rect.y, rect.width, rect.height);
     }
 
         InitRect(rect.x, rect.y, rect.width, rect.height);
     }
 

-    wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
+    wxRegion( size_t n, const wxPoint *points,
+              wxPolygonFillMode fillStyle = wxODDEVEN_RULE );

 
 

+#if wxUSE_IMAGE

     wxRegion( const wxBitmap& bmp)
     {
         Union(bmp);
     wxRegion( const wxBitmap& bmp)
     {
         Union(bmp);


@@ -46,6 +48,7 @@ public:
     {
         Union(bmp, transColour, tolerance);
     }
     {
         Union(bmp, transColour, tolerance);
     }

+#endif // wxUSE_IMAGE

 
     virtual ~wxRegion();
 
 
     virtual ~wxRegion();
 


@@ -61,9 +64,8 @@ public:
     GdkRegion *GetRegion() const;
 
 protected:
     GdkRegion *GetRegion() const;
 
 protected:

-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
     // wxRegionBase pure virtuals
     virtual bool DoIsEqual(const wxRegion& region) const;
 
     // wxRegionBase pure virtuals
     virtual bool DoIsEqual(const wxRegion& region) const;


@@ -94,8 +96,11 @@ class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);

+    wxRegionIterator(const wxRegionIterator& ri) : wxObject(ri) { Init(); *this = ri; }

     ~wxRegionIterator();
 
     ~wxRegionIterator();
 

+    wxRegionIterator& operator=(const wxRegionIterator& ri);
+

     void Reset() { m_current = 0u; }
     void Reset(const wxRegion& region);
 
     void Reset() { m_current = 0u; }
     void Reset(const wxRegion& region);
 


@@ -117,13 +122,11 @@ private:
     void Init();
     void CreateRects( const wxRegion& r );
 
     void Init();
     void CreateRects( const wxRegion& r );
 

-    size_t   m_current;

     wxRegion m_region;
     wxRegion m_region;

-

     wxRect *m_rects;
     wxRect *m_rects;

-    size_t  m_numRects;
+    int m_numRects;
+    int m_current;

 
 

-private:

     DECLARE_DYNAMIC_CLASS(wxRegionIterator)
 };
 
     DECLARE_DYNAMIC_CLASS(wxRegionIterator)
 };