Commit f53ad339 authored by Matthias Clasen's avatar Matthias Clasen

Remove GtkObject completely

parent eac1959d
...@@ -93,7 +93,6 @@ gtk_message_dialog_get_type ...@@ -93,7 +93,6 @@ gtk_message_dialog_get_type
gtk_misc_get_type gtk_misc_get_type
gtk_mount_operation_get_type gtk_mount_operation_get_type
gtk_notebook_get_type gtk_notebook_get_type
gtk_object_get_type
gtk_offscreen_window_get_type gtk_offscreen_window_get_type
gtk_orientable_get_type gtk_orientable_get_type
gtk_page_setup_get_type gtk_page_setup_get_type
......
...@@ -244,7 +244,6 @@ gtk_public_h_sources = \ ...@@ -244,7 +244,6 @@ gtk_public_h_sources = \
gtkmodules.h \ gtkmodules.h \
gtkmountoperation.h \ gtkmountoperation.h \
gtknotebook.h \ gtknotebook.h \
gtkobject.h \
gtkoffscreenwindow.h \ gtkoffscreenwindow.h \
gtkorientable.h \ gtkorientable.h \
gtkpagesetup.h \ gtkpagesetup.h \
...@@ -512,7 +511,6 @@ gtk_base_c_sources = \ ...@@ -512,7 +511,6 @@ gtk_base_c_sources = \
gtkmodules.c \ gtkmodules.c \
gtkmountoperation.c \ gtkmountoperation.c \
gtknotebook.c \ gtknotebook.c \
gtkobject.c \
gtkoffscreenwindow.c \ gtkoffscreenwindow.c \
gtkorientable.c \ gtkorientable.c \
gtkpagesetup.c \ gtkpagesetup.c \
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
#include <gtk/gtkmodules.h> #include <gtk/gtkmodules.h>
#include <gtk/gtkmountoperation.h> #include <gtk/gtkmountoperation.h>
#include <gtk/gtknotebook.h> #include <gtk/gtknotebook.h>
#include <gtk/gtkobject.h>
#include <gtk/gtkoffscreenwindow.h> #include <gtk/gtkoffscreenwindow.h>
#include <gtk/gtkorientable.h> #include <gtk/gtkorientable.h>
#include <gtk/gtkpagesetup.h> #include <gtk/gtkpagesetup.h>
......
...@@ -2067,13 +2067,6 @@ gtk_notebook_set_action_widget ...@@ -2067,13 +2067,6 @@ gtk_notebook_set_action_widget
#endif #endif
#endif #endif
#if IN_HEADER(__GTK_OBJECT_H__)
#if IN_FILE(__GTK_OBJECT_C__)
gtk_object_destroy
gtk_object_get_type G_GNUC_CONST
#endif
#endif
#if IN_HEADER(__GTK_OFFSCREEN_WINDOW_H__) #if IN_HEADER(__GTK_OFFSCREEN_WINDOW_H__)
#if IN_FILE(__GTK_OFFSCREEN_WINDOW_C__) #if IN_FILE(__GTK_OFFSCREEN_WINDOW_C__)
gtk_offscreen_window_get_type G_GNUC_CONST gtk_offscreen_window_get_type G_GNUC_CONST
...@@ -4361,6 +4354,7 @@ gtk_widget_get_margin_top ...@@ -4361,6 +4354,7 @@ gtk_widget_get_margin_top
gtk_widget_set_margin_top gtk_widget_set_margin_top
gtk_widget_get_margin_bottom gtk_widget_get_margin_bottom
gtk_widget_set_margin_bottom gtk_widget_set_margin_bottom
gtk_widget_in_destruction
#endif #endif
#endif #endif
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#ifndef __GTK_ADJUSTMENT_H__ #ifndef __GTK_ADJUSTMENT_H__
#define __GTK_ADJUSTMENT_H__ #define __GTK_ADJUSTMENT_H__
#include <gtk/gtkobject.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#include <math.h> #include <math.h>
#include "gtkarrow.h" #include "gtkarrow.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtktypeutils.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#include "gtkorientable.h" #include "gtkorientable.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtktypeutils.h"
#include "gtkintl.h" #include "gtkintl.h"
......
/* GTK - The GIMP Toolkit /* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
* *
* GtkBindingSet: Keybinding manager for GtkObjects. * GtkBindingSet: Keybinding manager for GObjects.
* Copyright (C) 1998 Tim Janik * Copyright (C) 1998 Tim Janik
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkkeyhash.h" #include "gtkkeyhash.h"
#include "gtktypeutils.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtkrc.h" #include "gtkrc.h"
...@@ -340,7 +341,7 @@ binding_ht_lookup_entry (GtkBindingSet *set, ...@@ -340,7 +341,7 @@ binding_ht_lookup_entry (GtkBindingSet *set,
} }
static gboolean static gboolean
binding_compose_params (GtkObject *object, binding_compose_params (GObject *object,
GtkBindingArg *args, GtkBindingArg *args,
GSignalQuery *query, GSignalQuery *query,
GValue **params_p) GValue **params_p)
...@@ -469,7 +470,7 @@ binding_compose_params (GtkObject *object, ...@@ -469,7 +470,7 @@ binding_compose_params (GtkObject *object,
static gboolean static gboolean
gtk_binding_entry_activate (GtkBindingEntry *entry, gtk_binding_entry_activate (GtkBindingEntry *entry,
GtkObject *object) GObject *object)
{ {
GtkBindingSignal *sig; GtkBindingSignal *sig;
gboolean old_emission; gboolean old_emission;
...@@ -593,7 +594,7 @@ gtk_binding_set_new (const gchar *set_name) ...@@ -593,7 +594,7 @@ gtk_binding_set_new (const gchar *set_name)
/** /**
* gtk_binding_set_by_class: * gtk_binding_set_by_class:
* @object_class: a valid #GtkObject class * @object_class: a valid #GObject class
* *
* This function returns the binding set named after the type name of * This function returns the binding set named after the type name of
* the passed in class structure. New binding sets are created on * the passed in class structure. New binding sets are created on
...@@ -604,10 +605,10 @@ gtk_binding_set_new (const gchar *set_name) ...@@ -604,10 +605,10 @@ gtk_binding_set_new (const gchar *set_name)
GtkBindingSet* GtkBindingSet*
gtk_binding_set_by_class (gpointer object_class) gtk_binding_set_by_class (gpointer object_class)
{ {
GtkObjectClass *class = object_class; GObjectClass *class = object_class;
GtkBindingSet* binding_set; GtkBindingSet* binding_set;
g_return_val_if_fail (GTK_IS_OBJECT_CLASS (class), NULL); g_return_val_if_fail (G_IS_OBJECT_CLASS (class), NULL);
if (!key_id_class_binding_set) if (!key_id_class_binding_set)
key_id_class_binding_set = g_quark_from_static_string (key_class_binding_set); key_id_class_binding_set = g_quark_from_static_string (key_class_binding_set);
...@@ -671,12 +672,12 @@ gboolean ...@@ -671,12 +672,12 @@ gboolean
gtk_binding_set_activate (GtkBindingSet *binding_set, gtk_binding_set_activate (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers, GdkModifierType modifiers,
GtkObject *object) GObject *object)
{ {
GtkBindingEntry *entry; GtkBindingEntry *entry;
g_return_val_if_fail (binding_set != NULL, FALSE); g_return_val_if_fail (binding_set != NULL, FALSE);
g_return_val_if_fail (GTK_IS_OBJECT (object), FALSE); g_return_val_if_fail (G_IS_OBJECT (object), FALSE);
keyval = gdk_keyval_to_lower (keyval); keyval = gdk_keyval_to_lower (keyval);
modifiers = modifiers & BINDING_MOD_MASK (); modifiers = modifiers & BINDING_MOD_MASK ();
...@@ -1052,7 +1053,7 @@ gtk_binding_set_add_path (GtkBindingSet *binding_set, ...@@ -1052,7 +1053,7 @@ gtk_binding_set_add_path (GtkBindingSet *binding_set,
static gboolean static gboolean
binding_match_activate (GSList *pspec_list, binding_match_activate (GSList *pspec_list,
GtkObject *object, GObject *object,
guint path_length, guint path_length,
gchar *path, gchar *path,
gchar *path_reversed, gchar *path_reversed,
...@@ -1170,7 +1171,7 @@ gtk_binding_entries_sort_patterns (GSList *entries, ...@@ -1170,7 +1171,7 @@ gtk_binding_entries_sort_patterns (GSList *entries,
} }
static gboolean static gboolean
gtk_bindings_activate_list (GtkObject *object, gtk_bindings_activate_list (GObject *object,
GSList *entries, GSList *entries,
gboolean is_release) gboolean is_release)
{ {
...@@ -1264,7 +1265,7 @@ gtk_bindings_activate_list (GtkObject *object, ...@@ -1264,7 +1265,7 @@ gtk_bindings_activate_list (GtkObject *object,
* Return value: %TRUE if a binding was found and activated * Return value: %TRUE if a binding was found and activated
*/ */
gboolean gboolean
gtk_bindings_activate (GtkObject *object, gtk_bindings_activate (GObject *object,
guint keyval, guint keyval,
GdkModifierType modifiers) GdkModifierType modifiers)
{ {
...@@ -1274,8 +1275,6 @@ gtk_bindings_activate (GtkObject *object, ...@@ -1274,8 +1275,6 @@ gtk_bindings_activate (GtkObject *object,
gboolean handled = FALSE; gboolean handled = FALSE;
gboolean is_release; gboolean is_release;
g_return_val_if_fail (GTK_IS_OBJECT (object), FALSE);
if (!GTK_IS_WIDGET (object)) if (!GTK_IS_WIDGET (object))
return FALSE; return FALSE;
...@@ -1296,7 +1295,7 @@ gtk_bindings_activate (GtkObject *object, ...@@ -1296,7 +1295,7 @@ gtk_bindings_activate (GtkObject *object,
/** /**
* gtk_bindings_activate_event: * gtk_bindings_activate_event:
* @object: a #GtkObject (generally must be a widget) * @object: a #GObject (generally must be a widget)
* @event: a #GdkEventKey * @event: a #GdkEventKey
* *
* Looks up key bindings for @object to find one matching * Looks up key bindings for @object to find one matching
...@@ -1307,7 +1306,7 @@ gtk_bindings_activate (GtkObject *object, ...@@ -1307,7 +1306,7 @@ gtk_bindings_activate (GtkObject *object,
* Since: 2.4 * Since: 2.4
*/ */
gboolean gboolean
gtk_bindings_activate_event (GtkObject *object, gtk_bindings_activate_event (GObject *object,
GdkEventKey *event) GdkEventKey *event)
{ {
GSList *entries = NULL; GSList *entries = NULL;
...@@ -1315,8 +1314,6 @@ gtk_bindings_activate_event (GtkObject *object, ...@@ -1315,8 +1314,6 @@ gtk_bindings_activate_event (GtkObject *object,
GtkKeyHash *key_hash; GtkKeyHash *key_hash;
gboolean handled = FALSE; gboolean handled = FALSE;
g_return_val_if_fail (GTK_IS_OBJECT (object), FALSE);
if (!GTK_IS_WIDGET (object)) if (!GTK_IS_WIDGET (object))
return FALSE; return FALSE;
......
/* GTK - The GIMP Toolkit /* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
* *
* GtkBindingSet: Keybinding manager for GtkObjects. * GtkBindingSet: Keybinding manager for GObjects.
* Copyright (C) 1998 Tim Janik * Copyright (C) 1998 Tim Janik
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtkobject.h> #include <gtk/gtkenums.h>
G_BEGIN_DECLS G_BEGIN_DECLS
...@@ -101,15 +100,15 @@ struct _GtkBindingSignal ...@@ -101,15 +100,15 @@ struct _GtkBindingSignal
GtkBindingSet* gtk_binding_set_new (const gchar *set_name); GtkBindingSet* gtk_binding_set_new (const gchar *set_name);
GtkBindingSet* gtk_binding_set_by_class(gpointer object_class); GtkBindingSet* gtk_binding_set_by_class(gpointer object_class);
GtkBindingSet* gtk_binding_set_find (const gchar *set_name); GtkBindingSet* gtk_binding_set_find (const gchar *set_name);
gboolean gtk_bindings_activate (GtkObject *object, gboolean gtk_bindings_activate (GObject *object,
guint keyval, guint keyval,
GdkModifierType modifiers); GdkModifierType modifiers);
gboolean gtk_bindings_activate_event (GtkObject *object, gboolean gtk_bindings_activate_event (GObject *object,
GdkEventKey *event); GdkEventKey *event);
gboolean gtk_binding_set_activate (GtkBindingSet *binding_set, gboolean gtk_binding_set_activate (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers, GdkModifierType modifiers,
GtkObject *object); GObject *object);
void gtk_binding_entry_skip (GtkBindingSet *binding_set, void gtk_binding_entry_skip (GtkBindingSet *binding_set,
guint keyval, guint keyval,
......
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
#include "gtkbox.h" #include "gtkbox.h"
#include "gtkorientable.h" #include "gtkorientable.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtktypeutils.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
......
...@@ -246,6 +246,7 @@ ...@@ -246,6 +246,7 @@
#include "gtkbuilder.h" #include "gtkbuilder.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkbuilderprivate.h" #include "gtkbuilderprivate.h"
#include "gtkdebug.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "gtkcellrendererspinner.h" #include "gtkcellrendererspinner.h"
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtktypeutils.h"
#include "gtkintl.h" #include "gtkintl.h"
......
...@@ -1283,7 +1283,7 @@ gtk_combo_box_remove (GtkContainer *container, ...@@ -1283,7 +1283,7 @@ gtk_combo_box_remove (GtkContainer *container,
gtk_widget_unparent (widget); gtk_widget_unparent (widget);
_gtk_bin_set_child (GTK_BIN (container), NULL); _gtk_bin_set_child (GTK_BIN (container), NULL);
if (GTK_OBJECT_FLAGS (combo_box) & GTK_IN_DESTRUCTION) if (gtk_widget_in_destruction (combo_box))
return; return;
gtk_widget_queue_resize (GTK_WIDGET (container)); gtk_widget_queue_resize (GTK_WIDGET (container));
...@@ -3964,12 +3964,12 @@ gtk_combo_box_menu_key_press (GtkWidget *widget, ...@@ -3964,12 +3964,12 @@ gtk_combo_box_menu_key_press (GtkWidget *widget,
{ {
GtkComboBox *combo_box = GTK_COMBO_BOX (data); GtkComboBox *combo_box = GTK_COMBO_BOX (data);
if (!gtk_bindings_activate_event (GTK_OBJECT (widget), event)) if (!gtk_bindings_activate_event (G_OBJECT (widget), event))
{ {
/* The menu hasn't managed the /* The menu hasn't managed the
* event, forward it to the combobox * event, forward it to the combobox
*/ */
gtk_bindings_activate_event (GTK_OBJECT (combo_box), event); gtk_bindings_activate_event (G_OBJECT (combo_box), event);
} }
return TRUE; return TRUE;
...@@ -4003,12 +4003,12 @@ gtk_combo_box_list_key_press (GtkWidget *widget, ...@@ -4003,12 +4003,12 @@ gtk_combo_box_list_key_press (GtkWidget *widget,
return TRUE; return TRUE;
} }
if (!gtk_bindings_activate_event (GTK_OBJECT (widget), event)) if (!gtk_bindings_activate_event (G_OBJECT (widget), event))
{ {
/* The list hasn't managed the /* The list hasn't managed the
* event, forward it to the combobox * event, forward it to the combobox
*/ */
gtk_bindings_activate_event (GTK_OBJECT (combo_box), event); gtk_bindings_activate_event (G_OBJECT (combo_box), event);
} }
return TRUE; return TRUE;
......
...@@ -1086,7 +1086,7 @@ gtk_container_destroy (GtkWidget *widget) ...@@ -1086,7 +1086,7 @@ gtk_container_destroy (GtkWidget *widget)
GtkContainer *container = GTK_CONTAINER (widget); GtkContainer *container = GTK_CONTAINER (widget);
GtkContainerPrivate *priv = container->priv; GtkContainerPrivate *priv = container->priv;
if (GTK_CONTAINER_RESIZE_PENDING (container)) if (_gtk_widget_get_resize_pending (GTK_WIDGET (container)))
_gtk_container_dequeue_resize_handler (container); _gtk_container_dequeue_resize_handler (container);
if (priv->focus_child) if (priv->focus_child)
...@@ -1278,10 +1278,10 @@ void ...@@ -1278,10 +1278,10 @@ void
_gtk_container_dequeue_resize_handler (GtkContainer *container) _gtk_container_dequeue_resize_handler (GtkContainer *container)
{ {
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (GTK_CONTAINER_RESIZE_PENDING (container)); g_return_if_fail (_gtk_widget_get_resize_pending (GTK_WIDGET (container)));
container_resize_queue = g_slist_remove (container_resize_queue, container); container_resize_queue = g_slist_remove (container_resize_queue, container);
GTK_PRIVATE_UNSET_FLAG (container, GTK_RESIZE_PENDING); _gtk_widget_set_resize_pending (GTK_WIDGET (container), FALSE);
} }
/** /**
...@@ -1392,7 +1392,7 @@ gtk_container_idle_sizer (gpointer data) ...@@ -1392,7 +1392,7 @@ gtk_container_idle_sizer (gpointer data)
widget = slist->data; widget = slist->data;
g_slist_free_1 (slist); g_slist_free_1 (slist);
GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING); _gtk_widget_set_resize_pending (widget, FALSE);
gtk_container_check_resize (GTK_CONTAINER (widget)); gtk_container_check_resize (GTK_CONTAINER (widget));
} }
...@@ -1418,9 +1418,9 @@ _gtk_container_queue_resize (GtkContainer *container) ...@@ -1418,9 +1418,9 @@ _gtk_container_queue_resize (GtkContainer *container)
while (TRUE) while (TRUE)
{ {
GTK_PRIVATE_SET_FLAG (widget, GTK_ALLOC_NEEDED); _gtk_widget_set_alloc_needed (widget, TRUE);
GTK_PRIVATE_SET_FLAG (widget, GTK_WIDTH_REQUEST_NEEDED); _gtk_widget_set_width_request_needed (widget, TRUE);
GTK_PRIVATE_SET_FLAG (widget, GTK_HEIGHT_REQUEST_NEEDED); _gtk_widget_set_height_request_needed (widget, TRUE);
if ((resize_container && widget == GTK_WIDGET (resize_container)) || if ((resize_container && widget == GTK_WIDGET (resize_container)) ||
!(parent = gtk_widget_get_parent (widget))) !(parent = gtk_widget_get_parent (widget)))
...@@ -1438,9 +1438,9 @@ _gtk_container_queue_resize (GtkContainer *container) ...@@ -1438,9 +1438,9 @@ _gtk_container_queue_resize (GtkContainer *container)
switch (resize_container->priv->resize_mode) switch (resize_container->priv->resize_mode)
{ {
case GTK_RESIZE_QUEUE: case GTK_RESIZE_QUEUE:
if (!GTK_CONTAINER_RESIZE_PENDING (resize_container)) if (!_gtk_widget_get_resize_pending (GTK_WIDGET (resize_container)))
{ {
GTK_PRIVATE_SET_FLAG (resize_container, GTK_RESIZE_PENDING); _gtk_widget_set_resize_pending (GTK_WIDGET (resize_container), TRUE);
if (container_resize_queue == NULL) if (container_resize_queue == NULL)
gdk_threads_add_idle_full (GTK_PRIORITY_RESIZE, gdk_threads_add_idle_full (GTK_PRIORITY_RESIZE,
gtk_container_idle_sizer, gtk_container_idle_sizer,
......
...@@ -608,7 +608,7 @@ gtk_expander_size_allocate (GtkWidget *widget, ...@@ -608,7 +608,7 @@ gtk_expander_size_allocate (GtkWidget *widget,
child_ypad = 2 * border_width + priv->spacing + (interior_focus ? 0 : 2 * focus_width + 2 * focus_pad); child_ypad = 2 * border_width + priv->spacing + (interior_focus ? 0 : 2 * focus_width + 2 * focus_pad);
top_min_height = 2 * expander_spacing + expander_size; top_min_height = 2 * expander_spacing + expander_size;
child_visible = (child && GTK_WIDGET_CHILD_VISIBLE (child)); child_visible = (child && gtk_widget_get_child_visible (child));
if (priv->label_widget && gtk_widget_get_visible (priv->label_widget)) if (priv->label_widget && gtk_widget_get_visible (priv->label_widget))
{ {
...@@ -1103,7 +1103,7 @@ focus_in_site (GtkExpander *expander, ...@@ -1103,7 +1103,7 @@ focus_in_site (GtkExpander *expander,
{ {
GtkWidget *child = gtk_bin_get_child (GTK_BIN (expander)); GtkWidget *child = gtk_bin_get_child (GTK_BIN (expander));
if (child && GTK_WIDGET_CHILD_VISIBLE (child)) if (child && gtk_widget_get_child_visible (child))
return gtk_widget_child_focus (child, direction); return gtk_widget_child_focus (child, direction);
else else
return FALSE; return FALSE;
...@@ -1312,7 +1312,7 @@ gtk_expander_get_preferred_width (GtkWidget *widget, ...@@ -1312,7 +1312,7 @@ gtk_expander_get_preferred_width (GtkWidget *widget,
*natural_size += label_nat; *natural_size += label_nat;
} }
if (child && GTK_WIDGET_CHILD_VISIBLE (child)) if (child && gtk_widget_get_child_visible (child))
{ {
gint child_min, child_nat; gint child_min, child_nat;
...@@ -1382,7 +1382,7 @@ gtk_expander_get_preferred_height (GtkWidget *widget, ...@@ -1382,7 +1382,7 @@ gtk_expander_get_preferred_height (GtkWidget *widget,
*natural_size += extra; *natural_size += extra;
} }
if (child && GTK_WIDGET_CHILD_VISIBLE (child)) if (child && gtk_widget_get_child_visible (child))
{ {
gint child_min, child_nat; gint child_min, child_nat;
...@@ -1457,7 +1457,7 @@ gtk_expander_get_preferred_height_for_width (GtkWidget *widget, ...@@ -1457,7 +1457,7 @@ gtk_expander_get_preferred_height_for_width (GtkWidget *widget,
*natural_height += extra; *natural_height += extra;
} }
if (child && GTK_WIDGET_CHILD_VISIBLE (child)) if (child && gtk_widget_get_child_visible (child))
{ {
gint child_min, child_nat; gint child_min, child_nat;
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "gtkhsv.h" #include "gtkhsv.h"
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtktypeutils.h"
#include "gtkintl.h" #include "gtkintl.h"
/* Default width/height */ /* Default width/height */
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkdebug.h"
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkiconcache.h" #include "gtkiconcache.h"
#include "gtkbuiltincache.h" #include "gtkbuiltincache.h"
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtkobject.h>
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "gtkimcontextsimple.h" #include "gtkimcontextsimple.h"
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtkdebug.h"
#include "gtkintl.h" #include "gtkintl.h"
......
...@@ -263,7 +263,7 @@ gtk_invisible_style_set (GtkWidget *widget, ...@@ -263,7 +263,7 @@ gtk_invisible_style_set (GtkWidget *widget,
static void static void
gtk_invisible_show (GtkWidget *widget) gtk_invisible_show (GtkWidget *widget)
{ {
GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE); _gtk_widget_set_visible_flag (widget, TRUE);
gtk_widget_map (widget); gtk_widget_map (widget);
} }
......
...@@ -1931,7 +1931,7 @@ gtk_grab_notify_foreach (GtkWidget *child, ...@@ -1931,7 +1931,7 @@ gtk_grab_notify_foreach (GtkWidget *child,
if (is_shadowed) if (is_shadowed)
{ {
GTK_PRIVATE_SET_FLAG (child, GTK_SHADOWED); _gtk_widget_set_shadowed (child, TRUE);
if (!was_shadowed && devices && if (!was_shadowed && devices &&
gtk_widget_is_sensitive (child)) gtk_widget_is_sensitive (child))
synth_crossing_for_grab_notify (child, info->new_grab_widget, synth_crossing_for_grab_notify (child, info->new_grab_widget,
...@@ -1940,7 +1940,7 @@ gtk_grab_notify_foreach (GtkWidget *child, ...@@ -1940,7 +1940,7 @@ gtk_grab_notify_foreach (GtkWidget *child,
} }
else else
{ {
GTK_PRIVATE_UNSET_FLAG (child, GTK_SHADOWED); _gtk_widget_set_shadowed (child, FALSE);
if (was_shadowed && devices && if (was_shadowed && devices &&
gtk_widget_is_sensitive (child)) gtk_widget_is_sensitive (child))
synth_crossing_for_grab_notify (info->old_grab_widget, child, synth_crossing_for_grab_notify (info->old_grab_widget, child,
...@@ -2240,25 +2240,25 @@ gtk_quit_destroy (GtkQuitFunction *quitf) ...@@ -2240,25 +2240,25 @@ gtk_quit_destroy (GtkQuitFunction *quitf)
} }
static gint static gint
gtk_quit_destructor (GtkObject **object_p) gtk_quit_destructor (GtkWidget **object_p)
{ {
if (*object_p) if (*object_p)
gtk_object_destroy (*object_p); gtk_widget_destroy (*object_p);
g_free (object_p); g_free (object_p);
return FALSE; return FALSE;
} }