diff options
author | bubnikv <bubnikv@gmail.com> | 2018-10-23 16:27:31 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2018-10-23 16:27:31 +0300 |
commit | bded28f88805f37c40ccd0cc0f4a3e3a233bee50 (patch) | |
tree | d3dfc83760d9959cac188d73a5e257b34fa792e9 /src/slic3r/GUI/ProgressStatusBar.cpp | |
parent | f33713e060d66320ec4cc7221fee4921d1115806 (diff) |
WIP: Reconstruction of background processing.
Diffstat (limited to 'src/slic3r/GUI/ProgressStatusBar.cpp')
-rw-r--r-- | src/slic3r/GUI/ProgressStatusBar.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/slic3r/GUI/ProgressStatusBar.cpp b/src/slic3r/GUI/ProgressStatusBar.cpp index 45c3aaa76..44a7b06c5 100644 --- a/src/slic3r/GUI/ProgressStatusBar.cpp +++ b/src/slic3r/GUI/ProgressStatusBar.cpp @@ -53,8 +53,8 @@ ProgressStatusBar::ProgressStatusBar(wxWindow *parent, int id): }); m_cancelbutton->Bind(wxEVT_BUTTON, [this](const wxCommandEvent&) { - if(m_cancel_cb) m_cancel_cb(); - m_perl_cancel_callback.call(); + if (m_cancel_cb) + m_cancel_cb(); m_cancelbutton->Hide(); }); } @@ -136,7 +136,17 @@ void ProgressStatusBar::embed(wxFrame *frame) void ProgressStatusBar::set_status_text(const wxString& txt) { - self->SetStatusText(wxString::FromUTF8(txt.c_str())); + self->SetStatusText(txt); +} + +void ProgressStatusBar::set_status_text(const std::string& txt) +{ + this->set_status_text(txt.c_str()); +} + +void ProgressStatusBar::set_status_text(const char *txt) +{ + this->set_status_text(wxString::FromUTF8(txt)); } void ProgressStatusBar::show_cancel_button() |