Merge branch '10.18' into 'master'10.18

add upstream 10.18

See merge request opensource-tracking/FreeFileSync!15

1 files changed, 10 insertions, 0 deletions

diff --git a/wx+/rtl.h b/wx+/rtl.h
index 0cae9bac..0adb6037 100644
--- a/wx+/rtl.h
+++ b/wx+/rtl.h
@@ -20,6 +20,7 @@ void drawBitmapRtlNoMirror(wxDC& dc, const wxBitmap& bmp, const wxRect& rect, in
 //wxDC::DrawIcon DOES mirror by default -> implement RTL support when needed
 
 wxBitmap mirrorIfRtl(const wxBitmap& bmp);
+wxImage  mirrorIfRtl(const wxImage& bmp);
 
 //manual text flow correction: https://www.w3.org/International/articles/inline-bidi-markup/
 
@@ -93,6 +94,15 @@ void drawBitmapRtlNoMirror(wxDC& dc, const wxBitmap& bmp, const wxRect& rect, in
 }
 
 
+inline 
+wxImage mirrorIfRtl(const wxImage& bmp)
+{
+    if (wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft)
+        return bmp.Mirror();
+    else
+        return bmp;}
+
+
 inline
 wxBitmap mirrorIfRtl(const wxBitmap& bmp)
 {