Explicitly set "C" locale for the tests using decimal point.

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 51664337887930e013b300c29fcaedec500d9a54..9a406184bd1db7f34d1be1681ceabba7b540514c 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/object.h"
 #include "wx/gtk/treeentry_gtk.h"
 
 #if wxUSE_TOOLTIPS
@@ -56,6 +57,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"
 //-----------------------------------------------------------------------------
@@ -173,29 +199,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"));
+    wxGtkObject<GtkTreeEntry> entry1(GetEntry(listbox->m_liststore, a, listbox));
+    wxCHECK_MSG(entry1, 0, wxT("Could not get first entry"));
+
+    wxGtkObject<GtkTreeEntry> entry2(GetEntry(listbox->m_liststore, b, listbox));
+    wxCHECK_MSG(entry2, 0, wxT("Could not get second entry"));
 
     //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;
-
-    g_object_unref (entry);
-    g_object_unref (entry2);
-
-    return ret;
+    return strcmp(gtk_tree_entry_get_collate_key(entry1),
+                  gtk_tree_entry_get_collate_key(entry2)) >= 0;
 }
 }
 
@@ -210,21 +223,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<GtkTreeEntry>
+        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;
 }
 }
 
@@ -232,8 +237,6 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model),
 // wxListBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
@@ -455,7 +458,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<GtkTreeEntry> 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,
@@ -466,8 +469,6 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
 
         GTKSetItem(itercur, entry);
 
-        g_object_unref (entry);
-
         if (clientData)
             AssignNewItemClientData(GTKGetIndexFor(itercur), clientData, i, type);
     }
@@ -551,12 +552,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)
@@ -582,27 +578,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<GtkTreeEntry> 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<GtkTreeEntry> entry(GTKGetEntry(n));
     wxCHECK_RET(entry, wxT("could not get entry"));
 
     gtk_tree_entry_set_userdata( entry, clientData );
-    g_object_unref (entry);
 }
 
 // ----------------------------------------------------------------------------
@@ -633,13 +620,10 @@ wxString wxListBox::GetString(unsigned int n) const
 {
     wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") );
 
-    GtkTreeEntry* entry = GTKGetEntry(n);
+    wxGtkObject<GtkTreeEntry> 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
@@ -856,8 +840,17 @@ int wxListBox::DoListHitTest(const wxPoint& point) const
 #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 );
+#if GTK_CHECK_VERSION(2, 12, 0)
+    if (!gtk_check_version(2, 12, 0))
+    {
+        gtk_widget_set_tooltip_text(GTK_WIDGET( m_treeview ), tip);
+    }
+    else
+#endif
+    {
+        // RN: Is this needed anymore?
+        gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, NULL );
+    }
 }
 #endif // wxUSE_TOOLTIPS