Added GetId() to Connect calls to ensure only the relevant events are processed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 80e1bb4a001789da04580e479c8e07f076edaadb..e9e06acc7171ebefbd23bc284e9bca9fc3a0bd78 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -300,7 +300,7 @@ void wxCalendarCtrl::CreateMonthComboBox()
                           wxDefaultCoord,
                           wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
 
-    m_comboMonth->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED,
+    m_comboMonth->Connect(m_comboMonth->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED,
                           wxCommandEventHandler(wxCalendarCtrl::OnMonthChange),
                           NULL, this);
 }
@@ -314,11 +314,11 @@ void wxCalendarCtrl::CreateYearSpinCtrl()
                                 wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
                                 -4300, 10000, GetDate().GetYear());
 
-    m_spinYear->Connect(wxEVT_COMMAND_TEXT_UPDATED,
+    m_spinYear->Connect(m_spinYear->GetId(), wxEVT_COMMAND_TEXT_UPDATED,
                         wxCommandEventHandler(wxCalendarCtrl::OnYearTextChange),
                         NULL, this);
 
-    m_spinYear->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED,
+    m_spinYear->Connect(m_spinYear->GetId(), wxEVT_COMMAND_SPINCTRL_UPDATED,
                         wxCommandEventHandler(wxCalendarCtrl::OnYearChange),
                         NULL, this);
 }

diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index 843dc86750e47bf8331c4da6bea9fac1fcda0fd3..b17a9f38afdb0365275c4001c6602af8e86fb95c 100644 (file)
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -58,7 +58,7 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
     }
 
     // and handle user clicks on it
-    Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,
             wxCommandEventHandler(wxGenericColourButton::OnButtonClick),
             NULL, this);
 
@@ -105,7 +105,7 @@ void wxGenericColourButton::UpdateColour()
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( wxBrush(m_colour) );
     dc.DrawRectangle( 0,0,m_bitmap.GetWidth(),m_bitmap.GetHeight() );
-    
+
     if ( HasFlag(wxCLRP_SHOW_LABEL) )
     {
         wxColour col( ~m_colour.Red(), ~m_colour.Green(), ~m_colour.Blue() );
@@ -113,7 +113,7 @@ void wxGenericColourButton::UpdateColour()
         dc.SetFont( GetFont() );
         dc.DrawText( m_colour.GetAsString(wxC2S_HTML_SYNTAX), 0, 0 );
     }
-    
+
     dc.SelectObject( wxNullBitmap );
     SetBitmapLabel( m_bitmap );
 }

diff --git a/src/generic/filepickerg.cpp b/src/generic/filepickerg.cpp
index 55583a121e67c25ce22caa6626d0684d7e4993ac..fa0259926f76e6ed6013425a021e254a7f56d43f 100644 (file)
--- a/src/generic/filepickerg.cpp
+++ b/src/generic/filepickerg.cpp
@@ -55,7 +55,7 @@ bool wxGenericFileDirButton::Create( wxWindow *parent, wxWindowID id,
     }
 
     // and handle user clicks on it
-    Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,
             wxCommandEventHandler(wxGenericFileDirButton::OnButtonClick),
             NULL, this);
 

diff --git a/src/generic/fontpickerg.cpp b/src/generic/fontpickerg.cpp
index 971f1cbdbbb28a61f870e99a3493d57614423a88..56963130797c12d8ab1da306e74a726cb3d5bc9f 100644 (file)
--- a/src/generic/fontpickerg.cpp
+++ b/src/generic/fontpickerg.cpp
@@ -59,7 +59,7 @@ bool wxGenericFontButton::Create( wxWindow *parent, wxWindowID id,
     }
 
     // and handle user clicks on it
-    Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,
             wxCommandEventHandler(wxGenericFontButton::OnButtonClick),
             NULL, this);