From 94e0c9205e6049c6b3295145af7fd39156e77543 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Wed, 3 Aug 2022 08:51:28 -0400 Subject: add upstream 11.23 --- wx+/bitmap_button.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'wx+/bitmap_button.h') diff --git a/wx+/bitmap_button.h b/wx+/bitmap_button.h index d701e64c..70f161d2 100644 --- a/wx+/bitmap_button.h +++ b/wx+/bitmap_button.h @@ -85,18 +85,18 @@ void setImage(wxAnyButton& button, const wxImage& img) } - button.SetBitmapLabel(toBitmapBundle(img)); + button.SetBitmapLabel(toScaledBitmap(img)); //wxWidgets excels at screwing up consistently once again: //the first call to SetBitmapLabel() *implicitly* sets the disabled bitmap, too, subsequent calls, DON'T! - button.SetBitmapDisabled(toBitmapBundle(img.ConvertToDisabled())); //inefficiency: wxBitmap::ConvertToDisabled() implicitly converts to wxImage! + button.SetBitmapDisabled(toScaledBitmap(img.ConvertToDisabled())); //inefficiency: wxBitmap::ConvertToDisabled() implicitly converts to wxImage! } inline void setImage(wxStaticBitmap& staticBmp, const wxImage& img) { - staticBmp.SetBitmap(toBitmapBundle(img)); + staticBmp.SetBitmap(toScaledBitmap(img)); } -- cgit