mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Removed Localization to GUI_App
+ cleaned code from some global variables (App, AppConfig, PresetBundle, MainFrame, tab_panels..)
This commit is contained in:
parent
08c6905751
commit
40022861c8
11 changed files with 185 additions and 525 deletions
|
@ -5,14 +5,14 @@
|
|||
#include <wx/button.h>
|
||||
#include <wx/statusbr.h>
|
||||
#include <wx/frame.h>
|
||||
#include "GUI.hpp"
|
||||
#include "GUI_App.hpp"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
namespace Slic3r {
|
||||
|
||||
ProgressStatusBar::ProgressStatusBar(wxWindow *parent, int id):
|
||||
self(new wxStatusBar(parent ? parent : GUI::get_main_frame(),
|
||||
self(new wxStatusBar(parent ? parent : GUI::wxGetApp().mainframe,
|
||||
id == -1? wxID_ANY : id)),
|
||||
m_timer(new wxTimer(self)),
|
||||
m_prog (new wxGauge(self,
|
||||
|
@ -130,7 +130,7 @@ void ProgressStatusBar::run(int rate)
|
|||
|
||||
void ProgressStatusBar::embed(wxFrame *frame)
|
||||
{
|
||||
wxFrame* mf = frame ? frame : GUI::get_main_frame();
|
||||
wxFrame* mf = frame ? frame : GUI::wxGetApp().mainframe;
|
||||
mf->SetStatusBar(self);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue