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

wxColourData::operator=() should return wxColourData&, not void

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-18 20:25:02 +00:00
parent 8cf304f81b
commit 5cd0202bdc
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/cmndata.h
View File

@@ -37,7 +37,7 @@ public:
wxColourData(); wxColourData();
wxColourData(const wxColourData& data); wxColourData(const wxColourData& data);
void operator=(const wxColourData&); wxColourData& operator=(const wxColourData& data);
virtual ~wxColourData(); virtual ~wxColourData();
void SetChooseFull(bool flag) { m_chooseFull = flag; } void SetChooseFull(bool flag) { m_chooseFull = flag; }

6
src/common/cmndata.cpp
View File

@@ -78,7 +78,7 @@ wxColourData::wxColourData()
} }
wxColourData::wxColourData(const wxColourData& data) wxColourData::wxColourData(const wxColourData& data)
: wxObject() : wxObject()
{ {
(*this) = data; (*this) = data;
} }
@@ -102,13 +102,15 @@ wxColour wxColourData::GetCustomColour(int i)
return m_custColours[i]; return m_custColours[i];
} }
void wxColourData::operator=(const wxColourData& data) wxColourData& wxColourData::operator=(const wxColourData& data)
{ {
for (int i = 0; i < WXSIZEOF(m_custColours); i++) for (int i = 0; i < WXSIZEOF(m_custColours); i++)
m_custColours[i] = data.m_custColours[i]; m_custColours[i] = data.m_custColours[i];
m_dataColour = data.m_dataColour; m_dataColour = data.m_dataColour;
m_chooseFull = data.m_chooseFull; m_chooseFull = data.m_chooseFull;
return *this;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------