removed not doing anything and not compiling code from DoAssociation()

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

diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index 362fb864f6bda3cfeb6fed832f41a9dd18c64d28..8cc2d539dac2d23b0923aa153a191081ecdb63e3 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
 /////////////////////////////////////////////////////////////////////////////


@@ -19,7 +19,7 @@
 //
 // * Currently there is no example of a custom property editor. However,
 //   SpinCtrl editor sample is well-commented. It can be found in
 //
 // * Currently there is no example of a custom property editor. However,
 //   SpinCtrl editor sample is well-commented. It can be found in

-//   contrib/src/propgrid/advprops.cpp.
+//   src/propgrid/advprops.cpp.

 //
 // * To find code that populates the grid with properties, search for
 //   string "::Populate".
 //
 // * To find code that populates the grid with properties, search for
 //   string "::Populate".


@@ -27,10 +27,6 @@
 // * To find code that handles property grid changes, search for string
 //   "::OnPropertyGridChange".
 //
 // * To find code that handles property grid changes, search for string
 //   "::OnPropertyGridChange".
 //

-// * At the end of file there is example code for using the owner-drawn combo
-//   box independently outside the wxPropertyGrid.
-//
-//

 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"


@@ -45,6 +41,10 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

+#if !wxUSE_PROPGRID
+    #error "Please set wxUSE_PROPGRID to 1 and rebuild the library."
+#endif
+

 #include <wx/numdlg.h>
 
 // -----------------------------------------------------------------------
 #include <wx/numdlg.h>
 
 // -----------------------------------------------------------------------


@@ -76,22 +76,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,


@@ -101,19 +101,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;


@@ -128,14 +129,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;
         }
     }


@@ -274,6 +283,7 @@ void wxAdvImageFileProperty::OnSetValue()
 
     if ( imagename.length() )
     {
 
     if ( imagename.length() )
     {

+        wxFileName filename = GetFileName();

         size_t prevCount = g_myImageArray.GetCount();
         int index = ms_choices.Index(imagename);
 
         size_t prevCount = g_myImageArray.GetCount();
         int index = ms_choices.Index(imagename);
 


@@ -281,7 +291,7 @@ void wxAdvImageFileProperty::OnSetValue()
         if ( index == wxNOT_FOUND )
         {
             ms_choices.Add( imagename );
         if ( index == wxNOT_FOUND )
         {
             ms_choices.Add( imagename );

-            g_myImageArray.Add( new wxMyImageInfo( m_filename.GetFullPath() ) );
+            g_myImageArray.Add( new wxMyImageInfo( filename.GetFullPath() ) );

 
             index = g_myImageArray.GetCount() - 1;
         }
 
             index = g_myImageArray.GetCount() - 1;
         }


@@ -290,8 +300,8 @@ void wxAdvImageFileProperty::OnSetValue()
         if ( !g_myImageArray[index].m_pThumbnail2 )
         {
             // Load if file exists.
         if ( !g_myImageArray[index].m_pThumbnail2 )
         {
             // Load if file exists.

-            if ( m_filename.FileExists() )
-                m_pImage = new wxImage( m_filename.GetFullPath() );
+            if ( filename.FileExists() )
+                m_pImage = new wxImage( filename.GetFullPath() );

         }
 
         m_index = index;
         }
 
         m_index = index;


@@ -322,14 +332,6 @@ void wxAdvImageFileProperty::OnSetValue()
         m_index = -1;
 }
 
         m_index = -1;
 }
 

