Wrap <commdlgs.h> as <commctls.h>. Required makefiles rebuilded.

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

diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index 52953d6a135465afecd9e264a4575fb1ed7d3433..144bb4a1cb47e61e3c133267316c87eee4d14146 100644 (file)
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -31,7 +31,7 @@ class wxBrush;
 // wxBrush
 //-----------------------------------------------------------------------------
 
 // wxBrush
 //-----------------------------------------------------------------------------
 

-class wxBrush: public wxGDIObject
+class wxBrush: public wxBrushBase

 {
 public:
     wxBrush() { }
 {
 public:
     wxBrush() { }


@@ -41,7 +41,7 @@ public:
     ~wxBrush();
 
     wxBrush( const wxBrush &brush )
     ~wxBrush();
 
     wxBrush( const wxBrush &brush )

-        : wxGDIObject()
+        : wxBrushBase()

         { Ref(brush); }
     wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; }
 
         { Ref(brush); }
     wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; }
 


@@ -50,13 +50,10 @@ public:
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }
 
     bool operator == ( const wxBrush& brush ) const;
     bool operator != (const wxBrush& brush) const { return !(*this == brush); }
 

-    int GetStyle() const;
+    virtual int GetStyle() const;

     wxColour &GetColour() const;
     wxBitmap *GetStipple() const;
 
     wxColour &GetColour() const;
     wxBitmap *GetStipple() const;
 

-    bool IsHatch() const
-        { return (GetStyle()>=wxBDIAGONAL_HATCH) && (GetStyle()<=wxVERTICAL_HATCH); }
-

     void SetColour( const wxColour& col );
     void SetColour( unsigned char r, unsigned char g, unsigned char b );
     void SetStyle( int style );
     void SetColour( const wxColour& col );
     void SetColour( unsigned char r, unsigned char g, unsigned char b );
     void SetStyle( int style );