X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18415eb5ca44bad29ab72db4607ed92cc6f456e4..2d46f281a5d4ea06c420a46748cc1b2a7b2af3cb:/include/wx/propgrid/property.h?ds=sidebyside

diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index be9739e6fc..7c329b7d1c 100644
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -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