added wxConvFileName which is a variable, not define as wxConvFile; added comments...

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

diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h
index 2859c6ad397a1355cfb5c342fc3489c78037762d..144bb4a1cb47e61e3c133267316c87eee4d14146 100644 (file)
--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -11,7 +11,7 @@
 #ifndef __GTKBRUSHH__
 #define __GTKBRUSHH__
 
 #ifndef __GTKBRUSHH__
 #define __GTKBRUSHH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -31,24 +31,26 @@ class wxBrush;
 // wxBrush
 //-----------------------------------------------------------------------------
 
 // wxBrush
 //-----------------------------------------------------------------------------
 

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

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

-    
-    wxBrush( const wxColour &colour, int style );
+
+    wxBrush( const wxColour &colour, int style = wxSOLID );

     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();
     wxBrush( const wxBitmap &stippleBitmap );
     ~wxBrush();

-    
-    wxBrush( const wxBrush &brush ) { Ref(brush); }
+
+    wxBrush( const wxBrush &brush )
+        : wxBrushBase()
+        { Ref(brush); }

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

-    
+

     bool Ok() const { return m_refData != NULL; }
     bool Ok() const { return m_refData != NULL; }

-    
+

     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;
 


@@ -61,7 +63,7 @@ private:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

-    
+

     DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };