mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-19 04:37:52 -06:00
Fixed OnContextMenu() under OSX
This commit is contained in:
parent
e8f27c6407
commit
9b5a577c07
1 changed files with 8 additions and 10 deletions
|
@ -738,18 +738,16 @@ void ObjectList::OnContextMenu(wxDataViewEvent&)
|
||||||
wxDataViewColumn* col;
|
wxDataViewColumn* col;
|
||||||
const wxPoint pt = get_mouse_position_in_control();
|
const wxPoint pt = get_mouse_position_in_control();
|
||||||
HitTest(pt, item, col);
|
HitTest(pt, item, col);
|
||||||
if (!item)
|
|
||||||
#ifdef __WXOSX__ // temporary workaround for OSX
|
#ifdef __WXOSX__ // temporary workaround for OSX
|
||||||
// after Yosemite OS X version, HitTest return undefined item
|
// after Yosemite OS X version, HitTest return undefined item
|
||||||
item = GetSelection();
|
if (!item) item = GetSelection();
|
||||||
if (item)
|
|
||||||
show_context_menu();
|
|
||||||
else
|
|
||||||
printf("undefined item\n");
|
|
||||||
return;
|
|
||||||
#else
|
|
||||||
return;
|
|
||||||
#endif // __WXOSX__
|
#endif // __WXOSX__
|
||||||
|
|
||||||
|
if (!item) {
|
||||||
|
printf("undefined item\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const wxString title = col->GetTitle();
|
const wxString title = col->GetTitle();
|
||||||
|
|
||||||
if (title == " ")
|
if (title == " ")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue