summaryrefslogtreecommitdiff
path: root/gtk/gtkimmulticontext.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-06-08 16:07:00 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-06-08 16:07:00 +0000
commitda562f4dc8db7722ffc89198d42eb9e2efbda62a (patch)
tree2b8c0442454fe272752ac51a961df4628298160b /gtk/gtkimmulticontext.c
parent11699349bb47a354bc602ad1bf0f57a0975c9b24 (diff)
downloadgtk+-da562f4dc8db7722ffc89198d42eb9e2efbda62a.tar.gz
Add a direction-changed signal, and gdk_keymap_get_current_direction().
Fri Jun 8 12:03:07 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkkeys.[ch]: Add a direction-changed signal, and gdk_keymap_get_current_direction(). * gdk/x11/gdkevents-x11.c gdk/x11/gdkkeys-x11.c gdk/x11/gdkmain-x11.c gdk/x11/gdkprivate-x11.h: Track the current locked group, use it to set the keymap direction. * gtk/gtksettings.c: Add a new gtk-split-cursor setting to determine whether we draw a split cursor or use a jumping cursor based on the current direction. * gtk/gtkentry.c gtk/gtktextview.c gtk/gtktextlayout.[ch]: Obey the split cursor setting. Fri Jun 8 11:57:50 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkimmulticontext.c (activate_cb): Only activate when toggling on, not when toggling off... (#55906) Wed Jun 6 10:37:07 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_widget_set_double_buffered): s/gdk_window_begin_paint/gdk_window_begin_paint_region/ in docs. (#55812, Vitaly Tishkov)
Diffstat (limited to 'gtk/gtkimmulticontext.c')
-rw-r--r--gtk/gtkimmulticontext.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 186dc503f6..b1c2ad87f4 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -313,12 +313,15 @@ static void
activate_cb (GtkWidget *menuitem,
GtkIMMulticontext *context)
{
- const gchar *id = gtk_object_get_data (GTK_OBJECT (menuitem), "gtk-context-id");
-
- gtk_im_context_reset (GTK_IM_CONTEXT (context));
+ if (GTK_CHECK_MENU_ITEM (menuitem)->active)
+ {
+ const gchar *id = gtk_object_get_data (GTK_OBJECT (menuitem), "gtk-context-id");
- global_context_id = id;
- gtk_im_multicontext_set_slave (context, NULL);
+ gtk_im_context_reset (GTK_IM_CONTEXT (context));
+
+ global_context_id = id;
+ gtk_im_multicontext_set_slave (context, NULL);
+ }
}
/**