X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f305456585c3f53b58f90803d25f1392eaedb36..fba05595e6cca40763f8ead119c7ad61cb01e0e4:/include/wx/mac/carbon/brush.h?ds=sidebyside diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h index 7684cf241e..ae73a725dd 100644 --- a/include/wx/mac/carbon/brush.h +++ b/include/wx/mac/carbon/brush.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/mac/carbon/brush.h // Purpose: wxBrush class // Author: Stefan Csomor // Modified by: @@ -12,70 +12,60 @@ #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "brush.h" -#endif - #include "wx/gdicmn.h" #include "wx/gdiobj.h" #include "wx/bitmap.h" -class WXDLLEXPORT wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBrush; -typedef enum +typedef enum { - kwxMacBrushColour , - kwxMacBrushTheme , - kwxMacBrushThemeBackground + kwxMacBrushColour , + kwxMacBrushTheme , + kwxMacBrushThemeBackground } wxMacBrushKind ; // Brush -class WXDLLEXPORT wxBrush: public wxGDIObject +class WXDLLEXPORT wxBrush: public wxBrushBase { - DECLARE_DYNAMIC_CLASS(wxBrush) + DECLARE_DYNAMIC_CLASS(wxBrush) public: - wxBrush(); - wxBrush(short macThemeBrush ) ; - wxBrush(const wxColour& col, int style = wxSOLID); - wxBrush(const wxBitmap& stipple); - wxBrush(const wxBrush& brush) - : wxGDIObject() - { Ref(brush); } - ~wxBrush(); - - 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) ; - virtual void MacSetTheme(short macThemeBrush) ; - virtual void MacSetThemeBackground(unsigned long macThemeBackground , WXRECTPTR extent) ; - - wxBrush& operator = (const wxBrush& brush) - { if (*this == brush) return (*this); Ref(brush); return *this; } - bool operator == (const wxBrush& brush) - { return m_refData == brush.m_refData; } - bool operator != (const wxBrush& brush) - { return m_refData != brush.m_refData; } - - wxMacBrushKind MacGetBrushKind() const ; - - unsigned long MacGetThemeBackground(WXRECTPTR extent) const ; - short MacGetTheme() const ; - wxColour& GetColour() const ; - int GetStyle() const ; - wxBitmap *GetStipple() const ; - - virtual bool Ok() const { return (m_refData != NULL) ; } + wxBrush(); + wxBrush(short macThemeBrush ) ; + wxBrush(const wxColour& col, int style = wxSOLID); + wxBrush(const wxBitmap& stipple); + virtual ~wxBrush(); + + 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) ; + virtual void MacSetTheme(short macThemeBrush) ; + virtual void MacSetThemeBackground(unsigned long macThemeBackground , WXRECTPTR extent) ; + + bool operator == (const wxBrush& brush) const; + bool operator != (const wxBrush& brush) const + { return !(*this == brush); } + + wxMacBrushKind MacGetBrushKind() const ; + + unsigned long MacGetThemeBackground(WXRECTPTR extent) const ; + short MacGetTheme() const ; + wxColour& GetColour() const ; + virtual int GetStyle() const ; + wxBitmap *GetStipple() const ; + + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return (m_refData != NULL) ; } // Implementation - // Useful helper: create the brush resource - bool RealizeResource(); + // Useful helper: create the brush resource + bool RealizeResource(); - // When setting properties, we must make sure we're not changing - // another object - void Unshare(); +private: + void Unshare(); }; #endif