Remove use of wxPG_EDITOR macro

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h
index daa34f2e7a052864fc8e2c948b2b1ef5c22685a8..d9d6b0729dfea486973e843b6bd2a01a53d294ac 100644 (file)
--- a/include/wx/propgrid/editors.h
+++ b/include/wx/propgrid/editors.h
@@ -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;

diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h
index 729da9038170df197313dda0e4ae33240f85584e..54ffdb262a152dcc6c374dc0b8af52c5f422a32e 100644 (file)
--- a/include/wx/propgrid/propgriddefs.h
+++ b/include/wx/propgrid/propgriddefs.h
@@ -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.

diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index 5c381150561558e992a3d2919fd070cf9dad3197..903d8313292989c69dd1a40753b6a20454ef09e8 100644 (file)
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -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); \
 } \

diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index a9ab7a67a22fe8e57b20001c66e07919b8bc62a0..2f0f236f8e690058287ec796b454450295971c60 100644 (file)
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -1113,7 +1113,7 @@ wxPGWindowList wxPGChoiceAndButtonEditor::CreateControls( wxPropertyGrid* propGr
     ch_sz.x -= wxPG_TEXTCTRL_AND_BUTTON_SPACING;
 #endif
 
-    wxWindow* ch = wxPG_EDITOR(Choice)->CreateControls(propGrid,property,
+    wxWindow* ch = wxPGEditor_Choice->CreateControls(propGrid,property,
         pos,ch_sz).m_primary;
 
 #ifdef __WXMSW__

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

diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index eaf5dcd20841007ca64eaf97af2c3303738cdb82..ba0c468b1aaaa5f5b3e6da9c4722be79b754e60f 100644 (file)
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -747,10 +747,10 @@ const wxPGEditor* wxBoolProperty::DoGetEditorClass() const
     // Select correct editor control.
 #if wxPG_INCLUDE_CHECKBOX
     if ( !(m_flags & wxPG_PROP_USE_CHECKBOX) )
-        return wxPG_EDITOR(Choice);
-    return wxPG_EDITOR(CheckBox);
+        return wxPGEditor_Choice;
+    return wxPGEditor_CheckBox;
 #else
-    return wxPG_EDITOR(Choice);
+    return wxPGEditor_Choice;
 #endif
 }