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

Eliminated WX_PG_DECLARE/IMPLEMENT_DERIVED_PROPERTY_CLASS

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

16
include/wx/propgrid/props.h
View File

@@ -36,14 +36,6 @@ WX_PG_IMPLEMENT_PROPERTY_CLASS_PLAIN(NAME,T,EDITOR)
#define WX_PG_IMPLEMENT_PROPERTY_CLASS(NAME,UPNAME,T,T_AS_ARG,EDITOR) \ #define WX_PG_IMPLEMENT_PROPERTY_CLASS(NAME,UPNAME,T,T_AS_ARG,EDITOR) \
WX_PG_IMPLEMENT_PROPERTY_CLASS2(NAME,NAME,UPNAME,T,T_AS_ARG,EDITOR) WX_PG_IMPLEMENT_PROPERTY_CLASS2(NAME,NAME,UPNAME,T,T_AS_ARG,EDITOR)
#define WX_PG_DECLARE_DERIVED_PROPERTY_CLASS(CLASSNAME) \
DECLARE_DYNAMIC_CLASS(CLASSNAME)
// Derived property class is one that inherits from an existing working property
// class, but assumes same value and editor type.
#define WX_PG_IMPLEMENT_DERIVED_PROPERTY_CLASS(NAME,UPNAME,T_AS_ARG) \
IMPLEMENT_DYNAMIC_CLASS(NAME, UPNAME)
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
#define wxPG_NO_ESCAPE wxPG_PROP_NO_ESCAPE // No escape sequences #define wxPG_NO_ESCAPE wxPG_PROP_NO_ESCAPE // No escape sequences
@@ -52,7 +44,7 @@ IMPLEMENT_DYNAMIC_CLASS(NAME, UPNAME)
#define WX_PG_DECLARE_STRING_PROPERTY_WITH_DECL(NAME, DECL) \ #define WX_PG_DECLARE_STRING_PROPERTY_WITH_DECL(NAME, DECL) \
DECL NAME : public wxLongStringProperty \ DECL NAME : public wxLongStringProperty \
{ \ { \
WX_PG_DECLARE_DERIVED_PROPERTY_CLASS(NAME) \ DECLARE_DYNAMIC_CLASS(NAME) \
public: \ public: \
NAME( const wxString& name = wxPG_LABEL, \ NAME( const wxString& name = wxPG_LABEL, \
const wxString& label = wxPG_LABEL, \ const wxString& label = wxPG_LABEL, \
@@ -66,8 +58,7 @@ public: \
WX_PG_DECLARE_STRING_PROPERTY_WITH_DECL(NAME, class) \ WX_PG_DECLARE_STRING_PROPERTY_WITH_DECL(NAME, class) \
#define WX_PG_IMPLEMENT_STRING_PROPERTY_WITH_VALIDATOR(NAME, FLAGS) \ #define WX_PG_IMPLEMENT_STRING_PROPERTY_WITH_VALIDATOR(NAME, FLAGS) \
WX_PG_IMPLEMENT_DERIVED_PROPERTY_CLASS(NAME,wxLongStringProperty,\ IMPLEMENT_DYNAMIC_CLASS(NAME,wxLongStringProperty) \
const wxString&) \
NAME::NAME( const wxString& name, \ NAME::NAME( const wxString& name, \
const wxString& label, \ const wxString& label, \
const wxString& value ) \ const wxString& value ) \
@@ -160,8 +151,7 @@ WX_PG_DECLARE_CUSTOM_COLOUR_PROPERTY_WITH_DECL(CLASSNAME, class)
#define WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY(CLASSNAME,\ #define WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY(CLASSNAME,\
LABELS,VALUES,COLOURS) \ LABELS,VALUES,COLOURS) \
static wxPGChoices gs_##CLASSNAME##_choicesCache; \ static wxPGChoices gs_##CLASSNAME##_choicesCache; \
WX_PG_IMPLEMENT_DERIVED_PROPERTY_CLASS(CLASSNAME, wxSystemColourProperty, \ IMPLEMENT_DYNAMIC_CLASS(CLASSNAME, wxSystemColourProperty) \
const wxColourPropertyValue&) \
CLASSNAME::CLASSNAME( const wxString& label, const wxString& name, \ CLASSNAME::CLASSNAME( const wxString& label, const wxString& name, \
const wxColourPropertyValue& value ) \ const wxColourPropertyValue& value ) \
: wxSystemColourProperty(label, name, LABELS, VALUES, \ : wxSystemColourProperty(label, name, LABELS, VALUES, \

4
src/propgrid/advprops.cpp
View File

@@ -1551,9 +1551,7 @@ const wxString& wxPGGetDefaultImageWildcard()
return wxPGGlobalVars->m_pDefaultImageWildcard; return wxPGGlobalVars->m_pDefaultImageWildcard;
} }
WX_PG_IMPLEMENT_DERIVED_PROPERTY_CLASS(wxImageFileProperty, IMPLEMENT_DYNAMIC_CLASS(wxImageFileProperty, wxFileProperty)
wxFileProperty,
const wxString&)
wxImageFileProperty::wxImageFileProperty( const wxString& label, const wxString& name, wxImageFileProperty::wxImageFileProperty( const wxString& label, const wxString& name,
const wxString& value ) const wxString& value )

2
src/propgrid/props.cpp
View File

@@ -1534,7 +1534,7 @@ void wxFlagsProperty::ChildChanged( wxVariant& thisValue, int childIndex, wxVari
// wxDirProperty // wxDirProperty
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
WX_PG_IMPLEMENT_DERIVED_PROPERTY_CLASS(wxDirProperty,wxLongStringProperty,const wxString&) IMPLEMENT_DYNAMIC_CLASS(wxDirProperty, wxLongStringProperty)
wxDirProperty::wxDirProperty( const wxString& name, const wxString& label, const wxString& value ) wxDirProperty::wxDirProperty( const wxString& name, const wxString& label, const wxString& value )
: wxLongStringProperty(name,label,value) : wxLongStringProperty(name,label,value)