amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix build on OsX

Browse source
This commit is contained in:
enricoturri1966 2020-09-08 12:10:07 +02:00
parent 67d10a3c0c
commit 7270d222df
2 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -562,7 +562,11 @@ bool GUI_App::on_init_inner()
wxInitAllImageHandlers(); wxInitAllImageHandlers();
wxBitmap bitmap = create_scaled_bitmap("prusa_slicer_logo", nullptr, 400); wxBitmap bitmap = create_scaled_bitmap("prusa_slicer_logo", nullptr, 400);
#if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
wxBitmap bmp(is_editor() ? from_u8(var("splashscreen.jpg")) : from_u8(var("splashscreen-gcodeviewer.jpg")), wxBITMAP_TYPE_JPEG); wxBitmap bmp(is_editor() ? from_u8(var("splashscreen.jpg")) : from_u8(var("splashscreen-gcodeviewer.jpg")), wxBITMAP_TYPE_JPEG);
#else
wxBitmap bmp(from_u8(var("splashscreen.jpg")), wxBITMAP_TYPE_JPEG);
#endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
DecorateSplashScreen(bmp); DecorateSplashScreen(bmp);

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

@ -102,17 +102,17 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
} }
#else #else
#if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION #if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
switch (wxGetApp().get_mode()) switch (wxGetApp().get_app_mode())
{ {
default: default:
case GUI_App::EMode::Editor: case GUI_App::EAppMode::Editor:
{ {
#endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION #endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG)); SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG));
#if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION #if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
break; break;
} }
case GUI_App::EMode::GCodeViewer: case GUI_App::EAppMode::GCodeViewer:
{ {
SetIcon(wxIcon(Slic3r::var("PrusaSlicer-gcodeviewer_128px.png"), wxBITMAP_TYPE_PNG)); SetIcon(wxIcon(Slic3r::var("PrusaSlicer-gcodeviewer_128px.png"), wxBITMAP_TYPE_PNG));
break; break;
@ -1355,13 +1355,13 @@ void MainFrame::init_menubar()
#endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION #endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
#else #else
auto menubar = new wxMenuBar(); auto menubar = new wxMenuBar();
menubar->Append(fileMenu, _(L("&File"))); menubar->Append(fileMenu, _L("&File"));
if (editMenu) menubar->Append(editMenu, _(L("&Edit"))); if (editMenu) menubar->Append(editMenu, _L("&Edit"));
menubar->Append(windowMenu, _(L("&Window"))); menubar->Append(windowMenu, _L("&Window"));
if (viewMenu) menubar->Append(viewMenu, _(L("&View"))); if (viewMenu) menubar->Append(viewMenu, _L("&View"));
// Add additional menus from C++ // Add additional menus from C++
wxGetApp().add_config_menu(menubar); wxGetApp().add_config_menu(menubar);
menubar->Append(helpMenu, _(L("&Help"))); menubar->Append(helpMenu, _L("&Help"));
SetMenuBar(menubar); SetMenuBar(menubar);
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
@ -1369,7 +1369,11 @@ void MainFrame::init_menubar()
// 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 #if ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
wxMenu* apple_menu = menubar->OSXGetAppleMenu();
#else
wxMenu* apple_menu = m_editor_menubar->OSXGetAppleMenu(); wxMenu* apple_menu = m_editor_menubar->OSXGetAppleMenu();
#endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
#else #else
wxMenu *apple_menu = menubar->OSXGetAppleMenu(); wxMenu *apple_menu = menubar->OSXGetAppleMenu();
#endif // ENABLE_GCODE_VIEWER #endif // ENABLE_GCODE_VIEWER
@ -1378,7 +1382,7 @@ void MainFrame::init_menubar()
Close(); Close();
}, wxID_EXIT); }, wxID_EXIT);
} }
#endif #endif // __APPLE__
if (plater()->printer_technology() == ptSLA) if (plater()->printer_technology() == ptSLA)
update_menubar(); update_menubar();
@ -1429,6 +1433,21 @@ void MainFrame::init_menubar_as_gcodeviewer()
m_gcodeviewer_menubar->Append(viewMenu, _L("&View")); m_gcodeviewer_menubar->Append(viewMenu, _L("&View"));
m_gcodeviewer_menubar->Append(helpMenu, _L("&Help")); m_gcodeviewer_menubar->Append(helpMenu, _L("&Help"));
#endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION #endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
#ifdef __APPLE__
// 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
#if ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
wxMenu* apple_menu = menubar->OSXGetAppleMenu();
#else
wxMenu* apple_menu = m_gcodeviewer_menubar->OSXGetAppleMenu();
#endif // ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION
if (apple_menu != nullptr) {
apple_menu->Bind(wxEVT_MENU, [this](wxCommandEvent&) {
Close();
}, wxID_EXIT);
}
#endif // __APPLE__
} }
#if !ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION #if !ENABLE_GCODE_VIEWER_AS_STANDALONE_APPLICATION