fix bugs in FindFirst() (it gets URL, not filename, on input) and FindNext() (which...

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

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index f13cf6de25cdfaf13311e514d1a314bec5afd2d4..c61db4bc164045e2baef9608b311f6454dec8fec 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -35,7 +35,7 @@
     #include "wx/intl.h"
 #endif
 
-#include <wx/propgrid/propgrid.h>
+#include "wx/propgrid/propgrid.h"
 
 
 #define PWC_CHILD_SUMMARY_LIMIT         16 // Maximum number of children summarized in a parent property's
@@ -880,7 +880,7 @@ void wxPGProperty::OnCustomPaint( wxDC& dc,
 
 const wxPGEditor* wxPGProperty::DoGetEditorClass() const
 {
-    return wxPG_EDITOR(TextCtrl);
+    return wxPGEditor_TextCtrl;
 }
 
 // Default extra property event handling - that is, none at all.
@@ -1387,11 +1387,11 @@ const wxPGEditor* wxPGProperty::GetEditorClass() const
     {
         // TextCtrlAndButton -> ComboBoxAndButton
         if ( editor->IsKindOf(CLASSINFO(wxPGTextCtrlAndButtonEditor)) )
-            editor = wxPG_EDITOR(ChoiceAndButton);
+            editor = wxPGEditor_ChoiceAndButton;
 
         // TextCtrl -> ComboBox
         else if ( editor->IsKindOf(CLASSINFO(wxPGTextCtrlEditor)) )
-            editor = wxPG_EDITOR(ComboBox);
+            editor = wxPGEditor_ComboBox;
     }
 
     return editor;
@@ -1412,12 +1412,6 @@ bool wxPGProperty::HasVisibleChildren() const
     return false;
 }
 
-bool wxPGProperty::PrepareValueForDialogEditing( wxPropertyGrid* propGrid )
-{
-    return propGrid->EditorValidate();
-}
-
-
 bool wxPGProperty::RecreateEditor()
 {
     wxPropertyGrid* pg = GetGrid();
@@ -1567,7 +1561,7 @@ void wxPGProperty::AddChild2( wxPGProperty* prop, int index, bool correct_mode )
     else
     {
         m_children.insert( m_children.begin()+index, prop);
-        if ( correct_mode ) FixIndexesOfChildren( index );
+        if ( correct_mode ) FixIndicesOfChildren( index );
     }
 
     prop->m_parent = this;
@@ -1657,7 +1651,7 @@ void wxPGProperty::AdaptListToValue( wxVariant& list, wxVariant* value ) const
 }
 
 
-void wxPGProperty::FixIndexesOfChildren( size_t starthere )
+void wxPGProperty::FixIndicesOfChildren( unsigned int starthere )
 {
     size_t i;
     for ( i=starthere;i<GetChildCount();i++)