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

indicate whether this is a selection or a deselection in wxCommandEvent generated by a multiselection wxListBox

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-02-02 03:05:41 +00:00
parent cf41e1a4d5
commit 9c9c3d7a8f
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/listbox.cpp
View File

@@ -243,7 +243,9 @@ static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbo
gtk_listitem_select_cb( widget, listbox, FALSE ); gtk_listitem_select_cb( widget, listbox, FALSE );
} }
static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection ) static void gtk_listitem_select_cb( GtkWidget *widget,
wxListBox *listbox,
bool is_selection )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
@@ -255,9 +257,8 @@ static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
event.SetEventObject( listbox ); event.SetEventObject( listbox );
// MSW doesn't do that either // indicate whether this is a selection or a deselection
// event.SetExtraLong( (long) is_selection ); event.SetExtraLong( is_selection );
if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0) if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0)
{ {

9
src/gtk1/listbox.cpp
View File

@@ -243,7 +243,9 @@ static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbo
gtk_listitem_select_cb( widget, listbox, FALSE ); gtk_listitem_select_cb( widget, listbox, FALSE );
} }
static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection ) static void gtk_listitem_select_cb( GtkWidget *widget,
wxListBox *listbox,
bool is_selection )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (g_isIdle) wxapp_install_idle_handler();
@@ -255,9 +257,8 @@ static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
event.SetEventObject( listbox ); event.SetEventObject( listbox );
// MSW doesn't do that either // indicate whether this is a selection or a deselection
// event.SetExtraLong( (long) is_selection ); event.SetExtraLong( is_selection );
if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0) if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0)
{ {

15
src/msw/listbox.cpp
View File

@@ -49,7 +49,7 @@
#endif #endif
#endif #endif
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
// ============================================================================ // ============================================================================
// list box item declaration and implementation // list box item declaration and implementation
@@ -675,20 +675,17 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
wxCommandEvent event(evtType, m_windowId); wxCommandEvent event(evtType, m_windowId);
event.SetEventObject( this ); event.SetEventObject( this );
wxArrayInt aSelections; // retrieve the affected item
int n, count = GetSelections(aSelections); int n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0);
if ( count > 0 ) if ( n != LB_ERR )
{ {
n = aSelections[0];
if ( HasClientObjectData() ) if ( HasClientObjectData() )
event.SetClientObject( GetClientObject(n) ); event.SetClientObject( GetClientObject(n) );
else if ( HasClientUntypedData() ) else if ( HasClientUntypedData() )
event.SetClientData( GetClientData(n) ); event.SetClientData( GetClientData(n) );
event.SetString( GetString(n) ); event.SetString( GetString(n) );
} event.SetExtraLong( HasMultipleSelection() ? IsSelected(n) : TRUE );
else
{
n = -1;
} }
event.m_commandInt = n; event.m_commandInt = n;