X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcontainer.h;h=94a8502c8f6d0e6b81021d06fd281ac70dde9f8c;hb=44d9fb2d711e976965ee3899ee6c7acb8cec9f54;hp=e7c2ff38bc01f3ee3c515bfb6a70bb9cc8def706;hpb=ebdc9e8221dde765272a4927060f606fec39a7c8;p=~andy%2Fgtk

diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index e7c2ff38b..94a8502c8 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -32,8 +32,6 @@
 #define __GTK_CONTAINER_H__
 
 
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkadjustment.h>
 
@@ -47,31 +45,25 @@ G_BEGIN_DECLS
 #define GTK_IS_CONTAINER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CONTAINER))
 #define GTK_CONTAINER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass))
 
-#define GTK_IS_RESIZE_CONTAINER(widget) (GTK_IS_CONTAINER (widget) && ((GtkContainer*) (widget))->resize_mode != GTK_RESIZE_PARENT)
 
-
-typedef struct _GtkContainer	   GtkContainer;
-typedef struct _GtkContainerClass  GtkContainerClass;
+typedef struct _GtkContainer              GtkContainer;
+typedef struct _GtkContainerPrivate       GtkContainerPrivate;
+typedef struct _GtkContainerClass         GtkContainerClass;
 
 struct _GtkContainer
 {
   GtkWidget widget;
 
-  GtkWidget *GSEAL (focus_child);
-
-  guint GSEAL (border_width : 16);
-
   /*< private >*/
-  guint GSEAL (need_resize : 1);
-  guint GSEAL (resize_mode : 2);
-  guint GSEAL (reallocate_redraws : 1);
-  guint GSEAL (has_focus_chain : 1);
+  GtkContainerPrivate *priv;
 };
 
 struct _GtkContainerClass
 {
   GtkWidgetClass parent_class;
 
+  unsigned int handle_border_width : 1;
+
   void    (*add)       		(GtkContainer	 *container,
 				 GtkWidget	 *widget);
   void    (*remove)    		(GtkContainer	 *container,
@@ -96,14 +88,21 @@ struct _GtkContainerClass
 				 guint            property_id,
 				 GValue          *value,
 				 GParamSpec      *pspec);
+  GtkWidgetPath * (*get_path_for_child) (GtkContainer *container,
+                                         GtkWidget    *child);
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
+  void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
+
 /* Application-level methods */
 
 GType   gtk_container_get_type		 (void) G_GNUC_CONST;
@@ -124,22 +123,11 @@ void    gtk_container_check_resize       (GtkContainer     *container);
 void     gtk_container_foreach      (GtkContainer       *container,
 				     GtkCallback         callback,
 				     gpointer            callback_data);
-#ifndef GTK_DISABLE_DEPRECATED
-void     gtk_container_foreach_full (GtkContainer       *container,
-				     GtkCallback         callback,
-				     GtkCallbackMarshal  marshal,
-				     gpointer            callback_data,
-				     GDestroyNotify      notify);
-#endif /*  GTK_DISABLE_DEPRECATED */
 GList*   gtk_container_get_children     (GtkContainer       *container);
 
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_container_children gtk_container_get_children
-#endif
-
-void     gtk_container_propagate_expose (GtkContainer   *container,
+void     gtk_container_propagate_draw   (GtkContainer   *container,
 					 GtkWidget      *child,
-					 GdkEventExpose *event);
+					 cairo_t        *cr);
 
 void     gtk_container_set_focus_chain  (GtkContainer   *container,
                                          GList          *focusable_widgets);
@@ -147,6 +135,9 @@ gboolean gtk_container_get_focus_chain  (GtkContainer   *container,
 					 GList         **focusable_widgets);
 void     gtk_container_unset_focus_chain (GtkContainer  *container);
 
+#define GTK_IS_RESIZE_CONTAINER(widget) (GTK_IS_CONTAINER (widget) && \
+                                        (gtk_container_get_resize_mode (GTK_CONTAINER (widget)) != GTK_RESIZE_PARENT))
+
 /* Widget-level methods */
 
 void   gtk_container_set_reallocate_redraws (GtkContainer    *container,
@@ -203,6 +194,16 @@ void	     gtk_container_child_get_property		(GtkContainer	   *container,
 							 const gchar	   *property_name,
 							 GValue		   *value);
 
+/**
+ * GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID:
+ * @object: the #GObject on which set_child_property() or get_child_property()
+ *  was called
+ * @property_id: the numeric id of the property
+ * @pspec: the #GParamSpec of the property
+ *
+ * This macro should be used to emit a standard warning about unexpected
+ * properties in set_child_property() and get_child_property() implementations.
+ */
 #define GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID(object, property_id, pspec) \
     G_OBJECT_WARN_INVALID_PSPEC ((object), "child property id", (property_id), (pspec))
 
@@ -211,8 +212,11 @@ void    gtk_container_forall		     (GtkContainer *container,
 					      GtkCallback   callback,
 					      gpointer	    callback_data);
 
+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);
@@ -221,10 +225,13 @@ 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);
 
-#ifndef GTK_DISABLE_DEPRECATED
-#define	gtk_container_border_width		gtk_container_set_border_width
-#endif /* GTK_DISABLE_DEPRECATED */
+GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer      *container,
+                                                  GtkWidget         *child);
 
 G_END_DECLS