Remove GtkObject completely

[~andy/gtk] / gtk / gtkwidget.h

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index a5746aa498b68ee3e13ac8a6c1e801f26d3a6ea6..af72dea7250e2fad3eb44ff037b4e8020c3bc842 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -33,7 +33,6 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkobject.h>
 #include <gtk/gtkadjustment.h>
 #include <gtk/gtkstyle.h>
 #include <gtk/gtksettings.h>
@@ -249,16 +248,7 @@ struct _GtkRequisition
  */
 struct _GtkWidget
 {
-  /* The object structure needs to be the first
-   *  element in the widget structure in order for
-   *  the object mechanism to work correctly. This
-   *  allows a GtkWidget pointer to be cast to a
-   *  GtkObject pointer.
-   */
-  GInitiallyUnowned object;
-
-  /* internally used private flags. */
-  guint GSEAL (private_flags) : 16;
+  GInitiallyUnowned parent_instance;
 
   GtkWidgetPrivate *priv;
 };
@@ -268,7 +258,7 @@ struct _GtkWidget
  * @parent_class: The object class structure needs to be the first
  *   element in the widget class structure in order for the class mechanism
  *   to work correctly. This allows a GtkWidgetClass pointer to be cast to
- *   a GtkObjectClass pointer.
+ *   a GObjectClass pointer.
  * @activate_signal: The signal to emit when a widget of this class is
  *   activated, gtk_widget_activate() handles the emission.
  *   Implementation of this signal is optional.
@@ -1030,6 +1020,8 @@ void         _gtk_widget_buildable_finish_accelerator (GtkWidget *widget,
                                                       GtkWidget *toplevel,
                                                       gpointer   user_data);
 
+gboolean     gtk_widget_in_destruction (GtkWidget *widget);
+
 G_END_DECLS
 
 #endif /* __GTK_WIDGET_H__ */