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

diff --git a/include/wx/generic/infobar.h b/include/wx/generic/infobar.h
index 79e1c683fe045bef0019bfecd8e367037dc627d6..db57ea31b11c605ee425775682cb04b81f357568 100644 (file)
--- 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;
 
     // the original parent background colour, before we changed it
     wxColour m_origParentBgCol;
 

+    DECLARE_EVENT_TABLE()

     wxDECLARE_NO_COPY_CLASS(wxInfoBarGeneric);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxInfoBarGeneric);
 };
 

diff --git a/src/generic/infobar.cpp b/src/generic/infobar.cpp
index 42f1daf56e3ce353ba5ff77a145242ddfa827db7..3b9c6b64cb4beeb8a5e874ac28a25db97a0535f7 100644 (file)
--- a/src/generic/infobar.cpp
+++ b/src/generic/infobar.cpp
@@ -39,6 +39,10 @@
 #include "wx/scopeguard.h"
 #include "wx/sizer.h"
 
 #include "wx/scopeguard.h"
 #include "wx/sizer.h"
 

+BEGIN_EVENT_TABLE(wxInfoBarGeneric, wxInfoBarBase)
+    EVT_BUTTON(wxID_ANY, wxInfoBarGeneric::OnButton)
+END_EVENT_TABLE()
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -89,14 +93,6 @@ bool wxInfoBarGeneric::Create(wxWindow *parent, wxWindowID winid)
                    );
     m_button->SetToolTip(_("Hide this notification message."));
 
                    );
     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
     //
     // center the text inside the sizer with an icon to the left of it and a
     // button at the very right
     //