add upstream 11.22

1 files changed, 7 insertions, 3 deletions

diff --git a/wx+/rtl.h b/wx+/rtl.h
index b59b5d14..9eb25bb6 100644
--- a/wx+/rtl.h
+++ b/wx+/rtl.h
@@ -64,11 +64,15 @@ void drawBitmapRtlMirror(wxDC& dc, const wxImage& img, const wxRect& rect, int a
             return impl::drawBitmapAligned(dc, img, rect, alignment);
 
         case wxLayout_RightToLeft:
+            if (rect.GetWidth() > 0 && rect.GetHeight() > 0)
         {
-            if (!buffer || buffer->GetWidth() != rect.width || buffer->GetHeight() < rect.height) //[!] since we do a mirror, width needs to match exactly!
-                buffer = wxBitmap(rect.width, rect.height);
+            if (!buffer || buffer->GetSize() != rect.GetSize()) //[!] since we do a mirror, width needs to match exactly!
+                buffer.emplace(rect.GetSize());
 
-            wxMemoryDC memDc(*buffer);
+            if (buffer->GetScaleFactor() != dc.GetContentScaleFactor()) //needed here?
+                buffer->SetScaleFactor(dc.GetContentScaleFactor());     //
+
+            wxMemoryDC memDc(*buffer); //copies scale factor from wxBitmap
             memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction!
 
             impl::drawBitmapAligned(memDc, img, wxRect(0, 0, rect.width, rect.height), alignment);