tons of wxFTP fixes and compilation fix for wxBase

[wxWidgets.git] / include / wx / os2 / textctrl.h

diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index 7bf7bdb077b30528039e16f3fa5386dca5d05163..7f819fe260142cffd3367116c16cf07b16de0465 100644 (file)
--- a/include/wx/os2/textctrl.h
+++ b/include/wx/os2/textctrl.h
@@ -24,7 +24,9 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
+#if wxUSE_VALIDATORS
                const wxValidator& validator = wxDefaultValidator,
+#endif
                const wxString& name = wxTextCtrlNameStr)
     {
         Create(parent, id, value, pos, size, style, validator, name);
@@ -35,7 +37,9 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
+#if wxUSE_VALIDATORS
                 const wxValidator& validator = wxDefaultValidator,
+#endif
                 const wxString& name = wxTextCtrlNameStr);
 
     // implement base class pure virtuals
@@ -142,7 +146,7 @@ protected:
     // limit is big enough)
     void AdjustSpaceLimit();
 
-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;
 
 private:
     DECLARE_EVENT_TABLE()