missing commit

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

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 1e4f0cdfacf536eaa6c2a6f4beb564535189abce..ceaba28ae3f92e6da1d96a0d400e365d94c192be 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -48,7 +48,7 @@
 
 #if wxPG_COMPATIBILITY_1_4
 
 
 #if wxPG_COMPATIBILITY_1_4
 

-// Used to establish backwards compatiblity
+// Used to establish backwards compatibility

 const char* g_invalidStringContent = "@__TOTALLY_INVALID_STRING__@";
 
 #endif
 const char* g_invalidStringContent = "@__TOTALLY_INVALID_STRING__@";
 
 #endif


@@ -500,7 +500,7 @@ void wxPGProperty::InitAfterAdded( wxPropertyGridPageState* pageState,
     // (so propgrid can be NULL, too).
 
     wxPGProperty* parent = m_parent;
     // (so propgrid can be NULL, too).
 
     wxPGProperty* parent = m_parent;

-    bool parentIsRoot = parent->IsKindOf(CLASSINFO(wxPGRootProperty));
+    bool parentIsRoot = parent->IsKindOf(wxCLASSINFO(wxPGRootProperty));

 
     //
     // Convert invalid cells to default ones in this grid
 
     //
     // Convert invalid cells to default ones in this grid


@@ -1035,7 +1035,7 @@ bool wxPGProperty::IntToValue( wxVariant& variant, int number, int WXUNUSED(argF
 }
 
 // Convert semicolon delimited tokens into child values.
 }
 
 // Convert semicolon delimited tokens into child values.

-bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int argFlags ) const
+bool wxPGProperty::StringToValue( wxVariant& v, const wxString& text, int argFlags ) const

 {
     if ( !GetChildCount() )
         return false;
 {
     if ( !GetChildCount() )
         return false;


@@ -1240,7 +1240,7 @@ bool wxPGProperty::StringToValue( wxVariant& variant, const wxString& text, int
     }
 
     if ( changed )
     }
 
     if ( changed )

-        variant = list;
+        v = list;

 
     return changed;
 }
 
     return changed;
 }


@@ -2021,11 +2021,11 @@ const wxPGEditor* wxPGProperty::GetEditorClass() const
     if ( GetDisplayedCommonValueCount() )
     {
         // TextCtrlAndButton -> ComboBoxAndButton
     if ( GetDisplayedCommonValueCount() )
     {
         // TextCtrlAndButton -> ComboBoxAndButton

-        if ( editor->IsKindOf(CLASSINFO(wxPGTextCtrlAndButtonEditor)) )
+        if ( wxDynamicCast(editor, wxPGTextCtrlAndButtonEditor) )

             editor = wxPGEditor_ChoiceAndButton;
 
         // TextCtrl -> ComboBox
             editor = wxPGEditor_ChoiceAndButton;
 
         // TextCtrl -> ComboBox

-        else if ( editor->IsKindOf(CLASSINFO(wxPGTextCtrlEditor)) )
+        else if ( wxDynamicCast(editor, wxPGTextCtrlEditor) )

             editor = wxPGEditor_ComboBox;
     }
 
             editor = wxPGEditor_ComboBox;
     }