X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..7ddb15416407390de67cc26b04e91ea99a521f57:/include/wx/msw/brush.h diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 71367662a4..d4ddc8d813 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -1,84 +1,62 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/msw/brush.h // Purpose: wxBrush class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -#ifdef __GNUG__ -#pragma interface "brush.h" -#endif - -#include "wx/gdicmn.h" -#include "wx/gdiobj.h" -#include "wx/bitmap.h" +class WXDLLIMPEXP_FWD_CORE wxBrush; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLEXPORT wxBrush; +// ---------------------------------------------------------------------------- +// wxBrush +// ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBrushRefData: public wxGDIRefData +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { - friend class WXDLLEXPORT wxBrush; public: - wxBrushRefData(void); - ~wxBrushRefData(void); - -protected: - int m_style; - wxBitmap m_stipple ; - wxColour m_colour; - WXHBRUSH m_hBrush; -}; - -#define M_BRUSHDATA ((wxBrushRefData *)m_refData) - -// Brush -class WXDLLEXPORT wxBrush: public wxGDIObject -{ - DECLARE_DYNAMIC_CLASS(wxBrush) + wxBrush(); + wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif + wxBrush(const wxBitmap& stipple); + virtual ~wxBrush(); -public: - wxBrush(void); - wxBrush(const wxColour& col, int style); - wxBrush(const wxString& col, int style); - wxBrush(const wxBitmap& stipple); - inline wxBrush(const wxBrush& brush) { Ref(brush); } - inline wxBrush(const wxBrush* brush) { /* UnRef(); */ if (brush) Ref(*brush); } - ~wxBrush(void); + virtual void SetColour(const wxColour& col); + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b); + virtual void SetStyle(wxBrushStyle style); + virtual void SetStipple(const wxBitmap& stipple); - virtual void SetColour(const wxColour& col) ; - virtual void SetColour(const wxString& col) ; - virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ; - virtual void SetStyle(int style) ; - virtual void SetStipple(const wxBitmap& stipple) ; + bool operator==(const wxBrush& brush) const; + bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; } - inline bool operator == (const wxBrush& brush) { return m_refData == brush.m_refData; } - inline bool operator != (const wxBrush& brush) { return m_refData != brush.m_refData; } + wxColour GetColour() const; + wxBrushStyle GetStyle() const; + wxBitmap *GetStipple() const; - inline wxColour& GetColour(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); }; - inline int GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); }; - inline wxBitmap *GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); }; +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxBrushStyle)style); } +#endif - virtual bool Ok(void) const { return (m_refData != NULL) ; } + // return the HBRUSH for this brush + virtual WXHANDLE GetResourceHandle() const; - // Internal - bool RealizeResource(void); - WXHANDLE GetResourceHandle(void) ; - bool FreeResource(bool force = FALSE); -/* - bool UseResource(void); - bool ReleaseResource(void); -*/ +protected: + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - bool IsFree(void); +private: + DECLARE_DYNAMIC_CLASS(wxBrush) }; -#endif - // _WX_BRUSH_H_ +#endif // _WX_BRUSH_H_