[uim] r6768 committed - * gtk/test/entry.c...

[codesite-noreply]

Revision: 6768
Author: nogu.dev
Date: Sat Sep 11 17:42:18 2010
Log: * gtk/test/entry.c
  - (main): Use gtk_entry_get_text_length() for GTK+3.
* gtk/text-util.c
  - (delete_text_in_gtk_entry): Ditto.
http://code.google.com/p/uim/source/detail?r=6768

Modified:
 /trunk/gtk/test/entry.c
 /trunk/gtk/text-util.c

=======================================
--- /trunk/gtk/test/entry.c     Sun Apr  4 20:35:54 2010
+++ /trunk/gtk/test/entry.c     Sat Sep 11 17:42:18 2010
@@ -97,7 +97,7 @@
     gtk_entry_set_text (GTK_ENTRY (entry), "hello");
     gtk_entry_append_text (GTK_ENTRY (entry), " world");
     gtk_entry_select_region (GTK_ENTRY (entry),
-                            0, GTK_ENTRY(entry)->text_length);
+                            0, gtk_entry_get_text_length(GTK_ENTRY(entry)));
     gtk_box_pack_start (GTK_BOX (vbox), entry, TRUE, TRUE, 0);
     gtk_widget_show (entry);

=======================================
--- /trunk/gtk/text-util.c      Sat Sep 11 17:42:09 2010
+++ /trunk/gtk/text-util.c      Sat Sep 11 17:42:18 2010
@@ -432,7 +432,7 @@
     else {
       if (!(~latter_req_len & (~UTextExtent_Line | ~UTextExtent_Full)))
        return -1;
-      end_pos = entry->text_length;
+      end_pos = gtk_entry_get_text_length(entry);
     }
     break;

@@ -444,20 +444,20 @@
     else {
       if (!(~latter_req_len & (~UTextExtent_Line | ~UTextExtent_Full)))
        return -1;
-      end_pos = entry->text_length;
+      end_pos = gtk_entry_get_text_length(entry);
     }
     break;

   case UTextOrigin_End:
     if (former_req_len >= 0)
-      start_pos = entry->text_length - former_req_len;
+      start_pos = gtk_entry_get_text_length(entry) - former_req_len;
     else {
       if (!(~former_req_len & (~UTextExtent_Line | ~UTextExtent_Full)))
        return -1;
       start_pos = 0;
     }

-    end_pos = entry->text_length;
+    end_pos = gtk_entry_get_text_length(entry);
     break;

   case UTextOrigin_Unspecified: