X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9d1fd7088fb2d9f27da3d4c232029807c4eeb7..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/mac/carbon/brush.cpp diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp index 36703d2cc7..f571682680 100644 --- a/src/mac/carbon/brush.cpp +++ b/src/mac/carbon/brush.cpp @@ -1,175 +1,185 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.cpp +// Name: src/mac/carbon/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__ -#pragma implementation "brush.h" -#endif +#include "wx/wxprec.h" -#include "wx/setup.h" -#include "wx/utils.h" #include "wx/brush.h" -#if !USE_SHARED_LIBRARIES -IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) +#ifndef WX_PRECOMP + #include "wx/utils.h" #endif -wxBrushRefData::wxBrushRefData() +#include "wx/mac/private.h" + +IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) + +class WXDLLEXPORT wxBrushRefData: public wxGDIRefData +{ +public: + wxBrushRefData(const wxColour& colour = wxNullColour, int style = wxSOLID); + wxBrushRefData(const wxBitmap& stipple); + wxBrushRefData(const wxBrushRefData& data); + virtual ~wxBrushRefData(); + + bool operator==(const wxBrushRefData& data) const; + + const wxColour& GetColour() const { return m_colour; } + int GetStyle() const { return m_style; } + wxBitmap *GetStipple() { return &m_stipple; } + + void SetColour(const wxColour& colour) { m_colour = colour; } + void SetStyle(int style) { m_style = style; } + void SetStipple(const wxBitmap& stipple) { DoSetStipple(stipple); } + +protected: + void DoSetStipple(const wxBitmap& stipple); + + wxBitmap m_stipple ; + wxColour m_colour; + int m_style; +}; + +#define M_BRUSHDATA ((wxBrushRefData *)m_refData) + +wxBrushRefData::wxBrushRefData(const wxColour& colour, int style) + : m_colour(colour), m_style( style ) { - m_style = wxSOLID; - m_macBrushKind = kwxMacBrushColour ; +} + +wxBrushRefData::wxBrushRefData(const wxBitmap& stipple) +{ + DoSetStipple( stipple ); } wxBrushRefData::wxBrushRefData(const wxBrushRefData& data) + : wxGDIRefData() , + m_stipple(data.m_stipple), + m_colour(data.m_colour), + 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 ; - m_macThemeBrush = data.m_macThemeBrush ; - m_macThemeBackground = data.m_macThemeBackground ; - m_macThemeBackgroundExtent = data.m_macThemeBackgroundExtent ; } wxBrushRefData::~wxBrushRefData() { } -// Brushes -wxBrush::wxBrush() +bool wxBrushRefData::operator==(const wxBrushRefData& data) const { + return m_style == data.m_style && + m_colour == data.m_colour && + m_stipple.IsSameAs(data.m_stipple); } -wxBrush::~wxBrush() +void wxBrushRefData::DoSetStipple(const wxBitmap& stipple) { + m_stipple = stipple; + m_style = stipple.GetMask() ? wxSTIPPLE_MASK_OPAQUE : wxSTIPPLE; } +// +// +// -wxBrush::wxBrush(const wxColour& col, int Style) +wxBrush::wxBrush() { - m_refData = new wxBrushRefData; - - M_BRUSHDATA->m_colour = col; - M_BRUSHDATA->m_style = Style; - - RealizeResource(); } -wxBrush::wxBrush(const wxBitmap& stipple) +wxBrush::~wxBrush() { - m_refData = new wxBrushRefData; - - M_BRUSHDATA->m_style = wxSTIPPLE; - M_BRUSHDATA->m_stipple = stipple; - - RealizeResource(); } -wxBrush::wxBrush(ThemeBrush macThemeBrush ) +wxBrush::wxBrush(const wxColour& col, int style) { - m_refData = new wxBrushRefData; - - M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme; - M_BRUSHDATA->m_macThemeBrush = macThemeBrush; - - RealizeResource(); + m_refData = new wxBrushRefData( col, style ); } -void wxBrush::Unshare() + +wxBrush::wxBrush(const wxBitmap& stipple) { - // Don't change shared data - if (!m_refData) - { - m_refData = new wxBrushRefData(); - } - else - { - wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData); - UnRef(); - m_refData = ref; - } + m_refData = new wxBrushRefData( stipple ); } -void wxBrush::SetColour(const wxColour& col) -{ - Unshare(); - M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour; - M_BRUSHDATA->m_colour = col; +// ---------------------------------------------------------------------------- +// wxBrush house keeping stuff +// ---------------------------------------------------------------------------- - RealizeResource(); +bool wxBrush::operator==(const wxBrush& brush) const +{ + const wxBrushRefData *brushData = (wxBrushRefData *)brush.m_refData; + + // an invalid brush is considered to be only equal to another invalid brush + return m_refData ? (brushData && *M_BRUSHDATA == *brushData) : !brushData; } -void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b) +wxGDIRefData *wxBrush::CreateGDIRefData() const { - Unshare(); - - M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour; - M_BRUSHDATA->m_colour.Set(r, g, b); - - RealizeResource(); + return new wxBrushRefData; } -void wxBrush::SetStyle(int Style) +wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const { - Unshare(); + return new wxBrushRefData(*(const wxBrushRefData *)data); +} - M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour; - M_BRUSHDATA->m_style = Style; +// ---------------------------------------------------------------------------- +// wxBrush accessors +// ---------------------------------------------------------------------------- - RealizeResource(); +const wxColour& wxBrush::GetColour() const +{ + wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") ); + + return M_BRUSHDATA->GetColour(); } -void wxBrush::SetStipple(const wxBitmap& Stipple) +int wxBrush::GetStyle() const { - Unshare(); - - M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour; - M_BRUSHDATA->m_stipple = Stipple; - - RealizeResource(); + wxCHECK_MSG( Ok(), 0, _T("invalid brush") ); + + return M_BRUSHDATA->GetStyle(); } -void wxBrush::SetMacTheme(ThemeBrush macThemeBrush) +wxBitmap *wxBrush::GetStipple() const { - Unshare(); + wxCHECK_MSG( Ok(), NULL, _T("invalid brush") ); + + return M_BRUSHDATA->GetStipple(); +} - M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme; - M_BRUSHDATA->m_macThemeBrush = macThemeBrush; +// ---------------------------------------------------------------------------- +// wxBrush setters +// ---------------------------------------------------------------------------- - RealizeResource(); +void wxBrush::SetColour(const wxColour& col) +{ + AllocExclusive(); + + M_BRUSHDATA->SetColour(col); } -void wxBrush::SetMacThemeBackground(ThemeBackgroundKind macThemeBackground, const Rect &extent) +void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b) { - Unshare(); - - M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground; - M_BRUSHDATA->m_macThemeBackground = macThemeBackground; - M_BRUSHDATA->m_macThemeBackgroundExtent = extent ; - RealizeResource(); + AllocExclusive(); + + M_BRUSHDATA->SetColour(wxColour(r, g, b)); } -bool wxBrush::RealizeResource() +void wxBrush::SetStyle(int style) { - return TRUE; + AllocExclusive(); + + M_BRUSHDATA->SetStyle(style); } -ThemeBackgroundKind wxBrush::GetMacThemeBackground(Rect *extent) const +void wxBrush::SetStipple(const wxBitmap& stipple) { - if ( M_BRUSHDATA && M_BRUSHDATA->m_macBrushKind == kwxMacBrushThemeBackground ) - { - if ( extent ) - *extent = M_BRUSHDATA->m_macThemeBackgroundExtent ; - return M_BRUSHDATA->m_macThemeBackground ; - } - else - { - return 0 ; - } + AllocExclusive(); + + M_BRUSHDATA->SetStipple(stipple); } -