X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e6858cdcb9278b36446466c346d984e7e306553..74c34d22773e39b13fe0502798494b38f261a9e5:/include/wx/os2/brush.h diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h index 0a0e64f080..c13dcf00fb 100644 --- a/include/wx/os2/brush.h +++ b/include/wx/os2/brush.h @@ -12,43 +12,17 @@ #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -#include "wx/gdicmn.h" -#include "wx/gdiobj.h" #include "wx/bitmap.h" -class WXDLLIMPEXP_FWD_CORE wxBrush; - -class WXDLLEXPORT wxBrushRefData: public wxGDIRefData -{ - friend class WXDLLIMPEXP_FWD_CORE 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: - wxBrushStyle 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 { public: wxBrush(); 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(); @@ -61,10 +35,15 @@ public: 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 wxBrushStyle 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; + +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxBrushStyle)style); } +#endif // // Implementation