fixing comments, making sure sound always gets the completion call in the same thread...

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

diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index a0298fc790ef9dd4b0d54b796e7915681074bfd9..140e0ff5963178d376490fba8e6b6cf9cf9c5eec 100644 (file)
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -212,7 +212,7 @@ void wxPGEditor::SetControlAppearance( wxPropertyGrid* pg,
                                        wxWindow* ctrl,
                                        const wxPGCell& cell,
                                        const wxPGCell& oCell,
-                                       bool WXUNUSED(unspecified) ) const
+                                       bool unspecified ) const
 {
     // Get old editor appearance
     wxTextCtrl* tc = NULL;
@@ -262,6 +262,9 @@ void wxPGEditor::SetControlAppearance( wxPropertyGrid* pg,
         }
     }
 
+    // Do not make the mistake of calling GetClassDefaultAttributes()
+    // here. It is static, while GetDefaultAttributes() is virtual
+    // and the correct one to use.
     wxVisualAttributes vattrs = ctrl->GetDefaultAttributes();
 
     // Foreground colour
@@ -298,7 +301,8 @@ void wxPGEditor::SetControlAppearance( wxPropertyGrid* pg,
     }
 
     // Also call the old SetValueToUnspecified()
-    SetValueToUnspecified(property, ctrl);
+    if ( unspecified )
+        SetValueToUnspecified(property, ctrl);
 }
 
 void wxPGEditor::SetValueToUnspecified( wxPGProperty* WXUNUSED(property),