3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Removed Strings.hpp, replaced with wxString

Browse source 
Fixed UTF8 rendering of status messages.
This commit is contained in:
bubnikv 2018-09-12 13:17:47 +02:00
parent 0235f1a821
commit bb70ad6090
14 changed files with 51 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

9
xs/src/slic3r/GUI/GUI.cpp
View file

@ -48,6 +48,7 @@
#include "AboutDialog.hpp"
#include "AppConfig.hpp"
#include "ConfigSnapshotDialog.hpp"
#include "ProgressStatusBar.hpp"
#include "Utils.hpp"
#include "MsgDialog.hpp"
#include "ConfigWizard.hpp"
@ -114,6 +115,7 @@ void break_to_debugger()
// Passing the wxWidgets GUI classes instantiated by the Perl part to C++.
wxApp *g_wxApp = nullptr;
wxFrame *g_wxMainFrame = nullptr;
ProgressStatusBar *g_progress_status_bar = nullptr;
wxNotebook *g_wxTabPanel = nullptr;
wxPanel *g_wxPlater = nullptr;
AppConfig *g_AppConfig = nullptr;
@ -207,6 +209,13 @@ void set_main_frame(wxFrame *main_frame)
wxFrame* get_main_frame() { return g_wxMainFrame; }
void set_progress_status_bar(ProgressStatusBar *prsb)
{
g_progress_status_bar = prsb;
}
ProgressStatusBar* get_progress_status_bar() { return g_progress_status_bar; }
void set_tab_panel(wxNotebook *tab_panel)
{
g_wxTabPanel = tab_panel;