wxMenu::callback stuff taken inside WXWIN_COMPATIBILITY_2 (everybody should

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

diff --git a/include/wx/control.h b/include/wx/control.h
index 47c78785c51cab9a071d2bb32cfeb1deadf32a3f..bfdda99063859b2fdf4d29081b2f6bdef1eacf7a 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -34,16 +34,34 @@ 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);
 
+    // an overloaded version for the controls without validators
+    bool CreateControl(wxWindowBase *parent,
+                       wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxString& name)
+    {
+        return CreateControl(parent, id, pos, size, style,
+                             wxDefaultValidator, name);
+    }
+
     // inherit colour and font settings from the parent window
     void InheritAttributes();
 };