compilation fix for builds when WXWIN_COMPATIBILITY_2 is not defined

[wxWidgets.git] / include / wx / control.h

diff --git a/include/wx/control.h b/include/wx/control.h
index 5b932502823275e82625ff38c4199fa91aac6597..7b1d491309475276824f16719b4cc82f132436fe 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -34,24 +34,21 @@ public:
     virtual void Command(wxCommandEvent &event);
 
 protected:
-    // creates the controls (invokes wxWindowBase::CreateBase) and adds it to
-    // the list of parents children
+    // creates the control (calls wxWindowBase::CreateBase inside) and adds it
+    // to the list of parents children
     bool CreateControl(wxWindowBase *parent,
                        wxWindowID id,
                        const wxPoint& pos,
                        const wxSize& size,
                        long style,
-#if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-                       const wxValidator* validator,
-#  else
                        const wxValidator& validator,
-#  endif
-#endif
                        const wxString& name);
 
     // inherit colour and font settings from the parent window
     void InheritAttributes();
+
+    // initialize the common fields of wxCommandEvent
+    void InitCommandEvent(wxCommandEvent& event) const;
 };
 
 // ----------------------------------------------------------------------------