X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6fd0b424573e09ae7e83a28b225bbba008157b7..d5cc191c9cd48a915ce0dfc6e49511b2fddb6746:/samples/propgrid/propgrid.cpp?ds=inline diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index c413502b23..87ca762f84 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 ///////////////////////////////////////////////////////////////////////////// // @@ -68,6 +68,9 @@ #include +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" +#endif // ----------------------------------------------------------------------- // wxSampleMultiButtonEditor @@ -131,21 +134,21 @@ bool wxSampleMultiButtonEditor::OnEvent( wxPropertyGrid* propGrid, if ( event.GetId() == buttons->GetButtonId(0) ) { - // Do something when first button is pressed + // Do something when the first button is pressed wxLogDebug("First button pressed"); - return true; + return false; // Return false since value did not change } if ( event.GetId() == buttons->GetButtonId(1) ) { - // Do something when second button is pressed - wxLogDebug("Second button 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) ) { - // Do something when third button is pressed - wxLogDebug("Third button 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); @@ -195,267 +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() ) - { - wxFileName filename = GetFileName(); - 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( 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 ( filename.FileExists() ) - m_pImage = new wxImage( 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 ) - { - wxFileName filename = GetFileName(); - - if ( !m_pImage || !m_pImage->Ok() || - 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 // ----------------------------------------------------------------------- @@ -474,10 +216,9 @@ wxVectorProperty::wxVectorProperty( const wxString& label, : wxPGProperty(label,name) { SetValue( WXVARIANT(value) ); - SetParentalType(wxPG_PROP_AGGREGATE); - AddChild( new wxFloatProperty(wxT("X"),wxPG_LABEL,value.x) ); - AddChild( new wxFloatProperty(wxT("Y"),wxPG_LABEL,value.y) ); - AddChild( new wxFloatProperty(wxT("Z"),wxPG_LABEL,value.z) ); + 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 +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; @@ -501,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; } @@ -523,10 +268,9 @@ wxTriangleProperty::wxTriangleProperty( const wxString& label, : wxPGProperty(label,name) { SetValue( WXVARIANT(value) ); - SetParentalType(wxPG_PROP_AGGREGATE); - AddChild( new wxVectorProperty(wxT("A"),wxPG_LABEL,value.a) ); - AddChild( new wxVectorProperty(wxT("B"),wxPG_LABEL,value.b) ); - AddChild( new wxVectorProperty(wxT("C"),wxPG_LABEL,value.c) ); + 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() { } @@ -540,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; @@ -551,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; } @@ -574,7 +322,7 @@ public: wxString s = ::wxGetSingleChoice(wxT("Message"), wxT("Caption"), m_choices.GetLabels()); - if ( s.length() ) + if ( !s.empty() ) { SetValue(s); return true; @@ -635,6 +383,7 @@ enum ID_INSERTPROP, ID_INSERTCAT, ID_ENABLE, + ID_SETREADONLY, ID_HIDE, ID_DELETE, ID_DELETER, @@ -678,7 +427,11 @@ enum ID_SELECTSTYLE, ID_SAVESTATE, ID_RESTORESTATE, - ID_RUNMINIMAL + ID_RUNMINIMAL, + ID_ENABLELABELEDITING, + ID_VETOCOLDRAG, + ID_SHOWHEADER, + ID_ONEXTENDEDKEYNAV }; // ----------------------------------------------------------------------- @@ -704,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 ) // @@ -726,16 +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_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 ) @@ -883,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); } } @@ -900,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") ) { @@ -932,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 ); } } @@ -1009,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) ) { } @@ -1083,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()); } // ----------------------------------------------------------------------- @@ -1248,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 ); @@ -1259,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") ); @@ -1270,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) ); @@ -1304,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); @@ -1394,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"), @@ -1436,13 +1259,19 @@ 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"), 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)")); + 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 // to trigger colour dialog directly from button. @@ -1476,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 @@ -1494,27 +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. Also use - // short form of constructor list + SetChoices. - prop = new wxEnumProperty(wxT("EnumProperty 3"), wxPG_LABEL); - pg->Append( prop ); - prop->SetChoices(soc); - prop->SetValue(360); - pg->SetPropertyHelpString(prop, - wxT("Should have same choices as EnumProperty 2")); - - pg->Append( new wxEnumProperty(wxT("EnumProperty 4"),wxPG_LABEL, + // Here we only display the original 'soc' choices + pg->Append( new wxEnumProperty(wxT("EnumProperty 3"),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")) ); @@ -1538,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 }; @@ -1580,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_); @@ -1700,11 +1566,12 @@ void FormMain::PopulateWithExamples () // For testing purposes, combine two methods of adding children // - // AddChild() requires that we call this - pid->SetParentalType(wxPG_PROP_MISC_PARENT); - - pid->AddChild( new wxStringProperty(wxT("Latest Release"), wxPG_LABEL, wxT("2.8.8"))); - pid->AddChild( new wxBoolProperty(wxT("Win API"), wxPG_LABEL, true) ); + 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 ); @@ -1726,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) ); \ @@ -1743,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 ) @@ -1780,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 ) @@ -1895,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()); } @@ -1903,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()); } @@ -2011,7 +1900,8 @@ void FormMain::CreateGrid( int style, int extraStyle ) 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 @@ -2032,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 @@ -2072,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; @@ -2104,7 +2008,8 @@ FormMain::FormMain(const wxString& title, const wxPoint& pos, const wxSize& size 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 @@ -2119,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") ); @@ -2133,18 +2038,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(); @@ -2170,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(); @@ -2181,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") ); @@ -2221,6 +2141,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() @@ -2402,6 +2330,8 @@ void FormMain::OnContextMenu( wxContextMenuEvent& event ) wxLogDebug(wxT("FormMain::OnContextMenu(%i,%i)"), event.GetPosition().x,event.GetPosition().y); + wxUnusedVar(event); + //event.Skip(); } @@ -2503,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(); @@ -2568,36 +2517,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 ); } // ----------------------------------------------------------------------- @@ -2722,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; @@ -2746,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); } // ----------------------------------------------------------------------- @@ -2844,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; @@ -2863,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); @@ -2890,6 +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_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); @@ -3100,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 @@ -3120,7 +3083,7 @@ bool cxApplication::OnInit() } } - return true; + return true; } // -----------------------------------------------------------------------