class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
{
- friend class wxBrush;
-
public:
- wxBrushRefData();
+ wxBrushRefData(const wxColour& colour = wxNullColour, int style = wxSOLID);
+ wxBrushRefData(const wxBitmap& stipple);
wxBrushRefData(const wxBrushRefData& data);
virtual ~wxBrushRefData();
- bool operator == ( const wxBrushRefData& brush ) const
- {
- return m_style == brush.m_style &&
- m_stipple.IsSameAs(brush.m_stipple) &&
- m_colour == brush.m_colour &&
- m_macBrushKind == brush.m_macBrushKind &&
- m_macThemeBrush == brush.m_macThemeBrush &&
- m_macThemeBackground == brush.m_macThemeBackground &&
- EqualRect(&m_macThemeBackgroundExtent, &brush.m_macThemeBackgroundExtent);
- }
-
+ 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:
- wxMacBrushKind m_macBrushKind ;
- int m_style;
+ void DoSetStipple(const wxBitmap& stipple);
+
wxBitmap m_stipple ;
wxColour m_colour;
-
- ThemeBrush m_macThemeBrush ;
-
- ThemeBackgroundKind m_macThemeBackground ;
- Rect m_macThemeBackgroundExtent ;
+ int m_style;
};
#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
-
-wxBrushRefData::wxBrushRefData()
- : m_style(wxSOLID)
+wxBrushRefData::wxBrushRefData(const wxColour& colour, int style)
+ : m_colour(colour), m_style( style )
{
- m_macBrushKind = kwxMacBrushColour ;
}
-wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
- : wxGDIRefData()
- , m_style(data.m_style)
+wxBrushRefData::wxBrushRefData(const wxBitmap& stipple)
{
- 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 ;
+ DoSetStipple( stipple );
}
-wxBrushRefData::~wxBrushRefData()
+wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
+ : wxGDIRefData() ,
+ m_stipple(data.m_stipple),
+ m_colour(data.m_colour),
+ m_style(data.m_style)
{
}
-wxBrush::wxBrush()
+wxBrushRefData::~wxBrushRefData()
{
}
-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(const wxColour& col, int Style)
+void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
{
- m_refData = new wxBrushRefData;
-
- M_BRUSHDATA->m_colour = col;
- M_BRUSHDATA->m_style = Style;
-
- RealizeResource();
+ m_stipple = stipple;
+ m_style = stipple.GetMask() ? wxSTIPPLE_MASK_OPAQUE : wxSTIPPLE;
}
+//
+//
+//
-wxBrush::wxBrush(const wxBitmap& stipple)
+wxBrush::wxBrush()
{
- m_refData = new wxBrushRefData;
-
- 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 )
+wxBrush::~wxBrush()
{
- m_refData = new wxBrushRefData;
-
- M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
- M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
-
- RealizeResource();
}
-void wxBrush::Unshare()
+wxBrush::wxBrush(const wxColour& col, int style)
{
- // 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( col, style );
}
-void wxBrush::SetColour(const wxColour& col)
+wxBrush::wxBrush(const wxBitmap& stipple)
{
- Unshare();
- M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour;
- M_BRUSHDATA->m_colour = col;
-
- RealizeResource();
+ m_refData = new wxBrushRefData( stipple );
}
-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);
+// ----------------------------------------------------------------------------
+// wxBrush house keeping stuff
+// ----------------------------------------------------------------------------
- RealizeResource();
-}
-
-void wxBrush::SetStyle(int Style)
+bool wxBrush::operator==(const wxBrush& brush) const
{
- Unshare();
-
- M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour;
- M_BRUSHDATA->m_style = Style;
-
- RealizeResource();
+ 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::SetStipple(const wxBitmap& Stipple)
+wxObjectRefData *wxBrush::CreateRefData() const
{
- Unshare();
-
- M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour;
- M_BRUSHDATA->m_stipple = Stipple;
-
- RealizeResource();
+ return new wxBrushRefData;
}
-void wxBrush::MacSetTheme(ThemeBrush macThemeBrush)
+wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
{
- Unshare();
-
- M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
- M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
-
- RGBColor color = { 0,0,0 } ;
-#ifdef __LP64__
- CGColorRef colorref = 0;
- HIThemeBrushCreateCGColor( macThemeBrush, &colorref );
- size_t noComp = CGColorGetNumberOfComponents( colorref );
- if ( noComp >=3 && noComp <= 4 )
- {
- // TODO verify whether we really are on a RGB color space
- const CGFloat *components = CGColorGetComponents( colorref );
- color.red = (int)(components[0]*255+0.5);
- color.green = (int)(components[1]*255+0.5);
- color.blue = (int)(components[2]*255+0.5);
- }
- CFRelease( colorref );
-#else
- GetThemeBrushAsColor( macThemeBrush , 32, true, &color );
-#endif
- M_BRUSHDATA->m_colour = color;
-
- RealizeResource();
+ return new wxBrushRefData(*(const wxBrushRefData *)data);
}
-/* TODO REMOVE
-void wxBrush::MacSetThemeBackground(unsigned long macThemeBackground, const WXRECTPTR extent)
-{
- Unshare();
-
- M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground;
- M_BRUSHDATA->m_macThemeBackground = macThemeBackground;
- M_BRUSHDATA->m_macThemeBackgroundExtent = *(Rect*)extent;
-
- RealizeResource();
-}
-*/
+// ----------------------------------------------------------------------------
+// wxBrush accessors
+// ----------------------------------------------------------------------------
-bool wxBrush::RealizeResource()
+const wxColour& wxBrush::GetColour() const
{
- return true;
+ wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
+
+ return M_BRUSHDATA->GetColour();
}
-/*
-unsigned long wxBrush::MacGetThemeBackground(WXRECTPTR extent) const
+int wxBrush::GetStyle() 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;
- }
+ wxCHECK_MSG( Ok(), 0, _T("invalid brush") );
+
+ return M_BRUSHDATA->GetStyle();
}
- */
-short wxBrush::MacGetTheme() const
+wxBitmap *wxBrush::GetStipple() const
{
- return (M_BRUSHDATA ? ((M_BRUSHDATA->m_macBrushKind == kwxMacBrushTheme) ? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack);
+ wxCHECK_MSG( Ok(), NULL, _T("invalid brush") );
+
+ return M_BRUSHDATA->GetStipple();
}
-wxColour& wxBrush::GetColour() const
-{
- return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour);
-}
+// ----------------------------------------------------------------------------
+// wxBrush setters
+// ----------------------------------------------------------------------------
-int wxBrush::GetStyle() const
+void wxBrush::SetColour(const wxColour& col)
{
- return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0);
+ AllocExclusive();
+
+ M_BRUSHDATA->SetColour(col);
}
-wxBitmap *wxBrush::GetStipple() const
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
{
- return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0);
+ AllocExclusive();
+
+ M_BRUSHDATA->SetColour(wxColour(r, g, b));
}
-wxMacBrushKind wxBrush::MacGetBrushKind() const
+void wxBrush::SetStyle(int style)
{
- return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);
+ AllocExclusive();
+
+ M_BRUSHDATA->SetStyle(style);
}
-bool wxBrush::operator == ( const wxBrush& brush ) const
+void wxBrush::SetStipple(const wxBitmap& stipple)
{
- if (m_refData == brush.m_refData) return true;
-
- if (!m_refData || !brush.m_refData) return false;
-
- return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
+ AllocExclusive();
+
+ M_BRUSHDATA->SetStipple(stipple);
}
projects / wxWidgets.git / commitdiff
