diff options
| author | Daniel Wilhelm <shieldwed@outlook.com> | 2019-02-13 21:05:15 +0000 |
|---|---|---|
| committer | Daniel Wilhelm <shieldwed@outlook.com> | 2019-02-13 21:05:15 +0000 |
| commit | 2e618740c10a6dc7f5a8ee031a196b4ac95b1294 (patch) | |
| tree | 475a67b0b138f2b1cd5f02eaab8e413f7eee62c6 /wx+/bitmap_button.h | |
| parent | Merge branch '10.8' into 'master' (diff) | |
| parent | 10.9 (diff) | |
| download | FreeFileSync-2e618740c10a6dc7f5a8ee031a196b4ac95b1294.tar.gz FreeFileSync-2e618740c10a6dc7f5a8ee031a196b4ac95b1294.tar.bz2 FreeFileSync-2e618740c10a6dc7f5a8ee031a196b4ac95b1294.zip | |
Merge branch '10.9' into 'master'10.9
10.9
See merge request opensource-tracking/FreeFileSync!6
Diffstat (limited to 'wx+/bitmap_button.h')
| -rw-r--r--[-rwxr-xr-x] | wx+/bitmap_button.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wx+/bitmap_button.h b/wx+/bitmap_button.h index 738a62ff..bcbc7328 100755..100644 --- a/wx+/bitmap_button.h +++ b/wx+/bitmap_button.h @@ -56,8 +56,8 @@ void setBitmapTextLabel(wxBitmapButton& btn, const wxImage& img, const wxString& wxImage dynImage = createImageFromText(text, btn.GetFont(), btn.GetForegroundColour()); if (img.IsOk()) dynImage = btn.GetLayoutDirection() != wxLayout_RightToLeft ? - stackImages(img, dynImage, ImageStackLayout::HORIZONTAL, ImageStackAlignment::CENTER, gap) : - stackImages(dynImage, img, ImageStackLayout::HORIZONTAL, ImageStackAlignment::CENTER, gap); + stackImages(img, dynImage, ImageStackLayout::HORIZONTAL, ImageStackAlignment::CENTER, gap) : + stackImages(dynImage, img, ImageStackLayout::HORIZONTAL, ImageStackAlignment::CENTER, gap); //SetMinSize() instead of SetSize() is needed here for wxWindows layout determination to work corretly const int defaultHeight = wxButton::GetDefaultSize().GetHeight(); |