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

Remove use of wxPG_EDITOR macro

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-10-06 15:38:30 +00:00
parent 75b6c4ce92
commit c26873c8ef
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/propgrid/editors.h
View File

@@ -92,7 +92,7 @@ public:
/** /**
Returns pointer to the name of the editor. For example, 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. for custom editors.
*/ */
virtual wxString GetName() const = 0; virtual wxString GetName() const = 0;

2
include/wx/propgrid/propgriddefs.h
View File

@@ -427,7 +427,7 @@ enum wxPG_SETVALUE_FLAGS
#ifndef SWIG #ifndef SWIG
// Editor accessor. // Editor accessor (for backwards compatiblity use only).
#define wxPG_EDITOR(T) wxPGEditor_##T #define wxPG_EDITOR(T) wxPGEditor_##T
// Declare editor class, with optional part. // Declare editor class, with optional part.

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

@@ -169,9 +169,9 @@ void CLASSNAME::Init( wxColour colour ) \
wxString CLASSNAME::GetValueAsString( int argFlags ) const \ wxString CLASSNAME::GetValueAsString( int argFlags ) const \
{ \ { \
const wxPGEditor* editor = GetEditorClass(); \ const wxPGEditor* editor = GetEditorClass(); \
if ( editor != wxPG_EDITOR(Choice) && \ if ( editor != wxPGEditor_Choice && \
editor != wxPG_EDITOR(ChoiceAndButton) && \ editor != wxPGEditor_ChoiceAndButton && \
editor != wxPG_EDITOR(ComboBox) ) \ editor != wxPGEditor_ComboBox ) \
argFlags |= wxPG_PROPERTY_SPECIFIC; \ argFlags |= wxPG_PROPERTY_SPECIFIC; \
return wxSystemColourProperty::GetValueAsString(argFlags); \ return wxSystemColourProperty::GetValueAsString(argFlags); \
} \ } \

2
src/propgrid/editors.cpp
View File

@@ -1113,7 +1113,7 @@ wxPGWindowList wxPGChoiceAndButtonEditor::CreateControls( wxPropertyGrid* propGr
ch_sz.x -= wxPG_TEXTCTRL_AND_BUTTON_SPACING; ch_sz.x -= wxPG_TEXTCTRL_AND_BUTTON_SPACING;
#endif #endif
wxWindow* ch = wxPG_EDITOR(Choice)->CreateControls(propGrid,property, wxWindow* ch = wxPGEditor_Choice->CreateControls(propGrid,property,
pos,ch_sz).m_primary; pos,ch_sz).m_primary;
#ifdef __WXMSW__ #ifdef __WXMSW__

6
src/propgrid/property.cpp
View File

@@ -880,7 +880,7 @@ void wxPGProperty::OnCustomPaint( wxDC& dc,
const wxPGEditor* wxPGProperty::DoGetEditorClass() const const wxPGEditor* wxPGProperty::DoGetEditorClass() const
{ {
return wxPG_EDITOR(TextCtrl); return wxPGEditor_TextCtrl;
} }
// Default extra property event handling - that is, none at all. // Default extra property event handling - that is, none at all.
@@ -1387,11 +1387,11 @@ const wxPGEditor* wxPGProperty::GetEditorClass() const
{ {
// TextCtrlAndButton -> ComboBoxAndButton // TextCtrlAndButton -> ComboBoxAndButton
if ( editor->IsKindOf(CLASSINFO(wxPGTextCtrlAndButtonEditor)) ) if ( editor->IsKindOf(CLASSINFO(wxPGTextCtrlAndButtonEditor)) )
editor = wxPG_EDITOR(ChoiceAndButton); editor = wxPGEditor_ChoiceAndButton;
// TextCtrl -> ComboBox // TextCtrl -> ComboBox
else if ( editor->IsKindOf(CLASSINFO(wxPGTextCtrlEditor)) ) else if ( editor->IsKindOf(CLASSINFO(wxPGTextCtrlEditor)) )
editor = wxPG_EDITOR(ComboBox); editor = wxPGEditor_ComboBox;
} }
return editor; return editor;

6
src/propgrid/props.cpp
View File

@@ -747,10 +747,10 @@ const wxPGEditor* wxBoolProperty::DoGetEditorClass() const
// Select correct editor control. // Select correct editor control.
#if wxPG_INCLUDE_CHECKBOX #if wxPG_INCLUDE_CHECKBOX
if ( !(m_flags & wxPG_PROP_USE_CHECKBOX) ) if ( !(m_flags & wxPG_PROP_USE_CHECKBOX) )
return wxPG_EDITOR(Choice); return wxPGEditor_Choice;
return wxPG_EDITOR(CheckBox); return wxPGEditor_CheckBox;
#else #else
return wxPG_EDITOR(Choice); return wxPGEditor_Choice;
#endif #endif
} }