Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

[wxWidgets.git] / src / gtk / treeentry_gtk.c

diff --git a/src/gtk/treeentry_gtk.c b/src/gtk/treeentry_gtk.c
index 625a8446087a376b8c7e71d5a19fedf672eb015d..b890df7a2385f988a122e1e14921d6c53c928e08 100644 (file)
--- a/src/gtk/treeentry_gtk.c
+++ b/src/gtk/treeentry_gtk.c
@@ -46,10 +46,10 @@ gtk_tree_entry_new()
     return GTK_TREE_ENTRY(g_object_new(GTK_TYPE_TREE_ENTRY, NULL));
 }
 
     return GTK_TREE_ENTRY(g_object_new(GTK_TYPE_TREE_ENTRY, NULL));
 }
 

-GtkType
+GType

 gtk_tree_entry_get_type ()
 {
 gtk_tree_entry_get_type ()
 {

-    static GtkType tree_entry_type = 0;
+    static GType tree_entry_type = 0;

 
     if (!tree_entry_type)
     {
 
     if (!tree_entry_type)
     {


@@ -95,6 +95,7 @@ gpointer   gtk_tree_entry_get_userdata  (GtkTreeEntry* entry)
 
 void     gtk_tree_entry_set_label       (GtkTreeEntry* entry, const gchar* label)
 {
 
 void     gtk_tree_entry_set_label       (GtkTreeEntry* entry, const gchar* label)
 {

+    gchar *temp;

     g_assert(GTK_IS_TREE_ENTRY(entry));
 
     /* free previous if it exists */
     g_assert(GTK_IS_TREE_ENTRY(entry));
 
     /* free previous if it exists */


@@ -105,7 +106,9 @@ void     gtk_tree_entry_set_label       (GtkTreeEntry* entry, const gchar* label
     }
 
     entry->label = g_strdup(label);
     }
 
     entry->label = g_strdup(label);

-    entry->collate_key = g_utf8_collate_key(label, -1); /* -1 == null terminated */
+    temp = g_utf8_casefold(label, -1); /* -1 == null terminated */
+    entry->collate_key = g_utf8_collate_key(temp, -1); /* -1 == null terminated */
+    g_free( temp );

 }
 
 void   gtk_tree_entry_set_userdata      (GtkTreeEntry* entry, gpointer userdata)
 }
 
 void   gtk_tree_entry_set_userdata      (GtkTreeEntry* entry, gpointer userdata)