diff options
| author | Vojtech Bubnik <bubnikv@gmail.com> | 2022-02-21 11:59:51 +0300 |
|---|---|---|
| committer | Vojtech Bubnik <bubnikv@gmail.com> | 2022-02-21 11:59:51 +0300 |
| commit | 6937b34fdc88d57280562dc4c160a4b24148d58d (patch) | |
| tree | 4bee72041d06d1549d047748f3839387f8d4dcb0 | |
| parent | 945bebd224dbdf6a1c160dd8277e6bb304f940ac (diff) | |
get_wraped_wxString(): Wrapping on '\' on Windows.
Deleting all G-code substitutions: Added a Cancel button.
| -rw-r--r-- | src/slic3r/GUI/MsgDialog.cpp | 6 | ||||
| -rw-r--r-- | src/slic3r/GUI/Tab.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index 2b8657294..31d137cb6 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -310,7 +310,11 @@ wxString get_wraped_wxString(const wxString& in, size_t line_len /*=80*/) overwrite = true; if (newline) break; - } else if (in[j] == '/') { + } else if (in[j] == '/' +#ifdef _WIN32 + || in[j] == '\\' +#endif // _WIN32 + ) { // Insert after the slash. ibreak = ++ j; overwrite = false; diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 8737cc9a8..7d184c47c 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -4141,7 +4141,7 @@ wxSizer* TabPrint::create_manage_substitution_widget(wxWindow* parent) create_btn(&m_del_all_substitutions_btn, _L("Delete all"), "cross"); m_del_all_substitutions_btn->Bind(wxEVT_BUTTON, [this, parent](wxCommandEvent e) { - if (MessageDialog(parent, _L("Are you sure you want to delete all substitutions?"), SLIC3R_APP_NAME, wxYES_NO | wxICON_QUESTION). + if (MessageDialog(parent, _L("Are you sure you want to delete all substitutions?"), SLIC3R_APP_NAME, wxYES_NO | wxCANCEL | wxICON_QUESTION). ShowModal() != wxID_YES) return; m_subst_manager.delete_all(); |