projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Slightly improved check whether or not to execute wxPropertyGrid::RecalculateVirtualS...
[wxWidgets.git]
/
src
/
x11
/
brush.cpp
diff --git
a/src/x11/brush.cpp
b/src/x11/brush.cpp
index 9aeb1581151e2c7455af9aff8976e26605edf423..25192ebb535ace6f67edf50e6103d5308e6e136f 100644
(file)
--- a/
src/x11/brush.cpp
+++ b/
src/x11/brush.cpp
@@
-24,12
+24,12
@@
// wxBrush
//-----------------------------------------------------------------------------
// wxBrush
//-----------------------------------------------------------------------------
-class wxBrushRefData
: public wxObject
RefData
+class wxBrushRefData
: public wxGDI
RefData
{
public:
wxBrushRefData()
{
{
public:
wxBrushRefData()
{
- m_style =
0
;
+ m_style =
wxBRUSHSTYLE_INVALID
;
}
wxBrushRefData( const wxBrushRefData& data )
}
wxBrushRefData( const wxBrushRefData& data )
@@
-42,13
+42,13
@@
public:
bool operator == (const wxBrushRefData& data) const
{
return (m_style == data.m_style &&
bool operator == (const wxBrushRefData& data) const
{
return (m_style == data.m_style &&
- m_stipple.Is
RefTo(&
data.m_stipple) &&
+ m_stipple.Is
SameAs(
data.m_stipple) &&
m_colour == data.m_colour);
}
m_colour == data.m_colour);
}
-
int
m_style;
- wxColour m_colour;
- wxBitmap m_stipple;
+
wxBrushStyle
m_style;
+ wxColour
m_colour;
+ wxBitmap
m_stipple;
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
@@
-57,13
+57,22
@@
public:
IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
-wxBrush::wxBrush( const wxColour &colour,
int
style )
+wxBrush::wxBrush( const wxColour &colour,
wxBrushStyle
style )
{
m_refData = new wxBrushRefData();
M_BRUSHDATA->m_style = style;
M_BRUSHDATA->m_colour = colour;
}
{
m_refData = new wxBrushRefData();
M_BRUSHDATA->m_style = style;
M_BRUSHDATA->m_colour = colour;
}
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+ m_refData = new wxBrushRefData;
+ M_BRUSHDATA->m_style = (wxBrushStyle)style;
+ M_BRUSHDATA->m_colour = col;
+}
+#endif
+
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{
m_refData = new wxBrushRefData();
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{
m_refData = new wxBrushRefData();
@@
-72,9
+81,9
@@
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
M_BRUSHDATA->m_stipple = stippleBitmap;
if (M_BRUSHDATA->m_stipple.GetMask())
M_BRUSHDATA->m_stipple = stippleBitmap;
if (M_BRUSHDATA->m_stipple.GetMask())
- M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+ M_BRUSHDATA->m_style = wx
BRUSHSTYLE_
STIPPLE_MASK_OPAQUE;
else
else
- M_BRUSHDATA->m_style = wx
STIPPLE
;
+ M_BRUSHDATA->m_style = wx
BRUSHSTYLE_STIPPLE_MASK
;
}
wxBrush::~wxBrush()
}
wxBrush::~wxBrush()
@@
-82,12
+91,12
@@
wxBrush::~wxBrush()
// m_refData unrefed in ~wxObject
}
// m_refData unrefed in ~wxObject
}
-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);
}
@@
-101,35
+110,23
@@
bool wxBrush::operator == ( const wxBrush& brush ) const
return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
}
return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
}
-
int
wxBrush::GetStyle() const
+
wxBrushStyle
wxBrush::GetStyle() const
{
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( wxT("invalid brush") );
- return 0;
- }
+ wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
return M_BRUSHDATA->m_style;
}
return M_BRUSHDATA->m_style;
}
-wxColour
&
wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const
{
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( wxT("invalid brush") );
- return wxNullColour;
- }
+ wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") );
return M_BRUSHDATA->m_colour;
}
wxBitmap *wxBrush::GetStipple() const
{
return M_BRUSHDATA->m_colour;
}
wxBitmap *wxBrush::GetStipple() const
{
- if (m_refData == NULL)
- {
- wxFAIL_MSG( wxT("invalid brush") );
- return &wxNullBitmap;
- }
+ wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") );
return &M_BRUSHDATA->m_stipple;
}
return &M_BRUSHDATA->m_stipple;
}
@@
-148,7
+145,7
@@
void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
M_BRUSHDATA->m_colour.Set( r, g, b );
}
M_BRUSHDATA->m_colour.Set( r, g, b );
}
-void wxBrush::SetStyle(
int
style )
+void wxBrush::SetStyle(
wxBrushStyle
style )
{
AllocExclusive();
{
AllocExclusive();
@@
-161,11
+158,7
@@
void wxBrush::SetStipple( const wxBitmap& stipple )
M_BRUSHDATA->m_stipple = stipple;
if (M_BRUSHDATA->m_stipple.GetMask())
M_BRUSHDATA->m_stipple = stipple;
if (M_BRUSHDATA->m_stipple.GetMask())
- {
- M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
- }
+ M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
else
else
- {
- M_BRUSHDATA->m_style = wxSTIPPLE;
- }
+ M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK;
}
}