diff options
Diffstat (limited to 'wx+')
| -rw-r--r-- | wx+/graph.cpp | 2 | ||||
| -rw-r--r-- | wx+/image_tools.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wx+/graph.cpp b/wx+/graph.cpp index bf30843d..ce65d299 100644 --- a/wx+/graph.cpp +++ b/wx+/graph.cpp @@ -37,7 +37,7 @@ double zen::nextNiceNumber(double blockSize) //round to next number which is a c //have a look at leading two digits: "nice" numbers start with 1, 2, 2.5 and 5 const double steps[] = {1, 2, 2.5, 5, 10}; - return e * numeric::nearMatch(a, std::begin(steps), std::end(steps)); + return e * numeric::roundToGrid(a, std::begin(steps), std::end(steps)); } diff --git a/wx+/image_tools.cpp b/wx+/image_tools.cpp index 2df24b6e..72c7dc74 100644 --- a/wx+/image_tools.cpp +++ b/wx+/image_tools.cpp @@ -173,7 +173,7 @@ wxImage zen::createImageFromText(const wxString& text, const wxFont& font, const 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', SplitOnEmpty::allow)) + for (const wxString& line : splitCpy(text, L'\n', SplitOnEmpty::allow)) lineInfo.emplace_back(line, line.empty() ? wxSize() : dc.GetTextExtent(line)); //------------------------------------------------------------------------------------------------ |