3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/master' into new_main_page_ui

Browse source
This commit is contained in:
YuSanka 2018-05-23 08:30:27 +02:00
commit 83cec1a640
21 changed files with 418 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xs/src/slic3r/GUI/GUI.cpp
View file

@ -690,7 +690,7 @@ void show_error(wxWindow* parent, const wxString& message) {
void show_error_id(int id, const std::string& message) {
auto *parent = id != 0 ? wxWindow::FindWindowById(id) : nullptr;
show_error(parent, message);
show_error(parent, wxString::FromUTF8(message.data()));
}
void show_info(wxWindow* parent, const wxString& message, const wxString& title){