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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 3ecfc402a8a1c51729a0e39a5142b532cd26f75e..0bfced12f30240f9d264b63315c0a2e8a16b5126 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -37,7 +37,7 @@ public:
 
     wxColourData();
     wxColourData(const wxColourData& data);
-    void operator=(const wxColourData&);
+    wxColourData& operator=(const wxColourData& data);
     virtual ~wxColourData();
 
     void SetChooseFull(bool flag) { m_chooseFull = flag; }

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 40e6073529f0d3c3e1955715fef2cc7bf8fdac74..2efed738bedea3b8cad42ec423437943553e953b 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -78,7 +78,7 @@ wxColourData::wxColourData()
 }
 
 wxColourData::wxColourData(const wxColourData& data)
-    : wxObject()
+            : wxObject()
 {
     (*this) = data;
 }
@@ -102,13 +102,15 @@ wxColour wxColourData::GetCustomColour(int 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++)
         m_custColours[i] = data.m_custColours[i];
 
     m_dataColour = data.m_dataColour;
     m_chooseFull = data.m_chooseFull;
+
+    return *this;
 }
 
 // ----------------------------------------------------------------------------