X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..5fc01d1326a34223746546326a7f616df8bfa991:/src/mac/carbon/brush.cpp?ds=sidebyside diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index 5589004fbe..f94401052f 100644 --- a/src/mac/carbon/brush.cpp +++ b/src/mac/carbon/brush.cpp @@ -6,7 +6,7 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -112,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) @@ -164,7 +164,7 @@ void wxBrush::SetStipple(const wxBitmap& Stipple) RealizeResource(); } -void wxBrush::SetMacTheme(ThemeBrush macThemeBrush) +void wxBrush::MacSetTheme(ThemeBrush macThemeBrush) { Unshare(); @@ -174,7 +174,7 @@ void wxBrush::SetMacTheme(ThemeBrush macThemeBrush) RealizeResource(); } -void wxBrush::SetMacThemeBackground(unsigned long macThemeBackground, const WXRECTPTR extent) +void wxBrush::MacSetThemeBackground(unsigned long macThemeBackground, const WXRECTPTR extent) { Unshare(); @@ -189,7 +189,7 @@ bool wxBrush::RealizeResource() return TRUE; } -unsigned long wxBrush::GetMacThemeBackground( WXRECTPTR extent) const +unsigned long wxBrush::MacGetThemeBackground( WXRECTPTR extent) const { if ( M_BRUSHDATA && M_BRUSHDATA->m_macBrushKind == kwxMacBrushThemeBackground ) { @@ -203,25 +203,27 @@ unsigned long wxBrush::GetMacThemeBackground( WXRECTPTR extent) const } } -short wxBrush::GetMacTheme() const +short wxBrush::MacGetTheme() const { - return (M_BRUSHDATA ? ( M_BRUSHDATA->m_macBrushKind == kwxMacBrushTheme ? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack); -}; + 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); }; +{ + return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); +} int wxBrush::GetStyle() const { - return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); -}; + return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); +} wxBitmap *wxBrush::GetStipple() const { - return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); -}; + return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); +} wxMacBrushKind wxBrush::MacGetBrushKind() const { - return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour); -}; + return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour); +} \ No newline at end of file