Deprecate widget flag: GTK_WIDGET_MAPPED

[~andy/gtk] / modules / other / gail / gailwindow.c

diff --git a/modules/other/gail/gailwindow.c b/modules/other/gail/gailwindow.c
index 14dbdb6cd145b4a3ad0d22c932fc493ba4589958..5582b3a5414b0e2d57da8ad8420922ae26be5be2 100644 (file)
--- a/modules/other/gail/gailwindow.c
+++ b/modules/other/gail/gailwindow.c
@@ -17,10 +17,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
+
 #include "gailwindow.h"
 #include "gailtoplevel.h"
 #include "gail-private-macros.h"
@@ -174,35 +178,6 @@ gail_window_class_init (GailWindowClass *klass)
                   G_TYPE_NONE, 0);
 }
 
-AtkObject*
-gail_window_new (GtkWidget *widget)
-{
-  GObject *object;
-  AtkObject *accessible;
-
-  gail_return_val_if_fail (widget != NULL, NULL);
-  /*
-   * A GailWindow can be created for a GtkHandleBox or a GtkWindow
-   */
-  if (!GTK_IS_WINDOW (widget) &&
-      !GTK_IS_HANDLE_BOX (widget))
-    gail_return_val_if_fail (FALSE, NULL);
-
-  object = g_object_new (GAIL_TYPE_WINDOW, NULL);
-
-  accessible = ATK_OBJECT (object);
-  atk_object_initialize (accessible, widget);
-
-  /*
-   * Notify that tooltip is showing
-   */
-  if (accessible->role == ATK_ROLE_TOOL_TIP &&
-      GTK_WIDGET_MAPPED (widget))
-    atk_object_notify_state_change (accessible, ATK_STATE_SHOWING, 1);
-
-  return accessible;
-}
-
 static void
 gail_window_init (GailWindow   *accessible)
 {
@@ -212,15 +187,21 @@ static void
 gail_window_real_initialize (AtkObject *obj,
                              gpointer  data)
 {
-  GtkWidget *widget;
+  GtkWidget *widget = GTK_WIDGET (data);
   GailWindow *window;
 
+  /*
+   * A GailWindow can be created for a GtkHandleBox or a GtkWindow
+   */
+  if (!GTK_IS_WINDOW (widget) &&
+      !GTK_IS_HANDLE_BOX (widget))
+    gail_return_if_fail (FALSE);
+
   ATK_OBJECT_CLASS (gail_window_parent_class)->initialize (obj, data);
 
   window = GAIL_WINDOW (obj);
   window->name_change_handler = 0;
   window->previous_name = g_strdup (gtk_window_get_title (GTK_WINDOW (data)));
-  widget = GTK_WIDGET (data);
 
   g_signal_connect (data,
                     "window_state_event",
@@ -254,6 +235,13 @@ gail_window_real_initialize (AtkObject *obj,
       else
         obj->role = ATK_ROLE_FRAME;
     }
+
+  /*
+   * Notify that tooltip is showing
+   */
+  if (obj->role == ATK_ROLE_TOOL_TIP &&
+      gtk_widget_get_mapped (widget))
+    atk_object_notify_state_change (obj, ATK_STATE_SHOWING, 1);
 }
 
 static void
@@ -317,7 +305,7 @@ gail_window_get_name (AtkObject *accessible)
                     {
                       GList *children;
                       guint count;
-                      children = gtk_container_get_children (child);
+                      children = gtk_container_get_children (GTK_CONTAINER (child));
                       count = g_list_length (children);
                       if (count == 2) 
                         {
@@ -430,7 +418,7 @@ gail_window_ref_relation_set (AtkObject *obj)
         {
           atk_relation_set_remove (relation_set, relation);
         }
-      if (GTK_WIDGET_VISIBLE(widget) && gtk_tooltips_get_info_from_tip_window (GTK_WINDOW (widget), NULL, &current_widget))
+      if (gtk_widget_get_visible(widget) && gtk_tooltips_get_info_from_tip_window (GTK_WINDOW (widget), NULL, &current_widget))
         {
           array [0] = gtk_widget_get_accessible (current_widget);
 
@@ -575,7 +563,7 @@ gail_window_get_extents (AtkComponent  *component,
 
   gail_return_if_fail (GTK_IS_WINDOW (widget));
 
-  if (!GTK_WIDGET_TOPLEVEL (widget))
+  if (!gtk_widget_is_toplevel (widget))
     {
       AtkComponentIface *parent_iface;
 
@@ -588,7 +576,7 @@ gail_window_get_extents (AtkComponent  *component,
 
   *width = rect.width;
   *height = rect.height;
-  if (!GTK_WIDGET_DRAWABLE (widget))
+  if (!gtk_widget_is_drawable (widget))
     {
       *x = G_MININT;
       *y = G_MININT;
@@ -620,7 +608,7 @@ gail_window_get_size (AtkComponent *component,
 
   gail_return_if_fail (GTK_IS_WINDOW (widget));
 
-  if (!GTK_WIDGET_TOPLEVEL (widget))
+  if (!gtk_widget_is_toplevel (widget))
     {
       AtkComponentIface *parent_iface;