a11y: Re-implement gtk_tree_view_accessible_get_n_rows()

[~andy/gtk] / gtk / gtkmnemonichash.c

diff --git a/gtk/gtkmnemonichash.c b/gtk/gtkmnemonichash.c
index 210002fb93befb2a3dcef73d368005eba0358168..37ee01644ab41d83781d6ededa9a6a18dfc9eccb 100644 (file)
--- a/gtk/gtkmnemonichash.c
+++ b/gtk/gtkmnemonichash.c
@@ -20,7 +20,6 @@
  */
 
 #include "gtkmnemonichash.h"
-#include "gtkalias.h"
 
 struct _GtkMnemnonicHash
 {
@@ -114,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,
@@ -126,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_MAPPED (widget) &&
-          widget->window &&
-         gdk_window_is_viewable (widget->window))
+         gtk_widget_get_mapped (widget) &&
+          window && gdk_window_is_viewable (window))
        {
          if (chosen_widget)
            {