juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
parent ec5b98477d 076b293fec
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){