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

added a preImage of the selection in order to avoid unnecessary events being triggered

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-11-18 18:52:47 +00:00
parent f47db8f067
commit ccf0e7f6d4
3 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/mac/listbox.h
View File

@@ -113,6 +113,7 @@ public:
ListHandle m_macList ; ListHandle m_macList ;
wxArrayString m_stringArray ; wxArrayString m_stringArray ;
wxListDataArray m_dataArray ; wxListDataArray m_dataArray ;
wxArrayInt m_selectionPreImage ;
void MacSetRedraw( bool doDraw ) ; void MacSetRedraw( bool doDraw ) ;
protected: protected:
void MacDestroy() ; void MacDestroy() ;

44
src/mac/carbon/listbox.cpp
View File

@@ -440,7 +440,8 @@ void wxListBox::SetSelection(int N, bool select)
{ {
wxCHECK_RET( N >= 0 && N < m_noItems, wxCHECK_RET( N >= 0 && N < m_noItems,
"invalid index in wxListBox::SetSelection" ); "invalid index in wxListBox::SetSelection" );
MacSetSelection( N , select ) ; MacSetSelection( N , select ) ;
GetSelections( m_selectionPreImage ) ;
} }
bool wxListBox::IsSelected(int N) const bool wxListBox::IsSelected(int N) const
@@ -448,7 +449,7 @@ bool wxListBox::IsSelected(int N) const
wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE, wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
"invalid index in wxListBox::Selected" ); "invalid index in wxListBox::Selected" );
return MacIsSelected( N ) ; return MacIsSelected( N ) ;
} }
void *wxListBox::DoGetItemClientData(int N) const void *wxListBox::DoGetItemClientData(int N) const
@@ -498,23 +499,6 @@ void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
int wxListBox::GetSelections(wxArrayInt& aSelections) const int wxListBox::GetSelections(wxArrayInt& aSelections) const
{ {
return MacGetSelections( aSelections ) ; return MacGetSelections( aSelections ) ;
/* TODO
if ((m_windowStyle & wxLB_MULTIMacE) || (m_windowStyle & wxLB_EXTENDED))
{
int no_sel = ??
for ( int n = 0; n < no_sel; n++ )
aSelections.Add(??);
return no_sel;
}
else // single-selection listbox
{
aSelections.Add(??);
return 1;
}
*/
} }
// Get single selection, for single choice list items // Get single selection, for single choice list items
@@ -768,11 +752,27 @@ void wxListBox::MacSetRedraw( bool doDraw )
void wxListBox::MacDoClick() void wxListBox::MacDoClick()
{ {
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
event.SetEventObject( this );
wxArrayInt aSelections; wxArrayInt aSelections;
int n, count = GetSelections(aSelections); int n, count = GetSelections(aSelections);
if ( count == m_selectionPreImage.GetCount() )
{
bool hasChanged = false ;
for ( int i = 0 ; i < count ; ++i )
{
if ( aSelections[i] != m_selectionPreImage[i] )
{
hasChanged = true ;
break ;
}
}
if ( !hasChanged )
return ;
}
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
event.SetEventObject( this );
if ( count > 0 ) if ( count > 0 )
{ {
n = aSelections[0]; n = aSelections[0];

44
src/mac/listbox.cpp
View File

@@ -440,7 +440,8 @@ void wxListBox::SetSelection(int N, bool select)
{ {
wxCHECK_RET( N >= 0 && N < m_noItems, wxCHECK_RET( N >= 0 && N < m_noItems,
"invalid index in wxListBox::SetSelection" ); "invalid index in wxListBox::SetSelection" );
MacSetSelection( N , select ) ; MacSetSelection( N , select ) ;
GetSelections( m_selectionPreImage ) ;
} }
bool wxListBox::IsSelected(int N) const bool wxListBox::IsSelected(int N) const
@@ -448,7 +449,7 @@ bool wxListBox::IsSelected(int N) const
wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE, wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
"invalid index in wxListBox::Selected" ); "invalid index in wxListBox::Selected" );
return MacIsSelected( N ) ; return MacIsSelected( N ) ;
} }
void *wxListBox::DoGetItemClientData(int N) const void *wxListBox::DoGetItemClientData(int N) const
@@ -498,23 +499,6 @@ void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
int wxListBox::GetSelections(wxArrayInt& aSelections) const int wxListBox::GetSelections(wxArrayInt& aSelections) const
{ {
return MacGetSelections( aSelections ) ; return MacGetSelections( aSelections ) ;
/* TODO
if ((m_windowStyle & wxLB_MULTIMacE) || (m_windowStyle & wxLB_EXTENDED))
{
int no_sel = ??
for ( int n = 0; n < no_sel; n++ )
aSelections.Add(??);
return no_sel;
}
else // single-selection listbox
{
aSelections.Add(??);
return 1;
}
*/
} }
// Get single selection, for single choice list items // Get single selection, for single choice list items
@@ -768,11 +752,27 @@ void wxListBox::MacSetRedraw( bool doDraw )
void wxListBox::MacDoClick() void wxListBox::MacDoClick()
{ {
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
event.SetEventObject( this );
wxArrayInt aSelections; wxArrayInt aSelections;
int n, count = GetSelections(aSelections); int n, count = GetSelections(aSelections);
if ( count == m_selectionPreImage.GetCount() )
{
bool hasChanged = false ;
for ( int i = 0 ; i < count ; ++i )
{
if ( aSelections[i] != m_selectionPreImage[i] )
{
hasChanged = true ;
break ;
}
}
if ( !hasChanged )
return ;
}
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
event.SetEventObject( this );
if ( count > 0 ) if ( count > 0 )
{ {
n = aSelections[0]; n = aSelections[0];