projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GetSocketManager() has no GUI-specific version under Darwin finally
[wxWidgets.git]
/
src
/
cocoa
/
brush.mm
diff --git
a/src/cocoa/brush.mm
b/src/cocoa/brush.mm
index de0760c16a9d801bbe581f609084ba16fa03a1b2..6a1bce5e7f87fc286e91944d2cfc195eece29a83 100644
(file)
--- a/
src/cocoa/brush.mm
+++ b/
src/cocoa/brush.mm
@@
-96,7
+96,7
@@
bool wxBrushRefData::operator==(const wxBrushRefData& data) const
// don't compare our NSColor
return m_style == data.m_style &&
m_colour == data.m_colour &&
// don't compare our NSColor
return m_style == data.m_style &&
m_colour == data.m_colour &&
- m_stipple
== data.m_stipple
;
+ m_stipple
.IsSameAs(data.m_stipple)
;
}
void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
}
void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
@@
-159,12
+159,12
@@
wxBrush::wxBrush(const wxBitmap& stipple)
m_refData = new wxBrushRefData(stipple);
}
m_refData = new wxBrushRefData(stipple);
}
-wx
ObjectRefData *wxBrush::Create
RefData() const
+wx
GDIRefData *wxBrush::CreateGDI
RefData() const
{
return new wxBrushRefData;
}
{
return new wxBrushRefData;
}
-wx
ObjectRefData *wxBrush::CloneRefData(const wxObject
RefData *data) const
+wx
GDIRefData *wxBrush::CloneGDIRefData(const wxGDI
RefData *data) const
{
return new wxBrushRefData(*(wxBrushRefData *)data);
}
{
return new wxBrushRefData(*(wxBrushRefData *)data);
}