add a very simple test for Load/Save()

[wxWidgets.git] / samples / propgrid / propgrid.cpp

diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index d6ab769b8439670bf1e1210ded4ab846e5b30d4a..26dbfd835d00dae2923e68f52b3ae8135d0a1db6 100644 (file)
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2004-09-25
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2004-09-25

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////


@@ -80,22 +80,22 @@
 
 class wxSampleMultiButtonEditor : public wxPGTextCtrlEditor
 {
 
 class wxSampleMultiButtonEditor : public wxPGTextCtrlEditor
 {

-    WX_PG_DECLARE_EDITOR_CLASS(wxSampleMultiButtonEditor)
+    DECLARE_DYNAMIC_CLASS(wxSampleMultiButtonEditor)

 public:
     wxSampleMultiButtonEditor() {}
     virtual ~wxSampleMultiButtonEditor() {}
 
 public:
     wxSampleMultiButtonEditor() {}
     virtual ~wxSampleMultiButtonEditor() {}
 

-    wxPG_DECLARE_CREATECONTROLS
+    virtual wxPGWindowList CreateControls( wxPropertyGrid* propGrid,
+                                           wxPGProperty* property,
+                                           const wxPoint& pos,
+                                           const wxSize& sz ) const;

     virtual bool OnEvent( wxPropertyGrid* propGrid,
                           wxPGProperty* property,
                           wxWindow* ctrl,
                           wxEvent& event ) const;
     virtual bool OnEvent( wxPropertyGrid* propGrid,
                           wxPGProperty* property,
                           wxWindow* ctrl,
                           wxEvent& event ) const;

-

 };
 
 };
 

