fix wxGTK1 compilation after wxTextEntry DoGetValue() change

[wxWidgets.git] / src / propgrid / advprops.cpp

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index f1af26b9da4eae129f0de8a1badd5191c83c06e6..1b9fa5ee16c03e8fddfd4c76ce22ba95c38215fb 100644 (file)
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -1423,8 +1423,6 @@ bool wxSystemColourProperty::DoSetAttribute( const wxString& name, wxVariant& va
     {
         int ival = wxPGVariantToInt(value);
 
     {
         int ival = wxPGVariantToInt(value);
 

-        SetChoicesExclusive(); // Make sure we don't corrupt colour lists of other properties
-

         if ( ival && (m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
         {
             // Show custom choice
         if ( ival && (m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
         {
             // Show custom choice


@@ -1756,8 +1754,8 @@ wxImageFileProperty::wxImageFileProperty( const wxString& label, const wxString&
 {
     SetAttribute( wxPG_FILE_WILDCARD, wxPGGetDefaultImageWildcard() );
 
 {
     SetAttribute( wxPG_FILE_WILDCARD, wxPGGetDefaultImageWildcard() );
 

-    m_pImage = (wxImage*) NULL;
-    m_pBitmap = (wxBitmap*) NULL;
+    m_pImage = NULL;
+    m_pBitmap = NULL;

 }
 
 wxImageFileProperty::~wxImageFileProperty()
 }
 
 wxImageFileProperty::~wxImageFileProperty()