Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix for wxPenRefData operator==()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-03 19:15:33 +00:00
parent a352e39f43
commit e001091c6f
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/mgl/pen.cpp
View File

@@ -29,16 +29,17 @@
class wxPenRefData: public wxObjectRefData class wxPenRefData: public wxObjectRefData
{ {
public: public:
wxPenRefData(); wxPenRefData();
wxPenRefData(const wxPenRefData& data); wxPenRefData(const wxPenRefData& data);
bool operator==(const wxPenRefData& data) const bool operator==(const wxPenRefData& data) const
{ {
// we intentionally don't compare m_hPen fields here // we intentionally don't compare m_hPen fields here
return m_style == data.m_style && return m_style == data.m_style &&
m_width == data.m_width && m_width == data.m_width &&
m_pixPattern == data.m_pixPattern && memcmp(m_pixPattern,
data.m_pixPattern, sizeof(m_pixPattern)) == 0 &&
m_capStyle == data.m_capStyle && m_capStyle == data.m_capStyle &&
m_joinStyle == data.m_joinStyle && m_joinStyle == data.m_joinStyle &&
m_colour == data.m_colour && m_colour == data.m_colour &&
@@ -48,17 +49,17 @@ class wxPenRefData: public wxObjectRefData
memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0)); memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0));
} }
int m_width; int m_width;
int m_style; int m_style;
wxColour m_colour; wxColour m_colour;
wxBitmap m_stipple; wxBitmap m_stipple;
pixpattern24_t m_pixPattern; pixpattern24_t m_pixPattern;
// not used by wxMGL, but we want to preserve values // not used by wxMGL, but we want to preserve values
int m_joinStyle; int m_joinStyle;
int m_capStyle; int m_capStyle;
int m_countDashes; int m_countDashes;
wxDash *m_dash; wxDash *m_dash;
}; };
wxPenRefData::wxPenRefData() wxPenRefData::wxPenRefData()