X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfcc02a8a4f019e3846b73660209080602e44967..cf21e2fc0bcb1c2f4c4aba2131e7a1756e2ba123:/include/wx/propgrid/advprops.h diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h index 22ae110b34..bb02c2eaea 100644 --- a/include/wx/propgrid/advprops.h +++ b/include/wx/propgrid/advprops.h @@ -126,7 +126,8 @@ public: #ifndef SWIG void operator=(const wxColourPropertyValue& cpv) { - Init( cpv.m_type, cpv.m_colour ); + if (this != &cpv) + Init( cpv.m_type, cpv.m_colour ); } private: @@ -289,9 +290,10 @@ public: const wxColour& value = *wxWHITE ); virtual ~wxColourProperty(); -protected: virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const; virtual wxColour GetColour( int index ) const; + +protected: virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const; private: