From 1b2dcabf94aa6ea73f6f995fed0b31c2337d20b3 Mon Sep 17 00:00:00 2001 From: David Kocik Date: Thu, 15 Oct 2020 19:40:57 +0200 Subject: [PATCH] fix of OSX dock menu items --- src/slic3r/GUI/MainFrame.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 0a9ba0f090..8418647033 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -54,9 +54,11 @@ class PrusaSlicerTaskBarIcon : public wxTaskBarIcon { public: PrusaSlicerTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE) : wxTaskBarIcon(iconType) {} -#if 0 wxMenu *CreatePopupMenu() override { wxMenu *menu = new wxMenu; + //int id; + //auto *item = menu->Append(id = wxNewId(), "&Test menu"); + //menu->Bind(wxEVT_MENU, [this](wxCommandEvent &) { wxMessageBox("Test menu - PrusaSlicer"); }, id); append_menu_item(menu, wxID_ANY, _L("Open new instance"), _L("Open a new PrusaSlicer instance"), [this](wxCommandEvent&) { start_new_slicer(); }, "", nullptr, [this]() {return wxGetApp().app_config->get("single_instance") != "1"; }); append_menu_item(menu, wxID_ANY, _L("G-code preview") + dots, _L("Open G-code viewer"), @@ -68,8 +70,11 @@ class GCodeViewerTaskBarIcon : public wxTaskBarIcon { public: GCodeViewerTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE) : wxTaskBarIcon(iconType) {} - wxMenu* CreatePopupMenu() override { - wxMenu* menu = new wxMenu; + wxMenu *CreatePopupMenu() override { + wxMenu *menu = new wxMenu; + //int id; + //auto *item = menu->Append(id = wxNewId(), "&Test menu"); + //menu->Bind(wxEVT_MENU, [this](wxCommandEvent &) { wxMessageBox("Test menu - GCode Viewer"); }, id); append_menu_item(menu, wxID_ANY, _L("Open PrusaSlicer"), _L("Open a new PrusaSlicer instance"), [this](wxCommandEvent&) { start_new_slicer(nullptr, true); }, "", nullptr); append_menu_item(menu, wxID_ANY, _L("G-code preview") + dots, _L("Open new G-code viewer"),