diff options
| author | B Stack <bgstack15@gmail.com> | 2020-08-31 20:07:13 -0400 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-08-31 20:07:13 -0400 |
| commit | 8a27fa9c617533e76673ce61a65e2ba869b52208 (patch) | |
| tree | acfdfb3e1046db87040477033fda0df76d92916a /wx+/image_tools.cpp | |
| parent | Merge branch '11.0' into 'master' (diff) | |
| download | FreeFileSync-8a27fa9c617533e76673ce61a65e2ba869b52208.tar.gz FreeFileSync-8a27fa9c617533e76673ce61a65e2ba869b52208.tar.bz2 FreeFileSync-8a27fa9c617533e76673ce61a65e2ba869b52208.zip | |
add upstream 11.1
Diffstat (limited to 'wx+/image_tools.cpp')
| -rw-r--r-- | wx+/image_tools.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wx+/image_tools.cpp b/wx+/image_tools.cpp index 19ba6ba6..4569a2a7 100644 --- a/wx+/image_tools.cpp +++ b/wx+/image_tools.cpp @@ -70,7 +70,7 @@ void copySubImage(const wxImage& src, wxPoint srcPos, void copyImageLayover(const wxImage& src, - /**/ wxImage& trg, wxPoint trgPos) + /**/ wxImage& trg, wxPoint trgPos) { const int srcWidth = src.GetWidth (); const int srcHeight = src.GetHeight(); @@ -119,7 +119,7 @@ std::vector<std::pair<wxString, wxSize>> getTextExtentInfo(const wxString& text, dc.SetFont(font); //the font parameter of GetMultiLineTextExtent() is not evaluated on OS X, wxWidgets 2.9.5, so apply it to the DC directly! std::vector<std::pair<wxString, wxSize>> lineInfo; //text + extent - for (const wxString& line : split(text, L'\n', SplitType::ALLOW_EMPTY)) + for (const wxString& line : split(text, L'\n', SplitOnEmpty::allow)) lineInfo.emplace_back(line, line.empty() ? wxSize() : dc.GetTextExtent(line)); return lineInfo; |