mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-12 03:29:00 +08:00
Follow-up of 7270d222dfe410eefda01bcfab487d9b28c2e9f0 -> Fix of build on OsX and Linux
This commit is contained in:
parent
7270d222df
commit
f6534f5f7a
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user