Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2020-02-27 19:01:50 +0300
committerbubnikv <bubnikv@gmail.com>2020-02-27 19:02:08 +0300
commit7c556742205b99000421b89803fd68d8644ff872 (patch)
treee36be47e2d59bb3d9f027bb09412331e2096ece2 /src/slic3r/GUI/GLCanvas3D.cpp
parent27f50778b25b5cd342d215d591619d97d000ece7 (diff)
Disabled implicit conversion of wxString to std::string or const char*
and vice versa. Fixed one last implicit wxString conversion.
Diffstat (limited to 'src/slic3r/GUI/GLCanvas3D.cpp')
-rw-r--r--src/slic3r/GUI/GLCanvas3D.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index adc1e2e44..1ccebbabb 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -734,7 +734,7 @@ static void msw_disable_cleartype(wxFont &font)
++ startpos_weight;
size_t endpos_weight = font_desc.find(sep, startpos_weight);
// Parse the weight field.
- unsigned int weight = atoi(font_desc(startpos_weight, endpos_weight - startpos_weight));
+ unsigned int weight = wxAtoi(font_desc(startpos_weight, endpos_weight - startpos_weight));
size_t startpos = endpos_weight;
for (size_t i = 0; i < 6; ++ i)
startpos = font_desc.find(sep, startpos + 1);