Call update_im_spot_location here explicitly

2001-10-26  Havoc Pennington  <hp@pobox.com>

	* gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call
	update_im_spot_location here explicitly
	(gtk_text_view_reset_im_context): don't update the spot location
	here

diff --git a/ChangeLog b/ChangeLog
index 0637f13123e2346a9727ca5b5bb3e78d2f438f32..2e3a3462a3f3ce4c65702edb087db50aa959db42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-26  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call
+       update_im_spot_location here explicitly
+       (gtk_text_view_reset_im_context): don't update the spot location
+       here
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0637f13123e2346a9727ca5b5bb3e78d2f438f32..2e3a3462a3f3ce4c65702edb087db50aa959db42 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2001-10-26  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call
+       update_im_spot_location here explicitly
+       (gtk_text_view_reset_im_context): don't update the spot location
+       here
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0637f13123e2346a9727ca5b5bb3e78d2f438f32..2e3a3462a3f3ce4c65702edb087db50aa959db42 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2001-10-26  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call
+       update_im_spot_location here explicitly
+       (gtk_text_view_reset_im_context): don't update the spot location
+       here
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0637f13123e2346a9727ca5b5bb3e78d2f438f32..2e3a3462a3f3ce4c65702edb087db50aa959db42 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2001-10-26  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call
+       update_im_spot_location here explicitly
+       (gtk_text_view_reset_im_context): don't update the spot location
+       here
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0637f13123e2346a9727ca5b5bb3e78d2f438f32..2e3a3462a3f3ce4c65702edb087db50aa959db42 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2001-10-26  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call
+       update_im_spot_location here explicitly
+       (gtk_text_view_reset_im_context): don't update the spot location
+       here
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0637f13123e2346a9727ca5b5bb3e78d2f438f32..2e3a3462a3f3ce4c65702edb087db50aa959db42 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2001-10-26  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call
+       update_im_spot_location here explicitly
+       (gtk_text_view_reset_im_context): don't update the spot location
+       here
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0637f13123e2346a9727ca5b5bb3e78d2f438f32..2e3a3462a3f3ce4c65702edb087db50aa959db42 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2001-10-26  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextview.c (gtk_text_view_mark_set_handler): Call
+       update_im_spot_location here explicitly
+       (gtk_text_view_reset_im_context): don't update the spot location
+       here
+
 2001-10-27  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs.

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 992c41f8d661a69445446e7b41fc38beaec04c1a..77182774b5fc706a2f06d1a6efe1ea9eefa709e4 100644 (file)
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -990,6 +990,12 @@ after other user handlers and the default handler.
 </para>
 
 
+<!-- ##### ARG GtkSettings:gtk-dnd-drag-threshold ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ENUM GtkSideType ##### -->
 <para>
 
@@ -2622,6 +2628,19 @@ a gtk_object_unref().
 @tree_store: 
 @n_columns: 
 
+<!-- ##### FUNCTION gtk_tree_view_column_cell_event ##### -->
+<para>
+
+</para>
+
+@tree_column: 
+@event: 
+@path_string: 
+@background_area: 
+@cell_area: 
+@flags: 
+@Returns: 
+
 <!-- ##### FUNCTION gtk_tree_view_column_set_cell_data ##### -->
 <para>
 

diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml
index f0928cfbb891a8c9766cf3c5f211cd303544e069..d246ff91f1f56edd1b080b30c84f5deb028add61 100644 (file)
--- a/docs/reference/gtk/tmpl/gtksettings.sgml
+++ b/docs/reference/gtk/tmpl/gtksettings.sgml
@@ -196,11 +196,6 @@ GtkSettings
 
 </para>
 
-<!-- ##### ARG GtkSettings:gtk-dnd-drag-threshold ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkSettings:gtk-color-palette ##### -->
 <para>
 

diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
index 285a1cc4066c40160295b2f701bae32aacfe6ee7..9d624d1fee3458b8273e184d42103dc7a732ff38 100644 (file)
--- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
@@ -449,20 +449,6 @@ GtkTreeViewColumn
 @flags: 
 
 
-<!-- ##### FUNCTION gtk_tree_view_column_cell_event ##### -->
-<para>
-
-</para>
-
-@tree_column: 
-@event: 
-@path_string: 
-@background_area: 
-@cell_area: 
-@flags: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_tree_view_column_cell_focus ##### -->
 <para>
 

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 0c015601cb00a41d058ed13d25c58078674934fc..39d5d740fee30911369610052f38837c84fe8e7d 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4712,7 +4712,6 @@ gtk_text_view_reset_im_context (GtkTextView *text_view)
     {
       text_view->need_im_reset = FALSE;
       gtk_im_context_reset (text_view->im_context);
-      gtk_text_view_update_im_spot_location (text_view);
     }
 }
 
@@ -5321,6 +5320,7 @@ gtk_text_view_mark_set_handler (GtkTextBuffer     *buffer,
     {
       text_view->virtual_cursor_x = -1;
       text_view->virtual_cursor_y = -1;
+      gtk_text_view_update_im_spot_location (text_view);
       need_reset = TRUE;
     }
   else if (mark == gtk_text_buffer_get_selection_bound (buffer))