From 5ebd76156d542d9d7ec61f56f62e7736f19a9af7 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 28 Sep 2021 12:08:31 +0200 Subject: [PATCH] adapting buttonbar --- include/wx/generic/buttonbar.h | 4 ++-- src/generic/buttonbar.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wx/generic/buttonbar.h b/include/wx/generic/buttonbar.h index 24de813d57..2d8d6e0506 100644 --- a/include/wx/generic/buttonbar.h +++ b/include/wx/generic/buttonbar.h @@ -66,8 +66,8 @@ protected: virtual wxToolBarToolBase *CreateTool(int id, const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, + const wxBitmapBundle& bmpNormal, + const wxBitmapBundle& bmpDisabled, wxItemKind kind, wxObject *clientData, const wxString& shortHelp, diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp index b6b50a2edd..c904e738c3 100644 --- a/src/generic/buttonbar.cpp +++ b/src/generic/buttonbar.cpp @@ -46,8 +46,8 @@ public: wxButtonToolBarTool(wxButtonToolBar *tbar, int id, const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, + const wxBitmapBundle& bmpNormal, + const wxBitmapBundle& bmpDisabled, wxItemKind kind, wxObject *clientData, const wxString& shortHelp, @@ -261,8 +261,8 @@ void wxButtonToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUS wxToolBarToolBase *wxButtonToolBar::CreateTool(int id, const wxString& label, - const wxBitmap& bmpNormal, - const wxBitmap& bmpDisabled, + const wxBitmapBundle& bmpNormal, + const wxBitmapBundle& bmpDisabled, wxItemKind kind, wxObject *clientData, const wxString& shortHelp,