projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added support for double arguments to wxCmdLineParser (patch 1907289)
[wxWidgets.git]
/
src
/
dfb
/
brush.cpp
diff --git
a/src/dfb/brush.cpp
b/src/dfb/brush.cpp
index 93209e3362ec4f1a649bb335b00afc0025b26a48..6d310fc0bd2c24e7e553c3c67ec2f5ce05fb9bfc 100644
(file)
--- a/
src/dfb/brush.cpp
+++ b/
src/dfb/brush.cpp
@@
-26,7
+26,7
@@
// wxBrush
//-----------------------------------------------------------------------------
// wxBrush
//-----------------------------------------------------------------------------
-class wxBrushRefData
: public wxObject
RefData
+class wxBrushRefData
: public wxGDI
RefData
{
public:
wxBrushRefData(const wxColour& clr = wxNullColour, int style = wxSOLID)
{
public:
wxBrushRefData(const wxColour& clr = wxNullColour, int style = wxSOLID)
@@
-41,6
+41,8
@@
public:
m_style = data.m_style;
}
m_style = data.m_style;
}
+ virtual bool IsOk() const { return m_colour.IsOk(); }
+
void SetStyle(int style)
{
if ( style != wxSOLID && style != wxTRANSPARENT )
void SetStyle(int style)
{
if ( style != wxSOLID && style != wxTRANSPARENT )
@@
-80,11
+82,6
@@
bool wxBrush::operator==(const wxBrush& brush) const
return m_refData == brush.m_refData;
}
return m_refData == brush.m_refData;
}
-bool wxBrush::IsOk() const
-{
- return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
-}
-
int wxBrush::GetStyle() const
{
if (m_refData == NULL)
int wxBrush::GetStyle() const
{
if (m_refData == NULL)
@@
-136,12
+133,12
@@
void wxBrush::SetStipple(const wxBitmap& WXUNUSED(stipple))
wxFAIL_MSG( wxT("brushes with stipple bitmaps not implemented") );
}
wxFAIL_MSG( wxT("brushes with stipple bitmaps not implemented") );
}
-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);
}