diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /gtk/gtkmnemonichash.c | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'gtk/gtkmnemonichash.c')
| -rw-r--r-- | gtk/gtkmnemonichash.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/gtkmnemonichash.c b/gtk/gtkmnemonichash.c index 6f85d04f6e..37ee01644a 100644 --- a/gtk/gtkmnemonichash.c +++ b/gtk/gtkmnemonichash.c @@ -113,6 +113,7 @@ _gtk_mnemonic_hash_activate (GtkMnemonicHash *mnemonic_hash, { GSList *list, *targets; GtkWidget *widget, *chosen_widget; + GdkWindow *window; gboolean overloaded; targets = g_hash_table_lookup (mnemonic_hash->hash, @@ -125,11 +126,11 @@ _gtk_mnemonic_hash_activate (GtkMnemonicHash *mnemonic_hash, for (list = targets; list; list = list->next) { widget = GTK_WIDGET (list->data); - + window = gtk_widget_get_window (widget); + if (gtk_widget_is_sensitive (widget) && gtk_widget_get_mapped (widget) && - widget->window && - gdk_window_is_viewable (widget->window)) + window && gdk_window_is_viewable (window)) { if (chosen_widget) { |