projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct and extend wxConfig::Create() documentation.
[wxWidgets.git]
/
src
/
gtk
/
brush.cpp
diff --git
a/src/gtk/brush.cpp
b/src/gtk/brush.cpp
index 1cc7e69e1f7dc0577981c82129c61ef86604a79e..e7ba31b30d9219092efdd6f27a62ebeb2136564a 100644
(file)
--- a/
src/gtk/brush.cpp
+++ b/
src/gtk/brush.cpp
@@
-21,16
+21,17
@@
// wxBrush
//-----------------------------------------------------------------------------
// wxBrush
//-----------------------------------------------------------------------------
-class wxBrushRefData: public wx
Object
RefData
+class wxBrushRefData: public wx
GDI
RefData
{
public:
{
public:
- wxBrushRefData()
+ wxBrushRefData(
const wxColour& colour = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID
)
{
{
- m_style = 0;
+ m_style = style;
+ m_colour = colour;
}
wxBrushRefData( const wxBrushRefData& data )
}
wxBrushRefData( const wxBrushRefData& data )
- : wx
Object
RefData()
+ : wx
GDI
RefData()
{
m_style = data.m_style;
m_stipple = data.m_stipple;
{
m_style = data.m_style;
m_stipple = data.m_stipple;
@@
-40,13
+41,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;
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
@@
-55,24
+56,26
@@
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(colour, style);
}
}
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+ m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
+}
+#endif
+
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
{
- m_refData = new wxBrushRefData();
- M_BRUSHDATA->m_colour = *wxBLACK;
+ wxBrushStyle style = wxBRUSHSTYLE_STIPPLE;
+ if (stippleBitmap.GetMask())
+ style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
+ m_refData = new wxBrushRefData(*wxBLACK, style);
M_BRUSHDATA->m_stipple = stippleBitmap;
M_BRUSHDATA->m_stipple = stippleBitmap;
-
- if (M_BRUSHDATA->m_stipple.GetMask())
- M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
- else
- M_BRUSHDATA->m_style = wxSTIPPLE;
}
wxBrush::~wxBrush()
}
wxBrush::~wxBrush()
@@
-80,17
+83,17
@@
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);
}
-bool wxBrush::operator
== ( const wxBrush& brush
) const
+bool wxBrush::operator
==(const wxBrush& brush
) const
{
if (m_refData == brush.m_refData) return true;
{
if (m_refData == brush.m_refData) return true;
@@
-99,35
+102,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;
}
@@
-146,7
+137,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();
@@
-160,10
+151,10
@@
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 = wx
BRUSHSTYLE_
STIPPLE_MASK_OPAQUE;
}
else
{
}
else
{
- M_BRUSHDATA->m_style = wxSTIPPLE;
+ M_BRUSHDATA->m_style = wx
BRUSHSTYLE_
STIPPLE;
}
}
}
}