3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Follow-up of 7270d222df -> Fix of build on OsX and Linux

Browse source
This commit is contained in:
enricoturri1966 2020-09-08 12:36:57 +02:00
parent 7270d222df
commit f6534f5f7a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/MainFrame.cpp
View file

@ -1370,7 +1370,7 @@ void MainFrame::init_menubar()
// wx bug: https://trac.wxwidgets.org/ticket/18328 // wx bug: https://trac.wxwidgets.org/ticket/18328
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION #if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
wxMenu* apple_menu = menubar->OSXGetAppleMenu(); wxMenu* apple_menu = m_menubar->OSXGetAppleMenu();
#else #else
wxMenu* apple_menu = m_editor_menubar->OSXGetAppleMenu(); wxMenu* apple_menu = m_editor_menubar->OSXGetAppleMenu();
#endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION #endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
@ -1438,7 +1438,7 @@ void MainFrame::init_menubar_as_gcodeviewer()
// This fixes a bug on Mac OS where the quit command doesn't emit window close events // This fixes a bug on Mac OS where the quit command doesn't emit window close events
// wx bug: https://trac.wxwidgets.org/ticket/18328 // wx bug: https://trac.wxwidgets.org/ticket/18328
#if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION #if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
wxMenu* apple_menu = menubar->OSXGetAppleMenu(); wxMenu* apple_menu = m_menubar->OSXGetAppleMenu();
#else #else
wxMenu* apple_menu = m_gcodeviewer_menubar->OSXGetAppleMenu(); wxMenu* apple_menu = m_gcodeviewer_menubar->OSXGetAppleMenu();
#endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION #endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION