check for self assignment in operator=

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-11-16 18:03:08 +00:00
parent 5c69ef61f3
commit a09307abba
5 changed files with 22 additions and 12 deletions

View File

@@ -322,7 +322,7 @@ public:
data->IncRef();
variant.SetData(data);
variant.SetName(it->first);
it++;
++it;
return true;
}
@@ -992,7 +992,8 @@ public:
#ifndef SWIG
void operator= (const wxPGChoices& a)
{
AssignData(a.m_data);
if (this != &a)
AssignData(a.m_data);
}
wxPGChoiceEntry& operator[](unsigned int i)
@@ -2355,9 +2356,9 @@ public:
int GetTextExtent( const wxWindow* wnd, const wxFont& font ) const;
protected:
virtual wxString ValueToString( wxVariant& value, int argFlags ) const;
protected:
void SetTextColIndex( unsigned int colInd )
{ m_capFgColIndex = (wxByte) colInd; }
unsigned int GetTextColIndex() const