Use wxBitmapBundle in wxBitmapButtonXmlHandler

Allow specifying bundles and not just individual bitmaps in XRC for this control.
2022-02-20 01:27:40 +00:00
parent 34facd225a
commit f4e3b69dd2
1 changed files with 2 additions and 2 deletions
--- 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,