remove the now unused Connect_Timeout()

[wxWidgets.git] / include / wx / propgrid / advprops.h

diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index 22ae110b34074c65785be6dc564d3cbcddc9bf59..bb02c2eaea4560989ad8979d6bb70e4fa6e0c6b8 100644 (file)
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -126,7 +126,8 @@ public:
 #ifndef SWIG
     void operator=(const wxColourPropertyValue& cpv)
     {
 #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:
     }
 
 private:


@@ -289,9 +290,10 @@ public:
                       const wxColour& value = *wxWHITE );
     virtual ~wxColourProperty();
 
                       const wxColour& value = *wxWHITE );
     virtual ~wxColourProperty();
 

-protected:

     virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
     virtual wxColour GetColour( int index ) const;
     virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
     virtual wxColour GetColour( int index ) const;

+
+protected:

     virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
 
 private:
     virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
 
 private: