Remove use of wxPG_EDITOR macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -92,7 +92,7 @@ public:
|
||||
|
||||
/**
|
||||
Returns pointer to the name of the editor. For example,
|
||||
wxPG_EDITOR(TextCtrl) has name "TextCtrl". This method is autogenerated
|
||||
wxPGEditor_TextCtrl has name "TextCtrl". This method is autogenerated
|
||||
for custom editors.
|
||||
*/
|
||||
virtual wxString GetName() const = 0;
|
||||
|
@@ -427,7 +427,7 @@ enum wxPG_SETVALUE_FLAGS
|
||||
|
||||
#ifndef SWIG
|
||||
|
||||
// Editor accessor.
|
||||
// Editor accessor (for backwards compatiblity use only).
|
||||
#define wxPG_EDITOR(T) wxPGEditor_##T
|
||||
|
||||
// Declare editor class, with optional part.
|
||||
|
@@ -169,9 +169,9 @@ void CLASSNAME::Init( wxColour colour ) \
|
||||
wxString CLASSNAME::GetValueAsString( int argFlags ) const \
|
||||
{ \
|
||||
const wxPGEditor* editor = GetEditorClass(); \
|
||||
if ( editor != wxPG_EDITOR(Choice) && \
|
||||
editor != wxPG_EDITOR(ChoiceAndButton) && \
|
||||
editor != wxPG_EDITOR(ComboBox) ) \
|
||||
if ( editor != wxPGEditor_Choice && \
|
||||
editor != wxPGEditor_ChoiceAndButton && \
|
||||
editor != wxPGEditor_ComboBox ) \
|
||||
argFlags |= wxPG_PROPERTY_SPECIFIC; \
|
||||
return wxSystemColourProperty::GetValueAsString(argFlags); \
|
||||
} \
|
||||
|
Reference in New Issue
Block a user