diff --git a/ChangeLog b/ChangeLog index 0637f13123..2e3a3462a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-10-26 Havoc Pennington + + * 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 * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0637f13123..2e3a3462a3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2001-10-26 Havoc Pennington + + * 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 * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0637f13123..2e3a3462a3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2001-10-26 Havoc Pennington + + * 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 * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0637f13123..2e3a3462a3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2001-10-26 Havoc Pennington + + * 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 * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0637f13123..2e3a3462a3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2001-10-26 Havoc Pennington + + * 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 * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0637f13123..2e3a3462a3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2001-10-26 Havoc Pennington + + * 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 * gtk/gtktreemodel.c (gtk_tree_model_get): Fix typo in docs. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0637f13123..2e3a3462a3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2001-10-26 Havoc Pennington + + * 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 * 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 992c41f8d6..77182774b5 100644 --- 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. + + + + + + @@ -2622,6 +2628,19 @@ a gtk_object_unref(). @tree_store: @n_columns: + + + + + +@tree_column: +@event: +@path_string: +@background_area: +@cell_area: +@flags: +@Returns: + diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml index f0928cfbb8..d246ff91f1 100644 --- a/docs/reference/gtk/tmpl/gtksettings.sgml +++ b/docs/reference/gtk/tmpl/gtksettings.sgml @@ -196,11 +196,6 @@ GtkSettings - - - - - diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml index 285a1cc406..9d624d1fee 100644 --- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml +++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml @@ -449,20 +449,6 @@ GtkTreeViewColumn @flags: - - - - - -@tree_column: -@event: -@path_string: -@background_area: -@cell_area: -@flags: -@Returns: - - diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 0c015601cb..39d5d740fe 100644 --- 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))