projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ticket #1032 wxVariant::operator==(wxVariant& variant) has bad bug
[wxWidgets.git]
/
src
/
gtk1
/
brush.cpp
diff --git
a/src/gtk1/brush.cpp
b/src/gtk1/brush.cpp
index dd6720c868b0e433a5ab53e558d5f1915eb5c26f..eb5606cfea9b6e3eeb666913bf80aa7257da81eb 100644
(file)
--- a/
src/gtk1/brush.cpp
+++ b/
src/gtk1/brush.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/brush.cpp
+// Name: src/gtk
1
/brush.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-7,12
+7,14
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/brush.h"
#include "wx/brush.h"
-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/colour.h"
+#endif
#include <gdk/gdk.h>
#include <gdk/gdk.h>
@@
-20,32
+22,32
@@
// wxBrush
//-----------------------------------------------------------------------------
// wxBrush
//-----------------------------------------------------------------------------
-class wxBrushRefData: public wx
Object
RefData
+class wxBrushRefData: public wx
GDI
RefData
{
public:
wxBrushRefData()
{
{
public:
wxBrushRefData()
{
- m_style =
0
;
+ m_style =
wxBRUSHSTYLE_INVALID
;
}
}
-
+
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_colour = data.m_colour;
}
{
m_style = data.m_style;
m_stipple = data.m_stipple;
m_colour = data.m_colour;
}
-
+
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
== data.m_stipple
&&
+ m_stipple
.IsSameAs(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;
};
//-----------------------------------------------------------------------------
};
//-----------------------------------------------------------------------------
@@
-54,13
+56,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();
@@
-69,9
+80,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()
@@
-79,54
+90,42
@@
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);
}
bool wxBrush::operator == ( const wxBrush& brush ) const
{
{
return new wxBrushRefData(*(wxBrushRefData *)data);
}
bool wxBrush::operator == ( const wxBrush& brush ) const
{
- if (m_refData == brush.m_refData) return
TRUE
;
-
- if (!m_refData || !brush.m_refData) return
FALSE
;
-
+ if (m_refData == brush.m_refData) return
true
;
+
+ if (!m_refData || !brush.m_refData) return
false
;
+
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, _T("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, _T("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, _T("invalid brush") );
return &M_BRUSHDATA->m_stipple;
}
return &M_BRUSHDATA->m_stipple;
}
@@
-134,36
+133,31
@@
wxBitmap *wxBrush::GetStipple() const
void wxBrush::SetColour( const wxColour& col )
{
AllocExclusive();
void wxBrush::SetColour( const wxColour& col )
{
AllocExclusive();
-
+
M_BRUSHDATA->m_colour = col;
}
void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
{
AllocExclusive();
M_BRUSHDATA->m_colour = col;
}
void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
{
AllocExclusive();
-
+
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();
-
+
M_BRUSHDATA->m_style = style;
}
void wxBrush::SetStipple( const wxBitmap& stipple )
{
AllocExclusive();
M_BRUSHDATA->m_style = style;
}
void wxBrush::SetStipple( const wxBitmap& stipple )
{
AllocExclusive();
-
+
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;
}
}
-