Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxPGEditor_X instead of wxPGEditor(X), as in new docs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-10-05 14:23:28 +00:00
parent 858ad6708d
commit 58f43b41b1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/propgrid/propgrid.cpp
View File

@@ -609,7 +609,7 @@ public:
// Set editor to have button // Set editor to have button
virtual const wxPGEditor* DoGetEditorClass() const virtual const wxPGEditor* DoGetEditorClass() const
{ {
return wxPG_EDITOR(TextCtrlAndButton); return wxPGEditor_TextCtrlAndButton;
} }
// Set what happens on button click // Set what happens on button click
@@ -1368,7 +1368,7 @@ void FormMain::PopulateWithExamples ()
#if wxUSE_SPINBTN #if wxUSE_SPINBTN
pg->Append( new wxIntProperty ( wxT("SpinCtrl"), wxPG_LABEL, 0 ) ); 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_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)10 ); // for reduced binary size.
pg->SetPropertyAttribute( wxT("SpinCtrl"), wxT("Step"), (long)2 ); pg->SetPropertyAttribute( wxT("SpinCtrl"), wxT("Step"), (long)2 );
@@ -1376,7 +1376,7 @@ void FormMain::PopulateWithExamples ()
pg->SetPropertyHelpString( wxT("SpinCtrl"), pg->SetPropertyHelpString( wxT("SpinCtrl"),
wxT("This is regular wxIntProperty, which editor has been ") 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("static wxPropertyGrid::RegisterAdditionalEditors() ")
wxT("needs to be called prior to using it.")); wxT("needs to be called prior to using it."));
@@ -1437,11 +1437,11 @@ void FormMain::PopulateWithExamples ()
pid = pg->Append( new wxColourProperty(wxT("ColourProperty"),wxPG_LABEL,*wxRED) ); pid = pg->Append( new wxColourProperty(wxT("ColourProperty"),wxPG_LABEL,*wxRED) );
//pg->SetPropertyAttribute(pid,wxPG_COLOUR_ALLOW_CUSTOM,false); //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->GetProperty(wxT("ColourProperty"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED);
pg->SetPropertyHelpString( wxT("ColourProperty"), pg->SetPropertyHelpString( wxT("ColourProperty"),
wxT("wxPropertyGrid::SetPropertyEditor method has been used to change ") 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 // This demonstrates using alternative editor for colour property
@@ -2616,7 +2616,7 @@ void FormMain::OnSetSpinCtrlEditorClick( wxCommandEvent& WXUNUSED(event) )
#if wxUSE_SPINBTN #if wxUSE_SPINBTN
wxPGProperty* pgId = m_pPropGridManager->GetSelection(); wxPGProperty* pgId = m_pPropGridManager->GetSelection();
if ( pgId ) if ( pgId )
m_pPropGridManager->SetPropertyEditor( pgId, wxPG_EDITOR(SpinCtrl) ); m_pPropGridManager->SetPropertyEditor( pgId, wxPGEditor_SpinCtrl );
else else
wxMessageBox(wxT("First select a property")); wxMessageBox(wxT("First select a property"));
#endif #endif

2
samples/propgrid/tests.cpp
View File

@@ -238,7 +238,7 @@ void FormMain::AddTestProperties( wxPropertyGridPage* pg )
pg->Append( new MyColourProperty3(wxT("CustomColourProperty3"), wxPG_LABEL, *wxGREEN) ); pg->Append( new MyColourProperty3(wxT("CustomColourProperty3"), wxPG_LABEL, *wxGREEN) );
pg->GetProperty(wxT("CustomColourProperty3"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED); pg->GetProperty(wxT("CustomColourProperty3"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED);
pg->SetPropertyEditor( wxT("CustomColourProperty3"), wxPG_EDITOR(ComboBox) ); pg->SetPropertyEditor( wxT("CustomColourProperty3"), wxPGEditor_ComboBox );
pg->SetPropertyHelpString(wxT("CustomColourProperty3"), pg->SetPropertyHelpString(wxT("CustomColourProperty3"),
wxT("This is a MyColourProperty3 from the sample app. ") wxT("This is a MyColourProperty3 from the sample app. ")