X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/939d936402b4ac38310531ed39b4fd05afe29531..d5cc191c9cd48a915ce0dfc6e49511b2fddb6746:/samples/propgrid/propgrid.cpp?ds=sidebyside diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index d6ab769b84..87ca762f84 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -4,9 +4,9 @@ // Author: Jaakko Salli // Modified by: // Created: 2004-09-25 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) Jaakko Salli -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // @@ -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 wxHAS_IMAGES_IN_RESOURCES + #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); @@ -190,265 +198,6 @@ private: #endif // wxUSE_VALIDATORS -// ----------------------------------------------------------------------- -// AdvImageFile Property -// ----------------------------------------------------------------------- - -class wxMyImageInfo; - -WX_DECLARE_OBJARRAY(wxMyImageInfo, wxArrayMyImageInfo); - -class wxMyImageInfo -{ -public: - wxString m_path; - wxBitmap* m_pThumbnail1; // smaller thumbnail - wxBitmap* m_pThumbnail2; // larger thumbnail - - wxMyImageInfo ( const wxString& str ) - { - m_path = str; - m_pThumbnail1 = (wxBitmap*) NULL; - m_pThumbnail2 = (wxBitmap*) NULL; - } - virtual ~wxMyImageInfo() - { - if ( m_pThumbnail1 ) - delete m_pThumbnail1; - if ( m_pThumbnail2 ) - delete m_pThumbnail2; - } - -}; - - -#include -WX_DEFINE_OBJARRAY(wxArrayMyImageInfo); - -wxArrayMyImageInfo g_myImageArray; - - -// Preferred thumbnail height. -#define PREF_THUMBNAIL_HEIGHT 64 - - -wxPGChoices wxAdvImageFileProperty::ms_choices; - -WX_PG_IMPLEMENT_PROPERTY_CLASS(wxAdvImageFileProperty,wxFileProperty, - wxString,const wxString&,ChoiceAndButton) - - -wxAdvImageFileProperty::wxAdvImageFileProperty( const wxString& label, - const wxString& name, - const wxString& value) - : wxFileProperty(label,name,value) -{ - m_wildcard = wxPGGetDefaultImageWildcard(); - - m_index = -1; - - m_pImage = (wxImage*) NULL; - - // Only show names. - m_flags &= ~(wxPG_PROP_SHOW_FULL_FILENAME); -} - -wxAdvImageFileProperty::~wxAdvImageFileProperty () -{ - // Delete old image - if ( m_pImage ) - { - delete m_pImage; - m_pImage = (wxImage*) NULL; - } -} - -void wxAdvImageFileProperty::OnSetValue() -{ - wxFileProperty::OnSetValue(); - - // Delete old image - if ( m_pImage ) - { - delete m_pImage; - m_pImage = (wxImage*) NULL; - } - - wxString imagename = GetValueAsString(0); - - if ( imagename.length() ) - { - size_t prevCount = g_myImageArray.GetCount(); - int index = ms_choices.Index(imagename); - - // If not in table, add now. - if ( index == wxNOT_FOUND ) - { - ms_choices.Add( imagename ); - g_myImageArray.Add( new wxMyImageInfo( m_filename.GetFullPath() ) ); - - index = g_myImageArray.GetCount() - 1; - } - - // If no thumbnail ready, then need to load image. - if ( !g_myImageArray[index].m_pThumbnail2 ) - { - // Load if file exists. - if ( m_filename.FileExists() ) - m_pImage = new wxImage( m_filename.GetFullPath() ); - } - - m_index = index; - - wxPropertyGrid* pg = GetGrid(); - wxWindow* control = pg->GetEditorControl(); - - if ( pg->GetSelection() == this && control ) - { - wxString name = GetValueAsString(0); - - if ( g_myImageArray.GetCount() != prevCount ) - { - wxASSERT( g_myImageArray.GetCount() == (prevCount+1) ); - - // Add to the control's array. - // (should be added to own array earlier) - - if ( control ) - GetEditorClass()->InsertItem(control, name, -1); - } - - if ( control ) - GetEditorClass()->UpdateControl(this, control); - } - } - else - m_index = -1; -} - -bool wxAdvImageFileProperty::IntToValue( wxVariant& variant, int number, int WXUNUSED(argFlags) ) const -{ - wxASSERT( number >= 0 ); - return StringToValue( variant, ms_choices.GetLabel(number), wxPG_FULL_VALUE ); -} - -bool wxAdvImageFileProperty::OnEvent( wxPropertyGrid* propgrid, wxWindow* primary, - wxEvent& event ) -{ - if ( propgrid->IsMainButtonEvent(event) ) - { - return wxFileProperty::OnEvent(propgrid,primary,event); - } - return false; -} - -wxSize wxAdvImageFileProperty::OnMeasureImage( int item ) const -{ - if ( item == -1 ) - return wxPG_DEFAULT_IMAGE_SIZE; - - return wxSize(PREF_THUMBNAIL_HEIGHT,PREF_THUMBNAIL_HEIGHT); -} - -void wxAdvImageFileProperty::LoadThumbnails( size_t index ) -{ - wxMyImageInfo& mii = g_myImageArray[index]; - - if ( !mii.m_pThumbnail2 ) - { - - if ( !m_pImage || !m_pImage->Ok() || - m_filename != mii.m_path - ) - { - if ( m_pImage ) - delete m_pImage; - m_pImage = new wxImage( mii.m_path ); - } - - if ( m_pImage && m_pImage->Ok() ) - { - int im_wid = m_pImage->GetWidth(); - int im_hei = m_pImage->GetHeight(); - if ( im_hei > PREF_THUMBNAIL_HEIGHT ) - { - // TNW = (TNH*IW)/IH - im_wid = (PREF_THUMBNAIL_HEIGHT*m_pImage->GetWidth())/m_pImage->GetHeight(); - im_hei = PREF_THUMBNAIL_HEIGHT; - } - - m_pImage->Rescale( im_wid, im_hei ); - - mii.m_pThumbnail2 = new wxBitmap( *m_pImage ); - - wxSize cis = GetParentState()->GetGrid()->GetImageSize(); - m_pImage->Rescale ( cis.x, cis.y ); - - mii.m_pThumbnail1 = new wxBitmap( *m_pImage ); - - } - - if ( m_pImage ) - { - delete m_pImage; - m_pImage = (wxImage*) NULL; - } - } -} - -void wxAdvImageFileProperty::OnCustomPaint( wxDC& dc, - const wxRect& rect, - wxPGPaintData& pd ) -{ - int index = m_index; - if ( pd.m_choiceItem >= 0 ) - index = pd.m_choiceItem; - - //wxLogDebug(wxT("%i"),index); - - if ( index >= 0 ) - { - LoadThumbnails(index); - - // Is this a measure item call? - if ( rect.x < 0 ) - { - // Variable height - //pd.m_drawnHeight = PREF_THUMBNAIL_HEIGHT; - wxBitmap* pBitmap = (wxBitmap*)g_myImageArray[index].m_pThumbnail2; - if ( pBitmap ) - pd.m_drawnHeight = pBitmap->GetHeight(); - else - pd.m_drawnHeight = 16; - return; - } - - // Draw the thumbnail - - wxBitmap* pBitmap; - - if ( pd.m_choiceItem >= 0 ) - pBitmap = (wxBitmap*)g_myImageArray[index].m_pThumbnail2; - else - pBitmap = (wxBitmap*)g_myImageArray[index].m_pThumbnail1; - - if ( pBitmap ) - { - dc.DrawBitmap ( *pBitmap, rect.x, rect.y, FALSE ); - - // Tell the caller how wide we drew. - pd.m_drawnWidth = pBitmap->GetWidth(); - - return; - } - } - - // No valid file - just draw a white box. - dc.SetBrush ( *wxWHITE_BRUSH ); - dc.DrawRectangle ( rect ); -} - - // ----------------------------------------------------------------------- // wxVectorProperty // ----------------------------------------------------------------------- @@ -467,9 +216,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() { } @@ -483,7 +232,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; @@ -493,7 +244,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; } @@ -515,9 +268,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() { } @@ -531,7 +284,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; @@ -542,7 +297,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; } @@ -565,7 +322,7 @@ public: wxString s = ::wxGetSingleChoice(wxT("Message"), wxT("Caption"), m_choices.GetLabels()); - if ( s.length() ) + if ( !s.empty() ) { SetValue(s); return true; @@ -598,7 +355,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 @@ -626,6 +383,7 @@ enum ID_INSERTPROP, ID_INSERTCAT, ID_ENABLE, + ID_SETREADONLY, ID_HIDE, ID_DELETE, ID_DELETER, @@ -642,9 +400,9 @@ enum ID_COLOURSCHEME2, ID_COLOURSCHEME3, ID_CATCOLOURS, - ID_SETCOLOUR, + ID_SETBGCOLOUR, + ID_SETBGCOLOURRECUR, ID_STATICLAYOUT, - ID_CLEAR, ID_POPULATE1, ID_POPULATE2, ID_COLLAPSE, @@ -669,7 +427,11 @@ enum ID_SELECTSTYLE, ID_SAVESTATE, ID_RESTORESTATE, - ID_RUNMINIMAL + ID_RUNMINIMAL, + ID_ENABLELABELEDITING, + ID_VETOCOLDRAG, + ID_SHOWHEADER, + ID_ONEXTENDEDKEYNAV }; // ----------------------------------------------------------------------- @@ -695,12 +457,22 @@ 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 ) EVT_PG_ITEM_COLLAPSED( PGID, FormMain::OnPropertyGridItemCollapse ) EVT_PG_ITEM_EXPANDED( PGID, FormMain::OnPropertyGridItemExpand ) + EVT_PG_COL_BEGIN_DRAG( PGID, FormMain::OnPropertyGridColBeginDrag ) + EVT_PG_COL_DRAGGING( PGID, FormMain::OnPropertyGridColDragging ) + EVT_PG_COL_END_DRAG( PGID, FormMain::OnPropertyGridColEndDrag ) + EVT_TEXT( PGID, FormMain::OnPropertyGridTextUpdate ) // @@ -717,14 +489,20 @@ BEGIN_EVENT_TABLE(FormMain, wxFrame) EVT_MENU( ID_UNSPECIFY, FormMain::OnMisc ) EVT_MENU( ID_DELETEALL, FormMain::OnClearClick ) EVT_MENU( ID_ENABLE, FormMain::OnEnableDisable ) - EVT_MENU( ID_HIDE, FormMain::OnHideShow ) + EVT_MENU( ID_SETREADONLY, FormMain::OnSetReadOnly ) + EVT_MENU( ID_HIDE, FormMain::OnHide ) + 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_ONEXTENDEDKEYNAV, FormMain::OnExtendedKeyNav ) + 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_SHOWHEADER, FormMain::OnShowHeader ) EVT_MENU( ID_DUMPLIST, FormMain::OnDumpList ) EVT_MENU( ID_COLOURSCHEME1, FormMain::OnColourScheme ) @@ -742,7 +520,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 ) @@ -809,7 +586,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(); @@ -847,7 +624,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(); @@ -873,7 +650,7 @@ void FormMain::OnPropertyGridChanging( wxPropertyGridEvent& event ) event.Veto(); // Since we ask a question, it is better if we omit any validation - // failure behavior. + // failure behaviour. event.SetValidationFailureBehavior(0); } } @@ -890,25 +667,36 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event ) wxPGProperty* property = event.GetProperty(); const wxString& name = property->GetName(); - wxVariant value = property->GetValue(); + + // Properties store values internally as wxVariants, but it is preferred + // to use the more modern wxAny at the interface level + wxAny value = property->GetValue(); // Don't handle 'unspecified' values if ( value.IsNull() ) return; + // + // FIXME-VC6: In order to compile on Visual C++ 6.0, wxANY_AS() + // macro is used. Unless you want to support this old + // compiler in your own code, you can use the more + // nicer form value.As() instead of + // wxANY_AS(value, FOO). + // + // Some settings are disabled outside Windows platform if ( name == wxT("X") ) - SetSize ( m_pPropGridManager->GetPropertyValueAsInt(property), -1, -1, -1, wxSIZE_USE_EXISTING ); + SetSize( wxANY_AS(value, int), -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, wxANY_AS(value, int), -1, -1, wxSIZE_USE_EXISTING ); else if ( name == wxT("Width") ) - SetSize ( -1, -1, m_pPropGridManager->GetPropertyValueAsInt(property), -1, wxSIZE_USE_EXISTING ); + SetSize ( -1, -1, wxANY_AS(value, int), -1, wxSIZE_USE_EXISTING ); else if ( name == wxT("Height") ) - SetSize ( -1, -1, -1, wxPGVariantToInt(value), wxSIZE_USE_EXISTING ); + SetSize ( -1, -1, -1, wxANY_AS(value, int), wxSIZE_USE_EXISTING ); else if ( name == wxT("Label") ) { - SetTitle ( m_pPropGridManager->GetPropertyValueAsString(property) ); + SetTitle( wxANY_AS(value, wxString) ); } else if ( name == wxT("Password") ) { @@ -922,35 +710,30 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event ) else if ( name == wxT("Font") ) { - wxFont font; - font << value; - wxASSERT( font.Ok() ); + wxFont font = wxANY_AS(value, wxFont); + wxASSERT( font.IsOk() ); m_pPropGridManager->SetFont( font ); } else if ( name == wxT("Margin Colour") ) { - wxColourPropertyValue cpv; - cpv << value; + wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue); m_pPropGridManager->GetGrid()->SetMarginColour( cpv.m_colour ); } else if ( name == wxT("Cell Colour") ) { - wxColourPropertyValue cpv; - cpv << value; + wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue); m_pPropGridManager->GetGrid()->SetCellBackgroundColour( cpv.m_colour ); } else if ( name == wxT("Line Colour") ) { - wxColourPropertyValue cpv; - cpv << value; + wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue); m_pPropGridManager->GetGrid()->SetLineColour( cpv.m_colour ); } else if ( name == wxT("Cell Text Colour") ) { - wxColourPropertyValue cpv; - cpv << value; + wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue); m_pPropGridManager->GetGrid()->SetCellTextColour( cpv.m_colour ); } } @@ -999,6 +782,22 @@ void FormMain::OnPropertyGridPageChange( wxPropertyGridEvent& WXUNUSED(event) ) // ----------------------------------------------------------------------- +void FormMain::OnPropertyGridLabelEditBegin( wxPropertyGridEvent& event ) +{ + wxLogMessage("wxPG_EVT_LABEL_EDIT_BEGIN(%s)", + event.GetProperty()->GetLabel().c_str()); +} + +// ----------------------------------------------------------------------- + +void FormMain::OnPropertyGridLabelEditEnding( wxPropertyGridEvent& event ) +{ + wxLogMessage("wxPG_EVT_LABEL_EDIT_ENDING(%s)", + event.GetProperty()->GetLabel().c_str()); +} + +// ----------------------------------------------------------------------- + void FormMain::OnPropertyGridHighlight( wxPropertyGridEvent& WXUNUSED(event) ) { } @@ -1052,7 +851,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 ) { @@ -1073,14 +872,45 @@ void FormMain::OnPropertyGridButtonClick ( wxCommandEvent& ) void FormMain::OnPropertyGridItemCollapse( wxPropertyGridEvent& ) { - wxLogDebug(wxT("Item was Collapsed")); + wxLogMessage(wxT("Item was Collapsed")); } // ----------------------------------------------------------------------- void FormMain::OnPropertyGridItemExpand( wxPropertyGridEvent& ) { - wxLogDebug(wxT("Item was Expanded")); + wxLogMessage(wxT("Item was Expanded")); +} + +// ----------------------------------------------------------------------- + +void FormMain::OnPropertyGridColBeginDrag( wxPropertyGridEvent& event ) +{ + if ( m_itemVetoDragging->IsChecked() ) + { + wxLogMessage("Splitter %i resize was vetoed", event.GetColumn()); + event.Veto(); + } + else + { + wxLogMessage("Splitter %i resize began", event.GetColumn()); + } +} + +// ----------------------------------------------------------------------- + +void FormMain::OnPropertyGridColDragging( wxPropertyGridEvent& event ) +{ + wxUnusedVar(event); + // For now, let's not spam the log output + //wxLogMessage("Splitter %i is being resized", event.GetColumn()); +} + +// ----------------------------------------------------------------------- + +void FormMain::OnPropertyGridColEndDrag( wxPropertyGridEvent& event ) +{ + wxLogMessage("Splitter %i resize ended", event.GetColumn()); } // ----------------------------------------------------------------------- @@ -1189,7 +1019,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 @@ -1238,10 +1068,16 @@ void FormMain::PopulateWithStandardItems () pg->SetPropertyAttribute(wxT("Height"), wxPG_ATTR_MAX, (long)2048 ); pg->SetPropertyAttribute(wxT("Height"), wxPG_ATTR_UNITS, wxT("Pixels") ); - // Set value to unspecified so that InlineHelp attribute will be demonstrated - pg->SetPropertyValueUnspecified(wxT("Height")); - pg->SetPropertyAttribute(wxT("Height"), wxPG_ATTR_INLINE_HELP, wxT("Enter new height for window") ); - pg->SetPropertyHelpString(wxT("Height"), wxT("This property uses attributes \"Units\" and \"InlineHelp\".") ); + // Set value to unspecified so that Hint attribute will be demonstrated + pg->SetPropertyValueUnspecified("Height"); + pg->SetPropertyAttribute("Height", wxPG_ATTR_HINT, + "Enter new height for window" ); + + // Difference between hint and help string is that the hint is shown in + // an empty value cell, while help string is shown either in the + // description text box, as a tool tip, or on the status bar. + pg->SetPropertyHelpString("Height", + "This property uses attributes \"Units\" and \"Hint\"." ); pg->Append( new wxIntProperty(wxT("Width"),wxPG_LABEL,640) ); pg->SetPropertyAttribute(wxT("Width"), wxPG_ATTR_MIN, (long)10 ); @@ -1249,8 +1085,10 @@ void FormMain::PopulateWithStandardItems () pg->SetPropertyAttribute(wxT("Width"), wxPG_ATTR_UNITS, wxT("Pixels") ); pg->SetPropertyValueUnspecified(wxT("Width")); - pg->SetPropertyAttribute(wxT("Width"), wxPG_ATTR_INLINE_HELP, wxT("Enter new width for window") ); - pg->SetPropertyHelpString(wxT("Width"), wxT("This property uses attributes \"Units\" and \"InlineHelp\".") ); + pg->SetPropertyAttribute("Width", wxPG_ATTR_HINT, + "Enter new width for window" ); + pg->SetPropertyHelpString("Width", + "This property uses attributes \"Units\" and \"Hint\"." ); pg->Append( new wxIntProperty(wxT("X"),wxPG_LABEL,10) ); pg->SetPropertyAttribute(wxT("X"), wxPG_ATTR_UNITS, wxT("Pixels") ); @@ -1260,7 +1098,7 @@ void FormMain::PopulateWithStandardItems () pg->SetPropertyAttribute(wxT("Y"), wxPG_ATTR_UNITS, wxT("Pixels") ); pg->SetPropertyHelpString(wxT("Y"), wxT("This property uses \"Units\" attribute.") ); - const wxChar* disabledHelpString = wxT("This property is simply disabled. Inorder to have label disabled as well, ") + const wxChar* disabledHelpString = wxT("This property is simply disabled. In order to have label disabled as well, ") wxT("you need to set wxPG_EX_GREY_LABEL_WHEN_DISABLED using SetExtraStyle."); pg->Append( new wxPropertyCategory(wxT("Environment"),wxPG_LABEL) ); @@ -1294,12 +1132,6 @@ void FormMain::PopulateWithStandardItems () wxT("with custom action (dir dialog popup) defined.") ); - pg->Append( new wxAdvImageFileProperty(wxT("AdvImageFileProperty"),wxPG_LABEL) ); - pg->SetPropertyHelpString( wxT("AdvImageFileProperty"), - wxT("This demonstrates wxAdvImageFileProperty class defined in this sample app. ") - wxT("Button can be used to add new images to the popup list.") - ); - wxArrayDouble arrdbl; arrdbl.Add(-1.0); arrdbl.Add(-0.5); @@ -1349,6 +1181,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.") ); @@ -1356,15 +1189,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.")); @@ -1382,9 +1216,10 @@ void FormMain::PopulateWithExamples () pg->SetPropertyHelpString( wxT("BoolProperty with CheckBox"), wxT("Property attribute wxPG_BOOL_USE_CHECKBOX has been set to true.") ); - pid = pg->Append( new wxFloatProperty( wxT("FloatProperty"), - wxPG_LABEL, - 1234500.23 ) ); + prop = pg->Append( new wxFloatProperty("FloatProperty", + wxPG_LABEL, + 1234500.23) ); + prop->SetAttribute("Min", -100.12); // A string property that can be edited in a separate editor dialog. pg->Append( new wxLongStringProperty( wxT("LongStringProperty"), wxT("LongStringProp"), @@ -1403,7 +1238,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")); @@ -1424,12 +1259,18 @@ void FormMain::PopulateWithExamples () #endif 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->GetProperty(wxT("ColourProperty"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED); + pg->SetPropertyEditor( wxT("ColourProperty"), wxPGEditor_ComboBox ); + pg->GetProperty(wxT("ColourProperty"))->SetAutoUnspecified(true); 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)")); + + pid = pg->Append( new wxColourProperty("ColourPropertyWithAlpha", + wxPG_LABEL, + wxColour(15, 200, 95, 128)) ); + pg->SetPropertyAttribute("ColourPropertyWithAlpha", "HasAlpha", true); + pg->SetPropertyHelpString("ColourPropertyWithAlpha", + "Attribute \"HasAlpha\" is set to true for this property."); // // This demonstrates using alternative editor for colour property @@ -1464,6 +1305,7 @@ void FormMain::PopulateWithExamples () soc.Add( wxT("Look, it continues"), 200 ); soc.Add( wxT("Even More"), 240 ); soc.Add( wxT("And More"), 280 ); + soc.Add( "", 300 ); soc.Add( wxT("True End of the List"), 320 ); // Test custom colours ([] operator of wxPGChoices returns @@ -1482,24 +1324,23 @@ void FormMain::PopulateWithExamples () 240) ); 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")); - - 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->Append( new wxEnumProperty(wxT("EnumProperty 5"),wxPG_LABEL, + // Test Hint attribute in EnumProperty + pg->GetProperty("EnumProperty 3")->SetAttribute("Hint", "Dummy Hint"); + + pg->SetPropertyHelpString("EnumProperty 3", + "This property uses \"Hint\" attribute."); + + // 'soc' plus one exclusive extra choice "4th only" + pg->Append( new wxEnumProperty(wxT("EnumProperty 4"),wxPG_LABEL, soc, 240 ) ); - pg->GetProperty(wxT("EnumProperty 5"))->SetChoicesExclusive(); - pg->GetProperty(wxT("EnumProperty 5"))->AddChoice(wxT("5th only"), 360); + pg->GetProperty(wxT("EnumProperty 4"))->AddChoice(wxT("4th 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")) ); @@ -1523,6 +1364,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 }; @@ -1552,7 +1427,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 ); @@ -1566,7 +1440,13 @@ void FormMain::PopulateWithExamples () eech.Add(wxT("Choice 1")); eech.Add(wxT("Choice 2")); eech.Add(wxT("Choice 3")); - pg->Append( new wxEditEnumProperty(wxT("EditEnumProperty"), wxPG_LABEL, eech) ); // , wxT("Choice 2") + pg->Append( new wxEditEnumProperty("EditEnumProperty", + wxPG_LABEL, + eech, + "Choice not in the list") ); + + // Test Hint attribute in EditEnumProperty + pg->GetProperty("EditEnumProperty")->SetAttribute("Hint", "Dummy Hint"); //wxString v_; //wxTextValidator validator1(wxFILTER_NUMERIC,&v_); @@ -1579,11 +1459,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 @@ -1615,36 +1497,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")) ); @@ -1665,11 +1559,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) ); @@ -1688,15 +1593,34 @@ void FormMain::PopulateWithLibraryConfig () wxPropertyGridManager* pgman = m_pPropGridManager; wxPropertyGridPage* pg = pgman->GetPage(wxT("wxWidgets Library Config")); + // Set custom column proportions (here in the sample app we need + // to check if the grid has wxPG_SPLITTER_AUTO_CENTER style. You usually + // need not to do it in your application). + if ( pgman->HasFlag(wxPG_SPLITTER_AUTO_CENTER) ) + { + pg->SetColumnProportion(0, 3); + pg->SetColumnProportion(1, 1); + } + wxPGProperty* cat; wxBitmap bmp = wxArtProvider::GetBitmap(wxART_REPORT_VIEW); wxPGProperty* pid; + wxFont italicFont = pgman->GetGrid()->GetCaptionFont(); + italicFont.SetStyle(wxFONTSTYLE_ITALIC); + + wxString italicFontHelp = "Font of this property's wxPGCell has " + "been modified. Obtain property's cell " + "with wxPGProperty::" + "GetOrCreateCell(column)."; + #define ADD_WX_LIB_CONF_GROUP(A) \ cat = pg->AppendIn( pid, new wxPropertyCategory(A) ); \ - pg->SetPropertyCell( cat, 0, wxPG_LABEL, bmp ); + pg->SetPropertyCell( cat, 0, wxPG_LABEL, bmp ); \ + cat->GetCell(0).SetFont(italicFont); \ + cat->SetHelpString(italicFontHelp); #define ADD_WX_LIB_CONF(A) pg->Append( new wxBoolProperty(wxT(#A),wxPG_LABEL,(bool)((A>0)?true:false))); #define ADD_WX_LIB_CONF_NODEF(A) pg->Append( new wxBoolProperty(wxT(#A),wxPG_LABEL,(bool)false) ); \ @@ -1705,6 +1629,10 @@ void FormMain::PopulateWithLibraryConfig () pid = pg->Append( new wxPropertyCategory( wxT("wxWidgets Library Configuration") ) ); pg->SetPropertyCell( pid, 0, wxPG_LABEL, bmp ); + // Both of following lines would set a label for the second column + pg->SetPropertyCell( pid, 1, "Is Enabled" ); + pid->SetValue("Is Enabled"); + ADD_WX_LIB_CONF_GROUP(wxT("Global Settings")) ADD_WX_LIB_CONF( wxUSE_GUI ) @@ -1742,7 +1670,6 @@ void FormMain::PopulateWithLibraryConfig () ADD_WX_LIB_CONF_GROUP(wxT("Unicode Support")) ADD_WX_LIB_CONF( wxUSE_UNICODE ) ADD_WX_LIB_CONF( wxUSE_UNICODE_MSLU ) - ADD_WX_LIB_CONF( wxUSE_WCHAR_T ) ADD_WX_LIB_CONF_GROUP(wxT("Global Features")) ADD_WX_LIB_CONF( wxUSE_EXCEPTIONS ) @@ -1857,7 +1784,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()); } @@ -1865,7 +1792,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()); } @@ -1901,7 +1828,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 @@ -1912,22 +1841,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() @@ -1966,13 +1895,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 @@ -1993,17 +1922,29 @@ 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(); pgman->SetExtraStyle(extraStyle); - m_pPropGridManager->SetValidationFailureBehavior( wxPG_VFB_BEEP | wxPG_VFB_MARK_CELL | wxPG_VFB_SHOW_MESSAGE ); + // This is the default validation failure behaviour + m_pPropGridManager->SetValidationFailureBehavior( wxPG_VFB_MARK_CELL | + wxPG_VFB_SHOW_MESSAGEBOX ); m_pPropGridManager->GetGrid()->SetVerticalSpacing( 2 ); + // + // Set somewhat different unspecified value appearance + wxPGCell cell; + cell.SetText("Unspecified"); + cell.SetFgCol(*wxLIGHT_GREY); + m_propGrid->SetUnspecifiedValueAppearance(cell); + PopulateGrid(); // Change some attributes in all properties @@ -2016,11 +1957,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 ); @@ -2035,6 +1974,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; @@ -2049,6 +1990,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 | @@ -2057,20 +2005,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); @@ -2079,7 +2024,7 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size wxMenu *menuTools2 = new wxMenu; wxMenu *menuHelp = new wxMenu; - menuHelp->Append(ID_ABOUT, wxT("&About..."), wxT("Show about dialog") ); + menuHelp->Append(ID_ABOUT, wxT("&About"), wxT("Show about dialog") ); menuTools1->Append(ID_APPENDPROP, wxT("Append New Property") ); menuTools1->Append(ID_APPENDCAT, wxT("Append New Category\tCtrl-S") ); @@ -2091,20 +2036,27 @@ 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_UNSPECIFY, wxT("Set to Unspecified") ); - menuTools1->Append(ID_CLEAR, wxT("Set Value to Default") ); + menuTools1->Append(ID_SETBGCOLOUR, wxT("Set Bg Colour") ); + menuTools1->Append(ID_SETBGCOLOURRECUR, wxT("Set Bg Colour (Recursively)") ); + menuTools1->Append(ID_UNSPECIFY, "Set Value to Unspecified"); menuTools1->AppendSeparator(); m_itemEnable = menuTools1->Append(ID_ENABLE, wxT("Enable"), wxT("Toggles item's enabled state.") ); m_itemEnable->Enable( FALSE ); - menuTools1->Append(ID_HIDE, wxT("Hide"), wxT("Shows or hides a property") ); + menuTools1->Append(ID_HIDE, "Hide", "Hides a property" ); + menuTools1->Append(ID_SETREADONLY, "Set as Read-Only", + "Set property as read-only" ); menuTools2->Append(ID_ITERATE1, wxT("Iterate Over Properties") ); menuTools2->Append(ID_ITERATE2, wxT("Iterate Over Visible Items") ); menuTools2->Append(ID_ITERATE3, wxT("Reverse Iterate Over Properties") ); menuTools2->Append(ID_ITERATE4, wxT("Iterate Over Categories") ); menuTools2->AppendSeparator(); + menuTools2->Append(ID_ONEXTENDEDKEYNAV, "Extend Keyboard Navigation", + "This will set Enter to navigate to next property, " + "and allows arrow keys to navigate even when in " + "editor control."); + menuTools2->AppendSeparator(); menuTools2->Append(ID_SETPROPERTYVALUE, wxT("Set Property Value") ); menuTools2->Append(ID_CLEARMODIF, wxT("Clear Modified Status"), wxT("Clears wxPG_MODIFIED flag from all properties.") ); menuTools2->AppendSeparator(); @@ -2130,6 +2082,9 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size menuTools2->Append(ID_REMOVEPAGE, wxT("Remove Page") ); menuTools2->AppendSeparator(); menuTools2->Append(ID_FITCOLUMNS, wxT("Fit Columns") ); + m_itemVetoDragging = + menuTools2->AppendCheckItem(ID_VETOCOLDRAG, + "Veto Column Dragging"); menuTools2->AppendSeparator(); menuTools2->Append(ID_CHANGEFLAGSITEMS, wxT("Change Children of FlagsProp") ); menuTools2->AppendSeparator(); @@ -2141,6 +2096,11 @@ 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->AppendCheckItem(ID_SHOWHEADER, + "Enable header", + "This calls wxPropertyGridManager::ShowHeader()"); menuTry->AppendSeparator(); menuTry->AppendRadioItem( ID_COLOURSCHEME1, wxT("Standard Colour Scheme") ); menuTry->AppendRadioItem( ID_COLOURSCHEME2, wxT("White Colour Scheme") ); @@ -2180,15 +2140,27 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size SetStatusText(wxEmptyString); #endif // wxUSE_STATUSBAR + FinalizeFramePosition(); - // - // Finalize - // +#if wxUSE_LOGWINDOW + // Create log window + m_logWindow = new wxLogWindow(this, "Log Messages", false); + m_logWindow->GetFrame()->Move(GetPosition().x + GetSize().x + 10, + GetPosition().y); + m_logWindow->Show(); +#endif +} + +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(); } @@ -2225,7 +2197,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; @@ -2242,8 +2214,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) ); } @@ -2291,7 +2263,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; @@ -2309,9 +2281,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) ); } // ----------------------------------------------------------------------- @@ -2359,6 +2330,8 @@ void FormMain::OnContextMenu( wxContextMenuEvent& event ) wxLogDebug(wxT("FormMain::OnContextMenu(%i,%i)"), event.GetPosition().x,event.GetPosition().y); + wxUnusedVar(event); + //event.Skip(); } @@ -2460,6 +2433,25 @@ void FormMain::OnIterate4Click( wxCommandEvent& WXUNUSED(event) ) // ----------------------------------------------------------------------- +void FormMain::OnExtendedKeyNav( wxCommandEvent& WXUNUSED(event) ) +{ + // Use AddActionTrigger() and DedicateKey() to set up Enter, + // Up, and Down keys for navigating between properties. + wxPropertyGrid* propGrid = m_pPropGridManager->GetGrid(); + + propGrid->AddActionTrigger(wxPG_ACTION_NEXT_PROPERTY, + WXK_RETURN); + propGrid->DedicateKey(WXK_RETURN); + + // Up and Down keys are alredy associated with navigation, + // but we must also prevent them from being eaten by + // editor controls. + propGrid->DedicateKey(WXK_UP); + propGrid->DedicateKey(WXK_DOWN); +} + +// ----------------------------------------------------------------------- + void FormMain::OnFitColumnsClick( wxCommandEvent& WXUNUSED(event) ) { wxPropertyGridPage* page = m_pPropGridManager->GetCurrentPage(); @@ -2525,35 +2517,52 @@ void FormMain::OnEnableDisable( wxCommandEvent& ) // ----------------------------------------------------------------------- -void FormMain::OnHideShow( wxCommandEvent& WXUNUSED(event) ) +void FormMain::OnSetReadOnly( wxCommandEvent& WXUNUSED(event) ) { - wxPGProperty* id = m_pPropGridManager->GetGrid()->GetSelection(); - if ( !id ) + wxPGProperty* p = m_pPropGridManager->GetGrid()->GetSelection(); + if ( !p ) { wxMessageBox(wxT("First select a property.")); return; } + m_pPropGridManager->SetPropertyReadOnly(p); +} - if ( m_pPropGridManager->IsPropertyShown( id ) ) +// ----------------------------------------------------------------------- + +void FormMain::OnHide( wxCommandEvent& WXUNUSED(event) ) +{ + wxPGProperty* id = m_pPropGridManager->GetGrid()->GetSelection(); + if ( !id ) { - m_pPropGridManager->HideProperty( id, true ); - m_itemEnable->SetItemLabel( wxT("Show") ); + wxMessageBox(wxT("First select a property.")); + return; } - else + + m_pPropGridManager->HideProperty( id, true ); +} + +// ----------------------------------------------------------------------- + +#include "wx/colordlg.h" + +void +FormMain::OnSetBackgroundColour( wxCommandEvent& event ) +{ + wxPropertyGrid* pg = m_pPropGridManager->GetGrid(); + wxPGProperty* prop = pg->GetSelection(); + if ( !prop ) { - m_pPropGridManager->HideProperty( id, false ); - m_itemEnable->SetItemLabel( wxT("Hide") ); + wxMessageBox(wxT("First select a property.")); + return; } - wxPropertyGridPage* curPage = m_pPropGridManager->GetCurrentPage(); - - // Check for bottomY precalculation validity - unsigned int byPre = curPage->GetVirtualHeight(); - unsigned int byAct = curPage->GetActualVirtualHeight(); + wxColour col = ::wxGetColourFromUser(this, *wxWHITE, "Choose colour"); - if ( byPre != byAct ) + if ( col.IsOk() ) { - wxLogDebug(wxT("VirtualHeight is %u, should be %u"), byPre, byAct); + bool recursively = (event.GetId()==ID_SETBGCOLOURRECUR) ? true : false; + pg->SetPropertyBackgroundColour(prop, col, recursively); } } @@ -2591,9 +2600,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 @@ -2603,7 +2612,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; @@ -2655,6 +2664,21 @@ void FormMain::OnFreezeClick( wxCommandEvent& event ) // ----------------------------------------------------------------------- +void FormMain::OnEnableLabelEditing( wxCommandEvent& WXUNUSED(event) ) +{ + m_propGrid->MakeColumnEditable(0); +} + +// ----------------------------------------------------------------------- + +void FormMain::OnShowHeader( wxCommandEvent& event ) +{ + m_pPropGridManager->ShowHeader(event.IsChecked()); + m_pPropGridManager->SetColumnTitle(2, _("Units")); +} + +// ----------------------------------------------------------------------- + void FormMain::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxString msg; @@ -2679,7 +2703,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); } // ----------------------------------------------------------------------- @@ -2777,8 +2801,8 @@ void FormMain::OnCatColours( wxCommandEvent& event ) void FormMain::OnSelectStyle( wxCommandEvent& WXUNUSED(event) ) { - int style; - int extraStyle; + int style = 0; + int extraStyle = 0; { wxArrayString chs; @@ -2796,6 +2820,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); @@ -2823,7 +2848,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); @@ -2840,11 +2869,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(); } // ----------------------------------------------------------------------- @@ -2932,10 +2957,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; @@ -2973,7 +2994,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); @@ -2991,32 +3012,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(); } } } @@ -3063,8 +3063,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 @@ -3083,7 +3083,7 @@ bool cxApplication::OnInit() } } - return true; + return true; } // -----------------------------------------------------------------------