X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97f16261694d93e1c5c4245381702b294148f3a9..dd71bfb9921430755a885117cc6c9843c62dafda:/samples/propgrid/propgrid.cpp?ds=sidebyside diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index 98286772bb..b81ea3cc3e 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -6,7 +6,7 @@ // Created: 2004-09-25 // RCS-ID: $Id$ // Copyright: (c) Jaakko Salli -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // @@ -264,11 +264,7 @@ wxAdvImageFileProperty::wxAdvImageFileProperty( const wxString& label, wxAdvImageFileProperty::~wxAdvImageFileProperty () { // Delete old image - if ( m_pImage ) - { - delete m_pImage; - m_pImage = (wxImage*) NULL; - } + wxDELETE(m_pImage); } void wxAdvImageFileProperty::OnSetValue() @@ -276,11 +272,7 @@ void wxAdvImageFileProperty::OnSetValue() wxFileProperty::OnSetValue(); // Delete old image - if ( m_pImage ) - { - delete m_pImage; - m_pImage = (wxImage*) NULL; - } + wxDELETE(m_pImage); wxString imagename = GetValueAsString(0); @@ -398,11 +390,7 @@ void wxAdvImageFileProperty::LoadThumbnails( size_t index ) } - if ( m_pImage ) - { - delete m_pImage; - m_pImage = (wxImage*) NULL; - } + wxDELETE(m_pImage); } } @@ -644,6 +632,7 @@ enum ID_INSERTPROP, ID_INSERTCAT, ID_ENABLE, + ID_SETREADONLY, ID_HIDE, ID_DELETE, ID_DELETER, @@ -688,7 +677,10 @@ enum ID_SAVESTATE, ID_RESTORESTATE, ID_RUNMINIMAL, - ID_ENABLELABELEDITING + ID_ENABLELABELEDITING, + ID_VETOCOLDRAG, + ID_SHOWHEADER, + ID_ONEXTENDEDKEYNAV }; // ----------------------------------------------------------------------- @@ -726,6 +718,10 @@ BEGIN_EVENT_TABLE(FormMain, wxFrame) 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 ) // @@ -742,17 +738,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_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 ) @@ -917,25 +916,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, value.GetLong(), -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, value.GetLong(), 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") ) { @@ -949,8 +959,7 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event ) else if ( name == wxT("Font") ) { - wxFont font; - font << value; + wxFont font = wxANY_AS(value, wxFont); wxASSERT( font.Ok() ); m_pPropGridManager->SetFont( font ); @@ -958,26 +967,22 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event ) 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 ); } } @@ -1028,16 +1033,16 @@ void FormMain::OnPropertyGridPageChange( wxPropertyGridEvent& WXUNUSED(event) ) void FormMain::OnPropertyGridLabelEditBegin( wxPropertyGridEvent& event ) { - wxLogDebug("wxPG_EVT_LABEL_EDIT_BEGIN(%s)", - event.GetProperty()->GetLabel().c_str()); + wxLogMessage("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()); + wxLogMessage("wxPG_EVT_LABEL_EDIT_ENDING(%s)", + event.GetProperty()->GetLabel().c_str()); } // ----------------------------------------------------------------------- @@ -1116,14 +1121,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()); } // ----------------------------------------------------------------------- @@ -1281,10 +1317,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 ); @@ -1292,8 +1334,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") ); @@ -1427,9 +1471,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"), @@ -1471,7 +1516,7 @@ 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"), wxPGEditor_ComboBox ); - pg->GetProperty(wxT("ColourProperty"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED); + 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 wxPGEditor_ComboBox)")); @@ -1509,6 +1554,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 @@ -1531,6 +1577,12 @@ void FormMain::PopulateWithExamples () pg->Append( new wxEnumProperty(wxT("EnumProperty 3"),wxPG_LABEL, soc, 240 ) ); + // 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 ) ); @@ -1642,6 +1694,9 @@ void FormMain::PopulateWithExamples () 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_); //pg->SetPropertyValidator( wxT("EditEnumProperty"), validator1 ); @@ -1787,15 +1842,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) ); \ @@ -1804,6 +1878,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 ) @@ -1841,7 +1919,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 ) @@ -2104,10 +2181,19 @@ void FormMain::CreateGrid( int style, int extraStyle ) pgman->SetExtraStyle(extraStyle); - m_pPropGridManager->SetValidationFailureBehavior( wxPG_VFB_BEEP | wxPG_VFB_MARK_CELL | wxPG_VFB_SHOW_MESSAGE ); + // This is the default validation failure behavior + 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 @@ -2201,18 +2287,25 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size menuTools1->AppendSeparator(); 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_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(); @@ -2238,6 +2331,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(); @@ -2251,6 +2347,9 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size 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") ); @@ -2291,6 +2390,14 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size #endif // wxUSE_STATUSBAR FinalizeFramePosition(); + +#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() @@ -2575,6 +2682,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(); @@ -2640,36 +2766,29 @@ 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 ) ) - { - m_pPropGridManager->HideProperty( id, true ); - m_itemEnable->SetItemLabel( wxT("Show") ); - } - else - { - m_pPropGridManager->HideProperty( id, false ); - m_itemEnable->SetItemLabel( wxT("Hide") ); - } - - wxPropertyGridPage* curPage = m_pPropGridManager->GetCurrentPage(); - - // Check for bottomY precalculation validity - unsigned int byPre = curPage->GetVirtualHeight(); - unsigned int byAct = curPage->GetActualVirtualHeight(); +// ----------------------------------------------------------------------- - if ( byPre != byAct ) +void FormMain::OnHide( wxCommandEvent& WXUNUSED(event) ) +{ + wxPGProperty* id = m_pPropGridManager->GetGrid()->GetSelection(); + if ( !id ) { - wxLogDebug(wxT("VirtualHeight is %u, should be %u"), byPre, byAct); + wxMessageBox(wxT("First select a property.")); + return; } + + m_pPropGridManager->HideProperty( id, true ); } // ----------------------------------------------------------------------- @@ -2801,6 +2920,14 @@ void FormMain::OnEnableLabelEditing( wxCommandEvent& WXUNUSED(event) ) // ----------------------------------------------------------------------- +void FormMain::OnShowHeader( wxCommandEvent& event ) +{ + m_pPropGridManager->ShowHeader(event.IsChecked()); + m_pPropGridManager->SetColumnTitle(2, _("Units")); +} + +// ----------------------------------------------------------------------- + void FormMain::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxString msg; @@ -2923,8 +3050,8 @@ void FormMain::OnCatColours( wxCommandEvent& event ) void FormMain::OnSelectStyle( wxCommandEvent& WXUNUSED(event) ) { - int style; - int extraStyle; + int style = 0; + int extraStyle = 0; { wxArrayString chs;