X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..a75124d0da255513e83d2e62f963dd849829466b:/include/wx/mac/carbon/brush.h diff --git a/include/wx/mac/carbon/brush.h b/include/wx/mac/carbon/brush.h index ae73a725dd..ea482f5089 100644 --- a/include/wx/mac/carbon/brush.h +++ b/include/wx/mac/carbon/brush.h @@ -18,19 +18,10 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; -typedef enum -{ - kwxMacBrushColour , - kwxMacBrushTheme , - kwxMacBrushThemeBackground -} wxMacBrushKind ; - // Brush class WXDLLEXPORT wxBrush: public wxBrushBase { - DECLARE_DYNAMIC_CLASS(wxBrush) - -public: + public: wxBrush(); wxBrush(short macThemeBrush ) ; wxBrush(const wxColour& col, int style = wxSOLID); @@ -41,31 +32,23 @@ public: 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 ; + 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(); - +protected: + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; private: - void Unshare(); + DECLARE_DYNAMIC_CLASS(wxBrush) }; #endif