From 601d9e60e12e417584857fc430113346aecde105 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 30 Nov 1998 12:59:20 +0000 Subject: [PATCH] Fixed toolbar gaffe. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/tbar95.h | 2 -- src/msw/tbar95.cpp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h index 756b3f371c..3a20875d47 100644 --- a/include/wx/msw/tbar95.h +++ b/include/wx/msw/tbar95.h @@ -44,11 +44,9 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase const wxString& name = wxToolBarNameStr); // Call default behaviour -/* void OnPaint(wxPaintEvent& event) { Default() ; } void OnSize(wxSizeEvent& event) { Default() ; } void OnKillFocus(wxFocusEvent& event) { Default() ; } -*/ void OnMouseEvent(wxMouseEvent& event); // Handle wxToolBar95 events diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index e68cb480f8..5e8e5dab76 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -75,7 +75,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase) #endif BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase) + EVT_SIZE(wxToolBar95::OnSize) + EVT_PAINT(wxToolBar95::OnPaint) EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent) + EVT_KILL_FOCUS(wxToolBar95::OnKillFocus) EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged) END_EVENT_TABLE() -- 2.47.2