Adapt to uscore-ification of gtktextiterprivate

[~andy/gtk] / gtk / gtkentry.c

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 766b9997352e48f2afb554549617d8e4403834d1..f2edb59daadb718ff295193201d8f20df02ca747 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -271,7 +271,6 @@ gtk_entry_class_init (GtkEntryClass *class)
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
   GtkObjectClass *object_class;
   GtkWidgetClass *widget_class;
-
   GtkBindingSet *binding_set;
 
   object_class = (GtkObjectClass*) class;
@@ -279,6 +278,35 @@ gtk_entry_class_init (GtkEntryClass *class)
   parent_class = gtk_type_class (GTK_TYPE_WIDGET);
 
   gobject_class->finalize = gtk_entry_finalize;
+  
+  object_class->set_arg = gtk_entry_set_arg;
+  object_class->get_arg = gtk_entry_get_arg;
+
+  widget_class->realize = gtk_entry_realize;
+  widget_class->unrealize = gtk_entry_unrealize;
+  widget_class->draw_focus = gtk_entry_draw_focus;
+  widget_class->size_request = gtk_entry_size_request;
+  widget_class->size_allocate = gtk_entry_size_allocate;
+  widget_class->expose_event = gtk_entry_expose;
+  widget_class->button_press_event = gtk_entry_button_press;
+  widget_class->button_release_event = gtk_entry_button_release;
+  widget_class->motion_notify_event = gtk_entry_motion_notify;
+  widget_class->key_press_event = gtk_entry_key_press;
+  widget_class->focus_in_event = gtk_entry_focus_in;
+  widget_class->focus_out_event = gtk_entry_focus_out;
+  widget_class->style_set = gtk_entry_style_set;
+  widget_class->direction_changed = gtk_entry_direction_changed;
+  widget_class->state_changed = gtk_entry_state_changed;
+
+  class->insert_text = gtk_entry_real_insert_text;
+  class->delete_text = gtk_entry_real_delete_text;
+  class->move_cursor = gtk_entry_move_cursor;
+  class->insert_at_cursor = gtk_entry_insert_at_cursor;
+  class->delete_from_cursor = gtk_entry_delete_from_cursor;
+  class->cut_clipboard = gtk_entry_cut_clipboard;
+  class->copy_clipboard = gtk_entry_copy_clipboard;
+  class->paste_clipboard = gtk_entry_paste_clipboard;
+  class->toggle_overwrite = gtk_entry_toggle_overwrite;
 
   gtk_object_add_arg_type ("GtkEntry::text_position", GTK_TYPE_INT,  GTK_ARG_READWRITE, ARG_TEXT_POSITION);
   gtk_object_add_arg_type ("GtkEntry::editable",      GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITABLE);
@@ -326,7 +354,6 @@ gtk_entry_class_init (GtkEntryClass *class)
                    GTK_SIGNAL_OFFSET (GtkEntryClass, activate),
                    gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
-
   widget_class->activate_signal = signals[ACTIVATE];
 
   signals[MOVE_CURSOR] = 
@@ -385,8 +412,6 @@ gtk_entry_class_init (GtkEntryClass *class)
                     gtk_marshal_VOID__VOID,
                     GTK_TYPE_NONE, 0);
 
-  gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
   /*
    * Key bindings
    */
@@ -395,16 +420,16 @@ gtk_entry_class_init (GtkEntryClass *class)
 
   /* Moving the insertion point */
   add_move_binding (binding_set, GDK_Right, 0,
-                   GTK_MOVEMENT_POSITIONS, 1);
+                   GTK_MOVEMENT_VISUAL_POSITIONS, 1);
   
   add_move_binding (binding_set, GDK_Left, 0,
-                   GTK_MOVEMENT_POSITIONS, -1);
+                   GTK_MOVEMENT_VISUAL_POSITIONS, -1);
 
   add_move_binding (binding_set, GDK_f, GDK_CONTROL_MASK,
-                   GTK_MOVEMENT_CHARS, 1);
+                   GTK_MOVEMENT_LOGICAL_POSITIONS, 1);
   
   add_move_binding (binding_set, GDK_b, GDK_CONTROL_MASK,
-                   GTK_MOVEMENT_CHARS, -1);
+                   GTK_MOVEMENT_LOGICAL_POSITIONS, -1);
   
   add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
                    GTK_MOVEMENT_WORDS, 1);
@@ -510,35 +535,6 @@ gtk_entry_class_init (GtkEntryClass *class)
   /* Overwrite */
   gtk_binding_entry_add_signal (binding_set, GDK_Insert, 0,
                                "toggle_overwrite", 0);
-  
-  object_class->set_arg = gtk_entry_set_arg;
-  object_class->get_arg = gtk_entry_get_arg;
-
-  widget_class->realize = gtk_entry_realize;
-  widget_class->unrealize = gtk_entry_unrealize;
-  widget_class->draw_focus = gtk_entry_draw_focus;
-  widget_class->size_request = gtk_entry_size_request;
-  widget_class->size_allocate = gtk_entry_size_allocate;
-  widget_class->expose_event = gtk_entry_expose;
-  widget_class->button_press_event = gtk_entry_button_press;
-  widget_class->button_release_event = gtk_entry_button_release;
-  widget_class->motion_notify_event = gtk_entry_motion_notify;
-  widget_class->key_press_event = gtk_entry_key_press;
-  widget_class->focus_in_event = gtk_entry_focus_in;
-  widget_class->focus_out_event = gtk_entry_focus_out;
-  widget_class->style_set = gtk_entry_style_set;
-  widget_class->direction_changed = gtk_entry_direction_changed;
-  widget_class->state_changed = gtk_entry_state_changed;
-
-  class->insert_text = gtk_entry_real_insert_text;
-  class->delete_text = gtk_entry_real_delete_text;
-  class->move_cursor = gtk_entry_move_cursor;
-  class->insert_at_cursor = gtk_entry_insert_at_cursor;
-  class->delete_from_cursor = gtk_entry_delete_from_cursor;
-  class->cut_clipboard = gtk_entry_cut_clipboard;
-  class->copy_clipboard = gtk_entry_copy_clipboard;
-  class->paste_clipboard = gtk_entry_paste_clipboard;
-  class->toggle_overwrite = gtk_entry_toggle_overwrite;
 }
 
 static void
@@ -1357,10 +1353,10 @@ gtk_entry_move_cursor (GtkEntry       *entry,
   
   switch (step)
     {
-    case GTK_MOVEMENT_CHARS:
+    case GTK_MOVEMENT_LOGICAL_POSITIONS:
       new_pos = CLAMP (new_pos + count, 0, entry->text_length);
       break;
-    case GTK_MOVEMENT_POSITIONS:
+    case GTK_MOVEMENT_VISUAL_POSITIONS:
       new_pos = gtk_entry_move_visually (entry, new_pos, count);
       break;
     case GTK_MOVEMENT_WORDS: