gtkwindow: Clean up gtk_window_map()

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

diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index f469d89ebab0f0c0b2c757ac63b0ec9387a73dc0..082b41edb1b391b59f6e14f6c37efae66f72fb20 100644 (file)
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -62,8 +62,6 @@ struct _GtkContainerClass
 {
   GtkWidgetClass parent_class;
 
-  unsigned int handle_border_width : 1;
-
   void    (*add)                       (GtkContainer    *container,
                                 GtkWidget       *widget);
   void    (*remove)                    (GtkContainer    *container,
@@ -74,7 +72,7 @@ struct _GtkContainerClass
                                 GtkCallback      callback,
                                 gpointer         callback_data);
   void    (*set_focus_child)   (GtkContainer    *container,
-                                GtkWidget       *widget);
+                                GtkWidget       *child);
   GType   (*child_type)                (GtkContainer    *container);
   gchar*  (*composite_name)    (GtkContainer    *container,
                                 GtkWidget       *child);
@@ -88,6 +86,13 @@ struct _GtkContainerClass
                                 guint            property_id,
                                 GValue          *value,
                                 GParamSpec      *pspec);
+  GtkWidgetPath * (*get_path_for_child) (GtkContainer *container,
+                                         GtkWidget    *child);
+
+
+  /*< private >*/
+
+  unsigned int _handle_border_width : 1;
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -190,7 +195,11 @@ void            gtk_container_child_set_property           (GtkContainer      *container,
 void        gtk_container_child_get_property           (GtkContainer      *container,
                                                         GtkWidget         *child,
                                                         const gchar       *property_name,
-                                                        GValue            *value);
+                                                        GValue            *value);
+
+void gtk_container_child_notify (GtkContainer *container,
+                                 GtkWidget    *child,
+                                 const gchar  *child_property);
 
 /**
  * GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID:
@@ -212,21 +221,8 @@ void    gtk_container_forall                    (GtkContainer *container,
 
 void    gtk_container_class_handle_border_width (GtkContainerClass *klass);
 
-/* Non-public methods */
-void   _gtk_container_queue_resize          (GtkContainer *container);
-void   _gtk_container_resize_invalidate     (GtkContainer *container);
-void    _gtk_container_clear_resize_widgets   (GtkContainer *container);
-gchar* _gtk_container_child_composite_name   (GtkContainer *container,
-                                             GtkWidget    *child);
-void   _gtk_container_dequeue_resize_handler (GtkContainer *container);
-GList *_gtk_container_focus_sort             (GtkContainer     *container,
-                                             GList            *children,
-                                             GtkDirectionType  direction,
-                                             GtkWidget        *old_focus);
-gboolean _gtk_container_get_need_resize      (GtkContainer     *container);
-void     _gtk_container_set_need_resize      (GtkContainer     *container,
-                                              gboolean          need_resize);
-gboolean _gtk_container_get_reallocate_redraws (GtkContainer   *container);
+GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer      *container,
+                                                  GtkWidget         *child);
 
 G_END_DECLS