From fb5ff50eda54cd5c7f5587497f849185b5e88393 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 23 Feb 2016 00:13:37 +0100
Subject: [PATCH] Make wxBitmap::ConvertToDisabled() work correctly for scaled
 bitmaps

Preserve the scale factor after conversion.

Closes #17307.
---
 include/wx/bitmap.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 1bef98d074..9032097bfe 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -302,7 +302,8 @@ wxBitmap::
 #endif
 ConvertToDisabled(unsigned char brightness) const
 {
-    return ConvertToImage().ConvertToDisabled(brightness);
+    const wxImage imgDisabled = ConvertToImage().ConvertToDisabled(brightness);
+    return wxBitmap(imgDisabled, -1, GetScaleFactor());
 }
 #endif // wxUSE_IMAGE