Handle the case without XKB properly.
Thu Jun 21 13:42:01 2001 Owen Taylor <otaylor@redhat.com> * gdk/x11/gdkkeys-x11.c (gdk_keymap_get_direction): Handle the case without XKB properly. * gtk/gtkrc.c (gtk_rc_set_default_files): Remove unused gtk_rc_auto_parse variable. * gtk/gtkrc.[ch] gtk/gtkstyle.c docs/Changes-2.0.txt: Remove gtk_rc_set_image_loader(), gtk_rc_load_image(), no longer needed with GdkPixbuf. * gtk/gtkrc.c (_gtk_rc_init): Make private.
This commit is contained in:
@ -192,7 +192,6 @@ get_keymap (void)
|
||||
}
|
||||
|
||||
#if HAVE_XKB
|
||||
|
||||
PangoDirection
|
||||
get_direction (void)
|
||||
{
|
||||
@ -236,13 +235,20 @@ _gdk_keymap_state_changed (void)
|
||||
PangoDirection
|
||||
gdk_keymap_get_direction (GdkKeymap *keymap)
|
||||
{
|
||||
if (!have_direction)
|
||||
#if HAVE_XKB
|
||||
if (_gdk_use_xkb)
|
||||
{
|
||||
current_direction = get_direction ();
|
||||
have_direction = TRUE;
|
||||
}
|
||||
if (!have_direction)
|
||||
{
|
||||
current_direction = get_direction ();
|
||||
have_direction = TRUE;
|
||||
}
|
||||
|
||||
return current_direction;
|
||||
return current_direction;
|
||||
}
|
||||
else
|
||||
#endif /* HAVE_XKB */
|
||||
return PANGO_DIRECTION_LTR;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user