fixing multiple extensions in one filter, turning off temporarily sheets code

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

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 26caf77531d10873046460a30227ae4030bfd05b..e465f0011f8abc0643c25643c4f51cd3eb986070 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -35,7 +35,8 @@ 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)
 
 #if wxUSE_IMAGE
     wxRegion( const wxBitmap& bmp)


@@ -63,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;