projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regenerated
[wxWidgets.git]
/
src
/
gtk1
/
brush.cpp
diff --git
a/src/gtk1/brush.cpp
b/src/gtk1/brush.cpp
index ca0987080c1b7503d8e0ed4e123f0a7a88442cb0..70a2790e4ae08880ff39c36cd20cefa4b2dc3d3f 100644
(file)
--- a/
src/gtk1/brush.cpp
+++ b/
src/gtk1/brush.cpp
@@
-66,15
+66,13
@@
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{
m_refData = new wxBrushRefData();
M_BRUSHDATA->m_colour = *wxBLACK;
{
m_refData = new wxBrushRefData();
M_BRUSHDATA->m_colour = *wxBLACK;
+
M_BRUSHDATA->m_stipple = stippleBitmap;
M_BRUSHDATA->m_stipple = stippleBitmap;
+
if (M_BRUSHDATA->m_stipple.GetMask())
if (M_BRUSHDATA->m_stipple.GetMask())
- {
- M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
- }
- else
- {
- M_BRUSHDATA->m_style = wxSTIPPLE;
- }
+ M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+ else
+ M_BRUSHDATA->m_style = wxSTIPPLE;
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
}
if (wxTheBrushList) wxTheBrushList->AddBrush( this );
}
@@
-98,12
+96,12
@@
wxBrush& wxBrush::operator = ( const wxBrush& brush )
return *this;
}
return *this;
}
-bool wxBrush::operator == ( const wxBrush& brush )
+bool wxBrush::operator == ( const wxBrush& brush )
const
{
return m_refData == brush.m_refData;
}
{
return m_refData == brush.m_refData;
}
-bool wxBrush::operator != ( const wxBrush& brush )
+bool wxBrush::operator != ( const wxBrush& brush )
const
{
return m_refData != brush.m_refData;
}
{
return m_refData != brush.m_refData;
}