X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea5af9c5356676a5c4d81b4d4915ad32ca3c9c6e..07a9d3f9467a07c99ffa8fae85b18cd475e60f11:/samples/propgrid/propgrid.cpp diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index e6dce6a4d1..8cc2d539da 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" @@ -85,8 +81,6 @@ public: wxSampleMultiButtonEditor() {} virtual ~wxSampleMultiButtonEditor() {} - virtual wxString GetName() const { return "SampleMultiButtonEditor"; } - virtual wxPGWindowList CreateControls( wxPropertyGrid* propGrid, wxPGProperty* property, const wxPoint& pos, @@ -289,6 +283,7 @@ void wxAdvImageFileProperty::OnSetValue() if ( imagename.length() ) { + wxFileName filename = GetFileName(); 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 ); - g_myImageArray.Add( new wxMyImageInfo( m_filename.GetFullPath() ) ); + g_myImageArray.Add( new wxMyImageInfo( filename.GetFullPath() ) ); index = g_myImageArray.GetCount() - 1; } @@ -305,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; @@ -367,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 ) @@ -478,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) ); @@ -526,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) ); @@ -653,9 +651,9 @@ enum ID_COLOURSCHEME2, ID_COLOURSCHEME3, ID_CATCOLOURS, - ID_SETCOLOUR, + ID_SETBGCOLOUR, + ID_SETBGCOLOURRECUR, ID_STATICLAYOUT, - ID_CLEAR, ID_POPULATE1, ID_POPULATE2, ID_COLLAPSE, @@ -729,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_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 ) @@ -753,7 +753,6 @@ BEGIN_EVENT_TABLE(FormMain, wxFrame) 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 ) @@ -1370,8 +1369,9 @@ void FormMain::PopulateWithExamples () 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"), wxPG_ATTR_MAX, (long)16384 ); // for reduced binary size. 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"), @@ -1687,11 +1687,21 @@ void FormMain::PopulateWithExamples () // // Test how non-editable composite strings appear - pid = pg->Append( new wxStringProperty(wxT("wxWidgets Traits"), wxPG_LABEL, wxT("")) ); + pid = new wxStringProperty(wxT("wxWidgets Traits"), wxPG_LABEL, wxT("")); 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) ); @@ -1923,7 +1933,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 @@ -1934,22 +1946,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() @@ -1988,7 +2000,6 @@ void FormMain::CreateGrid( int style, int extraStyle ) //wxPG_TOOLTIPS | //wxPG_HIDE_CATEGORIES | //wxPG_LIMITED_EDITING | - wxTAB_TRAVERSAL | wxPG_TOOLBAR | wxPG_DESCRIPTION; @@ -2084,7 +2095,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 @@ -2115,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_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_CLEAR, wxT("Set Value to Default") ); menuTools1->AppendSeparator(); m_itemEnable = menuTools1->Append(ID_ENABLE, wxT("Enable"), wxT("Toggles item's enabled state.") ); @@ -2204,15 +2214,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(); } @@ -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")); @@ -2862,11 +2900,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(); } // ----------------------------------------------------------------------- @@ -2954,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) ); } - else if ( id == ID_CLEAR ) - { - m_pPropGridManager->ClearPropertyValue(m_pPropGridManager->GetGrid()->GetSelection()); - } else if ( id == ID_COLLAPSEALL ) { wxPGVIterator it; @@ -3019,28 +3049,6 @@ void FormMain::OnMisc ( wxCommandEvent& event ) m_pPropGridManager->SetPropertyValueUnspecified(prop); } } - else if ( id == ID_SETCOLOUR ) - { - wxPGProperty* prop = m_pPropGridManager->GetSelection(); - 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()); - } - } - } } // -----------------------------------------------------------------------