X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f2711d5c119962a9fcb7198ebf351930d646e23..22e0ea84c89c61cceb3deb2b62145afa047a0dff:/include/wx/control.h

diff --git a/include/wx/control.h b/include/wx/control.h
index bfdda99063..c50fe6c033 100644
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -29,6 +29,9 @@
 class WXDLLEXPORT wxControlBase : public wxWindow
 {
 public:
+#ifdef __WXMAC_X__
+    virtual ~wxControlBase() {}   // Added min for Mac X
+#endif
     // simulates the event of given type (i.e. wxButton::Command() is just as
     // if the button was clicked)
     virtual void Command(wxCommandEvent &event);
@@ -41,29 +44,14 @@ protected:
                        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();
+
+    // initialize the common fields of wxCommandEvent
+    void InitCommandEvent(wxCommandEvent& event) const;
 };
 
 // ----------------------------------------------------------------------------