diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2020-03-04 11:24:13 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2020-03-04 12:34:59 +0300 |
| commit | eb3b65d8afcc7026cec0b2054152d78e08673041 (patch) | |
| tree | 680768b63df48742063c80918bf0a7857191f5b9 /src/slic3r/GUI/MainFrame.cpp | |
| parent | a87ba5d6a6912a06999d0b1f4e19280969b30ddf (diff) | |
Fixing build against wxWidgets 3.0
The wxString saga continues. wxWidgets 3.0 don't have the wxString::FromUTF8(const std::string&) overload, we must use the GUI::from_u8 helper
Also wxWidgets 3.0 don't allow to disable wxString->const char* conversion, so calling show_info(wxWindow*, wxString, const char*) was ambiguous
Several includes moved around
Diffstat (limited to 'src/slic3r/GUI/MainFrame.cpp')
| -rw-r--r-- | src/slic3r/GUI/MainFrame.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 18e43388a..a4ae3e008 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1029,7 +1029,7 @@ void MainFrame::load_configbundle(wxString file/* = wxEmptyString, const bool re wxGetApp().load_current_presets(); const auto message = wxString::Format(_(L("%d presets successfully imported.")), presets_imported); - Slic3r::GUI::show_info(this, message, "Info"); + Slic3r::GUI::show_info(this, message, wxString("Info")); } // Load a provied DynamicConfig into the Print / Filament / Printer tabs, thus modifying the active preset. |