picker controls improvements: fixes to valid paths recognition and event generation...

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 02a7a5d88f079ad02285a1f4cd937839f93eeb00..beb8d7d33644dc4be83b01942ebd88943f31dbab 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -14,18 +14,22 @@
 #if wxUSE_LISTBOX
 
 #include "wx/listbox.h"
 #if wxUSE_LISTBOX
 
 #include "wx/listbox.h"

-#include "wx/dynarray.h"
-#include "wx/arrstr.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/checklst.h"
-#include "wx/settings.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #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/gtk/private.h"
 #include "wx/gtk/treeentry_gtk.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/gtk/private.h"
 #include "wx/gtk/treeentry_gtk.h"
 
 #if wxUSE_TOOLTIPS

-#include "wx/tooltip.h"
+    #include "wx/tooltip.h"

 #endif
 
 #include <gdk/gdk.h>
 #endif
 
 #include <gdk/gdk.h>


@@ -102,7 +106,7 @@ gtk_listbox_row_activated_callback(GtkTreeView        *treeview,
                     (wxClientData*) gtk_tree_entry_get_userdata(entry) );
                 else if ( listbox->HasClientUntypedData() )
                     event.SetClientData( gtk_tree_entry_get_userdata(entry) );
                     (wxClientData*) gtk_tree_entry_get_userdata(entry) );
                 else if ( listbox->HasClientUntypedData() )
                     event.SetClientData( gtk_tree_entry_get_userdata(entry) );

-                g_object_unref(G_OBJECT(entry));
+                g_object_unref (entry);

             }
             else
             {
             }
             else
             {


@@ -316,7 +320,7 @@ static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection,
 
         listbox->GetEventHandler()->ProcessEvent( event );
 
 
         listbox->GetEventHandler()->ProcessEvent( event );
 

-        g_object_unref(G_OBJECT(entry));
+        g_object_unref (entry);

         return FALSE;  //We handled it/did it manually
     }
 
         return FALSE;  //We handled it/did it manually
     }
 


@@ -370,8 +374,8 @@ static gint gtk_listbox_sort_callback(GtkTreeModel *model,
     int ret = strcasecmp(gtk_tree_entry_get_collate_key(entry),
                          gtk_tree_entry_get_collate_key(entry2));
 
     int ret = strcasecmp(gtk_tree_entry_get_collate_key(entry),
                          gtk_tree_entry_get_collate_key(entry2));
 

-    g_object_unref(G_OBJECT(entry));
-    g_object_unref(G_OBJECT(entry2));
+    g_object_unref (entry);
+    g_object_unref (entry2);

 
     return ret;
 }
 
     return ret;
 }


@@ -401,7 +405,7 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model,
                          gtk_tree_entry_get_collate_key(entry));
 
     g_free(keycollatekey);
                          gtk_tree_entry_get_collate_key(entry));
 
     g_free(keycollatekey);

-    g_object_unref(G_OBJECT(entry));
+    g_object_unref (entry);

 
     return ret != 0;
 }
 
     return ret != 0;
 }


@@ -467,6 +471,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
     }
 
         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
     }
 

+
+    GtkScrolledWindowSetBorder(m_widget, style);
+

     m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) );
 
     //wxListBox doesn't have a header :)
     m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) );
 
     //wxListBox doesn't have a header :)


@@ -495,7 +502,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_tree_view_set_model(m_treeview, GTK_TREE_MODEL(m_liststore));
 
 
     gtk_tree_view_set_model(m_treeview, GTK_TREE_MODEL(m_liststore));
 

-    g_object_unref(G_OBJECT(m_liststore)); //free on treeview destruction
+    g_object_unref (m_liststore); //free on treeview destruction

 
     // Disable the pop-up textctrl that enables searching - note that
     // the docs specify that even if this disabled (which we are doing)
 
     // Disable the pop-up textctrl that enables searching - note that
     // the docs specify that even if this disabled (which we are doing)


@@ -656,7 +663,7 @@ void wxListBox::GtkInsertItems(const wxArrayString& items,
             gtk_list_store_set(m_liststore, &itercur,
                                  0, entry, -1);
 
             gtk_list_store_set(m_liststore, &itercur,
                                  0, entry, -1);
 

-        g_object_unref(G_OBJECT(entry)); //liststore always refs :)
+        g_object_unref (entry); //liststore always refs :)

     }
 }
 
     }
 }
 


@@ -758,7 +765,7 @@ void* wxListBox::DoGetItemClientData(unsigned int n) const
     wxCHECK_MSG(entry, NULL, wxT("could not get entry"));
 
     void* userdata = gtk_tree_entry_get_userdata( entry );
     wxCHECK_MSG(entry, NULL, wxT("could not get entry"));
 
     void* userdata = gtk_tree_entry_get_userdata( entry );

-    g_object_unref(G_OBJECT(entry));
+    g_object_unref (entry);

     return userdata;
 }
 
     return userdata;
 }
 


@@ -776,7 +783,7 @@ void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
     wxCHECK_RET(entry, wxT("could not get entry"));
 
     gtk_tree_entry_set_userdata( entry, clientData );
     wxCHECK_RET(entry, wxT("could not get entry"));
 
     gtk_tree_entry_set_userdata( entry, clientData );

-    g_object_unref(G_OBJECT(entry));
+    g_object_unref (entry);

 }
 
 void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
 }
 
 void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)


@@ -809,7 +816,7 @@ void wxListBox::SetString(unsigned int n, const wxString &string)
     // notification function...
     void* userdata = gtk_tree_entry_get_userdata(entry);
     gtk_tree_entry_set_userdata(entry, NULL); //don't delete on destroy
     // notification function...
     void* userdata = gtk_tree_entry_get_userdata(entry);
     gtk_tree_entry_set_userdata(entry, NULL); //don't delete on destroy

-    g_object_unref(G_OBJECT(entry));
+    g_object_unref (entry);

 
     bool bWasSelected = wxListBox::IsSelected(n);
     wxListBox::Delete(n);
 
     bool bWasSelected = wxListBox::IsSelected(n);
     wxListBox::Delete(n);


@@ -838,7 +845,7 @@ wxString wxListBox::GetString(unsigned int n) const
         label.erase(0, 4);
 #endif // wxUSE_CHECKLISTBOX
 
         label.erase(0, 4);
 #endif // wxUSE_CHECKLISTBOX
 

-    g_object_unref(G_OBJECT(entry));
+    g_object_unref (entry);

     return label;
 }
 
     return label;
 }
 


@@ -873,8 +880,8 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const
 
 int wxListBox::GetSelection() 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;
                     wxT("must be single selection listbox"));
 
     GtkTreeIter iter;


@@ -882,7 +889,7 @@ int wxListBox::GetSelection() const
 
     // only works on single-sel
     if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
 
     // 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);
 
     GtkTreePath* path =
         gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);


@@ -896,7 +903,7 @@ int wxListBox::GetSelection() const
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) 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();
 
 
     aSelections.Empty();
 


@@ -937,7 +944,30 @@ bool wxListBox::IsSelected( int n ) const
 
 void wxListBox::DoSetSelection( int n, bool select )
 {
 
 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();
+    }
+
+    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)
 }
 
 void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent)


@@ -997,6 +1027,11 @@ void wxListBox::DoSetFirstItem( int n )
 
 int wxListBox::DoListHitTest(const wxPoint& point) const
 {
 
 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) )
+        return wxNOT_FOUND;
+

     // 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),
     // 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),