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

Merge remote-tracking branch 'origin/dev' into new_main_page_ui

Browse source
This commit is contained in:
YuSanka 2018-09-11 11:49:36 +02:00
commit 73ee3f77c3
86 changed files with 4884 additions and 2922 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -196,6 +196,8 @@ void set_main_frame(wxFrame *main_frame)
g_wxMainFrame = main_frame;
}
wxFrame* get_main_frame() { return g_wxMainFrame; }
void set_tab_panel(wxNotebook *tab_panel)
{
g_wxTabPanel = tab_panel;
@ -859,10 +861,6 @@ wxWindow* get_right_panel(){
return g_right_panel;
}
wxFrame* get_main_frame() {
return g_wxMainFrame;
}
wxNotebook * get_tab_panel() {
return g_wxTabPanel;
}