X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d99be5f5381dad56492da02c2df1c3ec0750926..9739d9ee8090965862ba623b09a8fba731dc3d5c:/include/wx/control.h

diff --git a/include/wx/control.h b/include/wx/control.h
index 33d5486cb7..bfdda99063 100644
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -17,7 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma interface "choicebase.h"
+    #pragma interface "controlbase.h"
 #endif
 
 #include "wx/window.h"      // base class
@@ -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();
 };
@@ -62,6 +80,8 @@ protected:
     #include "wx/qt/control.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/control.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/control.h"
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/control.h"
 #endif