// Author: Jaakko Salli
// Modified by:
// Created: 2004-09-25
-// RCS-ID: $Id:
+// RCS-ID: $Id$
// Copyright: (c) Jaakko Salli
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
//
// * 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".
// * 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"
#include "wx/wx.h"
#endif
+#if !wxUSE_PROPGRID
+ #error "Please set wxUSE_PROPGRID to 1 and rebuild the library."
+#endif
+
#include <wx/numdlg.h>
// -----------------------------------------------------------------------
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,
// 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;
{
wxPGMultiButton* buttons = (wxPGMultiButton*) propGrid->GetEditorControlSecondary();
+ if ( event.GetId() == buttons->GetButtonId(0) )
+ {
+ // Do something when first button is pressed
+ wxLogDebug("First button pressed");
+ return true;
+ }
if ( event.GetId() == buttons->GetButtonId(1) )
{
- wxMessageBox(wxT("Second button was pressed"));
+ // Do something when second button is pressed
+ wxLogDebug("Second button pressed");
return true;
}
if ( event.GetId() == buttons->GetButtonId(2) )
{
- wxMessageBox(wxT("Third button was pressed"));
+ // Do something when third button is pressed
+ wxLogDebug("Third button pressed");
return true;
}
}
if ( imagename.length() )
{
+ wxFileName filename = GetFileName();
size_t prevCount = g_myImageArray.GetCount();
int index = ms_choices.Index(imagename);
if ( index == wxNOT_FOUND )
{
ms_choices.Add( imagename );
- g_myImageArray.Add( new wxMyImageInfo( m_filename.GetFullPath() ) );
+ g_myImageArray.Add( new wxMyImageInfo( filename.GetFullPath() ) );
index = g_myImageArray.GetCount() - 1;
}
if ( !g_myImageArray[index].m_pThumbnail2 )
{
// Load if file exists.
- if ( m_filename.FileExists() )
- m_pImage = new wxImage( m_filename.GetFullPath() );
+ if ( filename.FileExists() )
+ m_pImage = new wxImage( filename.GetFullPath() );
}
m_index = index;
m_index = -1;
}
-int wxAdvImageFileProperty::GetChoiceInfo( wxPGChoiceInfo* choiceinfo )
-{
- if ( choiceinfo )
- choiceinfo->m_choices = &ms_choices;
-
- return m_index;
-}
-
bool wxAdvImageFileProperty::IntToValue( wxVariant& variant, int number, int WXUNUSED(argFlags) ) const
{
wxASSERT( number >= 0 );
if ( !mii.m_pThumbnail2 )
{
+ wxFileName filename = GetFileName();
if ( !m_pImage || !m_pImage->Ok() ||
- m_filename != mii.m_path
+ filename != mii.m_path
)
{
if ( m_pImage )
: 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) );
: 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) );
// Set editor to have button
virtual const wxPGEditor* DoGetEditorClass() const
{
- return wxPG_EDITOR(TextCtrlAndButton);
+ return wxPGEditor_TextCtrlAndButton;
}
// Set what happens on button click
ID_COLOURSCHEME2,
ID_COLOURSCHEME3,
ID_CATCOLOURS,
- ID_SETCOLOUR,
+ ID_SETBGCOLOUR,
+ ID_SETBGCOLOURRECUR,
ID_STATICLAYOUT,
- ID_CLEAR,
ID_POPULATE1,
ID_POPULATE2,
ID_COLLAPSE,
EVT_MENU( ID_DELETEALL, FormMain::OnClearClick )
EVT_MENU( ID_ENABLE, FormMain::OnEnableDisable )
EVT_MENU( ID_HIDE, FormMain::OnHideShow )
+
EVT_MENU( ID_ITERATE1, FormMain::OnIterate1Click )
EVT_MENU( ID_ITERATE2, FormMain::OnIterate2Click )
EVT_MENU( ID_ITERATE3, FormMain::OnIterate3Click )
EVT_MENU( ID_ITERATE4, FormMain::OnIterate4Click )
- EVT_MENU( ID_SETCOLOUR, FormMain::OnMisc )
+ EVT_MENU( ID_SETBGCOLOUR, FormMain::OnSetBackgroundColour )
+ EVT_MENU( ID_SETBGCOLOURRECUR, FormMain::OnSetBackgroundColour )
EVT_MENU( ID_CLEARMODIF, FormMain::OnClearModifyStatusClick )
EVT_MENU( ID_FREEZE, FormMain::OnFreezeClick )
EVT_MENU( ID_DUMPLIST, FormMain::OnDumpList )
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 )
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();
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();
void FormMain::OnPropertyGridButtonClick ( wxCommandEvent& )
{
#if wxUSE_STATUSBAR
- wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty();
+ wxPGProperty* prop = m_pPropGridManager->GetSelection();
wxStatusBar* sb = GetStatusBar();
if ( prop )
{
void FormMain::OnEnableCommonValues(wxCommandEvent& WXUNUSED(event))
{
- wxPGProperty* prop = m_pPropGridManager->GetSelectedProperty();
+ wxPGProperty* prop = m_pPropGridManager->GetSelection();
if ( prop )
prop->EnableCommonValue();
else
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.") );
#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."));
// 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"));
pid = pg->Append( new wxColourProperty(wxT("ColourProperty"),wxPG_LABEL,*wxRED) );
//pg->SetPropertyAttribute(pid,wxPG_COLOUR_ALLOW_CUSTOM,false);
- pg->SetPropertyEditor( wxT("ColourProperty"), wxPG_EDITOR(ComboBox) );
+ pg->SetPropertyEditor( wxT("ColourProperty"), wxPGEditor_ComboBox );
pg->GetProperty(wxT("ColourProperty"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED);
pg->SetPropertyHelpString( wxT("ColourProperty"),
wxT("wxPropertyGrid::SetPropertyEditor method has been used to change ")
- wxT("editor of this property to wxPG_EDITOR(ComboBox)"));
+ wxT("editor of this property to wxPGEditor_ComboBox)"));
//
// This demonstrates using alternative editor for colour property
wxPG_LABEL,
soc,
240) );
- pg->AddPropertyChoice(wxT("EnumProperty 2"),wxT("Testing Extra"),360);
+ pg->GetProperty(wxT("EnumProperty 2"))->AddChoice(wxT("Testing Extra"), 360);
- // Add a second time to test that the caching works
- pg->Append( new wxEnumProperty(wxT("EnumProperty 3"),wxPG_LABEL,
- soc, 360 ) );
- pg->SetPropertyHelpString(wxT("EnumProperty 3"),
+ // 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,
pg->Append( new wxEnumProperty(wxT("EnumProperty 5"),wxPG_LABEL,
soc, 240 ) );
- pg->SetPropertyChoicesExclusive(wxT("EnumProperty 5"));
- pg->AddPropertyChoice(wxT("EnumProperty 5"),wxT("5th only"),360);
+ pg->GetProperty(wxT("EnumProperty 5"))->SetChoicesExclusive();
+ pg->GetProperty(wxT("EnumProperty 5"))->AddChoice(wxT("5th only"), 360);
+
pg->SetPropertyHelpString(wxT("EnumProperty 5"),
wxT("Should have one extra item when compared to EnumProperty 4"));
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 );
#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
//
// This snippet is a doc sample test
//
- pid = pg->Append( new wxStringProperty(wxT("Car"),wxPG_LABEL,wxT("<composed>")) );
+ wxPGProperty* carProp = pg->Append(new wxStringProperty(wxT("Car"),
+ wxPG_LABEL,
+ wxT("<composed>")));
- 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("<composed>")) );
- 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("<composed>")));
- 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")) );
//
// Test how non-editable composite strings appear
- pid = pg->Append( new wxStringProperty(wxT("wxWidgets Traits"), wxPG_LABEL, wxT("<composed>")) );
+ pid = new wxStringProperty(wxT("wxWidgets Traits"), wxPG_LABEL, wxT("<composed>"));
pg->SetPropertyReadOnly(pid);
- pg->AppendIn(pid, new wxStringProperty(wxT("Latest Release"), wxPG_LABEL, wxT("2.8.8")) );
- pg->AppendIn(pid, new wxBoolProperty(wxT("Win API"), wxPG_LABEL, true) );
+ //
+ // For testing purposes, combine two methods of adding children
+ //
+
+ // AddChild() requires that we call this
+ pid->SetParentalType(wxPG_PROP_MISC_PARENT);
+
+ pid->AddChild( new wxStringProperty(wxT("Latest Release"), wxPG_LABEL, wxT("2.8.8")));
+ pid->AddChild( new wxBoolProperty(wxT("Win API"), wxPG_LABEL, true) );
+
+ pg->Append( pid );
+
pg->AppendIn(pid, new wxBoolProperty(wxT("QT"), wxPG_LABEL, false) );
pg->AppendIn(pid, new wxBoolProperty(wxT("Cocoa"), wxPG_LABEL, true) );
pg->AppendIn(pid, new wxBoolProperty(wxT("BeOS"), wxPG_LABEL, false) );
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
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()
//wxPG_TOOLTIPS |
//wxPG_HIDE_CATEGORIES |
//wxPG_LIMITED_EDITING |
- wxTAB_TRAVERSAL |
wxPG_TOOLBAR |
wxPG_DESCRIPTION;
/*
// 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 );
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 |
//wxPG_TOOLTIPS |
//wxPG_HIDE_CATEGORIES |
//wxPG_LIMITED_EDITING |
- wxTAB_TRAVERSAL |
wxPG_TOOLBAR |
wxPG_DESCRIPTION,
// extra style
//| wxPG_EX_HELP_AS_TOOLTIPS
);
- // Register all editors (SpinCtrl etc.)
- m_pPropGridManager->RegisterAdditionalEditors();
-
//
// Create menubar
wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
menuTools1->Append(ID_DELETER, wxT("Delete Random") );
menuTools1->Append(ID_DELETEALL, wxT("Delete All") );
menuTools1->AppendSeparator();
- menuTools1->Append(ID_SETCOLOUR, wxT("Set Bg Colour") );
+ menuTools1->Append(ID_SETBGCOLOUR, wxT("Set Bg Colour") );
+ menuTools1->Append(ID_SETBGCOLOURRECUR, wxT("Set Bg Colour (Recursively)") );
menuTools1->Append(ID_UNSPECIFY, wxT("Set to Unspecified") );
- menuTools1->Append(ID_CLEAR, wxT("Set Value to Default") );
menuTools1->AppendSeparator();
m_itemEnable = menuTools1->Append(ID_ENABLE, wxT("Enable"),
wxT("Toggles item's enabled state.") );
SetStatusText(wxEmptyString);
#endif // wxUSE_STATUSBAR
+ FinalizeFramePosition();
+}
- //
- // Finalize
- //
+void FormMain::FinalizeFramePosition()
+{
+ wxSize frameSize((wxSystemSettings::GetMetric(wxSYS_SCREEN_X)/10)*4,
+ (wxSystemSettings::GetMetric(wxSYS_SCREEN_Y)/10)*8);
+
+ if ( frameSize.x > 500 )
+ frameSize.x = 500;
+
+ SetSize(frameSize);
- SetSize(
- (wxSystemSettings::GetMetric(wxSYS_SCREEN_X)/10)*4,
- (wxSystemSettings::GetMetric(wxSYS_SCREEN_Y)/10)*8
- );
Centre();
}
{
wxString propLabel;
- if ( !m_pPropGridManager->GetChildrenCount() )
+ if ( !m_pPropGridManager->GetGrid()->GetRoot()->GetChildCount() )
{
wxMessageBox(wxT("No items to relate - first add some with Append."));
return;
GenerateUniquePropertyLabel( m_pPropGridManager, propLabel );
m_pPropGridManager->Insert( m_pPropGridManager->GetPropertyParent(id),
- m_pPropGridManager->GetPropertyIndex(id),
- new wxStringProperty(propLabel) );
+ id->GetIndexInParent(),
+ new wxStringProperty(propLabel) );
}
{
wxString propLabel;
- if ( !m_pPropGridManager->GetChildrenCount() )
+ if ( !m_pPropGridManager->GetGrid()->GetRoot()->GetChildCount() )
{
wxMessageBox(wxT("No items to relate - first add some with Append."));
return;
GenerateUniquePropertyLabel( m_pPropGridManager, propLabel );
m_pPropGridManager->Insert( m_pPropGridManager->GetPropertyParent(id),
- m_pPropGridManager->GetPropertyIndex(id),
- new wxPropertyCategory (propLabel) );
-
+ id->GetIndexInParent(),
+ new wxPropertyCategory (propLabel) );
}
// -----------------------------------------------------------------------
void FormMain::OnChangeFlagsPropItemsClick( wxCommandEvent& WXUNUSED(event) )
{
-
- wxPGProperty* id = m_pPropGridManager->GetPropertyByName(wxT("Window Styles"));
+ wxPGProperty* p = m_pPropGridManager->GetPropertyByName(wxT("Window Styles"));
wxPGChoices newChoices;
newChoices.Add(wxT("Safe"),0x4);
newChoices.Add(wxT("Sleek"),0x8);
- m_pPropGridManager->SetPropertyChoices(id,newChoices);
- //m_pPropGridManager->ReplaceProperty(wxT("Window Styles"),
- // wxFlagsProperty(wxT("Window Styles"),wxPG_LABEL,newChoices));
+ p->SetChoices(newChoices);
}
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
+#include "wx/colordlg.h"
+
+void
+FormMain::OnSetBackgroundColour( wxCommandEvent& event )
+{
+ wxPropertyGrid* pg = m_pPropGridManager->GetGrid();
+ wxPGProperty* prop = pg->GetSelection();
+ if ( !prop )
+ {
+ wxMessageBox(wxT("First select a property."));
+ return;
+ }
+
+ wxColour col = ::wxGetColourFromUser(this, *wxWHITE, "Choose colour");
+
+ if ( col.IsOk() )
+ {
+ bool recursively = (event.GetId()==ID_SETBGCOLOURRECUR) ? true : false;
+ pg->SetPropertyBackgroundColour(prop, col, recursively);
+ }
+}
+
+// -----------------------------------------------------------------------
+
void FormMain::OnInsertPage( wxCommandEvent& WXUNUSED(event) )
{
m_pPropGridManager->AddPage(wxT("New Page"));
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
void FormMain::OnTestReplaceClick( wxCommandEvent& WXUNUSED(event) )
{
- wxPGProperty* pgId = m_pPropGridManager->GetSelectedProperty();
+ wxPGProperty* pgId = m_pPropGridManager->GetSelection();
if ( pgId )
{
wxPGChoices choices;
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)
wxMultiChoiceDialog dlg( this, wxT("Select extra window styles to use"),
wxT("wxPropertyGrid Extra Style"), chs );
dlg.SetSelections(sel);
CreateGrid( style, extraStyle );
- SetSize(
- (wxSystemSettings::GetMetric(wxSYS_SCREEN_X)/10)*4,
- (wxSystemSettings::GetMetric(wxSYS_SCREEN_Y)/10)*8
- );
- Centre();
+ FinalizeFramePosition();
}
// -----------------------------------------------------------------------
wxPropertyGrid* pg = m_pPropGridManager->GetGrid();
wxPGProperty* selected = pg->GetSelection();
- wxPGChoices& choices = pg->GetPropertyChoices(selected);
+ const wxPGChoices& choices = selected->GetChoices();
// Insert new choice to the center of list
if ( choices.IsOk() )
{
int pos = choices.GetCount() / 2;
- pg->InsertPropertyChoice(selected,wxT("New Choice"),pos);
+ selected->InsertChoice(wxT("New Choice"), pos);
}
else
{
wxPropertyGrid* pg = m_pPropGridManager->GetGrid();
wxPGProperty* selected = pg->GetSelection();
- wxPGChoices& choices = pg->GetPropertyChoices(selected);
+ const wxPGChoices& choices = selected->GetChoices();
// Deletes choice from the center of list
if ( choices.IsOk() )
{
int pos = choices.GetCount() / 2;
- pg->DeletePropertyChoice(selected,pos);
+ selected->DeleteChoice(pos);
}
else
{
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;
else if ( id == ID_COLLAPSE )
{
// Collapses selected.
- wxPGProperty* id = m_pPropGridManager->GetSelectedProperty();
+ wxPGProperty* id = m_pPropGridManager->GetSelection();
if ( id )
{
m_pPropGridManager->Collapse(id);
}
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();
}
}
}
projects / wxWidgets.git / blobdiff