X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0148fe1e2a2ea076bcd7a647c0b7946de0e0f990..f001799009630c46bc87aff5a84dbd2523005505:/include/wx/motif/control.h?ds=sidebyside

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index 9662c06ad1..d164e52485 100644
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -23,29 +23,28 @@
 #define wxControlNameStr _T("control")
 
 // General item class
-class WXDLLEXPORT wxControl: public wxWindow
+class WXDLLEXPORT wxControl: public wxControlBase
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 
 public:
     wxControl();
-    wxControl( wxWindow *parent,
-               wxWindowID id,
-               const wxPoint &pos = wxDefaultPosition,
-               const wxSize &size = wxDefaultSize,
-               long style = 0,
-               const wxString &name = wxControlNameStr );
-
-#if wxUSE_VALIDATORS
     wxControl( wxWindow *parent,
                wxWindowID id,
                const wxPoint &pos = wxDefaultPosition,
                const wxSize &size = wxDefaultSize,
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
-               const wxString &name = wxControlNameStr );
-#endif
-    ~wxControl();
+               const wxString &name = wxControlNameStr )
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxControlNameStr);
 
     // simulates the event, returns TRUE if the event was processed
     virtual void Command(wxCommandEvent& WXUNUSED(event)) { }