Merge branch 'b11.23' into 'master'11.23

add upstream 11.23

See merge request opensource-tracking/FreeFileSync!46

1 files changed, 3 insertions, 3 deletions

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));
 }