X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a45dd6fd9870de6b68eff437fd5fe4ea5895c3c..23d291c2d2e8d6bfd9e4a569d735dd8ff61a10f7:/samples/propgrid/propgrid.cpp

diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index 26dbfd835d..1c9ef397a5 100644
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -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
-//   contrib/src/propgrid/advprops.cpp.
+//   src/propgrid/advprops.cpp.
 //
 // * 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".
 //
-// * 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"
@@ -287,6 +283,7 @@ void wxAdvImageFileProperty::OnSetValue()
 
     if ( imagename.length() )
     {
+        wxFileName filename = GetFileName();
         size_t prevCount = g_myImageArray.GetCount();
         int index = ms_choices.Index(imagename);
 
@@ -294,7 +291,7 @@ void wxAdvImageFileProperty::OnSetValue()
         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;
         }
@@ -303,8 +300,8 @@ void wxAdvImageFileProperty::OnSetValue()
         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;
@@ -365,9 +362,10 @@ void wxAdvImageFileProperty::LoadThumbnails( size_t index )
 
     if ( !mii.m_pThumbnail2 )
     {
+        wxFileName filename = GetFileName();
 
         if ( !m_pImage || !m_pImage->Ok() ||
-             m_filename != mii.m_path
+             filename != mii.m_path
            )
         {
             if ( m_pImage )
@@ -476,6 +474,7 @@ wxVectorProperty::wxVectorProperty( const wxString& label,
     : 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) );
@@ -524,6 +523,7 @@ wxTriangleProperty::wxTriangleProperty( const wxString& label,
     : 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) );
@@ -1683,11 +1683,21 @@ void FormMain::PopulateWithExamples ()
 
     //
     // 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->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) );
@@ -1919,7 +1929,9 @@ void FormMain::InitPanel()
     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
@@ -1930,22 +1942,22 @@ void FormMain::InitPanel()
 
 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 );
+
     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()
@@ -1984,7 +1996,6 @@ void FormMain::CreateGrid( int style, int extraStyle )
                 //wxPG_TOOLTIPS |
                 //wxPG_HIDE_CATEGORIES |
                 //wxPG_LIMITED_EDITING |
-                wxTAB_TRAVERSAL |
                 wxPG_TOOLBAR |
                 wxPG_DESCRIPTION;
 
@@ -2080,7 +2091,6 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
                 //wxPG_TOOLTIPS |
                 //wxPG_HIDE_CATEGORIES |
                 //wxPG_LIMITED_EDITING |
-                wxTAB_TRAVERSAL |
                 wxPG_TOOLBAR |
                 wxPG_DESCRIPTION,
                 // extra style
@@ -2199,15 +2209,19 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size
     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();
 }
 
@@ -2857,11 +2871,7 @@ void FormMain::OnSelectStyle( wxCommandEvent& WXUNUSED(event) )
 
     CreateGrid( style, extraStyle );
 
-    SetSize(
-        (wxSystemSettings::GetMetric(wxSYS_SCREEN_X)/10)*4,
-        (wxSystemSettings::GetMetric(wxSYS_SCREEN_Y)/10)*8
-        );
-    Centre();
+    FinalizeFramePosition();
 }
 
 // -----------------------------------------------------------------------