From eae24cc3b240a5728e94b805bb040b403fdfbe5c Mon Sep 17 00:00:00 2001 From: taler21 Date: Tue, 27 Jun 2023 19:16:40 +0200 Subject: [PATCH] Fix bitmap returned from wxAuiToolBarItem::GetDisabledBitmap() Return the disabled bitmap and not the normal one. This fixes a regression introduced in 9a5123afed (Use wxBitmapBundle in wxAuiToolBar and wxAuiPaneInfo too, 2021-11-14). Closes #23666. --- include/wx/aui/auibar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h index aa4b01ea51..99619429c7 100644 --- a/include/wx/aui/auibar.h +++ b/include/wx/aui/auibar.h @@ -176,7 +176,7 @@ public: void SetDisabledBitmap(const wxBitmapBundle& bmp) { m_disabledBitmap = bmp; } const wxBitmapBundle& GetDisabledBitmapBundle() const { return m_disabledBitmap; } wxBitmap GetDisabledBitmapFor(wxWindow* wnd) const { return m_disabledBitmap.GetBitmapFor(wnd); } - wxBitmap GetDisabledBitmap() const { return GetBitmapFor(m_window); } + wxBitmap GetDisabledBitmap() const { return GetDisabledBitmapFor(m_window); } // Return the bitmap for the current state, normal or disabled. wxBitmap GetCurrentBitmapFor(wxWindow* wnd) const;