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

Removed macros to create enum and flag props with custom, static choice sets. Now use wxPGProperty::SetChoices() instead.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-09-19 17:39:09 +00:00
parent d53f610c1c
commit d577449426
4 changed files with 12 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
samples/propgrid/tests.cpp
View File

@@ -27,15 +27,6 @@
#include "sampleprops.h"
// -----------------------------------------------------------------------
// Declare custom test properties
// -----------------------------------------------------------------------
WX_PG_DECLARE_CUSTOM_FLAGS_PROPERTY(wxTestCustomFlagsProperty)
WX_PG_DECLARE_CUSTOM_ENUM_PROPERTY(wxTestCustomEnumProperty)
// -----------------------------------------------------------------------
// wxTestCustomFlagsProperty
// -----------------------------------------------------------------------
@@ -73,18 +64,6 @@ static const long _fs_framestyle_values[] = {
wxFRAME_SHAPED
};
WX_PG_IMPLEMENT_CUSTOM_FLAGS_PROPERTY(wxTestCustomFlagsProperty,
_fs_framestyle_labels,
_fs_framestyle_values,
wxDEFAULT_FRAME_STYLE)
WX_PG_IMPLEMENT_CUSTOM_ENUM_PROPERTY(wxTestCustomEnumProperty,
_fs_framestyle_labels,
_fs_framestyle_values,
wxCAPTION)
// Colour labels. Last (before NULL, if any) must be Custom.
static const wxChar* mycolprop_labels[] = {
wxT("Black"),
@@ -243,11 +222,6 @@ public:
void FormMain::AddTestProperties( wxPropertyGridPage* pg )
{
pg->Append( new wxTestCustomFlagsProperty(wxT("Custom FlagsProperty"), wxPG_LABEL ) );
pg->SetPropertyEditor( wxT("Custom FlagsProperty"), wxPG_EDITOR(TextCtrlAndButton) );
pg->Append( new wxTestCustomEnumProperty(wxT("Custom EnumProperty"), wxPG_LABEL ) );
pg->Append( new wxMyColourProperty(wxT("CustomColourProperty1")) );
pg->SetPropertyHelpString(wxT("CustomColourProperty1"),