From 9b5a577c073e1d5ee48741b9441af0016695d2ed Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 5 Aug 2019 11:02:56 +0200 Subject: [PATCH] Fixed OnContextMenu() under OSX --- src/slic3r/GUI/GUI_ObjectList.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 6ab87bd66..9de9323f1 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -738,18 +738,16 @@ void ObjectList::OnContextMenu(wxDataViewEvent&) wxDataViewColumn* col; const wxPoint pt = get_mouse_position_in_control(); HitTest(pt, item, col); - if (!item) #ifdef __WXOSX__ // temporary workaround for OSX - // after Yosemite OS X version, HitTest return undefined item - item = GetSelection(); - if (item) - show_context_menu(); - else - printf("undefined item\n"); - return; -#else - return; + // after Yosemite OS X version, HitTest return undefined item + if (!item) item = GetSelection(); #endif // __WXOSX__ + + if (!item) { + printf("undefined item\n"); + return; + } + const wxString title = col->GetTitle(); if (title == " ")