X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d4b632ba3c0e5e5c43412d2d7a2b485b8fcebf2..b96340e6f457071d63196f877c6df0ea1cc2af04:/src/common/ctrlcmn.cpp

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index be7735196d..479e92c1f5 100644
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -42,13 +42,7 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
                                   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)
 {
     // even if it's possible to create controls without parents in some port,
@@ -74,5 +68,28 @@ void wxControlBase::InheritAttributes()
 
 void wxControlBase::Command(wxCommandEvent& event)
 {
-    (void)ProcessEvent(event);
+    (void)GetEventHandler()->ProcessEvent(event);
 }
+
+void wxControlBase::InitCommandEvent(wxCommandEvent& event) const
+{
+    event.SetEventObject((wxControlBase *)this);    // const_cast
+
+    // event.SetId(GetId()); -- this is usuall done in the event ctor
+
+    switch ( m_clientDataType )
+    {
+        case ClientData_Void:
+            event.SetClientData(GetClientData());
+            break;
+
+        case ClientData_Object:
+            event.SetClientObject(GetClientObject());
+            break;
+
+        case ClientData_None:
+            // nothing to do
+            ;
+    }
+}
+