Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move wxListBox selection event generation to wxListBox itself

Browse Source 
This allows to avoid making DoChangeSingleSelection() and
CalcAndSendEvent() public.

No real changes, this is just a refactoring.
This commit is contained in:
Vadim Zeitlin
2018-06-30 23:13:33 +02:00
parent 1eee7a8a3c
commit dde6f662fc
3 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/osx/listbox.h
View File

@@ -126,10 +126,8 @@ public:
virtual void HandleLineEvent( unsigned int n, bool doubleClick );
// These are called by wxNSTableView
using wxListBoxBase::DoChangeSingleSelection;
using wxListBoxBase::CalcAndSendEvent;
int GetOldSelection() const { return m_oldSelections.empty() ? wxNOT_FOUND : m_oldSelections[0]; }
// This is called by wxNSTableView
void MacHandleSelectionChange(int row);
protected:
// callback for derived classes which may have to insert additional data

24
src/osx/cocoa/listbox.mm
View File

@@ -301,29 +301,7 @@ protected:
wxListBox* const list = wxDynamicCast(impl->GetWXPeer(), wxListBox);
wxCHECK_RET( list != NULL , "Associated control should be a wxListBox" );
// Correct notification events for multiselection list, like in Carbon version
if (list->HasMultipleSelection() && !list->MacGetBlockEvents())
{
list->CalcAndSendEvent();
return;
}
if ( !list->MacGetBlockEvents() )
{
// OS X can select an item below the last item. In that case keep the old selection because
// in wxWidgets API there is no notification event for removing the selection from a single-selection list box.
// Otherwise call DoChangeSingleSelection so GetOldSelection() will return the correct value if row < 0 later.
if ((row < 0) || (row > (int) list->GetCount()))
{
int oldsel = list->GetOldSelection();
if (oldsel >= 0)
list->SetSelection(oldsel);
return;
}
if ( !list->DoChangeSingleSelection(row) )
return ;
list->HandleLineEvent( row, false );
}
list->MacHandleSelectionChange(row);
}
- (void)setFont:(NSFont *)aFont

30
src/osx/listbox_osx.cpp
View File

@@ -420,6 +420,36 @@ void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
HandleWindowEvent(event);
}
void wxListBox::MacHandleSelectionChange(int row)
{
// Correct notification events for multiselection list, like in Carbon version
if ( HasMultipleSelection() && !MacGetBlockEvents() )
{
CalcAndSendEvent();
return;
}
if ( !MacGetBlockEvents() )
{
// OS X can select an item below the last item. In that case keep the old selection because
// in wxWidgets API there is no notification event for removing the selection from a single-selection list box.
// Otherwise call DoChangeSingleSelection so GetOldSelection() will return the correct value if row < 0 later.
if ((row < 0) || (row > (int) GetCount()))
{
if ( !m_oldSelections.empty() )
{
const int oldsel = m_oldSelections[0];
if (oldsel >= 0)
SetSelection(oldsel);
}
return;
}
if ( !DoChangeSingleSelection(row) )
return ;
HandleLineEvent( row, false );
}
}
//
// common list cell value operations
//