Fix under OSX for 584b37513f
This commit is contained in:
parent
91311fc0a0
commit
ddf37d3b01
1 changed files with 13 additions and 2 deletions
|
@ -794,15 +794,26 @@ void ObjectList::list_manipulation(bool evt_context_menu/* = false*/)
|
||||||
const wxPoint pt = get_mouse_position_in_control();
|
const wxPoint pt = get_mouse_position_in_control();
|
||||||
HitTest(pt, item, col);
|
HitTest(pt, item, col);
|
||||||
|
|
||||||
|
/* Note: Under OSX right click doesn't send "selection changed" event.
|
||||||
|
* It means that Selection() will be return still previously selected item.
|
||||||
|
* Thus under OSX we should force UnselectAll(), when item and col are nullptr,
|
||||||
|
* and select new item otherwise.
|
||||||
|
*/
|
||||||
|
|
||||||
if (!item) {
|
if (!item) {
|
||||||
if (col == nullptr)
|
if (wxOSX && col == nullptr)
|
||||||
return;
|
UnselectAll();
|
||||||
if (evt_context_menu) {
|
if (evt_context_menu) {
|
||||||
show_context_menu(evt_context_menu);
|
show_context_menu(evt_context_menu);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (wxOSX && item && col) {
|
||||||
|
UnselectAll();
|
||||||
|
Select(item);
|
||||||
|
}
|
||||||
|
|
||||||
const wxString title = col->GetTitle();
|
const wxString title = col->GetTitle();
|
||||||
|
|
||||||
if (title == " ")
|
if (title == " ")
|
||||||
|
|
Loading…
Add table
Reference in a new issue