Application of the most recent wxWebView patch, the only changes were so tab to space...

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

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index 0e03ceb99291b7d4ff41ba66679eb9fc6e54c0f6..c13dcf00fb70e70103b615790a0ad3bf4fbfd16f 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -12,64 +12,38 @@
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 
-#include "wx/gdicmn.h"
-#include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxBrush;
-
-class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
-{
-    friend class WXDLLEXPORT wxBrush;
-public:
-    wxBrushRefData();
-    wxBrushRefData(const wxBrushRefData& rData);
-    virtual ~wxBrushRefData();
-
-    bool operator == (const wxBrushRefData& data) const
-    {
-        return (m_nStyle == data.m_nStyle &&
-                m_vStipple.IsSameAs(data.m_vStipple) &&
-                m_vColour == data.m_vColour);
-    }
-
-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;
-};
-
-#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
-
 // Brush
-class WXDLLEXPORT wxBrush: public wxBrushBase
+class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
 {
-    DECLARE_DYNAMIC_CLASS(wxBrush)
-
 public:
     wxBrush();
-    wxBrush(const wxColour& rCol, int nStyle = wxSOLID);
+    wxBrush(const wxColour& rCol, wxBrushStyle nStyle = wxBRUSHSTYLE_SOLID);
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#endif
     wxBrush(const wxBitmap& rStipple);
     virtual ~wxBrush();
 
-    inline bool operator == (const wxBrush& rBrush) const;
+    bool operator == (const wxBrush& rBrush) const;
     inline bool operator != (const wxBrush& rBrush) const { return !(*this == rBrush); }
 
     virtual void SetColour(const wxColour& rColour);
     virtual void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBrush);
     virtual void SetPS(HPS hPS);
-    virtual void SetStyle(int nStyle)  ;
+    virtual void SetStyle(wxBrushStyle nStyle);
     virtual void SetStipple(const wxBitmap& rStipple);
 
-    inline wxColour& GetColour(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_vColour : wxNullColour); };
-    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); };
+    wxColour GetColour(void) const;
+    wxBrushStyle GetStyle(void) const;
+    wxBitmap* GetStipple(void) const;
+    int       GetPS(void) const;
 
-    inline virtual bool Ok() const { return IsOk(); }
-    inline virtual bool IsOk(void) const { return (m_refData != NULL) ; }
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
 
     //
     // Implementation
@@ -82,7 +56,13 @@ public:
     virtual WXHANDLE GetResourceHandle(void) const;
     bool     FreeResource(bool bForce = false);
     bool     IsFree(void) const;
-    void     Unshare(void);
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxBrush)
 }; // end of CLASS wxBrush
 
 #endif