X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9d1fd7088fb2d9f27da3d4c232029807c4eeb7..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/mac/carbon/brush.cpp?ds=sidebyside diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index 36703d2cc7..d484314a2c 100644 --- a/src/mac/carbon/brush.cpp +++ b/src/mac/carbon/brush.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: brush.cpp // Purpose: wxBrush -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -17,19 +17,44 @@ #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_style = wxSOLID; m_macBrushKind = kwxMacBrushColour ; } wxBrushRefData::wxBrushRefData(const wxBrushRefData& data) + : wxGDIRefData() + , m_style(data.m_style) { - m_style = data.m_style; m_stipple = data.m_stipple; m_colour = data.m_colour; m_macBrushKind = data.m_macBrushKind ; @@ -65,8 +90,13 @@ 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(); } @@ -82,17 +112,17 @@ wxBrush::wxBrush(ThemeBrush macThemeBrush ) } void wxBrush::Unshare() { - // Don't change shared data - if (!m_refData) + // Don't change shared data + if (!m_refData) { - m_refData = new wxBrushRefData(); - } + m_refData = new wxBrushRefData(); + } else { - wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData); - UnRef(); - m_refData = ref; - } + wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData); + UnRef(); + m_refData = ref; + } } void wxBrush::SetColour(const wxColour& col) @@ -144,13 +174,13 @@ void wxBrush::SetMacTheme(ThemeBrush macThemeBrush) RealizeResource(); } -void wxBrush::SetMacThemeBackground(ThemeBackgroundKind macThemeBackground, const Rect &extent) +void wxBrush::SetMacThemeBackground(unsigned long macThemeBackground, const WXRECTPTR extent) { Unshare(); M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground; M_BRUSHDATA->m_macThemeBackground = macThemeBackground; - M_BRUSHDATA->m_macThemeBackgroundExtent = extent ; + M_BRUSHDATA->m_macThemeBackgroundExtent = *(Rect*)extent ; RealizeResource(); } @@ -159,12 +189,12 @@ bool wxBrush::RealizeResource() return TRUE; } -ThemeBackgroundKind wxBrush::GetMacThemeBackground(Rect *extent) const +unsigned long wxBrush::GetMacThemeBackground( WXRECTPTR extent) const { if ( M_BRUSHDATA && M_BRUSHDATA->m_macBrushKind == kwxMacBrushThemeBackground ) { if ( extent ) - *extent = M_BRUSHDATA->m_macThemeBackgroundExtent ; + *(Rect*)extent = M_BRUSHDATA->m_macThemeBackgroundExtent ; return M_BRUSHDATA->m_macThemeBackground ; } else @@ -173,3 +203,27 @@ ThemeBackgroundKind wxBrush::GetMacThemeBackground(Rect *extent) const } } +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); +} \ No newline at end of file