-WX_PG_IMPLEMENT_EDITOR_CLASS(SampleMultiButtonEditor,wxSampleMultiButtonEditor,
-                             wxPGTextCtrlEditor)
-
+IMPLEMENT_DYNAMIC_CLASS(wxSampleMultiButtonEditor, wxPGTextCtrlEditor)

 
 wxPGWindowList wxSampleMultiButtonEditor::CreateControls( wxPropertyGrid* propGrid,
                                                           wxPGProperty* property,
 
 wxPGWindowList wxSampleMultiButtonEditor::CreateControls( wxPropertyGrid* propGrid,
                                                           wxPGProperty* property,


@@ -105,19 +105,20 @@ wxPGWindowList wxSampleMultiButtonEditor::CreateControls( wxPropertyGrid* propGr
     // Create and populate buttons-subwindow
     wxPGMultiButton* buttons = new wxPGMultiButton( propGrid, sz );
 
     // Create and populate buttons-subwindow
     wxPGMultiButton* buttons = new wxPGMultiButton( propGrid, sz );
 

+    // Add two regular buttons

     buttons->Add( "..." );
     buttons->Add( "A" );
     buttons->Add( "..." );
     buttons->Add( "A" );

-#if wxUSE_BMPBUTTON
+    // Add a bitmap button

     buttons->Add( wxArtProvider::GetBitmap(wxART_FOLDER) );
     buttons->Add( wxArtProvider::GetBitmap(wxART_FOLDER) );

-#endif

 
     // Create the 'primary' editor control (textctrl in this case)
     wxPGWindowList wndList = wxPGTextCtrlEditor::CreateControls
 
     // Create the 'primary' editor control (textctrl in this case)
     wxPGWindowList wndList = wxPGTextCtrlEditor::CreateControls

-                             ( propGrid, property, pos, buttons->GetPrimarySize() );
+                             ( propGrid, property, pos,
+                               buttons->GetPrimarySize() );

 
     // Finally, move buttons-subwindow to correct position and make sure
     // returned wxPGWindowList contains our custom button list.
 
     // Finally, move buttons-subwindow to correct position and make sure
     // returned wxPGWindowList contains our custom button list.

-    buttons->FinalizePosition(pos);
+    buttons->Finalize(propGrid, pos);

 
     wndList.SetSecondary( buttons );
     return wndList;
 
     wndList.SetSecondary( buttons );
     return wndList;


@@ -132,14 +133,22 @@ bool wxSampleMultiButtonEditor::OnEvent( wxPropertyGrid* propGrid,
     {
         wxPGMultiButton* buttons = (wxPGMultiButton*) propGrid->GetEditorControlSecondary();
 
     {
         wxPGMultiButton* buttons = (wxPGMultiButton*) propGrid->GetEditorControlSecondary();
 

+        if ( event.GetId() == buttons->GetButtonId(0) )
+        {
+            // Do something when first button is pressed
+            wxLogDebug("First button pressed");
+            return true;
+        }

         if ( event.GetId() == buttons->GetButtonId(1) )
         {
         if ( event.GetId() == buttons->GetButtonId(1) )
         {

-            wxMessageBox(wxT("Second button was pressed"));
+            // Do something when second button is pressed
+            wxLogDebug("Second button pressed");

             return true;
         }
         if ( event.GetId() == buttons->GetButtonId(2) )
         {
             return true;
         }
         if ( event.GetId() == buttons->GetButtonId(2) )
         {

-            wxMessageBox(wxT("Third button was pressed"));
+            // Do something when third button is pressed
+            wxLogDebug("Third button pressed");

             return true;
         }
     }
             return true;
         }
     }


@@ -598,7 +607,7 @@ public:
     // Set editor to have button
     virtual const wxPGEditor* DoGetEditorClass() const
     {
     // Set editor to have button
     virtual const wxPGEditor* DoGetEditorClass() const
     {

-        return wxPG_EDITOR(TextCtrlAndButton);
+        return wxPGEditor_TextCtrlAndButton;

     }
 
     // Set what happens on button click
     }
 
     // Set what happens on button click


@@ -644,7 +653,6 @@ enum
     ID_CATCOLOURS,
     ID_SETCOLOUR,
     ID_STATICLAYOUT,
     ID_CATCOLOURS,
     ID_SETCOLOUR,
     ID_STATICLAYOUT,

-    ID_CLEAR,

     ID_POPULATE1,
     ID_POPULATE2,
     ID_COLLAPSE,
     ID_POPULATE1,
     ID_POPULATE2,
     ID_COLLAPSE,


@@ -742,7 +750,6 @@ BEGIN_EVENT_TABLE(FormMain, wxFrame)
     EVT_MENU( ID_SELECTSTYLE, FormMain::OnSelectStyle )
 
     EVT_MENU( ID_STATICLAYOUT, FormMain::OnMisc )
     EVT_MENU( ID_SELECTSTYLE, FormMain::OnSelectStyle )
 
     EVT_MENU( ID_STATICLAYOUT, FormMain::OnMisc )

-    EVT_MENU( ID_CLEAR, FormMain::OnMisc )

     EVT_MENU( ID_COLLAPSE, FormMain::OnMisc )
     EVT_MENU( ID_COLLAPSEALL, FormMain::OnMisc )
 
     EVT_MENU( ID_COLLAPSE, FormMain::OnMisc )
     EVT_MENU( ID_COLLAPSEALL, FormMain::OnMisc )
 


@@ -809,7 +816,7 @@ void FormMain::OnMove( wxMoveEvent& event )
 
     id = m_pPropGridManager->GetPropertyByName( wxT("Position") );
     if ( id )
 
     id = m_pPropGridManager->GetPropertyByName( wxT("Position") );
     if ( id )

-        m_pPropGridManager->SetPropertyValue( id, wxPoint(x,y) );
+        m_pPropGridManager->SetPropertyValue( id, WXVARIANT(wxPoint(x,y)) );

 
     // Should always call event.Skip() in frame's MoveEvent handler
     event.Skip();
 
     // Should always call event.Skip() in frame's MoveEvent handler
     event.Skip();


@@ -847,7 +854,7 @@ void FormMain::OnResize( wxSizeEvent& event )
 
     id = m_pPropGridManager->GetPropertyByName ( wxT("Size") );
     if ( id )
 
     id = m_pPropGridManager->GetPropertyByName ( wxT("Size") );
     if ( id )

-        m_pPropGridManager->SetPropertyValue( id, wxSize(w,h) );
+        m_pPropGridManager->SetPropertyValue( id, WXVARIANT(wxSize(w,h)) );

 
     // Should always call event.Skip() in frame's SizeEvent handler
     event.Skip();
 
     // Should always call event.Skip() in frame's SizeEvent handler
     event.Skip();


@@ -1052,7 +1059,7 @@ void FormMain::OnPropertyGridItemDoubleClick( wxPropertyGridEvent& event )
 void FormMain::OnPropertyGridButtonClick ( wxCommandEvent& )
 {
 #if wxUSE_STATUSBAR
 void FormMain::OnPropertyGridButtonClick ( wxCommandEvent& )
 {
 #if wxUSE_STATUSBAR

-    wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty();
+    wxPGProperty* prop = m_pPropGridManager->GetSelection();

     wxStatusBar* sb = GetStatusBar();
     if ( prop )
     {
     wxStatusBar* sb = GetStatusBar();
     if ( prop )
     {


@@ -1189,7 +1196,7 @@ void FormMain::OnTestXRC(wxCommandEvent& WXUNUSED(event))
 
 void FormMain::OnEnableCommonValues(wxCommandEvent& WXUNUSED(event))
 {
 
 void FormMain::OnEnableCommonValues(wxCommandEvent& WXUNUSED(event))
 {

-    wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty();
+    wxPGProperty* prop = m_pPropGridManager->GetSelection();

     if ( prop )
         prop->EnableCommonValue();
     else
     if ( prop )
         prop->EnableCommonValue();
     else


@@ -1349,6 +1356,7 @@ void FormMain::PopulateWithExamples ()
     wxPropertyGridManager* pgman = m_pPropGridManager;
     wxPropertyGridPage* pg = pgman->GetPage(wxT("Examples"));
     wxPGProperty* pid;
     wxPropertyGridManager* pgman = m_pPropGridManager;
     wxPropertyGridPage* pg = pgman->GetPage(wxT("Examples"));
     wxPGProperty* pid;

+    wxPGProperty* prop;

 
     //pg->Append( new wxPropertyCategory(wxT("Examples (low priority)"),wxT("Examples")) );
     //pg->SetPropertyHelpString ( wxT("Examples"), wxT("This category has example of (almost) every built-in property class.") );
 
     //pg->Append( new wxPropertyCategory(wxT("Examples (low priority)"),wxT("Examples")) );
     //pg->SetPropertyHelpString ( wxT("Examples"), wxT("This category has example of (almost) every built-in property class.") );


@@ -1356,7 +1364,7 @@ void FormMain::PopulateWithExamples ()
 #if wxUSE_SPINBTN
     pg->Append( new wxIntProperty ( wxT("SpinCtrl"), wxPG_LABEL, 0 ) );
 
 #if wxUSE_SPINBTN
     pg->Append( new wxIntProperty ( wxT("SpinCtrl"), wxPG_LABEL, 0 ) );
 

-    pg->SetPropertyEditor( wxT("SpinCtrl"), wxPG_EDITOR(SpinCtrl) );
+    pg->SetPropertyEditor( wxT("SpinCtrl"), wxPGEditor_SpinCtrl );

     pg->SetPropertyAttribute( wxT("SpinCtrl"), wxPG_ATTR_MIN, (long)-10 );  // Use constants instead of string
     pg->SetPropertyAttribute( wxT("SpinCtrl"), wxPG_ATTR_MAX, (long)10 );   // for reduced binary size.
     pg->SetPropertyAttribute( wxT("SpinCtrl"), wxT("Step"), (long)2 );
     pg->SetPropertyAttribute( wxT("SpinCtrl"), wxPG_ATTR_MIN, (long)-10 );  // Use constants instead of string
     pg->SetPropertyAttribute( wxT("SpinCtrl"), wxPG_ATTR_MAX, (long)10 );   // for reduced binary size.
     pg->SetPropertyAttribute( wxT("SpinCtrl"), wxT("Step"), (long)2 );


@@ -1364,7 +1372,7 @@ void FormMain::PopulateWithExamples ()
 
     pg->SetPropertyHelpString( wxT("SpinCtrl"),
         wxT("This is regular wxIntProperty, which editor has been ")
 
     pg->SetPropertyHelpString( wxT("SpinCtrl"),
         wxT("This is regular wxIntProperty, which editor has been ")

-        wxT("changed to wxPG_EDITOR(SpinCtrl). Note however that ")
+        wxT("changed to wxPGEditor_SpinCtrl. Note however that ")

         wxT("static wxPropertyGrid::RegisterAdditionalEditors() ")
         wxT("needs to be called prior to using it."));
 
         wxT("static wxPropertyGrid::RegisterAdditionalEditors() ")
         wxT("needs to be called prior to using it."));
 


@@ -1403,7 +1411,7 @@ void FormMain::PopulateWithExamples ()
 
     // A file selector property. Note that argument between name
     // and initial value is wildcard (format same as in wxFileDialog).
 
     // A file selector property. Note that argument between name
     // and initial value is wildcard (format same as in wxFileDialog).

-    wxPGProperty* prop = new wxFileProperty( wxT("FileProperty"), wxT("TextFile") );
+    prop = new wxFileProperty( wxT("FileProperty"), wxT("TextFile") );

     pg->Append( prop );
 
     prop->SetAttribute(wxPG_FILE_WILDCARD,wxT("Text Files (*.txt)|*.txt"));
     pg->Append( prop );
 
     prop->SetAttribute(wxPG_FILE_WILDCARD,wxT("Text Files (*.txt)|*.txt"));


@@ -1425,11 +1433,11 @@ void FormMain::PopulateWithExamples ()
 
     pid = pg->Append( new wxColourProperty(wxT("ColourProperty"),wxPG_LABEL,*wxRED) );
     //pg->SetPropertyAttribute(pid,wxPG_COLOUR_ALLOW_CUSTOM,false);
 
     pid = pg->Append( new wxColourProperty(wxT("ColourProperty"),wxPG_LABEL,*wxRED) );
     //pg->SetPropertyAttribute(pid,wxPG_COLOUR_ALLOW_CUSTOM,false);

-    pg->SetPropertyEditor( wxT("ColourProperty"), wxPG_EDITOR(ComboBox) );
+    pg->SetPropertyEditor( wxT("ColourProperty"), wxPGEditor_ComboBox );

     pg->GetProperty(wxT("ColourProperty"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED);
     pg->SetPropertyHelpString( wxT("ColourProperty"),
         wxT("wxPropertyGrid::SetPropertyEditor method has been used to change ")
     pg->GetProperty(wxT("ColourProperty"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED);
     pg->SetPropertyHelpString( wxT("ColourProperty"),
         wxT("wxPropertyGrid::SetPropertyEditor method has been used to change ")

-        wxT("editor of this property to wxPG_EDITOR(ComboBox)"));
+        wxT("editor of this property to wxPGEditor_ComboBox)"));

 
     //
     // This demonstrates using alternative editor for colour property
 
     //
     // This demonstrates using alternative editor for colour property


@@ -1482,10 +1490,13 @@ void FormMain::PopulateWithExamples ()
                                   240) );
     pg->GetProperty(wxT("EnumProperty 2"))->AddChoice(wxT("Testing Extra"), 360);
 
                                   240) );
     pg->GetProperty(wxT("EnumProperty 2"))->AddChoice(wxT("Testing Extra"), 360);
 

-    // Add a second time to test that the caching works
-    pg->Append( new wxEnumProperty(wxT("EnumProperty 3"),wxPG_LABEL,
-        soc, 360 ) );
-    pg->SetPropertyHelpString(wxT("EnumProperty 3"),
+    // Add a second time to test that the caching works. Also use
+    // short form of constructor list + SetChoices.
+    prop = new wxEnumProperty(wxT("EnumProperty 3"), wxPG_LABEL);
+    pg->Append( prop );
+    prop->SetChoices(soc);
+    prop->SetValue(360);
+    pg->SetPropertyHelpString(prop,

         wxT("Should have same choices as EnumProperty 2"));
 
     pg->Append( new wxEnumProperty(wxT("EnumProperty 4"),wxPG_LABEL,
         wxT("Should have same choices as EnumProperty 2"));
 
     pg->Append( new wxEnumProperty(wxT("EnumProperty 4"),wxPG_LABEL,


@@ -1552,7 +1563,6 @@ void FormMain::PopulateWithExamples ()
     pg->Append( new wxSizeProperty( wxT("SizeProperty"), wxT("Size"), GetSize() ) );
     pg->Append( new wxPointProperty( wxT("PointProperty"), wxT("Position"), GetPosition() ) );
 
     pg->Append( new wxSizeProperty( wxT("SizeProperty"), wxT("Size"), GetSize() ) );
     pg->Append( new wxPointProperty( wxT("PointProperty"), wxT("Position"), GetPosition() ) );
 

-

     // UInt samples
     pg->Append( new wxUIntProperty( wxT("UIntProperty"), wxPG_LABEL, wxULongLong(wxULL(0xFEEEFEEEFEEE))));
     pg->SetPropertyAttribute( wxT("UIntProperty"), wxPG_UINT_PREFIX, wxPG_PREFIX_NONE );
     // UInt samples
     pg->Append( new wxUIntProperty( wxT("UIntProperty"), wxPG_LABEL, wxULongLong(wxULL(0xFEEEFEEEFEEE))));
     pg->SetPropertyAttribute( wxT("UIntProperty"), wxPG_UINT_PREFIX, wxPG_PREFIX_NONE );


@@ -1615,36 +1625,44 @@ void FormMain::PopulateWithExamples ()
     //
     // This snippet is a doc sample test
     //
     //
     // This snippet is a doc sample test
     //

-    pid = pg->Append( new wxStringProperty(wxT("Car"),wxPG_LABEL,wxT("<composed>")) );
+    wxPGProperty* carProp = pg->Append(new wxStringProperty(wxT("Car"),
+                                         wxPG_LABEL,
+                                         wxT("<composed>")));

 
 

-    pg->AppendIn( pid, new wxStringProperty(wxT("Model"),
-                                            wxPG_LABEL,
-                                            wxT("Lamborghini Diablo SV")) );
+    pg->AppendIn(carProp, new wxStringProperty(wxT("Model"),
+                                                wxPG_LABEL,
+                                                wxT("Lamborghini Diablo SV")));

 
 

-    pg->AppendIn( pid, new wxIntProperty(wxT("Engine Size (cc)"),
-                                         wxPG_LABEL,
-                                         5707) );
+    pg->AppendIn(carProp, new wxIntProperty(wxT("Engine Size (cc)"),
+                                            wxPG_LABEL,
+                                            5707) );

 
 

-    wxPGProperty* speedId = pg->AppendIn( pid, new wxStringProperty(wxT("Speeds"),wxPG_LABEL,wxT("<composed>")) );
-    pg->AppendIn( speedId, new wxIntProperty(wxT("Max. Speed (mph)"),wxPG_LABEL,290) );
-    pg->AppendIn( speedId, new wxFloatProperty(wxT("0-100 mph (sec)"),wxPG_LABEL,3.9) );
-    pg->AppendIn( speedId, new wxFloatProperty(wxT("1/4 mile (sec)"),wxPG_LABEL,8.6) );
+    wxPGProperty* speedsProp = pg->AppendIn(carProp,
+                                            new wxStringProperty(wxT("Speeds"),
+                                              wxPG_LABEL,
+                                              wxT("<composed>")));

 
 

-    pg->AppendIn( pid, new wxIntProperty(wxT("Price ($)"),
-                                         wxPG_LABEL,
-                                         300000) );
+    pg->AppendIn( speedsProp, new wxIntProperty(wxT("Max. Speed (mph)"),
+                                                wxPG_LABEL,290) );
+    pg->AppendIn( speedsProp, new wxFloatProperty(wxT("0-100 mph (sec)"),
+                                                  wxPG_LABEL,3.9) );
+    pg->AppendIn( speedsProp, new wxFloatProperty(wxT("1/4 mile (sec)"),
+                                                  wxPG_LABEL,8.6) );

 
 

-    // Make sure the child properties can be accessed correctly
+    // This is how child property can be referred to by name

     pg->SetPropertyValue( wxT("Car.Speeds.Max. Speed (mph)"), 300 );
 
     pg->SetPropertyValue( wxT("Car.Speeds.Max. Speed (mph)"), 300 );
 

-    // Displayed value of "Car" property is now:
-    // "Lamborghini Diablo SV; [300; 3.9; 8.6]; 300000"
+    pg->AppendIn(carProp, new wxIntProperty(wxT("Price ($)"),
+                                            wxPG_LABEL,
+                                            300000) );
+
+    // Displayed value of "Car" property is now very close to this:
+    // "Lamborghini Diablo SV; 5707 [300; 3.9; 8.6] 300000"

 
     //
     // Test wxSampleMultiButtonEditor
 
     //
     // Test wxSampleMultiButtonEditor

-    wxPGRegisterEditorClass( SampleMultiButtonEditor );

     pg->Append( new wxLongStringProperty(wxT("MultipleButtons"), wxPG_LABEL) );
     pg->Append( new wxLongStringProperty(wxT("MultipleButtons"), wxPG_LABEL) );

-    pg->SetPropertyEditor(wxT("MultipleButtons"), wxPG_EDITOR(SampleMultiButtonEditor) );
+    pg->SetPropertyEditor(wxT("MultipleButtons"), m_pSampleMultiButtonEditor );

 
     // Test SingleChoiceProperty
     pg->Append( new SingleChoiceProperty(wxT("SingleChoiceProperty")) );
 
     // Test SingleChoiceProperty
     pg->Append( new SingleChoiceProperty(wxT("SingleChoiceProperty")) );


@@ -2016,11 +2034,9 @@ void FormMain::CreateGrid( int style, int extraStyle )
     /*
     // This would setup event handling without event table entries
     Connect(m_pPropGridManager->GetId(), wxEVT_PG_SELECTED,
     /*
     // This would setup event handling without event table entries
     Connect(m_pPropGridManager->GetId(), wxEVT_PG_SELECTED,

-            (wxObjectEventFunction) (wxEventFunction) (wxPropertyGridEventFunction)
-            &FormMain::OnPropertyGridSelect );
+            wxPropertyGridEventHandler(FormMain::OnPropertyGridSelect) );

     Connect(m_pPropGridManager->GetId(), wxEVT_PG_CHANGED,
     Connect(m_pPropGridManager->GetId(), wxEVT_PG_CHANGED,

-            (wxObjectEventFunction) (wxEventFunction) (wxPropertyGridEventFunction)
-            &FormMain::OnPropertyGridChange );
+            wxPropertyGridEventHandler(FormMain::OnPropertyGridChange) );

     */
 
     m_topSizer->Add( m_pPropGridManager, 1, wxEXPAND );
     */
 
     m_topSizer->Add( m_pPropGridManager, 1, wxEXPAND );


@@ -2049,6 +2065,13 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
     wxInitAllImageHandlers();
 #endif
 
     wxInitAllImageHandlers();
 #endif
 

+    // Register all editors (SpinCtrl etc.)
+    m_pPropGridManager->RegisterAdditionalEditors();
+
+    // Register our sample custom editors
+    m_pSampleMultiButtonEditor =
+        wxPropertyGrid::RegisterEditorClass(new wxSampleMultiButtonEditor());
+

     CreateGrid( // style
                 wxPG_BOLD_MODIFIED |
                 wxPG_SPLITTER_AUTO_CENTER |
     CreateGrid( // style
                 wxPG_BOLD_MODIFIED |
                 wxPG_SPLITTER_AUTO_CENTER |


@@ -2068,9 +2091,6 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
                 //| wxPG_EX_HELP_AS_TOOLTIPS
               );
 
                 //| wxPG_EX_HELP_AS_TOOLTIPS
               );
 

-    // Register all editors (SpinCtrl etc.)
-    m_pPropGridManager->RegisterAdditionalEditors();
-

     //
     // Create menubar
     wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
     //
     // Create menubar
     wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);


@@ -2093,7 +2113,6 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
     menuTools1->AppendSeparator();
     menuTools1->Append(ID_SETCOLOUR, wxT("Set Bg Colour") );
     menuTools1->Append(ID_UNSPECIFY, wxT("Set to Unspecified") );
     menuTools1->AppendSeparator();
     menuTools1->Append(ID_SETCOLOUR, wxT("Set Bg Colour") );
     menuTools1->Append(ID_UNSPECIFY, wxT("Set to Unspecified") );

-    menuTools1->Append(ID_CLEAR, wxT("Set Value to Default") );

     menuTools1->AppendSeparator();
     m_itemEnable = menuTools1->Append(ID_ENABLE, wxT("Enable"),
         wxT("Toggles item's enabled state.") );
     menuTools1->AppendSeparator();
     m_itemEnable = menuTools1->Append(ID_ENABLE, wxT("Enable"),
         wxT("Toggles item's enabled state.") );


@@ -2225,7 +2244,7 @@ void FormMain::OnInsertPropClick( wxCommandEvent& WXUNUSED(event) )
 {
     wxString propLabel;
 
 {
     wxString propLabel;
 

-    if ( !m_pPropGridManager->GetChildrenCount() )
+    if ( !m_pPropGridManager->GetGrid()->GetRoot()->GetChildCount() )

     {
         wxMessageBox(wxT("No items to relate - first add some with Append."));
         return;
     {
         wxMessageBox(wxT("No items to relate - first add some with Append."));
         return;


@@ -2242,8 +2261,8 @@ void FormMain::OnInsertPropClick( wxCommandEvent& WXUNUSED(event) )
     GenerateUniquePropertyLabel( m_pPropGridManager, propLabel );
 
     m_pPropGridManager->Insert( m_pPropGridManager->GetPropertyParent(id),
     GenerateUniquePropertyLabel( m_pPropGridManager, propLabel );
 
     m_pPropGridManager->Insert( m_pPropGridManager->GetPropertyParent(id),

-                            m_pPropGridManager->GetPropertyIndex(id),
-                            new wxStringProperty(propLabel) );
+                                id->GetIndexInParent(),
+                                new wxStringProperty(propLabel) );

 
 }
 
 
 }
 


@@ -2291,7 +2310,7 @@ void FormMain::OnInsertCatClick( wxCommandEvent& WXUNUSED(event) )
 {
     wxString propLabel;
 
 {
     wxString propLabel;
 

-    if ( !m_pPropGridManager->GetChildrenCount() )
+    if ( !m_pPropGridManager->GetGrid()->GetRoot()->GetChildCount() )

     {
         wxMessageBox(wxT("No items to relate - first add some with Append."));
         return;
     {
         wxMessageBox(wxT("No items to relate - first add some with Append."));
         return;


@@ -2309,9 +2328,8 @@ void FormMain::OnInsertCatClick( wxCommandEvent& WXUNUSED(event) )
     GenerateUniquePropertyLabel( m_pPropGridManager, propLabel );
 
     m_pPropGridManager->Insert( m_pPropGridManager->GetPropertyParent(id),
     GenerateUniquePropertyLabel( m_pPropGridManager, propLabel );
 
     m_pPropGridManager->Insert( m_pPropGridManager->GetPropertyParent(id),

-                            m_pPropGridManager->GetPropertyIndex(id),
-                            new wxPropertyCategory (propLabel) );
-
+                                id->GetIndexInParent(),
+                                new wxPropertyCategory (propLabel) );

 }
 
 // -----------------------------------------------------------------------
 }
 
 // -----------------------------------------------------------------------


@@ -2591,9 +2609,9 @@ void FormMain::OnRestoreState( wxCommandEvent& WXUNUSED(event) )
 void FormMain::OnSetSpinCtrlEditorClick( wxCommandEvent& WXUNUSED(event) )
 {
 #if wxUSE_SPINBTN
 void FormMain::OnSetSpinCtrlEditorClick( wxCommandEvent& WXUNUSED(event) )
 {
 #if wxUSE_SPINBTN

-    wxPGProperty* pgId = m_pPropGridManager->GetSelectedProperty();
+    wxPGProperty* pgId = m_pPropGridManager->GetSelection();

     if ( pgId )
     if ( pgId )

-        m_pPropGridManager->SetPropertyEditor( pgId, wxPG_EDITOR(SpinCtrl) );
+        m_pPropGridManager->SetPropertyEditor( pgId, wxPGEditor_SpinCtrl );

     else
         wxMessageBox(wxT("First select a property"));
 #endif
     else
         wxMessageBox(wxT("First select a property"));
 #endif


@@ -2603,7 +2621,7 @@ void FormMain::OnSetSpinCtrlEditorClick( wxCommandEvent& WXUNUSED(event) )
 
 void FormMain::OnTestReplaceClick( wxCommandEvent& WXUNUSED(event) )
 {
 
 void FormMain::OnTestReplaceClick( wxCommandEvent& WXUNUSED(event) )
 {

-    wxPGProperty* pgId = m_pPropGridManager->GetSelectedProperty();
+    wxPGProperty* pgId = m_pPropGridManager->GetSelection();

     if ( pgId )
     {
         wxPGChoices choices;
     if ( pgId )
     {
         wxPGChoices choices;


@@ -2823,7 +2841,6 @@ void FormMain::OnSelectStyle( wxCommandEvent& WXUNUSED(event) )
         ADD_FLAG(wxPG_EX_NATIVE_DOUBLE_BUFFERING)
         ADD_FLAG(wxPG_EX_AUTO_UNSPECIFIED_VALUES)
         ADD_FLAG(wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES)
         ADD_FLAG(wxPG_EX_NATIVE_DOUBLE_BUFFERING)
         ADD_FLAG(wxPG_EX_AUTO_UNSPECIFIED_VALUES)
         ADD_FLAG(wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES)

-        ADD_FLAG(wxPG_EX_LEGACY_VALIDATORS)

         wxMultiChoiceDialog dlg( this, wxT("Select extra window styles to use"),
                                  wxT("wxPropertyGrid Extra Style"), chs );
         dlg.SetSelections(sel);
         wxMultiChoiceDialog dlg( this, wxT("Select extra window styles to use"),
                                  wxT("wxPropertyGrid Extra Style"), chs );
         dlg.SetSelections(sel);


@@ -2932,10 +2949,6 @@ void FormMain::OnMisc ( wxCommandEvent& event )
         if ( event.IsChecked() ) m_pPropGridManager->SetWindowStyleFlag( wsf|wxPG_STATIC_LAYOUT );
         else m_pPropGridManager->SetWindowStyleFlag( wsf&~(wxPG_STATIC_LAYOUT) );
     }
         if ( event.IsChecked() ) m_pPropGridManager->SetWindowStyleFlag( wsf|wxPG_STATIC_LAYOUT );
         else m_pPropGridManager->SetWindowStyleFlag( wsf&~(wxPG_STATIC_LAYOUT) );
     }

-    else if ( id == ID_CLEAR )
-    {
-        m_pPropGridManager->ClearPropertyValue(m_pPropGridManager->GetGrid()->GetSelection());
-    }

     else if ( id == ID_COLLAPSEALL )
     {
         wxPGVIterator it;
     else if ( id == ID_COLLAPSEALL )
     {
         wxPGVIterator it;


@@ -2973,7 +2986,7 @@ void FormMain::OnMisc ( wxCommandEvent& event )
     else if ( id == ID_COLLAPSE )
     {
         // Collapses selected.
     else if ( id == ID_COLLAPSE )
     {
         // Collapses selected.

-        wxPGProperty* id = m_pPropGridManager->GetSelectedProperty();
+        wxPGProperty* id = m_pPropGridManager->GetSelection();

         if ( id )
         {
             m_pPropGridManager->Collapse(id);
         if ( id )
         {
             m_pPropGridManager->Collapse(id);


@@ -2991,7 +3004,7 @@ void FormMain::OnMisc ( wxCommandEvent& event )
     }
     else if ( id == ID_UNSPECIFY )
     {
     }
     else if ( id == ID_UNSPECIFY )
     {

-        wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty();
+        wxPGProperty* prop = m_pPropGridManager->GetSelection();

         if ( prop )
         {
             m_pPropGridManager->SetPropertyValueUnspecified(prop);
         if ( prop )
         {
             m_pPropGridManager->SetPropertyValueUnspecified(prop);


@@ -2999,7 +3012,7 @@ void FormMain::OnMisc ( wxCommandEvent& event )
     }
     else if ( id == ID_SETCOLOUR )
     {
     }
     else if ( id == ID_SETCOLOUR )
     {

-        wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty();
+        wxPGProperty* prop = m_pPropGridManager->GetSelection();

         if ( prop )
         {
             wxColourData data;
         if ( prop )
         {
             wxColourData data;