3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merged with dev

Browse source
This commit is contained in:
bubnikv 2018-09-17 15:12:13 +02:00
parent d934b63424
commit fe3b92870f
90 changed files with 3310 additions and 1748 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ void ProgressStatusBar::embed(wxFrame *frame)
mf->SetStatusBar(self);
}
void ProgressStatusBar::set_status_text(const std::string& txt)
void ProgressStatusBar::set_status_text(const wxString& txt)
{
self->SetStatusText(wxString::FromUTF8(txt.c_str()));
}