Use generic collapsible pane for wxUniv based builds.

[wxWidgets.git] / src / gtk / listbox.cpp

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index a8d8ab56454205c459f6b221aec20f361a9c0835..ad3193f273827e335f3c146dc64f5173f6a1a83e 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -20,11 +20,11 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/checklst.h"
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/arrstr.h"
-#include "wx/checklst.h"
-#include "wx/settings.h"
 #include "wx/gtk/private.h"
 #include "wx/gtk/treeentry_gtk.h"
 
@@ -42,7 +42,6 @@
 
 extern bool           g_blockEventsOnDrag;
 extern bool           g_blockEventsOnScroll;
-extern wxCursor       g_globalCursor;
 
 
 
@@ -158,7 +157,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
                                    GdkEventButton *gdk_event,
                                    wxListBox *listbox )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    // don't need to install idle handler, its done from "event" signal
 
     if (g_blockEventsOnDrag) return FALSE;
     if (g_blockEventsOnScroll) return FALSE;
@@ -204,7 +203,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget,
                                 GdkEventKey *gdk_event,
                                 wxListBox *listbox )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    // don't need to install idle handler, its done from "event" signal
 
     if (g_blockEventsOnDrag) return FALSE;
 
@@ -241,13 +240,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget,
         listbox->m_spacePressed = true;
     }
 
-    if (ret)
-    {
-        g_signal_stop_emission_by_name (widget, "key_press_event");
-        return TRUE;
-    }
-
-    return FALSE;
+    return ret;
 }
 }
 
@@ -399,12 +392,11 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model,
                              WXLISTBOX_DATACOLUMN_ARG(listbox),
                              &entry, -1);
     wxCHECK_MSG(entry, 0, wxT("Could not get entry"));
-    gchar* keycollatekey = g_utf8_collate_key(key, -1);
+    wxGtkString keycollatekey(g_utf8_collate_key(key, -1));
 
     int ret = strcasecmp(keycollatekey,
                          gtk_tree_entry_get_collate_key(entry));
 
-    g_free(keycollatekey);
     g_object_unref (entry);
 
     return ret != 0;
@@ -563,6 +555,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     gtk_container_add (GTK_CONTAINER (m_widget), GTK_WIDGET(m_treeview) );
 
     gtk_widget_show( GTK_WIDGET(m_treeview) );
+    m_focusWidget = GTK_WIDGET(m_treeview);
 
     wxListBox::DoInsertItems(wxArrayString(n, choices), 0); // insert initial items
 
@@ -880,8 +873,8 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const
 
 int wxListBox::GetSelection() const
 {
-    wxCHECK_MSG( m_treeview != NULL, -1, wxT("invalid listbox"));
-    wxCHECK_MSG( HasFlag(wxLB_SINGLE), -1,
+    wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox"));
+    wxCHECK_MSG( HasFlag(wxLB_SINGLE), wxNOT_FOUND,
                     wxT("must be single selection listbox"));
 
     GtkTreeIter iter;
@@ -889,7 +882,7 @@ int wxListBox::GetSelection() const
 
     // only works on single-sel
     if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
-        return -1;
+        return wxNOT_FOUND;
 
     GtkTreePath* path =
         gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);
@@ -903,7 +896,7 @@ int wxListBox::GetSelection() const
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {
-    wxCHECK_MSG( m_treeview != NULL, -1, wxT("invalid listbox") );
+    wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
 
     aSelections.Empty();
 
@@ -944,7 +937,31 @@ bool wxListBox::IsSelected( int n ) const
 
 void wxListBox::DoSetSelection( int n, bool select )
 {
-    return GtkSetSelection(n, select, true); //docs say no events here
+    // passing -1 to SetSelection() is documented to deselect all items
+    if ( n == wxNOT_FOUND )
+    {
+        // ... and not generate any events in the process
+        GtkDeselectAll();
+       return;
+    }
+
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") );
+
+    // don't generate the selection event
+    GtkSetSelection(n, select, true);
+}
+
+void wxListBox::GtkDeselectAll()
+{
+    wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
+
+    GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
+
+    m_blockEvent = true;
+
+    gtk_tree_selection_unselect_all(selection);
+
+    m_blockEvent = false;
 }
 
 void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent)
@@ -1006,7 +1023,7 @@ int wxListBox::DoListHitTest(const wxPoint& point) const
 {
     // gtk_tree_view_get_path_at_pos() also gets items that are not visible and
     // we only want visible items we need to check for it manually here
-    if ( !GetClientRect().Inside(point) )
+    if ( !GetClientRect().Contains(point) )
         return wxNOT_FOUND;
 
     // need to translate from master window since it is in client coords
@@ -1054,9 +1071,9 @@ GtkWidget *wxListBox::GetConnectWidget()
     return GTK_WIDGET(m_treeview);
 }
 
-bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
-    return (window == gtk_tree_view_get_bin_window(m_treeview));
+    return gtk_tree_view_get_bin_window(m_treeview);
 }
 
 void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
@@ -1075,26 +1092,6 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
     gtk_widget_modify_style( GTK_WIDGET(m_treeview), style );
 }
 
-void wxListBox::OnInternalIdle()
-{
-    //RN: Is this needed anymore?
-    wxCursor cursor = m_cursor;
-    if (g_globalCursor.Ok()) cursor = g_globalCursor;
-
-    if (GTK_WIDGET(m_treeview)->window && cursor.Ok())
-    {
-        /* I now set the cursor the anew in every OnInternalIdle call
-           as setting the cursor in a parent window also effects the
-           windows above so that checking for the current cursor is
-           not possible. */
-        GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview);
-        gdk_window_set_cursor( window, cursor.GetCursor() );
-    }
-
-    if (wxUpdateUIEvent::CanUpdate(this))
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
 wxSize wxListBox::DoGetBestSize() const
 {
     wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view"));