From cc7033c2f581cd45e97196c5be847cfd5bdad7a1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 5 Oct 2009 22:55:22 +0000 Subject: [PATCH] Use event tables instead of Connect() in wxInfoBarGeneric. This allows to handle events from the info bar buttons in the derived classes using the event tables while if the base class used Connect(), the derived classes static event handlers would be never executed. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/infobar.h | 1 + src/generic/infobar.cpp | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/wx/generic/infobar.h b/include/wx/generic/infobar.h index 79e1c683fe..db57ea31b1 100644 --- a/include/wx/generic/infobar.h +++ b/include/wx/generic/infobar.h @@ -114,6 +114,7 @@ private: // the original parent background colour, before we changed it wxColour m_origParentBgCol; + DECLARE_EVENT_TABLE() wxDECLARE_NO_COPY_CLASS(wxInfoBarGeneric); }; diff --git a/src/generic/infobar.cpp b/src/generic/infobar.cpp index 42f1daf56e..3b9c6b64cb 100644 --- a/src/generic/infobar.cpp +++ b/src/generic/infobar.cpp @@ -39,6 +39,10 @@ #include "wx/scopeguard.h" #include "wx/sizer.h" +BEGIN_EVENT_TABLE(wxInfoBarGeneric, wxInfoBarBase) + EVT_BUTTON(wxID_ANY, wxInfoBarGeneric::OnButton) +END_EVENT_TABLE() + // ============================================================================ // implementation // ============================================================================ @@ -89,14 +93,6 @@ bool wxInfoBarGeneric::Create(wxWindow *parent, wxWindowID winid) ); m_button->SetToolTip(_("Hide this notification message.")); - Connect - ( - wxEVT_COMMAND_BUTTON_CLICKED, - wxCommandEventHandler(wxInfoBarGeneric::OnButton), - NULL, - this - ); - // center the text inside the sizer with an icon to the left of it and a // button at the very right // -- 2.45.2