tons of wxFTP fixes and compilation fix for wxBase

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

diff --git a/include/wx/control.h b/include/wx/control.h
index 6f5999c7bc7068b08c0738427e94127f460c27f3..7b1d491309475276824f16719b4cc82f132436fe 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -41,25 +41,14 @@ protected:
                        const wxPoint& pos,
                        const wxSize& size,
                        long style,
                        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();

+
+    // initialize the common fields of wxCommandEvent
+    void InitCommandEvent(wxCommandEvent& event) const;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------