From f4e3b69dd2f8b0469b63eb24ba755923610f6369 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 20 Feb 2022 01:27:40 +0000
Subject: [PATCH] Use wxBitmapBundle in wxBitmapButtonXmlHandler

Allow specifying bundles and not just individual bitmaps in XRC for this
control.
---
 src/xrc/xh_bmpbt.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index 210c95dae5..fcf84d56ae 100644
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -38,7 +38,7 @@ wxBitmapButtonXmlHandler::SetBitmapIfSpecified(wxBitmapButton* button,
 {
     wxXmlNode* const node = GetParamNode(paramName);
     if ( node )
-        (button->*setter)(GetBitmap(node));
+        (button->*setter)(GetBitmapBundle(node));
 }
 
 wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
@@ -55,7 +55,7 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
     {
         button->Create(m_parentAsWindow,
                        GetID(),
-                       GetBitmap(wxT("bitmap"), wxART_BUTTON),
+                       GetBitmapBundle(wxT("bitmap"), wxART_BUTTON),
                        GetPosition(), GetSize(),
                        GetStyle(wxT("style")),
                        wxDefaultValidator,