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

Don't duplicate event sending code in wxGTK wxListBox.

Browse Source 
Reuse wxListBoxBase::SetEvent() instead of duplicating its code in wxGTK.

Also get rid of the code checking for selection of the item with index -1:
this can't happen any more since r65865 which changed GTK_SELECTION_SINGLE to
GTK_SELECTION_BROWSE.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-10-27 23:22:00 +00:00
parent 24ee1bef74
commit 09e744f552
2 changed files with 11 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,6 +101,7 @@ public:
void GTKEnableEvents(); void GTKEnableEvents();
void GTKOnSelectionChanged(); void GTKOnSelectionChanged();
void GTKOnActivated(int item);
protected: protected:
virtual void DoClear(); virtual void DoClear();

100
src/gtk/listbox.cpp
View File

@@ -74,37 +74,7 @@ gtk_listbox_row_activated_callback(GtkTreeView * WXUNUSED(treeview),
int sel = gtk_tree_path_get_indices(path)[0]; int sel = gtk_tree_path_get_indices(path)[0];
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); listbox->GTKOnActivated(sel);
event.SetEventObject( listbox );
if (listbox->IsSelected(sel))
{
GtkTreeEntry* entry = listbox->GTKGetEntry(sel);
if (entry)
{
event.SetInt(sel);
event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
if ( listbox->HasClientObjectData() )
event.SetClientObject( (wxClientData*) gtk_tree_entry_get_userdata(entry) );
else if ( listbox->HasClientUntypedData() )
event.SetClientData( gtk_tree_entry_get_userdata(entry) );
g_object_unref (entry);
}
else
{
wxLogSysError(wxT("Internal error - could not get entry for double-click"));
event.SetInt(-1);
}
}
else
{
event.SetInt(-1);
}
listbox->HandleWindowEvent( event );
} }
} }
@@ -151,27 +121,7 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
if (index != wxNOT_FOUND) if (index != wxNOT_FOUND)
{ {
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); listbox->GTKOnActivated(index);
event.SetEventObject( listbox );
GtkTreeEntry* entry = listbox->GTKGetEntry( index );
// indicate that this is a selection
event.SetExtraLong( 1 );
event.SetInt( index );
event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
if ( listbox->HasClientObjectData() )
event.SetClientObject(
(wxClientData*) gtk_tree_entry_get_userdata(entry)
);
else if ( listbox->HasClientUntypedData() )
event.SetClientData( gtk_tree_entry_get_userdata(entry) );
/* bool ret = */ listbox->HandleWindowEvent( event );
g_object_unref (entry);
// wxMac and wxMSW always invoke default action // wxMac and wxMSW always invoke default action
// if (!ret) // if (!ret)
@@ -721,6 +671,11 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const
// selection // selection
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxListBox::GTKOnActivated(int item)
{
SendEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, item, IsSelected(item));
}
void wxListBox::GTKOnSelectionChanged() void wxListBox::GTKOnSelectionChanged()
{ {
if ( HasFlag(wxLB_MULTIPLE | wxLB_EXTENDED) ) if ( HasFlag(wxLB_MULTIPLE | wxLB_EXTENDED) )
@@ -729,44 +684,9 @@ void wxListBox::GTKOnSelectionChanged()
} }
else // single selection else // single selection
{ {
const int index = GetSelection(); const int item = GetSelection();
if ( !DoChangeSingleSelection(index) ) if ( DoChangeSingleSelection(item) )
return; SendEvent(wxEVT_COMMAND_LISTBOX_SELECTED, item, true);
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId() );
event.SetEventObject( this );
if (index == wxNOT_FOUND)
{
// indicate that this is a deselection
event.SetExtraLong( 0 );
event.SetInt( -1 );
HandleWindowEvent( event );
return;
}
else
{
GtkTreeEntry* entry = GTKGetEntry( index );
// indicate that this is a selection
event.SetExtraLong( 1 );
event.SetInt( index );
event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
if ( HasClientObjectData() )
event.SetClientObject(
(wxClientData*) gtk_tree_entry_get_userdata(entry)
);
else if ( HasClientUntypedData() )
event.SetClientData( gtk_tree_entry_get_userdata(entry) );
HandleWindowEvent( event );
g_object_unref (entry);
}
} }
} }