X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4bc1aa27cb33f679d7e9c1518a7855bbc1fa471..474e9711477a5737b232435525da1c87f7eb72d2:/samples/propgrid/propgrid.cpp?ds=sidebyside diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index f44d23dab8..74742446d1 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -4,7 +4,7 @@ // Author: Jaakko Salli // Modified by: // Created: 2004-09-25 -// RCS-ID: $Id: +// RCS-ID: $Id$ // 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 -// 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" @@ -72,6 +68,9 @@ #include +#ifndef __WXMSW__ + #include "../sample.xpm" +#endif // ----------------------------------------------------------------------- // wxSampleMultiButtonEditor @@ -80,22 +79,22 @@ class wxSampleMultiButtonEditor : public wxPGTextCtrlEditor { - WX_PG_DECLARE_EDITOR_CLASS(wxSampleMultiButtonEditor) + DECLARE_DYNAMIC_CLASS(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; - }; -WX_PG_IMPLEMENT_EDITOR_CLASS(SampleMultiButtonEditor,wxSampleMultiButtonEditor, - wxPGTextCtrlEditor) - +IMPLEMENT_DYNAMIC_CLASS(wxSampleMultiButtonEditor, wxPGTextCtrlEditor) wxPGWindowList wxSampleMultiButtonEditor::CreateControls( wxPropertyGrid* propGrid, wxPGProperty* property, @@ -105,19 +104,20 @@ wxPGWindowList wxSampleMultiButtonEditor::CreateControls( wxPropertyGrid* propGr // Create and populate buttons-subwindow wxPGMultiButton* buttons = new wxPGMultiButton( propGrid, sz ); + // Add two regular buttons buttons->Add( "..." ); buttons->Add( "A" ); -#if wxUSE_BMPBUTTON + // Add a bitmap button buttons->Add( wxArtProvider::GetBitmap(wxART_FOLDER) ); -#endif // 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. - buttons->FinalizePosition(pos); + buttons->Finalize(propGrid, pos); wndList.SetSecondary( buttons ); return wndList; @@ -132,15 +132,23 @@ bool wxSampleMultiButtonEditor::OnEvent( wxPropertyGrid* propGrid, { wxPGMultiButton* buttons = (wxPGMultiButton*) propGrid->GetEditorControlSecondary(); + if ( event.GetId() == buttons->GetButtonId(0) ) + { + // Do something when the first button is pressed + wxLogDebug("First button pressed"); + return false; // Return false since value did not change + } if ( event.GetId() == buttons->GetButtonId(1) ) { - wxMessageBox(wxT("Second button was pressed")); - return true; + // Do something when the second button is pressed + wxMessageBox("Second button pressed"); + return false; // Return false since value did not change } if ( event.GetId() == buttons->GetButtonId(2) ) { - wxMessageBox(wxT("Third button was pressed")); - return true; + // Do something when the third button is pressed + wxMessageBox("Third button pressed"); + return false; // Return false since value did not change } } return wxPGTextCtrlEditor::OnEvent(propGrid, property, ctrl, event); @@ -278,6 +286,7 @@ void wxAdvImageFileProperty::OnSetValue() if ( imagename.length() ) { + wxFileName filename = GetFileName(); size_t prevCount = g_myImageArray.GetCount(); int index = ms_choices.Index(imagename); @@ -285,7 +294,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; } @@ -294,8 +303,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; @@ -326,14 +335,6 @@ void wxAdvImageFileProperty::OnSetValue() 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 ); @@ -364,9 +365,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 ) @@ -475,9 +477,9 @@ wxVectorProperty::wxVectorProperty( const wxString& label, : wxPGProperty(label,name) { SetValue( WXVARIANT(value) ); - 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) ); + AddPrivateChild( new wxFloatProperty(wxT("X"),wxPG_LABEL,value.x) ); + AddPrivateChild( new wxFloatProperty(wxT("Y"),wxPG_LABEL,value.y) ); + AddPrivateChild( new wxFloatProperty(wxT("Z"),wxPG_LABEL,value.z) ); } wxVectorProperty::~wxVectorProperty() { } @@ -491,7 +493,9 @@ void wxVectorProperty::RefreshChildren() Item(2)->SetValue( vector.z ); } -void wxVectorProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const +wxVariant wxVectorProperty::ChildChanged( wxVariant& thisValue, + int childIndex, + wxVariant& childValue ) const { wxVector3f vector; vector << thisValue; @@ -501,7 +505,9 @@ void wxVectorProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVar case 1: vector.y = childValue.GetDouble(); break; case 2: vector.z = childValue.GetDouble(); break; } - thisValue << vector; + wxVariant newVariant; + newVariant << vector; + return newVariant; } @@ -523,9 +529,9 @@ wxTriangleProperty::wxTriangleProperty( const wxString& label, : wxPGProperty(label,name) { SetValue( WXVARIANT(value) ); - 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) ); + AddPrivateChild( new wxVectorProperty(wxT("A"),wxPG_LABEL,value.a) ); + AddPrivateChild( new wxVectorProperty(wxT("B"),wxPG_LABEL,value.b) ); + AddPrivateChild( new wxVectorProperty(wxT("C"),wxPG_LABEL,value.c) ); } wxTriangleProperty::~wxTriangleProperty() { } @@ -539,7 +545,9 @@ void wxTriangleProperty::RefreshChildren() Item(2)->SetValue( WXVARIANT(triangle.c) ); } -void wxTriangleProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVariant& childValue ) const +wxVariant wxTriangleProperty::ChildChanged( wxVariant& thisValue, + int childIndex, + wxVariant& childValue ) const { wxTriangle triangle; triangle << thisValue; @@ -550,7 +558,9 @@ void wxTriangleProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxV case 1: triangle.b = vector; break; case 2: triangle.c = vector; break; } - thisValue << triangle; + wxVariant newVariant; + newVariant << triangle; + return newVariant; } @@ -606,7 +616,7 @@ public: // Set editor to have button virtual const wxPGEditor* DoGetEditorClass() const { - return wxPG_EDITOR(TextCtrlAndButton); + return wxPGEditor_TextCtrlAndButton; } // Set what happens on button click @@ -650,9 +660,9 @@ enum ID_COLOURSCHEME2, ID_COLOURSCHEME3, ID_CATCOLOURS, - ID_SETCOLOUR, + ID_SETBGCOLOUR, + ID_SETBGCOLOURRECUR, ID_STATICLAYOUT, - ID_CLEAR, ID_POPULATE1, ID_POPULATE2, ID_COLLAPSE, @@ -677,7 +687,8 @@ enum ID_SELECTSTYLE, ID_SAVESTATE, ID_RESTORESTATE, - ID_RUNMINIMAL + ID_RUNMINIMAL, + ID_ENABLELABELEDITING }; // ----------------------------------------------------------------------- @@ -703,6 +714,12 @@ BEGIN_EVENT_TABLE(FormMain, wxFrame) EVT_PG_DOUBLE_CLICK( PGID, FormMain::OnPropertyGridItemDoubleClick ) // This occurs when propgridmanager's page changes. EVT_PG_PAGE_CHANGED( PGID, FormMain::OnPropertyGridPageChange ) + // This occurs when user starts editing a property label + EVT_PG_LABEL_EDIT_BEGIN( PGID, + FormMain::OnPropertyGridLabelEditBegin ) + // This occurs when user stops editing a property label + EVT_PG_LABEL_EDIT_ENDING( PGID, + FormMain::OnPropertyGridLabelEditEnding ) // This occurs when property's editor button (if any) is clicked. EVT_BUTTON( PGID, FormMain::OnPropertyGridButtonClick ) @@ -726,13 +743,16 @@ 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_ENABLELABELEDITING, FormMain::OnEnableLabelEditing ) EVT_MENU( ID_DUMPLIST, FormMain::OnDumpList ) EVT_MENU( ID_COLOURSCHEME1, FormMain::OnColourScheme ) @@ -750,7 +770,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 ) @@ -817,7 +836,7 @@ void FormMain::OnMove( wxMoveEvent& event ) 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(); @@ -855,7 +874,7 @@ void FormMain::OnResize( wxSizeEvent& event ) 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(); @@ -909,11 +928,11 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event ) SetSize ( m_pPropGridManager->GetPropertyValueAsInt(property), -1, -1, -1, wxSIZE_USE_EXISTING ); else if ( name == wxT("Y") ) // wxPGVariantToInt is safe long int value getter - SetSize ( -1, wxPGVariantToInt(value), -1, -1, wxSIZE_USE_EXISTING ); + SetSize ( -1, value.GetLong(), -1, -1, wxSIZE_USE_EXISTING ); else if ( name == wxT("Width") ) SetSize ( -1, -1, m_pPropGridManager->GetPropertyValueAsInt(property), -1, wxSIZE_USE_EXISTING ); else if ( name == wxT("Height") ) - SetSize ( -1, -1, -1, wxPGVariantToInt(value), wxSIZE_USE_EXISTING ); + SetSize ( -1, -1, -1, value.GetLong(), wxSIZE_USE_EXISTING ); else if ( name == wxT("Label") ) { SetTitle ( m_pPropGridManager->GetPropertyValueAsString(property) ); @@ -1007,6 +1026,22 @@ void FormMain::OnPropertyGridPageChange( wxPropertyGridEvent& WXUNUSED(event) ) // ----------------------------------------------------------------------- +void FormMain::OnPropertyGridLabelEditBegin( wxPropertyGridEvent& event ) +{ + wxLogDebug("wxPG_EVT_LABEL_EDIT_BEGIN(%s)", + event.GetProperty()->GetLabel().c_str()); +} + +// ----------------------------------------------------------------------- + +void FormMain::OnPropertyGridLabelEditEnding( wxPropertyGridEvent& event ) +{ + wxLogDebug("wxPG_EVT_LABEL_EDIT_ENDING(%s)", + event.GetProperty()->GetLabel().c_str()); +} + +// ----------------------------------------------------------------------- + void FormMain::OnPropertyGridHighlight( wxPropertyGridEvent& WXUNUSED(event) ) { } @@ -1060,7 +1095,7 @@ void FormMain::OnPropertyGridItemDoubleClick( wxPropertyGridEvent& event ) void FormMain::OnPropertyGridButtonClick ( wxCommandEvent& ) { #if wxUSE_STATUSBAR - wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty(); + wxPGProperty* prop = m_pPropGridManager->GetSelection(); wxStatusBar* sb = GetStatusBar(); if ( prop ) { @@ -1197,7 +1232,7 @@ void FormMain::OnTestXRC(wxCommandEvent& WXUNUSED(event)) void FormMain::OnEnableCommonValues(wxCommandEvent& WXUNUSED(event)) { - wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty(); + wxPGProperty* prop = m_pPropGridManager->GetSelection(); if ( prop ) prop->EnableCommonValue(); else @@ -1357,6 +1392,7 @@ void FormMain::PopulateWithExamples () 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.") ); @@ -1364,15 +1400,16 @@ void FormMain::PopulateWithExamples () #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"), 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"), 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.")); @@ -1411,7 +1448,7 @@ void FormMain::PopulateWithExamples () // 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")); @@ -1433,11 +1470,11 @@ void FormMain::PopulateWithExamples () 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 ") - 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 @@ -1488,25 +1525,19 @@ void FormMain::PopulateWithExamples () 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 + // Here we only display the original 'soc' choices pg->Append( new wxEnumProperty(wxT("EnumProperty 3"),wxPG_LABEL, - soc, 360 ) ); - pg->SetPropertyHelpString(wxT("EnumProperty 3"), - wxT("Should have same choices as EnumProperty 2")); + soc, 240 ) ); + // 'soc' plus one exclusive extra choice "4th only" pg->Append( new wxEnumProperty(wxT("EnumProperty 4"),wxPG_LABEL, soc, 240 ) ); - pg->SetPropertyHelpString(wxT("EnumProperty 4"), - wxT("Should have same choices as EnumProperty 2")); + pg->GetProperty(wxT("EnumProperty 4"))->AddChoice(wxT("4th only"), 360); - 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->SetPropertyHelpString(wxT("EnumProperty 5"), - wxT("Should have one extra item when compared to EnumProperty 4")); + pg->SetPropertyHelpString(wxT("EnumProperty 4"), + wxT("Should have one extra item when compared to EnumProperty 3")); // Password property example. pg->Append( new wxStringProperty(wxT("Password"),wxPG_LABEL, wxT("password")) ); @@ -1530,6 +1561,40 @@ void FormMain::PopulateWithExamples () // Set value after limiting so that it will be applied pg->SetPropertyValue( wxT("StringProperty"), wxT("some text") ); + // + // Demonstrate "AutoComplete" attribute + pg->Append( new wxStringProperty( "StringProperty AutoComplete", + wxPG_LABEL ) ); + + wxArrayString autoCompleteStrings; + autoCompleteStrings.Add("One choice"); + autoCompleteStrings.Add("Another choice"); + autoCompleteStrings.Add("Another choice, yeah"); + autoCompleteStrings.Add("Yet another choice"); + autoCompleteStrings.Add("Yet another choice, bear with me"); + pg->SetPropertyAttribute( "StringProperty AutoComplete", + "AutoComplete", + autoCompleteStrings ); + + pg->SetPropertyHelpString( "StringProperty AutoComplete", + "AutoComplete attribute has been set for this property " + "(try writing something beginning with 'a', 'o' or 'y')."); + + // Add string property with arbitrarily wide bitmap in front of it. We + // intentionally lower-than-typical row height here so that the ugly + // scaling code wont't be run. + pg->Append( new wxStringProperty( wxT("StringPropertyWithBitmap"), + wxPG_LABEL, + wxT("Test Text")) ); + wxBitmap myTestBitmap(60, 15, 32); + wxMemoryDC mdc; + mdc.SelectObject(myTestBitmap); + mdc.Clear(); + mdc.SetPen(*wxBLACK); + mdc.DrawLine(0, 0, 60, 15); + mdc.SelectObject(wxNullBitmap); + pg->SetPropertyImage( wxT("StringPropertyWithBitmap"), myTestBitmap ); + // this value array would be optional if values matched string indexes //long flags_prop_values[] = { wxICONIZE, wxCAPTION, wxMINIMIZE_BOX, wxMAXIMIZE_BOX }; @@ -1559,7 +1624,6 @@ void FormMain::PopulateWithExamples () 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 ); @@ -1586,11 +1650,13 @@ void FormMain::PopulateWithExamples () #if wxUSE_DATEPICKCTRL pg->SetPropertyAttribute( wxT("DateProperty"), wxPG_DATE_PICKER_STYLE, - (long)(wxDP_DROPDOWN | wxDP_SHOWCENTURY) ); + (long)(wxDP_DROPDOWN | + wxDP_SHOWCENTURY | + wxDP_ALLOWNONE) ); pg->SetPropertyHelpString( wxT("DateProperty"), - wxT("Attribute wxPG_DATE_PICKER_STYLE has been set to (long)(wxDP_DROPDOWN | wxDP_SHOWCENTURY).") - wxT("Also note that wxPG_ALLOW_WXADV needs to be defined inorder to use wxDatePickerCtrl.") ); + wxT("Attribute wxPG_DATE_PICKER_STYLE has been set to (long)") + wxT("(wxDP_DROPDOWN | wxDP_SHOWCENTURY | wxDP_ALLOWNONE).") ); #endif #endif @@ -1622,36 +1688,48 @@ void FormMain::PopulateWithExamples () // // This snippet is a doc sample test // - pid = pg->Append( new wxStringProperty(wxT("Car"),wxPG_LABEL,wxT("")) ); + wxPGProperty* carProp = pg->Append(new wxStringProperty(wxT("Car"), + wxPG_LABEL, + wxT(""))); - 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("")) ); - 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(""))); - 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 ); - // 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) ); + + pg->AppendIn(carProp, new wxBoolProperty(wxT("Convertible"), + wxPG_LABEL, + false) ); + + // Displayed value of "Car" property is now very close to this: + // "Lamborghini Diablo SV; 5707 [300; 3.9; 8.6] 300000" // // Test wxSampleMultiButtonEditor - wxPGRegisterEditorClass( SampleMultiButtonEditor ); 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")) ); @@ -1672,11 +1750,22 @@ 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 + // + + pid->AppendChild( new wxStringProperty(wxT("Latest Release"), + wxPG_LABEL, + wxT("2.8.10"))); + pid->AppendChild( 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) ); @@ -1864,7 +1953,7 @@ void wxMyPropertyGridPage::OnPropertySelect( wxPropertyGridEvent& WXUNUSED(event void wxMyPropertyGridPage::OnPropertyChange( wxPropertyGridEvent& event ) { wxPGProperty* p = event.GetProperty(); - wxLogDebug(wxT("wxMyPropertyGridPage::OnPropertyChange('%s', to value '%s')"), + wxLogVerbose(wxT("wxMyPropertyGridPage::OnPropertyChange('%s', to value '%s')"), p->GetName().c_str(), p->GetDisplayedString().c_str()); } @@ -1872,7 +1961,7 @@ void wxMyPropertyGridPage::OnPropertyChange( wxPropertyGridEvent& event ) void wxMyPropertyGridPage::OnPropertyChanging( wxPropertyGridEvent& event ) { wxPGProperty* p = event.GetProperty(); - wxLogDebug(wxT("wxMyPropertyGridPage::OnPropertyChanging('%s', to value '%s')"), + wxLogVerbose(wxT("wxMyPropertyGridPage::OnPropertyChanging('%s', to value '%s')"), p->GetName().c_str(), event.GetValue().GetString().c_str()); } @@ -1908,7 +1997,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 @@ -1919,22 +2010,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() @@ -1973,13 +2064,13 @@ void FormMain::CreateGrid( int style, int extraStyle ) //wxPG_TOOLTIPS | //wxPG_HIDE_CATEGORIES | //wxPG_LIMITED_EDITING | - wxTAB_TRAVERSAL | wxPG_TOOLBAR | wxPG_DESCRIPTION; if ( extraStyle == -1 ) // default extra style - extraStyle = wxPG_EX_MODE_BUTTONS; + extraStyle = wxPG_EX_MODE_BUTTONS | + wxPG_EX_MULTIPLE_SELECTION; //| wxPG_EX_AUTO_UNSPECIFIED_VALUES //| wxPG_EX_GREY_LABEL_WHEN_DISABLED //| wxPG_EX_NATIVE_DOUBLE_BUFFERING @@ -2000,7 +2091,10 @@ void FormMain::CreateGrid( int style, int extraStyle ) // event handling will obviously be broken. PGID, /*wxID_ANY*/ wxDefaultPosition, - wxDefaultSize, + wxSize(100, 100), // FIXME: wxDefaultSize gives assertion in propgrid. + // But calling SetInitialSize in manager changes the code + // order to the grid gets created immediately, before SetExtraStyle + // is called. style ); m_propGrid = pgman->GetGrid(); @@ -2023,11 +2117,9 @@ void FormMain::CreateGrid( int style, int extraStyle ) /* // 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, - (wxObjectEventFunction) (wxEventFunction) (wxPropertyGridEventFunction) - &FormMain::OnPropertyGridChange ); + wxPropertyGridEventHandler(FormMain::OnPropertyGridChange) ); */ m_topSizer->Add( m_pPropGridManager, 1, wxEXPAND ); @@ -2042,6 +2134,8 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size (wxMINIMIZE_BOX|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCAPTION| wxTAB_TRAVERSAL|wxCLOSE_BOX|wxNO_FULL_REPAINT_ON_RESIZE) ) { + SetIcon(wxICON(sample)); + m_propGrid = NULL; m_panel = NULL; @@ -2056,6 +2150,13 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size 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 | @@ -2064,20 +2165,17 @@ 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 - wxPG_EX_MODE_BUTTONS + wxPG_EX_MODE_BUTTONS | + wxPG_EX_MULTIPLE_SELECTION //| wxPG_EX_AUTO_UNSPECIFIED_VALUES //| wxPG_EX_GREY_LABEL_WHEN_DISABLED //| wxPG_EX_NATIVE_DOUBLE_BUFFERING //| wxPG_EX_HELP_AS_TOOLTIPS ); - // Register all editors (SpinCtrl etc.) - m_pPropGridManager->RegisterAdditionalEditors(); - // // Create menubar wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF); @@ -2098,9 +2196,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.") ); @@ -2148,6 +2246,8 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size menuTry->Append(ID_SELECTSTYLE, wxT("Set Window Style"), wxT("Select window style flags used by the grid.")); + menuTry->Append(ID_ENABLELABELEDITING, "Enable label editing", + "This calls wxPropertyGrid::MakeColumnEditable(0)"); menuTry->AppendSeparator(); menuTry->AppendRadioItem( ID_COLOURSCHEME1, wxT("Standard Colour Scheme") ); menuTry->AppendRadioItem( ID_COLOURSCHEME2, wxT("White Colour Scheme") ); @@ -2187,15 +2287,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(); } @@ -2232,7 +2336,7 @@ void FormMain::OnInsertPropClick( wxCommandEvent& WXUNUSED(event) ) { wxString propLabel; - if ( !m_pPropGridManager->GetChildrenCount() ) + if ( !m_pPropGridManager->GetGrid()->GetRoot()->GetChildCount() ) { wxMessageBox(wxT("No items to relate - first add some with Append.")); return; @@ -2249,8 +2353,8 @@ void FormMain::OnInsertPropClick( wxCommandEvent& WXUNUSED(event) ) GenerateUniquePropertyLabel( m_pPropGridManager, propLabel ); m_pPropGridManager->Insert( m_pPropGridManager->GetPropertyParent(id), - m_pPropGridManager->GetPropertyIndex(id), - new wxStringProperty(propLabel) ); + id->GetIndexInParent(), + new wxStringProperty(propLabel) ); } @@ -2298,7 +2402,7 @@ void FormMain::OnInsertCatClick( wxCommandEvent& WXUNUSED(event) ) { wxString propLabel; - if ( !m_pPropGridManager->GetChildrenCount() ) + if ( !m_pPropGridManager->GetGrid()->GetRoot()->GetChildCount() ) { wxMessageBox(wxT("No items to relate - first add some with Append.")); return; @@ -2316,9 +2420,8 @@ void FormMain::OnInsertCatClick( wxCommandEvent& WXUNUSED(event) ) GenerateUniquePropertyLabel( m_pPropGridManager, propLabel ); m_pPropGridManager->Insert( m_pPropGridManager->GetPropertyParent(id), - m_pPropGridManager->GetPropertyIndex(id), - new wxPropertyCategory (propLabel) ); - + id->GetIndexInParent(), + new wxPropertyCategory (propLabel) ); } // ----------------------------------------------------------------------- @@ -2366,6 +2469,8 @@ void FormMain::OnContextMenu( wxContextMenuEvent& event ) wxLogDebug(wxT("FormMain::OnContextMenu(%i,%i)"), event.GetPosition().x,event.GetPosition().y); + wxUnusedVar(event); + //event.Skip(); } @@ -2495,8 +2600,7 @@ void FormMain::OnFitColumnsClick( 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; @@ -2505,9 +2609,7 @@ void FormMain::OnChangeFlagsPropItemsClick( wxCommandEvent& WXUNUSED(event) ) 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); } // ----------------------------------------------------------------------- @@ -2569,6 +2671,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")); @@ -2601,9 +2727,9 @@ void FormMain::OnRestoreState( wxCommandEvent& WXUNUSED(event) ) void FormMain::OnSetSpinCtrlEditorClick( wxCommandEvent& WXUNUSED(event) ) { #if wxUSE_SPINBTN - wxPGProperty* pgId = m_pPropGridManager->GetSelectedProperty(); + 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 @@ -2613,7 +2739,7 @@ void FormMain::OnSetSpinCtrlEditorClick( wxCommandEvent& WXUNUSED(event) ) void FormMain::OnTestReplaceClick( wxCommandEvent& WXUNUSED(event) ) { - wxPGProperty* pgId = m_pPropGridManager->GetSelectedProperty(); + wxPGProperty* pgId = m_pPropGridManager->GetSelection(); if ( pgId ) { wxPGChoices choices; @@ -2665,6 +2791,13 @@ void FormMain::OnFreezeClick( wxCommandEvent& event ) // ----------------------------------------------------------------------- +void FormMain::OnEnableLabelEditing( wxCommandEvent& WXUNUSED(event) ) +{ + m_propGrid->MakeColumnEditable(0); +} + +// ----------------------------------------------------------------------- + void FormMain::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxString msg; @@ -2689,7 +2822,7 @@ void FormMain::OnAbout(wxCommandEvent& WXUNUSED(event)) wxT("Jaakko Salli"), wxVERSION_STRING ); - wxMessageBox(msg, _T("About"), wxOK | wxICON_INFORMATION, this); + wxMessageBox(msg, wxT("About"), wxOK | wxICON_INFORMATION, this); } // ----------------------------------------------------------------------- @@ -2806,6 +2939,7 @@ void FormMain::OnSelectStyle( wxCommandEvent& WXUNUSED(event) ) ADD_FLAG(wxPG_LIMITED_EDITING) ADD_FLAG(wxPG_TOOLBAR) ADD_FLAG(wxPG_DESCRIPTION) + ADD_FLAG(wxPG_NO_INTERNAL_BORDER) wxMultiChoiceDialog dlg( this, wxT("Select window styles to use"), wxT("wxPropertyGrid Window Style"), chs ); dlg.SetSelections(sel); @@ -2833,7 +2967,11 @@ 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_LEGACY_VALIDATORS) + ADD_FLAG(wxPG_EX_HIDE_PAGE_BUTTONS) + ADD_FLAG(wxPG_EX_MULTIPLE_SELECTION) + ADD_FLAG(wxPG_EX_ENABLE_TLP_TRACKING) + ADD_FLAG(wxPG_EX_NO_TOOLBAR_DIVIDER) + ADD_FLAG(wxPG_EX_TOOLBAR_SEPARATOR) wxMultiChoiceDialog dlg( this, wxT("Select extra window styles to use"), wxT("wxPropertyGrid Extra Style"), chs ); dlg.SetSelections(sel); @@ -2850,11 +2988,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(); } // ----------------------------------------------------------------------- @@ -2892,14 +3026,14 @@ void FormMain::OnInsertChoice( wxCommandEvent& WXUNUSED(event) ) 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; - pg->InsertPropertyChoice(selected,wxT("New Choice"),pos); + selected->InsertChoice(wxT("New Choice"), pos); } else { @@ -2914,14 +3048,14 @@ void FormMain::OnDeleteChoice( wxCommandEvent& WXUNUSED(event) ) 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; - pg->DeletePropertyChoice(selected,pos); + selected->DeleteChoice(pos); } else { @@ -2942,10 +3076,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; @@ -2983,7 +3113,7 @@ void FormMain::OnMisc ( wxCommandEvent& event ) else if ( id == ID_COLLAPSE ) { // Collapses selected. - wxPGProperty* id = m_pPropGridManager->GetSelectedProperty(); + wxPGProperty* id = m_pPropGridManager->GetSelection(); if ( id ) { m_pPropGridManager->Collapse(id); @@ -3001,32 +3131,11 @@ void FormMain::OnMisc ( wxCommandEvent& event ) } else if ( id == ID_UNSPECIFY ) { - wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty(); + wxPGProperty* prop = m_pPropGridManager->GetSelection(); 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()); - } + prop->RefreshEditor(); } } } @@ -3073,8 +3182,8 @@ bool cxApplication::OnInit() //wxLocale Locale; //Locale.Init(wxLANGUAGE_FINNISH); - FormMain* frame = Form1 = new FormMain( wxT("wxPropertyGrid Sample"), wxPoint(0,0), wxSize(300,500) ); - frame->Show(true); + FormMain* frame = Form1 = new FormMain( wxT("wxPropertyGrid Sample"), wxPoint(0,0), wxSize(300,500) ); + frame->Show(true); // // Parse command-line @@ -3093,7 +3202,7 @@ bool cxApplication::OnInit() } } - return true; + return true; } // -----------------------------------------------------------------------