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>2019-04-29 19:10:08 +0300
committerbubnikv <bubnikv@gmail.com>2019-04-29 19:10:08 +0300
commit5084d544a246063d315ae9ba000596726b2a7a67 (patch)
tree4200a3fa3331847eb91f50d3cf08487470473bda /src/slic3r/GUI/GUI_ObjectManipulation.hpp
parentebb7981d16d58d1dbd9bed1214b6689b51b8fd92 (diff)
Fixed a bug, where std::string and wxString were mixed up.
Diffstat (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.hpp')
-rw-r--r--src/slic3r/GUI/GUI_ObjectManipulation.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
index a66576498..e93ce1ffb 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
@@ -28,9 +28,9 @@ class ObjectManipulation : public OG_Settings
Vec3d size;
Vec3d size_rounded;
- std::string move_label_string;
- std::string rotate_label_string;
- std::string scale_label_string;
+ wxString move_label_string;
+ wxString rotate_label_string;
+ wxString scale_label_string;
struct Instance
{
@@ -55,9 +55,9 @@ class ObjectManipulation : public OG_Settings
rotation = rotation_rounded = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
scale = scale_rounded = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
size = size_rounded = Vec3d(DBL_MAX, DBL_MAX, DBL_MAX);
- move_label_string = "";
- rotate_label_string = "";
- scale_label_string = "";
+ move_label_string = wxString();
+ rotate_label_string = wxString();
+ scale_label_string = wxString();
instance.reset();
}
bool is_valid() const { return position != Vec3d(DBL_MAX, DBL_MAX, DBL_MAX); }