Deprecate widget flag: GTK_WIDGET_MAPPED

Use gtk_widget_get_mapped() instead.

https://bugzilla.gnome.org/show_bug.cgi?id=69872

11 files changed, 14 insertions, 14 deletions

diff --git a/modules/other/gail/gail.c b/modules/other/gail/gail.c
index 48a33d86a..133952c2b 100644
--- a/modules/other/gail/gail.c
+++ b/modules/other/gail/gail.c
@@ -348,7 +348,7 @@ gail_select_watcher (GSignalInvocationHint *ihint,
 
   widget = GTK_WIDGET (object);
 
-  if (!GTK_WIDGET_MAPPED (widget))
+  if (!gtk_widget_get_mapped (widget))
     {
       g_signal_connect (widget, "map",
                         G_CALLBACK (gail_map_cb),
@@ -369,7 +369,7 @@ gail_finish_select (GtkWidget *widget)
 
       menu_item = GTK_MENU_ITEM (widget);
       if (menu_item->submenu &&
-          !GTK_WIDGET_MAPPED (menu_item->submenu))
+          !gtk_widget_get_mapped (menu_item->submenu))
         {
           /*
            * If the submenu is not visble, wait until it is before
diff --git a/modules/other/gail/gailbutton.c b/modules/other/gail/gailbutton.c
index 3a1ac3d46..e5f17e662 100644
--- a/modules/other/gail/gailbutton.c
+++ b/modules/other/gail/gailbutton.c
@@ -289,7 +289,7 @@ gail_button_real_initialize (AtkObject *obj,
   label = get_label_from_button (widget, 0, FALSE);
   if (GTK_IS_LABEL (label))
     {
-      if (GTK_WIDGET_MAPPED (label))
+      if (gtk_widget_get_mapped (label))
         gail_button_init_textutil (button, label);
       else 
         g_signal_connect (label,
diff --git a/modules/other/gail/gailcombo.c b/modules/other/gail/gailcombo.c
index 1f10ecbec..3f4213050 100644
--- a/modules/other/gail/gailcombo.c
+++ b/modules/other/gail/gailcombo.c
@@ -310,7 +310,7 @@ idle_do_action (gpointer data)
 
   combo = GTK_COMBO (widget);
 
-  do_popup = !GTK_WIDGET_MAPPED (combo->popwin);
+  do_popup = !gtk_widget_get_mapped (combo->popwin);
 
   tmp_event.button.type = GDK_BUTTON_PRESS; 
   tmp_event.button.window = widget->window;
diff --git a/modules/other/gail/gailcombobox.c b/modules/other/gail/gailcombobox.c
index d33e919b0..f7dc403f3 100644
--- a/modules/other/gail/gailcombobox.c
+++ b/modules/other/gail/gailcombobox.c
@@ -319,7 +319,7 @@ idle_do_action (gpointer data)
   combo_box = GTK_COMBO_BOX (widget);
 
   popup = gtk_combo_box_get_popup_accessible (combo_box);
-  do_popup = !GTK_WIDGET_MAPPED (GTK_ACCESSIBLE (popup)->widget);
+  do_popup = !gtk_widget_get_mapped (GTK_ACCESSIBLE (popup)->widget);
   if (do_popup)
       gtk_combo_box_popup (combo_box);
   else
diff --git a/modules/other/gail/gailexpander.c b/modules/other/gail/gailexpander.c
index fd42659a0..1d4681946 100644
--- a/modules/other/gail/gailexpander.c
+++ b/modules/other/gail/gailexpander.c
@@ -257,7 +257,7 @@ gail_expander_real_initialize (AtkObject *obj,
   ATK_OBJECT_CLASS (gail_expander_parent_class)->initialize (obj, data);
 
   expander = GTK_WIDGET (data);
-  if (GTK_WIDGET_MAPPED (expander))
+  if (gtk_widget_get_mapped (expander))
     gail_expander_init_textutil (gail_expander, GTK_EXPANDER (expander));
   else 
     g_signal_connect (expander,
diff --git a/modules/other/gail/gailitem.c b/modules/other/gail/gailitem.c
index 438cc256f..308e1618d 100644
--- a/modules/other/gail/gailitem.c
+++ b/modules/other/gail/gailitem.c
@@ -134,7 +134,7 @@ gail_item_real_initialize (AtkObject *obj,
   label = get_label_from_container (GTK_WIDGET (data));
   if (GTK_IS_LABEL (label))
     {
-      if (GTK_WIDGET_MAPPED (label))
+      if (gtk_widget_get_mapped (label))
         gail_item_init_textutil (item, label);
       else
         g_signal_connect (label,
diff --git a/modules/other/gail/gaillabel.c b/modules/other/gail/gaillabel.c
index 903e395e2..b7e06eb45 100644
--- a/modules/other/gail/gaillabel.c
+++ b/modules/other/gail/gaillabel.c
@@ -153,7 +153,7 @@ gail_label_real_initialize (AtkObject *obj,
   
   widget = GTK_WIDGET (data);
 
-  if (GTK_WIDGET_MAPPED (widget))
+  if (gtk_widget_get_mapped (widget))
     gail_label_init_text_util (gail_label, widget);
   else
     g_signal_connect (widget,
diff --git a/modules/other/gail/gailmenuitem.c b/modules/other/gail/gailmenuitem.c
index 567755226..28095930f 100644
--- a/modules/other/gail/gailmenuitem.c
+++ b/modules/other/gail/gailmenuitem.c
@@ -325,7 +325,7 @@ ensure_menus_unposted (GailMenuItem *menu_item)
           widget = GTK_ACCESSIBLE (parent)->widget;
           if (GTK_IS_MENU (widget))
             {
-              if (GTK_WIDGET_MAPPED (widget))
+              if (gtk_widget_get_mapped (widget))
                 gtk_menu_shell_cancel (GTK_MENU_SHELL (widget));
 
               return;
@@ -352,7 +352,7 @@ idle_do_action (gpointer data)
 
   item_parent = gtk_widget_get_parent (item);
   gtk_menu_shell_select_item (GTK_MENU_SHELL (item_parent), item);
-  item_mapped = GTK_WIDGET_MAPPED (item);
+  item_mapped = gtk_widget_get_mapped (item);
   /*
    * This is what is called when <Return> is pressed for a menu item
    */
diff --git a/modules/other/gail/gailnotebookpage.c b/modules/other/gail/gailnotebookpage.c
index 302775425..a258d35a2 100644
--- a/modules/other/gail/gailnotebookpage.c
+++ b/modules/other/gail/gailnotebookpage.c
@@ -203,7 +203,7 @@ gail_notebook_page_new (GtkNotebook *notebook,
   label = get_label_from_notebook_page (page);
   if (GTK_IS_LABEL (label))
     {
-      if (GTK_WIDGET_MAPPED (label))
+      if (gtk_widget_get_mapped (label))
         gail_notebook_page_init_textutil (page, label);
       else
         g_signal_connect (label,
diff --git a/modules/other/gail/gailwidget.c b/modules/other/gail/gailwidget.c
index 95d430298..4d550f0ea 100644
--- a/modules/other/gail/gailwidget.c
+++ b/modules/other/gail/gailwidget.c
@@ -514,7 +514,7 @@ gail_widget_ref_state_set (AtkObject *accessible)
       if (gtk_widget_get_visible (widget))
         {
           atk_state_set_add_state (state_set, ATK_STATE_VISIBLE);
-          if (gail_widget_on_screen (widget) && GTK_WIDGET_MAPPED (widget) &&
+          if (gail_widget_on_screen (widget) && gtk_widget_get_mapped (widget) &&
               gail_widget_all_parents_visible (widget))
             {
               atk_state_set_add_state (state_set, ATK_STATE_SHOWING);
@@ -937,7 +937,7 @@ gail_widget_map_gtk (GtkWidget     *widget)
 
   accessible = gtk_widget_get_accessible (widget);
   atk_object_notify_state_change (accessible, ATK_STATE_SHOWING,
-                                  GTK_WIDGET_MAPPED (widget));
+                                  gtk_widget_get_mapped (widget));
   return 1;
 }
 
diff --git a/modules/other/gail/gailwindow.c b/modules/other/gail/gailwindow.c
index 851179a38..5582b3a54 100644
--- a/modules/other/gail/gailwindow.c
+++ b/modules/other/gail/gailwindow.c
@@ -240,7 +240,7 @@ gail_window_real_initialize (AtkObject *obj,
    * Notify that tooltip is showing
    */
   if (obj->role == ATK_ROLE_TOOL_TIP &&
-      GTK_WIDGET_MAPPED (widget))
+      gtk_widget_get_mapped (widget))
     atk_object_notify_state_change (obj, ATK_STATE_SHOWING, 1);
 }