Applied patch to add n bitmaps at once to an image

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

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index b5aa46844cc91e51b1a4954e474fd4e5ff8a5cdc..877ee04e51853f44dd869ac5f3d707856a3b6d20 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        brush.h
+// Name:        wx/os2/brush.h
 // Purpose:     wxBrush class
 // Author:      David Webster
 // Modified by:
@@ -27,44 +27,37 @@ public:
     ~wxBrushRefData();
 
 protected:
-    int                             m_nStyle;
-    wxBitmap                        m_vStipple ;
-    wxColour                        m_vColour;
-    WXHBRUSH                        m_hBrush; // in OS/2 GPI this will be the PS the pen is associated with
-    AREABUNDLE                      m_vBundle;
+    int         m_nStyle;
+    wxBitmap    m_vStipple ;
+    wxColour    m_vColour;
+    WXHBRUSH    m_hBrush; // in OS/2 GPI this will be the PS the pen is associated with
+    AREABUNDLE  m_vBundle;
 };
 
 #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
-            ,int             nStyle
-           );
+    wxBrush(const wxColour& rCol, 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; }
-    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
-                           ,unsigned char cGreen
-                           ,unsigned char cBrush
-                          );
+    virtual void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBrush);
     virtual void SetPS(HPS hPS);
     virtual void SetStyle(int nStyle)  ;
     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); };
 
@@ -79,7 +72,7 @@ public:
     //
     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