Call gtk_entry_set_position_internal() that takes a new "reset_IM"

Mon Dec 16 21:39:28 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkentry.c (gtk_entry_enter_text): Call
        gtk_entry_set_position_internal() that takes a
        new "reset_IM" parameter, so that we avoid the
        problem where committing text would reset the
        input method. (#74381, Kang Jeong-Hee)
This commit is contained in:
Owen Taylor 2002-12-17 02:59:18 +00:00 committed by Owen Taylor
parent 85e7cab2ed
commit 24899adb05
7 changed files with 61 additions and 6 deletions

View File

@ -1,3 +1,11 @@
Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_enter_text): Call
gtk_entry_set_position_internal() that takes a
new "reset_IM" parameter, so that we avoid the
problem where committing text would reset the
input method. (#74381, Kang Jeong-Hee)
2002-12-17 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c: Fix a few doc comments.

View File

@ -1,3 +1,11 @@
Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_enter_text): Call
gtk_entry_set_position_internal() that takes a
new "reset_IM" parameter, so that we avoid the
problem where committing text would reset the
input method. (#74381, Kang Jeong-Hee)
2002-12-17 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c: Fix a few doc comments.

View File

@ -1,3 +1,11 @@
Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_enter_text): Call
gtk_entry_set_position_internal() that takes a
new "reset_IM" parameter, so that we avoid the
problem where committing text would reset the
input method. (#74381, Kang Jeong-Hee)
2002-12-17 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c: Fix a few doc comments.

View File

@ -1,3 +1,11 @@
Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_enter_text): Call
gtk_entry_set_position_internal() that takes a
new "reset_IM" parameter, so that we avoid the
problem where committing text would reset the
input method. (#74381, Kang Jeong-Hee)
2002-12-17 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c: Fix a few doc comments.

View File

@ -1,3 +1,11 @@
Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_enter_text): Call
gtk_entry_set_position_internal() that takes a
new "reset_IM" parameter, so that we avoid the
problem where committing text would reset the
input method. (#74381, Kang Jeong-Hee)
2002-12-17 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c: Fix a few doc comments.

View File

@ -1,3 +1,11 @@
Mon Dec 16 21:39:28 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_enter_text): Call
gtk_entry_set_position_internal() that takes a
new "reset_IM" parameter, so that we avoid the
problem where committing text would reset the
input method. (#74381, Kang Jeong-Hee)
2002-12-17 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcontainer.c: Fix a few doc comments.

View File

@ -1751,22 +1751,29 @@ gtk_entry_get_chars (GtkEditable *editable,
}
static void
gtk_entry_real_set_position (GtkEditable *editable,
gint position)
gtk_entry_set_position_internal (GtkEntry *entry,
gint position,
gboolean reset_im)
{
GtkEntry *entry = GTK_ENTRY (editable);
if (position < 0 || position > entry->text_length)
position = entry->text_length;
if (position != entry->current_pos ||
position != entry->selection_bound)
{
gtk_entry_reset_im_context (entry);
if (reset_im)
gtk_entry_reset_im_context (entry);
gtk_entry_set_positions (entry, position, position);
}
}
static void
gtk_entry_real_set_position (GtkEditable *editable,
gint position)
{
gtk_entry_set_position_internal (GTK_ENTRY (editable), position, TRUE);
}
static gint
gtk_entry_get_position (GtkEditable *editable)
{
@ -2359,7 +2366,7 @@ gtk_entry_enter_text (GtkEntry *entry,
tmp_pos = entry->current_pos;
gtk_editable_insert_text (editable, str, strlen (str), &tmp_pos);
gtk_editable_set_position (editable, tmp_pos);
gtk_entry_set_position_internal (entry, tmp_pos, FALSE);
}
/* All changes to entry->current_pos and entry->selection_bound