From 96360917d3c000e479ec64806b96188342eea260 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 19 Mar 2007 01:22:18 +0000 Subject: [PATCH] fixed all the other ports broken by controls labels in wxToolBar patch commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/wince/tbarwce.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp index 45d5c81172..0ff004bae3 100644 --- a/src/msw/wince/tbarwce.cpp +++ b/src/msw/wince/tbarwce.cpp @@ -96,8 +96,8 @@ public: m_bitmapIndex = -1; } - wxToolMenuBarTool(wxToolBar *tbar, wxControl *control) - : wxToolBarToolBase(tbar, control) + wxToolMenuBarTool(wxToolBar *tbar, wxControl *control, const wxString& label) + : wxToolBarToolBase(tbar, control, label) { m_nSepCount = 1; m_bitmapIndex = -1; @@ -151,9 +151,10 @@ wxToolBarToolBase *wxToolMenuBar::CreateTool(int id, clientData, shortHelp, longHelp); } -wxToolBarToolBase *wxToolMenuBar::CreateTool(wxControl *control) +wxToolBarToolBase * +wxToolMenuBar::CreateTool(wxControl *control, const wxString& label) { - return new wxToolMenuBarTool(this, control); + return new wxToolMenuBarTool(this, control, label); } // ---------------------------------------------------------------------------- -- 2.45.2