3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-10 23:35:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Meged with dev2

Browse source
This commit is contained in:
bubnikv 2018-09-19 11:28:30 +02:00
commit e8c16c35e5
17 changed files with 1301 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/GUI.cpp
View file

@ -991,6 +991,12 @@ wxString from_u8(const std::string &str)
return wxString::FromUTF8(str.c_str());
}
std::string into_u8(const wxString &str)
{
auto buffer_utf8 = str.utf8_str();
return std::string(buffer_utf8.data());
}
void set_model_events_from_perl(Model &model,
int event_object_selection_changed,
int event_object_settings_changed,

2
src/slic3r/GUI/GUI.hpp
View file

@ -217,6 +217,8 @@ int combochecklist_get_flags(wxComboCtrl* comboCtrl);
wxString L_str(const std::string &str);
// Return wxString from std::string in UTF8
wxString from_u8(const std::string &str);
// Return std::string in UTF8 from wxString
std::string into_u8(const wxString &str);
void set_model_events_from_perl(Model &model,
int event_object_selection_changed,