diff options
| author | B Stack <bgstack15@gmail.com> | 2018-09-10 02:46:25 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-09-10 02:46:25 +0000 |
| commit | 728d32e6da9ce66968f8eef47a59505d613e2c1b (patch) | |
| tree | 0f0441755ff0e6d65e12222d4502c648bffd6a7c /wx+/rtl.h | |
| parent | 10.3 (diff) | |
| parent | pull in latest 10.4 from upstream (diff) | |
| download | FreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.tar.gz FreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.tar.bz2 FreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.zip | |
Merge branch '10.4' into 'master'10.4
pull in latest 10.4 from upstream
See merge request opensource-tracking/FreeFileSync!1
Diffstat (limited to 'wx+/rtl.h')
| -rwxr-xr-x | wx+/rtl.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -7,7 +7,6 @@ #ifndef RTL_H_0183487180058718273432148 #define RTL_H_0183487180058718273432148 -#include <zen/optional.h> #include <wx/dcmemory.h> #include <wx/image.h> #include <wx/app.h> @@ -16,7 +15,7 @@ namespace zen { //functions supporting right-to-left GUI layout -void drawBitmapRtlMirror (wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment, Opt<wxBitmap>& buffer); +void drawBitmapRtlMirror (wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment, std::optional<wxBitmap>& buffer); void drawBitmapRtlNoMirror(wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment); //wxDC::DrawIcon DOES mirror by default -> implement RTL support when needed @@ -56,7 +55,7 @@ void drawBitmapAligned(wxDC& dc, const wxBitmap& image, const wxRect& rect, int inline -void drawBitmapRtlMirror(wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment, Opt<wxBitmap>& buffer) +void drawBitmapRtlMirror(wxDC& dc, const wxBitmap& image, const wxRect& rect, int alignment, std::optional<wxBitmap>& buffer) { if (dc.GetLayoutDirection() == wxLayout_RightToLeft) { |