don't annoy the user by repeating the question which had been already answered (and...

[wxWidgets.git] / src / common / ctrlcmn.cpp

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index dec9f63a0c724a07c892e4263090456c8e0a38c7..479e92c1f59d39447043c49a5e33bead31433a9e 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -42,9 +42,7 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
                                   const wxPoint& pos,
                                   const wxSize& size,
                                   long style,
-#if wxUSE_VALIDATORS
                                   const wxValidator& validator,
-#endif
                                   const wxString& name)
 {
     // even if it's possible to create controls without parents in some port,
@@ -70,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
+            ;
+    }
+}
+