X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..81853b98619293be66074d74d2557973c0f3ab21:/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 ac1a9ea8f7..31b9593ab0 100644 --- a/include/wx/mac/carbon/brush.h +++ b/include/wx/mac/carbon/brush.h @@ -1,81 +1,72 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/mac/carbon/brush.h // Purpose: wxBrush class // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #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; -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); + ~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 + { return m_refData == brush.m_refData; } + bool operator != (const wxBrush& brush) const + { return m_refData != brush.m_refData; } + + 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 (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(); + // When setting properties, we must make sure we're not changing + // another object + void Unshare(); }; #endif