X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..cfa87e8121c94814302ad0a94c7c043c8bb277f6:/include/wx/msw/brush.h diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 59fce013ad..3500cbf3b3 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -1,20 +1,16 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __BRUSHH__ -#define __BRUSHH__ - -#ifdef __GNUG__ -#pragma interface "brush.h" -#endif +#ifndef _WX_BRUSH_H_ +#define _WX_BRUSH_H_ #include "wx/gdicmn.h" #include "wx/gdiobj.h" @@ -22,63 +18,43 @@ class WXDLLEXPORT wxBrush; -class WXDLLEXPORT wxBrushRefData: public wxGDIRefData -{ - friend class WXDLLEXPORT wxBrush; -public: - wxBrushRefData(void); - ~wxBrushRefData(void); +// ---------------------------------------------------------------------------- +// wxBrush +// ---------------------------------------------------------------------------- -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 +class WXDLLEXPORT wxBrush : public wxBrushBase { - DECLARE_DYNAMIC_CLASS(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); + wxBrush(); + wxBrush(const wxColour& col, int style = wxSOLID); + wxBrush(const wxBitmap& stipple); + virtual ~wxBrush(); - 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) ; + virtual void SetColour(const wxColour& col); + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b); + virtual void SetStyle(int style); + virtual void SetStipple(const wxBitmap& stipple); - 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; } + bool operator==(const wxBrush& brush) const; + bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - 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); }; + wxColour GetColour() const; + virtual int GetStyle() const; + wxBitmap *GetStipple() const; - virtual bool Ok(void) const { return (m_refData != NULL) ; } + bool Ok() const { return IsOk(); } + bool IsOk() const { return m_refData != NULL; } - // Internal - bool RealizeResource(void); - WXHANDLE GetResourceHandle(void) ; - bool FreeResource(bool force = FALSE); -/* - bool UseResource(void); - bool ReleaseResource(void); -*/ + // return the HBRUSH for this brush + virtual WXHANDLE GetResourceHandle() const; + +protected: + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - bool IsFree(void); +private: + DECLARE_DYNAMIC_CLASS(wxBrush) }; #endif - // __BRUSHH__ + // _WX_BRUSH_H_