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

Try to fix compilation bug

Browse source
This commit is contained in:
YuSanka 2018-06-05 09:13:03 +02:00
parent 04dc50cec4
commit bb27d62ba8
2 changed files with 67 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -142,12 +142,8 @@ wxDataViewCtrl *m_objects_ctrl = nullptr;
MyObjectTreeModel *m_objects_model = nullptr;
PrusaCollapsiblePane *m_collpane_settings = nullptr;
wxFont g_small_font{ wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) };
wxFont g_bold_font{ wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold() };
#ifdef __WXMAC__
g_small_font.SetPointSize(11);
g_bold_font.SetPointSize(11);
#endif /*__WXMAC__*/
wxFont g_small_font { wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) };
wxFont g_bold_font { wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold() };
static void init_label_colours()
{
@ -177,10 +173,19 @@ void update_label_colours_from_appconfig()
}
}
static void init_fonts()
{
#ifdef __WXMAC__
g_small_font.SetPointSize(11);
g_bold_font.SetPointSize(11);
#endif /*__WXMAC__*/
}
void set_wxapp(wxApp *app)
{
g_wxApp = app;
init_label_colours();
init_fonts();
}
void set_main_frame(wxFrame *main_frame)