-int wxAdvImageFileProperty::GetChoiceInfo( wxPGChoiceInfo* choiceinfo )
-{
-    if ( choiceinfo )
-        choiceinfo->m_choices = &ms_choices;
-
-    return m_index;
-}
-

 bool wxAdvImageFileProperty::IntToValue( wxVariant& variant, int number, int WXUNUSED(argFlags) ) const
 {
     wxASSERT( number >= 0 );
 bool wxAdvImageFileProperty::IntToValue( wxVariant& variant, int number, int WXUNUSED(argFlags) ) const
 {
     wxASSERT( number >= 0 );


@@ -360,9 +362,10 @@ void wxAdvImageFileProperty::LoadThumbnails( size_t index )
 
     if ( !mii.m_pThumbnail2 )
     {
 
     if ( !mii.m_pThumbnail2 )
     {

+        wxFileName filename = GetFileName();

 
         if ( !m_pImage || !m_pImage->Ok() ||
 
         if ( !m_pImage || !m_pImage->Ok() ||

-             m_filename != mii.m_path
+             filename != mii.m_path

            )
         {
             if ( m_pImage )
            )
         {
             if ( m_pImage )


@@ -459,7 +462,7 @@ void wxAdvImageFileProperty::OnCustomPaint( wxDC& dc,
 
 // See propgridsample.h for wxVector3f class
 
 
 // See propgridsample.h for wxVector3f class
 

-WX_PG_IMPLEMENT_VARIANT_DATA(wxVector3fVariantData, wxVector3f)
+WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(wxVector3f)

 
 WX_PG_IMPLEMENT_PROPERTY_CLASS(wxVectorProperty,wxPGProperty,
                                wxVector3f,const wxVector3f&,TextCtrl)
 
 WX_PG_IMPLEMENT_PROPERTY_CLASS(wxVectorProperty,wxPGProperty,
                                wxVector3f,const wxVector3f&,TextCtrl)


@@ -470,7 +473,8 @@ wxVectorProperty::wxVectorProperty( const wxString& label,
                                               const wxVector3f& value )
     : wxPGProperty(label,name)
 {
                                               const wxVector3f& value )
     : wxPGProperty(label,name)
 {

-    SetValue( wxVector3fToVariant(value) );
+    SetValue( WXVARIANT(value) );
+    SetParentalType(wxPG_PROP_AGGREGATE);

     AddChild( new wxFloatProperty(wxT("X"),wxPG_LABEL,value.x) );
     AddChild( new wxFloatProperty(wxT("Y"),wxPG_LABEL,value.y) );
     AddChild( new wxFloatProperty(wxT("Z"),wxPG_LABEL,value.z) );
     AddChild( new wxFloatProperty(wxT("X"),wxPG_LABEL,value.x) );
     AddChild( new wxFloatProperty(wxT("Y"),wxPG_LABEL,value.y) );
     AddChild( new wxFloatProperty(wxT("Z"),wxPG_LABEL,value.z) );


@@ -481,7 +485,7 @@ wxVectorProperty::~wxVectorProperty() { }
 void wxVectorProperty::RefreshChildren()
 {
     if ( !GetChildCount() ) return;
 void wxVectorProperty::RefreshChildren()
 {
     if ( !GetChildCount() ) return;

-    wxVector3f& vector = wxVector3fFromVariant(m_value);
+    const wxVector3f& vector = wxVector3fRefFromVariant(m_value);

     Item(0)->SetValue( vector.x );
     Item(1)->SetValue( vector.y );
     Item(2)->SetValue( vector.z );
     Item(0)->SetValue( vector.x );
     Item(1)->SetValue( vector.y );
     Item(2)->SetValue( vector.z );


@@ -489,13 +493,15 @@ void wxVectorProperty::RefreshChildren()
 
 void wxVectorProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
 {
 
 void wxVectorProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
 {

-    wxVector3f& vector = wxVector3fFromVariant(thisValue);
+    wxVector3f vector;
+    vector << thisValue;

     switch ( childIndex )
     {
         case 0: vector.x = childValue.GetDouble(); break;
         case 1: vector.y = childValue.GetDouble(); break;
         case 2: vector.z = childValue.GetDouble(); break;
     }
     switch ( childIndex )
     {
         case 0: vector.x = childValue.GetDouble(); break;
         case 1: vector.y = childValue.GetDouble(); break;
         case 2: vector.z = childValue.GetDouble(); break;
     }

+    thisValue << vector;

 }
 
 
 }
 
 


@@ -505,7 +511,7 @@ void wxVectorProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVar
 
 // See propgridsample.h for wxTriangle class
 
 
 // See propgridsample.h for wxTriangle class
 

-WX_PG_IMPLEMENT_VARIANT_DATA(wxTriangleVariantData, wxTriangle)
+WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(wxTriangle)

 
 WX_PG_IMPLEMENT_PROPERTY_CLASS(wxTriangleProperty,wxPGProperty,
                                wxTriangle,const wxTriangle&,TextCtrl)
 
 WX_PG_IMPLEMENT_PROPERTY_CLASS(wxTriangleProperty,wxPGProperty,
                                wxTriangle,const wxTriangle&,TextCtrl)


@@ -516,7 +522,8 @@ wxTriangleProperty::wxTriangleProperty( const wxString& label,
                                                   const wxTriangle& value)
     : wxPGProperty(label,name)
 {
                                                   const wxTriangle& value)
     : wxPGProperty(label,name)
 {

-    SetValue( wxTriangleToVariant(value) );
+    SetValue( WXVARIANT(value) );
+    SetParentalType(wxPG_PROP_AGGREGATE);

     AddChild( new wxVectorProperty(wxT("A"),wxPG_LABEL,value.a) );
     AddChild( new wxVectorProperty(wxT("B"),wxPG_LABEL,value.b) );
     AddChild( new wxVectorProperty(wxT("C"),wxPG_LABEL,value.c) );
     AddChild( new wxVectorProperty(wxT("A"),wxPG_LABEL,value.a) );
     AddChild( new wxVectorProperty(wxT("B"),wxPG_LABEL,value.b) );
     AddChild( new wxVectorProperty(wxT("C"),wxPG_LABEL,value.c) );


@@ -527,22 +534,24 @@ wxTriangleProperty::~wxTriangleProperty() { }
 void wxTriangleProperty::RefreshChildren()
 {
     if ( !GetChildCount() ) return;
 void wxTriangleProperty::RefreshChildren()
 {
     if ( !GetChildCount() ) return;

-    wxTriangle& triangle = wxTriangleFromVariant(m_value);
-    Item(0)->SetValue( wxVector3fToVariant(triangle.a) );
-    Item(1)->SetValue( wxVector3fToVariant(triangle.b) );
-    Item(2)->SetValue( wxVector3fToVariant(triangle.c) );
+    const wxTriangle& triangle = wxTriangleRefFromVariant(m_value);
+    Item(0)->SetValue( WXVARIANT(triangle.a) );
+    Item(1)->SetValue( WXVARIANT(triangle.b) );
+    Item(2)->SetValue( WXVARIANT(triangle.c) );

 }
 
 void wxTriangleProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
 {
 }
 
 void wxTriangleProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const
 {

-    wxTriangle& triangle = wxTriangleFromVariant(thisValue);
-    wxVector3f& vector = wxVector3fFromVariant(childValue);
+    wxTriangle triangle;
+    triangle << thisValue;
+    const wxVector3f& vector = wxVector3fRefFromVariant(childValue);

     switch ( childIndex )
     {
         case 0: triangle.a = vector; break;
         case 1: triangle.b = vector; break;
         case 2: triangle.c = vector; break;
     }
     switch ( childIndex )
     {
         case 0: triangle.a = vector; break;
         case 1: triangle.b = vector; break;
         case 2: triangle.c = vector; break;
     }

+    thisValue << triangle;

 }
 
 
 }
 
 


@@ -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


@@ -642,9 +651,9 @@ enum
     ID_COLOURSCHEME2,
     ID_COLOURSCHEME3,
     ID_CATCOLOURS,
     ID_COLOURSCHEME2,
     ID_COLOURSCHEME3,
     ID_CATCOLOURS,

-    ID_SETCOLOUR,
+    ID_SETBGCOLOUR,
+    ID_SETBGCOLOURRECUR,

     ID_STATICLAYOUT,
     ID_STATICLAYOUT,

-    ID_CLEAR,

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


@@ -718,11 +727,13 @@ BEGIN_EVENT_TABLE(FormMain, wxFrame)
     EVT_MENU( ID_DELETEALL, FormMain::OnClearClick )
     EVT_MENU( ID_ENABLE, FormMain::OnEnableDisable )
     EVT_MENU( ID_HIDE, FormMain::OnHideShow )
     EVT_MENU( ID_DELETEALL, FormMain::OnClearClick )
     EVT_MENU( ID_ENABLE, FormMain::OnEnableDisable )
     EVT_MENU( ID_HIDE, FormMain::OnHideShow )

+

     EVT_MENU( ID_ITERATE1, FormMain::OnIterate1Click )
     EVT_MENU( ID_ITERATE2, FormMain::OnIterate2Click )
     EVT_MENU( ID_ITERATE3, FormMain::OnIterate3Click )
     EVT_MENU( ID_ITERATE4, FormMain::OnIterate4Click )
     EVT_MENU( ID_ITERATE1, FormMain::OnIterate1Click )
     EVT_MENU( ID_ITERATE2, FormMain::OnIterate2Click )
     EVT_MENU( ID_ITERATE3, FormMain::OnIterate3Click )
     EVT_MENU( ID_ITERATE4, FormMain::OnIterate4Click )

-    EVT_MENU( ID_SETCOLOUR, FormMain::OnMisc )
+    EVT_MENU( ID_SETBGCOLOUR, FormMain::OnSetBackgroundColour )
+    EVT_MENU( ID_SETBGCOLOURRECUR, FormMain::OnSetBackgroundColour )

     EVT_MENU( ID_CLEARMODIF, FormMain::OnClearModifyStatusClick )
     EVT_MENU( ID_FREEZE, FormMain::OnFreezeClick )
     EVT_MENU( ID_DUMPLIST, FormMain::OnDumpList )
     EVT_MENU( ID_CLEARMODIF, FormMain::OnClearModifyStatusClick )
     EVT_MENU( ID_FREEZE, FormMain::OnFreezeClick )
     EVT_MENU( ID_DUMPLIST, FormMain::OnDumpList )


@@ -742,7 +753,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 +819,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 +857,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();


@@ -922,34 +932,36 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event )
     else
     if ( name == wxT("Font") )
     {
     else
     if ( name == wxT("Font") )
     {

-        wxFont& font = *wxDynamicCast(m_pPropGridManager->GetPropertyValueAsWxObjectPtr(property), wxFont);
-        wxASSERT( &font && font.Ok() );
+        wxFont font;
+        font << value;
+        wxASSERT( font.Ok() );

 
         m_pPropGridManager->SetFont( font );
     }
     else
     if ( name == wxT("Margin Colour") )
     {
 
         m_pPropGridManager->SetFont( font );
     }
     else
     if ( name == wxT("Margin Colour") )
     {

-        wxColourPropertyValue& cpv = *wxGetVariantCast(value,wxColourPropertyValue);
-        m_pPropGridManager->GetGrid()->SetMarginColour ( cpv.m_colour );
+        wxColourPropertyValue cpv;
+        cpv << value;
+        m_pPropGridManager->GetGrid()->SetMarginColour( cpv.m_colour );

     }
     else if ( name == wxT("Cell Colour") )
     {
     }
     else if ( name == wxT("Cell Colour") )
     {

-        wxColourPropertyValue* cpv = wxGetVariantCast(value,wxColourPropertyValue);
-        wxASSERT( cpv );
-        m_pPropGridManager->GetGrid()->SetCellBackgroundColour( cpv->m_colour );
+        wxColourPropertyValue cpv;
+        cpv << value;
+        m_pPropGridManager->GetGrid()->SetCellBackgroundColour( cpv.m_colour );

     }
     else if ( name == wxT("Line Colour") )
     {
     }
     else if ( name == wxT("Line Colour") )
     {

-        wxColourPropertyValue* cpv = wxGetVariantCast(value,wxColourPropertyValue);
-        wxASSERT( cpv );
-        m_pPropGridManager->GetGrid()->SetLineColour( cpv->m_colour );
+        wxColourPropertyValue cpv;
+        cpv << value;
+        m_pPropGridManager->GetGrid()->SetLineColour( cpv.m_colour );

     }
     else if ( name == wxT("Cell Text Colour") )
     {
     }
     else if ( name == wxT("Cell Text Colour") )
     {

-        wxColourPropertyValue* cpv = wxGetVariantCast(value,wxColourPropertyValue);
-        wxASSERT( cpv );
-        m_pPropGridManager->GetGrid()->SetCellTextColour( cpv->m_colour );
+        wxColourPropertyValue cpv;
+        cpv << value;
+        m_pPropGridManager->GetGrid()->SetCellTextColour( cpv.m_colour );

     }
 }
 
     }
 }
 


@@ -1050,7 +1062,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 )
     {


@@ -1187,7 +1199,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


@@ -1347,6 +1359,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.") );


@@ -1354,15 +1367,16 @@ 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_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"), wxPG_ATTR_MAX, (long)16384 );   // for reduced binary size.

     pg->SetPropertyAttribute( wxT("SpinCtrl"), wxT("Step"), (long)2 );
     pg->SetPropertyAttribute( wxT("SpinCtrl"), wxT("Step"), (long)2 );

+    pg->SetPropertyAttribute( wxT("SpinCtrl"), wxT("MotionSpin"), true );

     //pg->SetPropertyAttribute( wxT("SpinCtrl"), wxT("Wrap"), true );
 
     pg->SetPropertyHelpString( wxT("SpinCtrl"),
         wxT("This is regular wxIntProperty, which editor has been ")
     //pg->SetPropertyAttribute( wxT("SpinCtrl"), wxT("Wrap"), true );
 
     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."));
 


@@ -1380,29 +1394,6 @@ void FormMain::PopulateWithExamples ()
     pg->SetPropertyHelpString( wxT("BoolProperty with CheckBox"),
         wxT("Property attribute wxPG_BOOL_USE_CHECKBOX has been set to true.") );
 
     pg->SetPropertyHelpString( wxT("BoolProperty with CheckBox"),
         wxT("Property attribute wxPG_BOOL_USE_CHECKBOX has been set to true.") );
 

-
-    wxPGProperty* lineThickProp;
-    wxPGProperty* lineThickUnitProp;
-    lineThickProp = new wxFloatProperty(wxT("Line Thickness"));
-    lineThickProp->SetEditor(wxPG_EDITOR(SpinCtrl));
-    lineThickProp->SetAttribute(wxT("Min"), wxVariant(0.01));
-
-     wxPGChoices choices;
-     choices.Add(wxT("millimetres"), 1);
-     choices.Add(wxT("inches"), 2);
-    lineThickUnitProp = new wxEnumProperty(
-             wxT("Unit"), wxPG_LABEL, choices,
-             static_cast<int>(1));
-
-     pg->Append(lineThickProp);
-     pg->AppendIn(lineThickProp, lineThickUnitProp);
-
-     lineThickProp->SetValue(wxVariant());
-     /*if (!pg->HideProperty(lineThickUnitProp, true))
-     {
-             return; 
-     }*/
-

      pid = pg->Append( new wxFloatProperty( wxT("FloatProperty"),
                                        wxPG_LABEL,
                                        1234500.23 ) );
      pid = pg->Append( new wxFloatProperty( wxT("FloatProperty"),
                                        wxPG_LABEL,
                                        1234500.23 ) );


@@ -1424,7 +1415,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"));


@@ -1446,11 +1437,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


@@ -1501,12 +1492,15 @@ void FormMain::PopulateWithExamples ()
                                    wxPG_LABEL,
                                    soc,
                                   240) );
                                    wxPG_LABEL,
                                    soc,
                                   240) );

-    pg->AddPropertyChoice(wxT("EnumProperty 2"),wxT("Testing Extra"),360);
+    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,


@@ -1516,8 +1510,9 @@ void FormMain::PopulateWithExamples ()
 
     pg->Append( new wxEnumProperty(wxT("EnumProperty 5"),wxPG_LABEL,
         soc, 240 ) );
 
     pg->Append( new wxEnumProperty(wxT("EnumProperty 5"),wxPG_LABEL,
         soc, 240 ) );

-    pg->SetPropertyChoicesExclusive(wxT("EnumProperty 5"));
-    pg->AddPropertyChoice(wxT("EnumProperty 5"),wxT("5th only"),360);
+    pg->GetProperty(wxT("EnumProperty 5"))->SetChoicesExclusive();
+    pg->GetProperty(wxT("EnumProperty 5"))->AddChoice(wxT("5th only"), 360);
+

     pg->SetPropertyHelpString(wxT("EnumProperty 5"),
         wxT("Should have one extra item when compared to EnumProperty 4"));
 
     pg->SetPropertyHelpString(wxT("EnumProperty 5"),
         wxT("Should have one extra item when compared to EnumProperty 4"));
 


@@ -1572,7 +1567,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,9 +1609,9 @@ void FormMain::PopulateWithExamples ()
     wxPGProperty* topId = pg->Append( new wxStringProperty(wxT("3D Object"), wxPG_LABEL, wxT("<composed>")) );
 
     pid = pg->AppendIn( topId, new wxStringProperty(wxT("Triangle 1"), wxT("Triangle 1"), wxT("<composed>")) );
     wxPGProperty* topId = pg->Append( new wxStringProperty(wxT("3D Object"), wxPG_LABEL, wxT("<composed>")) );
 
     pid = pg->AppendIn( topId, new wxStringProperty(wxT("Triangle 1"), wxT("Triangle 1"), wxT("<composed>")) );

-    pg->AppendIn( pid, new wxVectorProperty( wxT("A"), wxEmptyString ) );
-    pg->AppendIn( pid, new wxVectorProperty( wxT("B"), wxEmptyString ) );
-    pg->AppendIn( pid, new wxVectorProperty( wxT("C"), wxEmptyString ) );
+    pg->AppendIn( pid, new wxVectorProperty( wxT("A"), wxPG_LABEL ) );
+    pg->AppendIn( pid, new wxVectorProperty( wxT("B"), wxPG_LABEL ) );
+    pg->AppendIn( pid, new wxVectorProperty( wxT("C"), wxPG_LABEL ) );

 
     pg->AppendIn( topId, new wxTriangleProperty( wxT("Triangle 2"), wxT("Triangle 2") ) );
 
 
     pg->AppendIn( topId, new wxTriangleProperty( wxT("Triangle 2"), wxT("Triangle 2") ) );
 


@@ -1626,45 +1620,53 @@ void FormMain::PopulateWithExamples ()
         wxT("three wxVectorProperty children, and other two are custom wxTriangleProperties.") );
 
     pid = pg->AppendIn( topId, new wxStringProperty(wxT("Triangle 3"), wxT("Triangle 3"), wxT("<composed>")) );
         wxT("three wxVectorProperty children, and other two are custom wxTriangleProperties.") );
 
     pid = pg->AppendIn( topId, new wxStringProperty(wxT("Triangle 3"), wxT("Triangle 3"), wxT("<composed>")) );

-    pg->AppendIn( pid, new wxVectorProperty( wxT("A"), wxEmptyString ) );
-    pg->AppendIn( pid, new wxVectorProperty( wxT("B"), wxEmptyString ) );
-    pg->AppendIn( pid, new wxVectorProperty( wxT("C"), wxEmptyString ) );
+    pg->AppendIn( pid, new wxVectorProperty( wxT("A"), wxPG_LABEL ) );
+    pg->AppendIn( pid, new wxVectorProperty( wxT("B"), wxPG_LABEL ) );
+    pg->AppendIn( pid, new wxVectorProperty( wxT("C"), wxPG_LABEL ) );

 
     pg->AppendIn( topId, new wxTriangleProperty( wxT("Triangle 4"), wxT("Triangle 4") ) );
 
     //
     // This snippet is a doc sample test
     //
 
     pg->AppendIn( topId, new wxTriangleProperty( wxT("Triangle 4"), wxT("Triangle 4") ) );
 
     //
     // 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")) );


@@ -1685,11 +1687,21 @@ void FormMain::PopulateWithExamples ()
 
     //
     // Test how non-editable composite strings appear
 
     //
     // Test how non-editable composite strings appear

-    pid = pg->Append( new wxStringProperty(wxT("wxWidgets Traits"), wxPG_LABEL, wxT("<composed>")) );
+    pid = new wxStringProperty(wxT("wxWidgets Traits"), wxPG_LABEL, wxT("<composed>"));

     pg->SetPropertyReadOnly(pid);
 
     pg->SetPropertyReadOnly(pid);
 

-    pg->AppendIn(pid, new wxStringProperty(wxT("Latest Release"), wxPG_LABEL, wxT("2.8.8")) );
-    pg->AppendIn(pid, new wxBoolProperty(wxT("Win API"), wxPG_LABEL, true) );
+    //
+    // For testing purposes, combine two methods of adding children
+    //
+
+    // AddChild() requires that we call this
+    pid->SetParentalType(wxPG_PROP_MISC_PARENT);
+
+    pid->AddChild( new wxStringProperty(wxT("Latest Release"), wxPG_LABEL, wxT("2.8.8")));
+    pid->AddChild( new wxBoolProperty(wxT("Win API"), wxPG_LABEL, true) );
+
+    pg->Append( pid );
+

     pg->AppendIn(pid, new wxBoolProperty(wxT("QT"), wxPG_LABEL, false) );
     pg->AppendIn(pid, new wxBoolProperty(wxT("Cocoa"), wxPG_LABEL, true) );
     pg->AppendIn(pid, new wxBoolProperty(wxT("BeOS"), wxPG_LABEL, false) );
     pg->AppendIn(pid, new wxBoolProperty(wxT("QT"), wxPG_LABEL, false) );
     pg->AppendIn(pid, new wxBoolProperty(wxT("Cocoa"), wxPG_LABEL, true) );
     pg->AppendIn(pid, new wxBoolProperty(wxT("BeOS"), wxPG_LABEL, false) );


@@ -1921,7 +1933,9 @@ void FormMain::InitPanel()
     if ( m_panel )
         m_panel->Destroy();
 
     if ( m_panel )
         m_panel->Destroy();
 

-    wxWindow* panel = new wxPanel(this,-1,wxPoint(0,0),wxSize(400,400));
+    wxWindow* panel = new wxPanel(this, wxID_ANY,
+                                  wxPoint(0, 0), wxSize(400, 400),
+                                  wxTAB_TRAVERSAL);

     m_panel = panel;
 
     // Column
     m_panel = panel;
 
     // Column


@@ -1932,22 +1946,22 @@ void FormMain::InitPanel()
 
 void FormMain::FinalizePanel( bool wasCreated )
 {
 
 void FormMain::FinalizePanel( bool wasCreated )
 {

+    // Button for tab traversal testing
+    m_topSizer->Add( new wxButton(m_panel, wxID_ANY,
+                     wxS("Should be able to move here with Tab")),
+                     0, wxEXPAND );
+

     m_panel->SetSizer( m_topSizer );
     m_topSizer->SetSizeHints( m_panel );
 
     wxBoxSizer* panelSizer = new wxBoxSizer( wxHORIZONTAL );
     panelSizer->Add( m_panel, 1, wxEXPAND|wxFIXED_MINSIZE );
     m_panel->SetSizer( m_topSizer );
     m_topSizer->SetSizeHints( m_panel );
 
     wxBoxSizer* panelSizer = new wxBoxSizer( wxHORIZONTAL );
     panelSizer->Add( m_panel, 1, wxEXPAND|wxFIXED_MINSIZE );

+

     SetSizer( panelSizer );
     panelSizer->SetSizeHints( this );
 
     if ( wasCreated )
     SetSizer( panelSizer );
     panelSizer->SetSizeHints( this );
 
     if ( wasCreated )

-    {
-        SetSize(
-            (wxSystemSettings::GetMetric(wxSYS_SCREEN_X)/10)*4,
-            (wxSystemSettings::GetMetric(wxSYS_SCREEN_Y)/10)*8
-            );
-        Centre();
-    }
+        FinalizeFramePosition();

 }
 
 void FormMain::PopulateGrid()
 }
 
 void FormMain::PopulateGrid()


@@ -1986,7 +2000,6 @@ void FormMain::CreateGrid( int style, int extraStyle )
                 //wxPG_TOOLTIPS |
                 //wxPG_HIDE_CATEGORIES |
                 //wxPG_LIMITED_EDITING |
                 //wxPG_TOOLTIPS |
                 //wxPG_HIDE_CATEGORIES |
                 //wxPG_LIMITED_EDITING |

-                wxTAB_TRAVERSAL |

                 wxPG_TOOLBAR |
                 wxPG_DESCRIPTION;
 
                 wxPG_TOOLBAR |
                 wxPG_DESCRIPTION;
 


@@ -2036,11 +2049,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 );


@@ -2069,6 +2080,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 |


@@ -2077,7 +2095,6 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
                 //wxPG_TOOLTIPS |
                 //wxPG_HIDE_CATEGORIES |
                 //wxPG_LIMITED_EDITING |
                 //wxPG_TOOLTIPS |
                 //wxPG_HIDE_CATEGORIES |
                 //wxPG_LIMITED_EDITING |

-                wxTAB_TRAVERSAL |

                 wxPG_TOOLBAR |
                 wxPG_DESCRIPTION,
                 // extra style
                 wxPG_TOOLBAR |
                 wxPG_DESCRIPTION,
                 // extra style


@@ -2088,9 +2105,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);


@@ -2111,9 +2125,9 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
     menuTools1->Append(ID_DELETER, wxT("Delete Random") );
     menuTools1->Append(ID_DELETEALL, wxT("Delete All") );
     menuTools1->AppendSeparator();
     menuTools1->Append(ID_DELETER, wxT("Delete Random") );
     menuTools1->Append(ID_DELETEALL, wxT("Delete All") );
     menuTools1->AppendSeparator();

-    menuTools1->Append(ID_SETCOLOUR, wxT("Set Bg Colour") );
+    menuTools1->Append(ID_SETBGCOLOUR, wxT("Set Bg Colour") );
+    menuTools1->Append(ID_SETBGCOLOURRECUR, wxT("Set Bg Colour (Recursively)") );

     menuTools1->Append(ID_UNSPECIFY, wxT("Set to Unspecified") );
     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.") );


@@ -2200,15 +2214,19 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
     SetStatusText(wxEmptyString);
 #endif // wxUSE_STATUSBAR
 
     SetStatusText(wxEmptyString);
 #endif // wxUSE_STATUSBAR
 

+    FinalizeFramePosition();
+}

 
 

-    //
-    // Finalize
-    //
+void FormMain::FinalizeFramePosition()
+{
+    wxSize frameSize((wxSystemSettings::GetMetric(wxSYS_SCREEN_X)/10)*4,
+                     (wxSystemSettings::GetMetric(wxSYS_SCREEN_Y)/10)*8);
+
+    if ( frameSize.x > 500 )
+        frameSize.x = 500;
+
+    SetSize(frameSize);

 
 

-    SetSize(
-        (wxSystemSettings::GetMetric(wxSYS_SCREEN_X)/10)*4,
-        (wxSystemSettings::GetMetric(wxSYS_SCREEN_Y)/10)*8
-        );

     Centre();
 }
 
     Centre();
 }
 


@@ -2245,7 +2263,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;


@@ -2262,8 +2280,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) );

 
 }
 
 
 }
 


@@ -2311,7 +2329,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;


@@ -2329,9 +2347,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) );

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


@@ -2508,8 +2525,7 @@ void FormMain::OnFitColumnsClick( wxCommandEvent& WXUNUSED(event) )
 
 void FormMain::OnChangeFlagsPropItemsClick( wxCommandEvent& WXUNUSED(event) )
 {
 
 void FormMain::OnChangeFlagsPropItemsClick( wxCommandEvent& WXUNUSED(event) )
 {

-
-    wxPGProperty* id = m_pPropGridManager->GetPropertyByName(wxT("Window Styles"));
+    wxPGProperty* p = m_pPropGridManager->GetPropertyByName(wxT("Window Styles"));

 
     wxPGChoices newChoices;
 
 
     wxPGChoices newChoices;
 


@@ -2518,9 +2534,7 @@ void FormMain::OnChangeFlagsPropItemsClick( wxCommandEvent& WXUNUSED(event) )
     newChoices.Add(wxT("Safe"),0x4);
     newChoices.Add(wxT("Sleek"),0x8);
 
     newChoices.Add(wxT("Safe"),0x4);
     newChoices.Add(wxT("Sleek"),0x8);
 

-    m_pPropGridManager->SetPropertyChoices(id,newChoices);
-    //m_pPropGridManager->ReplaceProperty(wxT("Window Styles"),
-    //    wxFlagsProperty(wxT("Window Styles"),wxPG_LABEL,newChoices));
+    p->SetChoices(newChoices);

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


@@ -2582,6 +2596,30 @@ void FormMain::OnHideShow( wxCommandEvent& WXUNUSED(event) )
 
 // -----------------------------------------------------------------------
 
 
 // -----------------------------------------------------------------------
 

+#include "wx/colordlg.h"
+
+void
+FormMain::OnSetBackgroundColour( wxCommandEvent& event )
+{
+    wxPropertyGrid* pg = m_pPropGridManager->GetGrid();
+    wxPGProperty* prop = pg->GetSelection();
+    if ( !prop )
+    {
+        wxMessageBox(wxT("First select a property."));
+        return;
+    }
+
+    wxColour col = ::wxGetColourFromUser(this, *wxWHITE, "Choose colour");
+
+    if ( col.IsOk() )
+    {
+        bool recursively = (event.GetId()==ID_SETBGCOLOURRECUR) ? true : false;
+        pg->SetPropertyBackgroundColour(prop, col, recursively);
+    }
+}
+
+// -----------------------------------------------------------------------
+

 void FormMain::OnInsertPage( wxCommandEvent& WXUNUSED(event) )
 {
     m_pPropGridManager->AddPage(wxT("New Page"));
 void FormMain::OnInsertPage( wxCommandEvent& WXUNUSED(event) )
 {
     m_pPropGridManager->AddPage(wxT("New Page"));


@@ -2614,9 +2652,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


@@ -2626,7 +2664,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;


@@ -2846,7 +2884,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);


@@ -2863,11 +2900,7 @@ void FormMain::OnSelectStyle( wxCommandEvent& WXUNUSED(event) )
 
     CreateGrid( style, extraStyle );
 
 
     CreateGrid( style, extraStyle );
 

-    SetSize(
-        (wxSystemSettings::GetMetric(wxSYS_SCREEN_X)/10)*4,
-        (wxSystemSettings::GetMetric(wxSYS_SCREEN_Y)/10)*8
-        );
-    Centre();
+    FinalizeFramePosition();

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


@@ -2905,14 +2938,14 @@ void FormMain::OnInsertChoice( wxCommandEvent& WXUNUSED(event) )
     wxPropertyGrid* pg = m_pPropGridManager->GetGrid();
 
     wxPGProperty* selected = pg->GetSelection();
     wxPropertyGrid* pg = m_pPropGridManager->GetGrid();
 
     wxPGProperty* selected = pg->GetSelection();

-    wxPGChoices& choices = pg->GetPropertyChoices(selected);
+    const wxPGChoices& choices = selected->GetChoices();

 
     // Insert new choice to the center of list
 
     if ( choices.IsOk() )
     {
         int pos = choices.GetCount() / 2;
 
     // Insert new choice to the center of list
 
     if ( choices.IsOk() )
     {
         int pos = choices.GetCount() / 2;

-        pg->InsertPropertyChoice(selected,wxT("New Choice"),pos);
+        selected->InsertChoice(wxT("New Choice"), pos);

     }
     else
     {
     }
     else
     {


@@ -2927,14 +2960,14 @@ void FormMain::OnDeleteChoice( wxCommandEvent& WXUNUSED(event) )
     wxPropertyGrid* pg = m_pPropGridManager->GetGrid();
 
     wxPGProperty* selected = pg->GetSelection();
     wxPropertyGrid* pg = m_pPropGridManager->GetGrid();
 
     wxPGProperty* selected = pg->GetSelection();

-    wxPGChoices& choices = pg->GetPropertyChoices(selected);
+    const wxPGChoices& choices = selected->GetChoices();

 
     // Deletes choice from the center of list
 
     if ( choices.IsOk() )
     {
         int pos = choices.GetCount() / 2;
 
     // Deletes choice from the center of list
 
     if ( choices.IsOk() )
     {
         int pos = choices.GetCount() / 2;

-        pg->DeletePropertyChoice(selected,pos);
+        selected->DeleteChoice(pos);

     }
     else
     {
     }
     else
     {


@@ -2955,10 +2988,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;


@@ -2996,7 +3025,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);


@@ -3014,34 +3043,12 @@ 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);
         }
     }

-    else if ( id == ID_SETCOLOUR )
-    {
-        wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty();
-        if ( prop )
-        {
-            wxColourData data;
-            data.SetChooseFull(true);
-            int i;
-            for ( i = 0; i < 16; i++)
-            {
-                wxColour colour(i*16, i*16, i*16);
-                data.SetCustomColour(i, colour);
-            }
-
-            wxColourDialog dialog(this, &data);
-            if ( dialog.ShowModal() == wxID_OK )
-            {
-                wxColourData retData = dialog.GetColourData();
-                m_pPropGridManager->GetGrid()->SetPropertyBackgroundColour(prop,retData.GetColour());
-            }
-        }
-    }

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