X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24ee1bef74a8f403ad3df207edd9d656648c4da5..e9d7a889634ee5cbe90bcc639c6197a29169be3a:/src/gtk/listbox.cpp?ds=inline diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 19d4beb5a6..788f1f4cb2 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -25,15 +25,20 @@ #include "wx/arrstr.h" #endif -#include "wx/gtk/private.h" -#include "wx/gtk/treeentry_gtk.h" - #if wxUSE_TOOLTIPS #include "wx/tooltip.h" #endif #include +#include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" +#include "wx/gtk/private/object.h" +#include "wx/gtk/treeentry_gtk.h" + #include +#if GTK_CHECK_VERSION(3,0,0) +#include +#endif //----------------------------------------------------------------------------- // data @@ -56,6 +61,31 @@ extern bool g_blockEventsOnScroll; #define WXLISTBOX_DATACOLUMN WXLISTBOX_DATACOLUMN_ARG(this) +// ---------------------------------------------------------------------------- +// helper functions +// ---------------------------------------------------------------------------- + +namespace +{ + +// Return the entry for the given listbox item. +// +// Return value must be released by caller if non-NULL. +GtkTreeEntry * +GetEntry(GtkListStore *store, GtkTreeIter *iter, const wxListBox *listbox) +{ + GtkTreeEntry* entry; + gtk_tree_model_get(GTK_TREE_MODEL(store), + iter, + WXLISTBOX_DATACOLUMN_ARG(listbox), + &entry, + -1); + + return entry; +} + +} // anonymous namespace + //----------------------------------------------------------------------------- // "row-activated" //----------------------------------------------------------------------------- @@ -74,37 +104,7 @@ gtk_listbox_row_activated_callback(GtkTreeView * WXUNUSED(treeview), int sel = gtk_tree_path_get_indices(path)[0]; - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); - 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 ); + listbox->GTKOnActivated(sel); } } @@ -151,27 +151,7 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget), if (index != wxNOT_FOUND) { - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); - 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); + listbox->GTKOnActivated(index); // wxMac and wxMSW always invoke default action // if (!ret) @@ -223,29 +203,16 @@ static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(model), GtkTreeIter *b, wxListBox *listbox) { - GtkTreeEntry* entry; - GtkTreeEntry* entry2; - - gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore), - a, - WXLISTBOX_DATACOLUMN_ARG(listbox), - &entry, -1); - gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore), - b, - WXLISTBOX_DATACOLUMN_ARG(listbox), - &entry2, -1); - wxCHECK_MSG(entry, 0, wxT("Could not get entry")); - wxCHECK_MSG(entry2, 0, wxT("Could not get entry2")); - - //We compare collate keys here instead of calling g_utf8_collate - //as it is rather slow (and even the docs reccommend this) - int ret = strcmp(gtk_tree_entry_get_collate_key(entry), - gtk_tree_entry_get_collate_key(entry2)) >= 0; + wxGtkObject entry1(GetEntry(listbox->m_liststore, a, listbox)); + wxCHECK_MSG(entry1, 0, wxT("Could not get first entry")); - g_object_unref (entry); - g_object_unref (entry2); + wxGtkObject entry2(GetEntry(listbox->m_liststore, b, listbox)); + wxCHECK_MSG(entry2, 0, wxT("Could not get second entry")); - return ret; + //We compare collate keys here instead of calling g_utf8_collate + //as it is rather slow (and even the docs recommend this) + return strcmp(gtk_tree_entry_get_collate_key(entry1), + gtk_tree_entry_get_collate_key(entry2)) >= 0; } } @@ -260,21 +227,13 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model), GtkTreeIter* iter, wxListBox* listbox) { - GtkTreeEntry* entry; - - gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore), - iter, - WXLISTBOX_DATACOLUMN_ARG(listbox), - &entry, -1); + wxGtkObject + entry(GetEntry(listbox->m_liststore, iter, listbox)); wxCHECK_MSG(entry, 0, wxT("Could not get entry")); - wxGtkString keycollatekey(g_utf8_collate_key(key, -1)); - - int ret = strcmp(keycollatekey, - gtk_tree_entry_get_collate_key(entry)); - g_object_unref (entry); + wxGtkString keycollatekey(g_utf8_collate_key(key, -1)); - return ret != 0; + return strcmp(keycollatekey, gtk_tree_entry_get_collate_key(entry)) != 0; } } @@ -282,8 +241,6 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model), // wxListBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) - // ---------------------------------------------------------------------------- // construction // ---------------------------------------------------------------------------- @@ -476,7 +433,7 @@ void wxListBox::Update() wxWindow::Update(); if (m_treeview) - gdk_window_process_updates(GTK_WIDGET(m_treeview)->window, TRUE); + gdk_window_process_updates(gtk_widget_get_window(GTK_WIDGET(m_treeview)), true); } // ---------------------------------------------------------------------------- @@ -505,7 +462,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, const unsigned int numItems = items.GetCount(); for ( unsigned int i = 0; i < numItems; ++i ) { - GtkTreeEntry* entry = gtk_tree_entry_new(); + wxGtkObject entry(gtk_tree_entry_new()); gtk_tree_entry_set_label(entry, wxGTK_CONV(items[i])); gtk_tree_entry_set_destroy_func(entry, (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb, @@ -516,8 +473,6 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, GTKSetItem(itercur, entry); - g_object_unref (entry); - if (clientData) AssignNewItemClientData(GTKGetIndexFor(itercur), clientData, i, type); } @@ -542,6 +497,8 @@ void wxListBox::DoClear() gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */ GTKEnableEvents(); + + UpdateOldSelections(); } void wxListBox::DoDeleteOneItem(unsigned int n) @@ -601,12 +558,7 @@ GtkTreeEntry *wxListBox::GTKGetEntry(unsigned n) const if ( !GTKGetIteratorFor(n, &iter) ) return NULL; - - GtkTreeEntry* entry = NULL; - gtk_tree_model_get(GTK_TREE_MODEL(m_liststore), &iter, - WXLISTBOX_DATACOLUMN, &entry, -1); - - return entry; + return GetEntry(m_liststore, &iter, this); } void wxListBox::GTKSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry) @@ -632,27 +584,18 @@ void wxListBox::GTKSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry) void* wxListBox::DoGetItemClientData(unsigned int n) const { - wxCHECK_MSG( IsValid(n), NULL, - wxT("Invalid index passed to GetItemClientData") ); - - GtkTreeEntry* entry = GTKGetEntry(n); + wxGtkObject entry(GTKGetEntry(n)); wxCHECK_MSG(entry, NULL, wxT("could not get entry")); - void* userdata = gtk_tree_entry_get_userdata( entry ); - g_object_unref (entry); - return userdata; + return gtk_tree_entry_get_userdata( entry ); } void wxListBox::DoSetItemClientData(unsigned int n, void* clientData) { - wxCHECK_RET( IsValid(n), - wxT("Invalid index passed to SetItemClientData") ); - - GtkTreeEntry* entry = GTKGetEntry(n); + wxGtkObject entry(GTKGetEntry(n)); wxCHECK_RET(entry, wxT("could not get entry")); gtk_tree_entry_set_userdata( entry, clientData ); - g_object_unref (entry); } // ---------------------------------------------------------------------------- @@ -683,13 +626,10 @@ wxString wxListBox::GetString(unsigned int n) const { wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") ); - GtkTreeEntry* entry = GTKGetEntry(n); + wxGtkObject entry(GTKGetEntry(n)); wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") ); - wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ); - - g_object_unref (entry); - return label; + return wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ); } unsigned int wxListBox::GetCount() const @@ -721,6 +661,11 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const // selection // ---------------------------------------------------------------------------- +void wxListBox::GTKOnActivated(int item) +{ + SendEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, item, IsSelected(item)); +} + void wxListBox::GTKOnSelectionChanged() { if ( HasFlag(wxLB_MULTIPLE | wxLB_EXTENDED) ) @@ -729,44 +674,9 @@ void wxListBox::GTKOnSelectionChanged() } else // single selection { - const int index = GetSelection(); - if ( !DoChangeSingleSelection(index) ) - return; - - 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); - } + const int item = GetSelection(); + if ( DoChangeSingleSelection(item) ) + SendEvent(wxEVT_COMMAND_LISTBOX_SELECTED, item, true); } } @@ -819,7 +729,7 @@ bool wxListBox::IsSelected( int n ) const GtkTreeIter iter; wxCHECK_MSG( GTKGetIteratorFor(n, &iter), false, wxT("Invalid index") ); - return gtk_tree_selection_iter_is_selected(selection, &iter); + return gtk_tree_selection_iter_is_selected(selection, &iter) != 0; } void wxListBox::DoSetSelection( int n, bool select ) @@ -865,7 +775,7 @@ void wxListBox::DoScrollToCell(int n, float alignY, float alignX) wxCHECK_RET( IsValid(n), wxT("invalid index")); //RN: I have no idea why this line is needed... - if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_treeview)) + if (gdk_pointer_is_grabbed () && gtk_widget_has_grab(GTK_WIDGET(m_treeview))) return; GtkTreeIter iter; @@ -906,7 +816,7 @@ int wxListBox::DoListHitTest(const wxPoint& point) const // need to translate from master window since it is in client coords gint binx, biny; gdk_window_get_geometry(gtk_tree_view_get_bin_window(m_treeview), - &binx, &biny, NULL, NULL, NULL); + &binx, &biny, NULL, NULL); GtkTreePath* path; if ( !gtk_tree_view_get_path_at_pos @@ -933,14 +843,6 @@ int wxListBox::DoListHitTest(const wxPoint& point) const // helpers // ---------------------------------------------------------------------------- -#if wxUSE_TOOLTIPS -void wxListBox::GTKApplyToolTip( GtkTooltips *tips, const gchar *tip ) -{ - // RN: Is this needed anymore? - gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, NULL ); -} -#endif // wxUSE_TOOLTIPS - GtkWidget *wxListBox::GetConnectWidget() { // the correct widget for listbox events (such as mouse clicks for example) @@ -955,7 +857,10 @@ GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) { - if (m_hasBgCol && m_backgroundColour.Ok()) +#ifdef __WXGTK3__ + // don't know if this is even necessary, or how to do it +#else + if (m_hasBgCol && m_backgroundColour.IsOk()) { GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview); if (window) @@ -965,8 +870,9 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style) gdk_window_clear( window ); } } +#endif - gtk_widget_modify_style( GTK_WIDGET(m_treeview), style ); + GTKApplyStyle(GTK_WIDGET(m_treeview), style); } wxSize wxListBox::DoGetBestSize() const