Reviewed some g* interface headers.

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

diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index 5772484f8ce72908f7a5b277b1cacbf3fc3cd5cf..1c9ef397a5ca74bc071a235d2b83b8cbc88f037c 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"


@@ -85,8 +81,6 @@ public:
     wxSampleMultiButtonEditor() {}
     virtual ~wxSampleMultiButtonEditor() {}
 
     wxSampleMultiButtonEditor() {}
     virtual ~wxSampleMultiButtonEditor() {}
 

-    virtual wxString GetName() const { return "SampleMultiButtonEditor"; }
-

     virtual wxPGWindowList CreateControls( wxPropertyGrid* propGrid,
                                            wxPGProperty* property,
                                            const wxPoint& pos,
     virtual wxPGWindowList CreateControls( wxPropertyGrid* propGrid,
                                            wxPGProperty* property,
                                            const wxPoint& pos,


@@ -289,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);
 


@@ -296,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;
         }


@@ -305,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;


@@ -367,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 )


@@ -478,6 +474,7 @@ wxVectorProperty::wxVectorProperty( const wxString& label,
     : wxPGProperty(label,name)
 {
     SetValue( WXVARIANT(value) );
     : wxPGProperty(label,name)
 {
     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) );


@@ -526,6 +523,7 @@ wxTriangleProperty::wxTriangleProperty( const wxString& label,
     : wxPGProperty(label,name)
 {
     SetValue( WXVARIANT(value) );
     : wxPGProperty(label,name)
 {
     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) );


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


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


@@ -753,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 )
 


@@ -1368,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 );


@@ -1376,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."));
 


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


@@ -1687,11 +1683,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) );


@@ -1923,7 +1929,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


@@ -1934,22 +1942,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()


@@ -1988,7 +1996,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;
 


@@ -2084,7 +2091,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


@@ -2117,7 +2123,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.") );


@@ -2204,15 +2209,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();
 }
 


@@ -2616,7 +2625,7 @@ void FormMain::OnSetSpinCtrlEditorClick( wxCommandEvent& WXUNUSED(event) )
 #if wxUSE_SPINBTN
     wxPGProperty* pgId = m_pPropGridManager->GetSelection();
     if ( pgId )
 #if wxUSE_SPINBTN
     wxPGProperty* pgId = m_pPropGridManager->GetSelection();
     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


@@ -2846,7 +2855,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 +2871,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();

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


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