This commit is contained in:
YuSanka 2019-09-23 10:17:53 +02:00
parent 927ad5776c
commit 4e22761f95

View File

@ -810,8 +810,13 @@ void ObjectList::list_manipulation(bool evt_context_menu/* = false*/)
*/ */
if (!item) { if (!item) {
if (wxOSX && col == nullptr) if (col == nullptr) {
if (wxOSX)
UnselectAll(); UnselectAll();
else
return;
}
if (evt_context_menu) { if (evt_context_menu) {
show_context_menu(evt_context_menu); show_context_menu(evt_context_menu);
return; return;
@ -1330,7 +1335,7 @@ wxMenu* ObjectList::append_submenu_add_generic(wxMenu* menu, const ModelVolumeTy
for (auto& item : { L("Box"), L("Cylinder"), L("Sphere"), L("Slab") }) for (auto& item : { L("Box"), L("Cylinder"), L("Sphere"), L("Slab") })
{ {
if (type == ModelVolumeType::INVALID && item == "Slab") if (type == ModelVolumeType::INVALID && strncmp(item, "Slab", 4) == 0)
continue; continue;
append_menu_item(sub_menu, wxID_ANY, _(item), "", append_menu_item(sub_menu, wxID_ANY, _(item), "",
[this, type, item](wxCommandEvent&) { load_generic_subobject(item, type); }, "", menu); [this, type, item](wxCommandEvent&) { load_generic_subobject(item, type); }, "", menu);