X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcontainer.h;h=3bcd2b1cc3fdd3e01db319e052b2f0b4e6f38b14;hb=d484721b5ca9e82d6422cca8a3a40f001208f87b;hp=854b839582608759cba8247b015b74c0cb87575e;hpb=2a109640089bc769b5a9bdca9a42849cac5e54a7;p=~andy%2Fgtk
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 854b83958..3bcd2b1cc 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
/*
@@ -24,18 +22,15 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __GTK_CONTAINER_H__
#define __GTK_CONTAINER_H__
-#include
-#include
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
-#include
G_BEGIN_DECLS
@@ -47,25 +42,17 @@ 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 need_resize : 1;
- guint resize_mode : 2;
- guint reallocate_redraws : 1;
- guint has_focus_chain : 1;
+ GtkContainerPrivate *priv;
};
struct _GtkContainerClass
@@ -82,7 +69,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);
@@ -96,14 +83,26 @@ 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);
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,12 +135,17 @@ 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,
gboolean needs_redraws);
void gtk_container_set_focus_child (GtkContainer *container,
GtkWidget *child);
+GtkWidget *
+ gtk_container_get_focus_child (GtkContainer *container);
void gtk_container_set_focus_vadjustment (GtkContainer *container,
GtkAdjustment *adjustment);
GtkAdjustment *gtk_container_get_focus_vadjustment (GtkContainer *container);
@@ -199,8 +192,23 @@ 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);
+
+GDK_AVAILABLE_IN_3_2
+void gtk_container_child_notify (GtkContainer *container,
+ GtkWidget *child,
+ const gchar *child_property);
+
+/**
+ * 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))
@@ -209,20 +217,10 @@ void gtk_container_forall (GtkContainer *container,
GtkCallback callback,
gpointer callback_data);
-/* Non-public methods */
-void _gtk_container_queue_resize (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);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_container_border_width gtk_container_set_border_width
-#endif /* GTK_DISABLE_DEPRECATED */
+void gtk_container_class_handle_border_width (GtkContainerClass *klass);
+
+GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer *container,
+ GtkWidget *child);
G_END_DECLS