Updated version to 2.5.5

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

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index b5aa46844cc91e51b1a4954e474fd4e5ff8a5cdc..365a4a0575b634ec0a78777f5482ac189156164f 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -37,22 +37,22 @@ protected:
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
 // Brush
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
 // Brush

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

 {
     DECLARE_DYNAMIC_CLASS(wxBrush)
 
 public:
     wxBrush();
     wxBrush( const wxColour& rCol
 {
     DECLARE_DYNAMIC_CLASS(wxBrush)
 
 public:
     wxBrush();
     wxBrush( const wxColour& rCol

-            ,int             nStyle
+            ,int             nStyle = wxSOLID

            );
     wxBrush(const wxBitmap& rStipple);
     inline wxBrush(const wxBrush& rBrush) { Ref(rBrush); }
     ~wxBrush();
 
     inline wxBrush& operator = (const wxBrush& rBrush) { if (*this == rBrush) return (*this); Ref(rBrush); return *this; }
            );
     wxBrush(const wxBitmap& rStipple);
     inline wxBrush(const wxBrush& rBrush) { Ref(rBrush); }
     ~wxBrush();
 
     inline wxBrush& operator = (const wxBrush& rBrush) { if (*this == rBrush) return (*this); Ref(rBrush); return *this; }

-    inline bool operator == (const wxBrush& rBrush) { return m_refData == rBrush.m_refData; }
-    inline bool operator != (const wxBrush& rBrush) { return m_refData != rBrush.m_refData; }
+    inline bool operator == (const wxBrush& rBrush) const { return m_refData == rBrush.m_refData; }
+    inline bool operator != (const wxBrush& rBrush) const { return m_refData != rBrush.m_refData; }

 
     virtual void SetColour(const wxColour& rColour);
     virtual void SetColour( unsigned char cRed
 
     virtual void SetColour(const wxColour& rColour);
     virtual void SetColour( unsigned char cRed


@@ -64,7 +64,7 @@ public:
     virtual void SetStipple(const wxBitmap& rStipple);
 
     inline wxColour& GetColour(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_vColour : wxNullColour); };
     virtual void SetStipple(const wxBitmap& rStipple);
 
     inline wxColour& GetColour(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_vColour : wxNullColour); };

-    inline int       GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_nStyle : 0); };
+    virtual int      GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_nStyle : 0); };

     inline wxBitmap* GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_vStipple : 0); };
     inline int       GetPS(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_hBrush : 0); };
 
     inline wxBitmap* GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_vStipple : 0); };
     inline int       GetPS(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_hBrush : 0); };
 


@@ -79,7 +79,7 @@ public:
     //
     bool     RealizeResource(void);
     WXHANDLE GetResourceHandle(void) ;
     //
     bool     RealizeResource(void);
     WXHANDLE GetResourceHandle(void) ;

-    bool     FreeResource(bool bForce = FALSE);
+    bool     FreeResource(bool bForce = false);

     bool     IsFree(void) const;
     void     Unshare(void);
 }; // end of CLASS wxBrush
     bool     IsFree(void) const;
     void     Unshare(void);
 }; // end of CLASS wxBrush