patch from Ricky Gonzales <gonzales@pyramid3.net> for the Unicode support for BC...

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

diff --git a/include/wx/control.h b/include/wx/control.h
index 5641eb3506fdb73ed539aa6ba853d0a68f44c5ab..6f5999c7bc7068b08c0738427e94127f460c27f3 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -17,7 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma interface "ctrlcmn.h"
+    #pragma interface "controlbase.h"

 #endif
 
 #include "wx/window.h"      // base class
 #endif
 
 #include "wx/window.h"      // base class


@@ -34,16 +34,30 @@ public:
     virtual void Command(wxCommandEvent &event);
 
 protected:
     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,
     bool CreateControl(wxWindowBase *parent,
                        wxWindowID id,
                        const wxPoint& pos,
                        const wxSize& size,
                        long style,

+#if wxUSE_VALIDATORS

                        const wxValidator& validator,
                        const wxValidator& validator,

+#endif

                        const wxString& name);
 
                        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();
 };
     // inherit colour and font settings from the parent window
     void InheritAttributes();
 };