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

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

diff --git a/src/gtk/treeentry_gtk.c b/src/gtk/treeentry_gtk.c
index 66e5a75f070dff12c7432a0cbab4fe216491a79b..f25a7aaf73b3e14ceef3a648751036e25891672c 100644 (file)
--- a/src/gtk/treeentry_gtk.c
+++ b/src/gtk/treeentry_gtk.c
@@ -7,6 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 

+#ifdef __VMS
+#include <types.h>
+typedef pid_t GPid;
+#define G_GNUC_INTERNAL 
+#define GSEAL(x) x
+#endif
+

 #include "wx/gtk/treeentry_gtk.h"
 
 /*
 #include "wx/gtk/treeentry_gtk.h"
 
 /*


@@ -46,7 +53,7 @@ gtk_tree_entry_get_type ()
 
     if (!tree_entry_type)
     {
 
     if (!tree_entry_type)
     {

-        static const GTypeInfo tree_entry_info =
+        const GTypeInfo tree_entry_info =

         {
             sizeof (GtkTreeEntryClass),
             NULL,           /* base_init */
         {
             sizeof (GtkTreeEntryClass),
             NULL,           /* base_init */


@@ -57,6 +64,7 @@ gtk_tree_entry_get_type ()
             sizeof (GtkTreeEntry),
             16,             /* n_preallocs */
             (GInstanceInitFunc) gtk_tree_entry_init, /*instance_init*/
             sizeof (GtkTreeEntry),
             16,             /* n_preallocs */
             (GInstanceInitFunc) gtk_tree_entry_init, /*instance_init*/

+            NULL            /* value_table */

         };
         tree_entry_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeEntry",
                                                   &tree_entry_info,
         };
         tree_entry_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeEntry",
                                                   &tree_entry_info,


@@ -88,6 +96,7 @@ gpointer   gtk_tree_entry_get_userdata  (GtkTreeEntry* entry)
 void     gtk_tree_entry_set_label       (GtkTreeEntry* entry, const gchar* label)
 {
     g_assert(GTK_IS_TREE_ENTRY(entry));
 void     gtk_tree_entry_set_label       (GtkTreeEntry* entry, const gchar* label)
 {
     g_assert(GTK_IS_TREE_ENTRY(entry));

+    gchar *temp;

 
     /* free previous if it exists */
     if(entry->label)
 
     /* free previous if it exists */
     if(entry->label)


@@ -97,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)


@@ -137,21 +148,25 @@ static void gtk_tree_entry_init (GTypeInstance* instance, gpointer g_class)
 static void gtk_tree_entry_string_transform_func(const GValue *src_value,
                                                  GValue *dest_value)
 {
 static void gtk_tree_entry_string_transform_func(const GValue *src_value,
                                                  GValue *dest_value)
 {

+    GtkTreeEntry *entry;
+

     /* Make sure src is a treeentry and dest can hold a string */
     g_assert(GTK_IS_TREE_ENTRY(src_value->data[0].v_pointer));
     g_assert(G_VALUE_HOLDS(dest_value, G_TYPE_STRING));
 
     /* TODO: Use strdup here or just pass it? */
     /* Make sure src is a treeentry and dest can hold a string */
     g_assert(GTK_IS_TREE_ENTRY(src_value->data[0].v_pointer));
     g_assert(G_VALUE_HOLDS(dest_value, G_TYPE_STRING));
 
     /* TODO: Use strdup here or just pass it? */

-    GtkTreeEntry* entry = GTK_TREE_ENTRY(src_value->data[0].v_pointer);
+    entry = GTK_TREE_ENTRY(src_value->data[0].v_pointer);

 
     g_value_set_string(dest_value, entry->label);
 }
 
 static void gtk_tree_entry_dispose(GObject* obj)
 {
 
     g_value_set_string(dest_value, entry->label);
 }
 
 static void gtk_tree_entry_dispose(GObject* obj)
 {

+    GtkTreeEntry *entry;
+

     g_assert(GTK_IS_TREE_ENTRY(obj));
 
     g_assert(GTK_IS_TREE_ENTRY(obj));
 

-    GtkTreeEntry* entry = GTK_TREE_ENTRY(obj);
+    entry = GTK_TREE_ENTRY(obj);

 
     /* free label if it exists */
     if(entry->label)
 
     /* free label if it exists */
     if(entry->label)