Deprecate widget flag: GTK_WIDGET_VISIBLE

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

diff --git a/modules/other/gail/gailcombo.c b/modules/other/gail/gailcombo.c
index c99a0f6b1426628d377b295e61883f4a4b3f8344..1f10ecbec81dd400a776ff05044b827dfaa97c04 100644 (file)
--- a/modules/other/gail/gailcombo.c
+++ b/modules/other/gail/gailcombo.c
@@ -17,11 +17,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include <gtk/gtk.h>
 #include "gailcombo.h"
 
 static void         gail_combo_class_init              (GailComboClass *klass);
-static void         gail_combo_object_init             (GailCombo      *combo);
+static void         gail_combo_init                    (GailCombo      *combo);
 static void         gail_combo_real_initialize         (AtkObject      *obj,
                                                         gpointer       data);
 
@@ -63,53 +67,9 @@ static gint         _gail_combo_button_release         (gpointer       data);
 static gint         _gail_combo_popup_release          (gpointer       data);
 
 
-static gpointer parent_class = NULL;
-
-GType
-gail_combo_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type)
-    {
-      static const GTypeInfo tinfo =
-      {
-        sizeof (GailComboClass),
-        (GBaseInitFunc) NULL, /* base init */
-        (GBaseFinalizeFunc) NULL, /* base finalize */
-        (GClassInitFunc) gail_combo_class_init, /* class init */
-        (GClassFinalizeFunc) NULL, /* class finalize */
-        NULL, /* class data */
-        sizeof (GailCombo), /* instance size */
-        0, /* nb preallocs */
-        (GInstanceInitFunc) gail_combo_object_init, /* instance init */
-        NULL /* value table */
-      };
-
-      static const GInterfaceInfo atk_action_info =
-      {
-        (GInterfaceInitFunc) atk_action_interface_init,
-        (GInterfaceFinalizeFunc) NULL,
-        NULL
-      };
-      static const GInterfaceInfo atk_selection_info =
-      {
-        (GInterfaceInitFunc) atk_selection_interface_init,
-        (GInterfaceFinalizeFunc) NULL,
-        NULL
-      };
-
-      type = g_type_register_static (GAIL_TYPE_CONTAINER,
-                                     "GailCombo", &tinfo, 0);
-
-      g_type_add_interface_static (type, ATK_TYPE_ACTION,
-                                   &atk_action_info);
-      g_type_add_interface_static (type, ATK_TYPE_SELECTION,
-                                   &atk_selection_info);
-    }
-
-  return type;
-}
+G_DEFINE_TYPE_WITH_CODE (GailCombo, gail_combo, GAIL_TYPE_CONTAINER,
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
 
 static void
 gail_combo_class_init (GailComboClass *klass)
@@ -119,15 +79,13 @@ gail_combo_class_init (GailComboClass *klass)
 
   gobject_class->finalize = gail_combo_finalize;
 
-  parent_class = g_type_class_peek_parent (klass);
-
   class->get_n_children = gail_combo_get_n_children;
   class->ref_child = gail_combo_ref_child;
   class->initialize = gail_combo_real_initialize;
 }
 
 static void
-gail_combo_object_init (GailCombo      *combo)
+gail_combo_init (GailCombo      *combo)
 {
   combo->press_description = NULL;
   combo->old_selection = NULL;
@@ -135,22 +93,6 @@ gail_combo_object_init (GailCombo      *combo)
   combo->select_idle_handler = 0;
 }
 
-AtkObject* 
-gail_combo_new (GtkWidget *widget)
-{
-  GObject *object;
-  AtkObject *accessible;
-
-  g_return_val_if_fail (GTK_IS_COMBO (widget), NULL);
-
-  object = g_object_new (GAIL_TYPE_COMBO, NULL);
-
-  accessible = ATK_OBJECT (object);
-  atk_object_initialize (accessible, widget);
-
-  return accessible;
-}
-
 static void
 gail_combo_real_initialize (AtkObject *obj,
                             gpointer  data)
@@ -160,7 +102,7 @@ gail_combo_real_initialize (AtkObject *obj,
   GList *slist; 
   GailCombo *gail_combo;
 
-  ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
+  ATK_OBJECT_CLASS (gail_combo_parent_class)->initialize (obj, data);
 
   combo = GTK_COMBO (data);
 
@@ -304,8 +246,6 @@ gail_combo_ref_child (AtkObject *obj,
 static void
 atk_action_interface_init (AtkActionIface *iface)
 {
-  g_return_if_fail (iface != NULL);
-
   iface->do_action = gail_combo_do_action;
   iface->get_n_actions = gail_combo_get_n_actions;
   iface->get_description = gail_combo_get_description;
@@ -327,7 +267,7 @@ gail_combo_do_action (AtkAction *action,
      */
     return FALSE;
 
-  if (!GTK_WIDGET_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
+  if (!gtk_widget_get_sensitive (widget) || !gtk_widget_get_visible (widget))
     return FALSE;
 
   combo = GAIL_COMBO (action);
@@ -365,7 +305,7 @@ idle_do_action (gpointer data)
   gail_combo->action_idle_handler = 0;
   widget = GTK_ACCESSIBLE (gail_combo)->widget;
   if (widget == NULL /* State is defunct */ ||
-      !GTK_WIDGET_SENSITIVE (widget) || !GTK_WIDGET_VISIBLE (widget))
+      !gtk_widget_get_sensitive (widget) || !gtk_widget_get_visible (widget))
     return FALSE;
 
   combo = GTK_COMBO (widget);
@@ -441,8 +381,6 @@ gail_combo_get_name (AtkAction *action,
 static void
 atk_selection_interface_init (AtkSelectionIface *iface)
 {
-  g_return_if_fail (iface != NULL);
-
   iface->add_selection = gail_combo_add_selection;
   iface->clear_selection = gail_combo_clear_selection;
   iface->ref_selection = gail_combo_ref_selection;
@@ -697,5 +635,5 @@ gail_combo_finalize (GObject            *object)
       g_source_remove (combo->select_idle_handler);
       combo->select_idle_handler = 0;       
     }
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (gail_combo_parent_class)->finalize (object);
 }