X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b796bb03c1410ebda4b010130fb022a8729a68f..24f932d22a085ce899b94c98578f475782c75bf6:/src/mac/brush.cpp diff --git a/src/mac/brush.cpp b/src/mac/brush.cpp index f9e14bad6b..f38b3782d9 100644 --- a/src/mac/brush.cpp +++ b/src/mac/brush.cpp @@ -17,13 +17,38 @@ #include "wx/utils.h" #include "wx/brush.h" +#include "wx/mac/private.h" + #if !USE_SHARED_LIBRARIES IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) #endif +class WXDLLEXPORT wxBrushRefData: public wxGDIRefData +{ + friend class WXDLLEXPORT wxBrush; +public: + wxBrushRefData(); + wxBrushRefData(const wxBrushRefData& data); + ~wxBrushRefData(); + +protected: + wxMacBrushKind m_macBrushKind ; + int m_style; + wxBitmap m_stipple ; + wxColour m_colour; + + ThemeBrush m_macThemeBrush ; + + ThemeBackgroundKind m_macThemeBackground ; + Rect m_macThemeBackgroundExtent ; +}; + +#define M_BRUSHDATA ((wxBrushRefData *)m_refData) + wxBrushRefData::wxBrushRefData() { m_style = wxSOLID; + m_macBrushKind = kwxMacBrushColour ; } wxBrushRefData::wxBrushRefData(const wxBrushRefData& data) @@ -31,6 +56,10 @@ wxBrushRefData::wxBrushRefData(const wxBrushRefData& data) m_style = data.m_style; m_stipple = data.m_stipple; m_colour = data.m_colour; + m_macBrushKind = data.m_macBrushKind ; + m_macThemeBrush = data.m_macThemeBrush ; + m_macThemeBackground = data.m_macThemeBackground ; + m_macThemeBackgroundExtent = data.m_macThemeBackgroundExtent ; } wxBrushRefData::~wxBrushRefData() @@ -60,12 +89,26 @@ wxBrush::wxBrush(const wxBitmap& stipple) { m_refData = new wxBrushRefData; - M_BRUSHDATA->m_style = wxSTIPPLE; + M_BRUSHDATA->m_colour = *wxBLACK; M_BRUSHDATA->m_stipple = stipple; + + if (M_BRUSHDATA->m_stipple.GetMask()) + M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; + else + M_BRUSHDATA->m_style = wxSTIPPLE; RealizeResource(); } +wxBrush::wxBrush(ThemeBrush macThemeBrush ) +{ + m_refData = new wxBrushRefData; + + M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme; + M_BRUSHDATA->m_macThemeBrush = macThemeBrush; + + RealizeResource(); +} void wxBrush::Unshare() { // Don't change shared data @@ -84,7 +127,7 @@ void wxBrush::Unshare() void wxBrush::SetColour(const wxColour& col) { Unshare(); - + M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour; M_BRUSHDATA->m_colour = col; RealizeResource(); @@ -94,6 +137,7 @@ void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b) { Unshare(); + M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour; M_BRUSHDATA->m_colour.Set(r, g, b); RealizeResource(); @@ -103,6 +147,7 @@ void wxBrush::SetStyle(int Style) { Unshare(); + M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour; M_BRUSHDATA->m_style = Style; RealizeResource(); @@ -112,13 +157,70 @@ void wxBrush::SetStipple(const wxBitmap& Stipple) { Unshare(); + M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour; M_BRUSHDATA->m_stipple = Stipple; RealizeResource(); } +void wxBrush::SetMacTheme(ThemeBrush macThemeBrush) +{ + Unshare(); + + M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme; + M_BRUSHDATA->m_macThemeBrush = macThemeBrush; + + RealizeResource(); +} + +void wxBrush::SetMacThemeBackground(unsigned long macThemeBackground, const WXRECTPTR extent) +{ + Unshare(); + + M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground; + M_BRUSHDATA->m_macThemeBackground = macThemeBackground; + M_BRUSHDATA->m_macThemeBackgroundExtent = *(Rect*)extent ; + RealizeResource(); +} + bool wxBrush::RealizeResource() { return TRUE; } +unsigned long wxBrush::GetMacThemeBackground( WXRECTPTR extent) const +{ + if ( M_BRUSHDATA && M_BRUSHDATA->m_macBrushKind == kwxMacBrushThemeBackground ) + { + if ( extent ) + *(Rect*)extent = M_BRUSHDATA->m_macThemeBackgroundExtent ; + return M_BRUSHDATA->m_macThemeBackground ; + } + else + { + return 0 ; + } +} + +short wxBrush::GetMacTheme() const +{ + return (M_BRUSHDATA ? ( M_BRUSHDATA->m_macBrushKind == kwxMacBrushTheme ? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack); +}; + +wxColour& wxBrush::GetColour() const +{ return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); }; + +int wxBrush::GetStyle() const +{ + return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); +}; + +wxBitmap *wxBrush::GetStipple() const +{ + return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); +}; + +wxMacBrushKind wxBrush::MacGetBrushKind() const +{ + return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour); +};