#include <gtk/gtkadjustment.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
#define GTK_TYPE_CONTAINER (gtk_container_get_type ())
-#define GTK_CONTAINER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer))
-#define GTK_CONTAINER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER, GtkContainerClass))
-#define GTK_IS_CONTAINER(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_CONTAINER))
-#define GTK_IS_CONTAINER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CONTAINER))
-#define GTK_CONTAINER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass))
+#define GTK_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer))
+#define GTK_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER, GtkContainerClass))
+#define GTK_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER))
+#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)
GtkWidget *focus_child;
guint border_width : 16;
+
+ /*< private >*/
guint need_resize : 1;
guint resize_mode : 2;
guint reallocate_redraws : 1;
guint has_focus_chain : 1;
-
- /* The list of children that requested a resize
- */
- GSList *resize_widgets;
};
struct _GtkContainerClass
gpointer callback_data);
void (*set_focus_child) (GtkContainer *container,
GtkWidget *widget);
- GtkType (*child_type) (GtkContainer *container);
+ GType (*child_type) (GtkContainer *container);
gchar* (*composite_name) (GtkContainer *container,
GtkWidget *child);
void (*set_child_property) (GtkContainer *container,
guint property_id,
GValue *value,
GParamSpec *pspec);
+
/* Padding for future expansion */
- GtkFunction pad1;
- GtkFunction pad2;
+ void (*_gtk_reserved1) (void);
+ void (*_gtk_reserved2) (void);
+ void (*_gtk_reserved3) (void);
+ void (*_gtk_reserved4) (void);
};
/* Application-level methods */
-GtkType gtk_container_get_type (void) G_GNUC_CONST;
+GType gtk_container_get_type (void) G_GNUC_CONST;
void gtk_container_set_border_width (GtkContainer *container,
guint border_width);
+guint gtk_container_get_border_width (GtkContainer *container);
void gtk_container_add (GtkContainer *container,
GtkWidget *widget);
void gtk_container_remove (GtkContainer *container,
void gtk_container_set_resize_mode (GtkContainer *container,
GtkResizeMode resize_mode);
+GtkResizeMode gtk_container_get_resize_mode (GtkContainer *container);
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,
GtkDestroyNotify notify);
-GList* gtk_container_children (GtkContainer *container);
+#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,
GtkWidget *child,
GdkEventExpose *event);
void gtk_container_set_focus_chain (GtkContainer *container,
GList *focusable_widgets);
+gboolean gtk_container_get_focus_chain (GtkContainer *container,
+ GList **focusable_widgets);
void gtk_container_unset_focus_chain (GtkContainer *container);
/* Widget-level methods */
GtkWidget *child);
void gtk_container_set_focus_vadjustment (GtkContainer *container,
GtkAdjustment *adjustment);
+GtkAdjustment *gtk_container_get_focus_vadjustment (GtkContainer *container);
void gtk_container_set_focus_hadjustment (GtkContainer *container,
GtkAdjustment *adjustment);
+GtkAdjustment *gtk_container_get_focus_hadjustment (GtkContainer *container);
void gtk_container_resize_children (GtkContainer *container);
-GtkType gtk_container_child_type (GtkContainer *container);
+GType gtk_container_child_type (GtkContainer *container);
void gtk_container_class_install_child_property (GtkContainerClass *cclass,
void gtk_container_add_with_properties (GtkContainer *container,
GtkWidget *widget,
const gchar *first_prop_name,
- ...);
+ ...) G_GNUC_NULL_TERMINATED;
void gtk_container_child_set (GtkContainer *container,
GtkWidget *child,
const gchar *first_prop_name,
- ...);
+ ...) G_GNUC_NULL_TERMINATED;
void gtk_container_child_get (GtkContainer *container,
GtkWidget *child,
const gchar *first_prop_name,
- ...);
+ ...) G_GNUC_NULL_TERMINATED;
void gtk_container_child_set_valist (GtkContainer *container,
GtkWidget *child,
const gchar *first_property_name,
GtkWidget *child,
const gchar *first_property_name,
va_list var_args);
-
+void gtk_container_child_set_property (GtkContainer *container,
+ GtkWidget *child,
+ const gchar *property_name,
+ const GValue *value);
+void gtk_container_child_get_property (GtkContainer *container,
+ GtkWidget *child,
+ const gchar *property_name,
+ GValue *value);
#define GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID(object, property_id, pspec) \
G_OBJECT_WARN_INVALID_PSPEC ((object), "child property id", (property_id), (pspec))
-/* Non-public methods */
-void gtk_container_queue_resize (GtkContainer *container);
-void gtk_container_clear_resize_widgets (GtkContainer *container);
void gtk_container_forall (GtkContainer *container,
GtkCallback callback,
gpointer callback_data);
-gchar* gtk_container_child_composite_name (GtkContainer *container,
+
+/* 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);
+void _gtk_container_dequeue_resize_handler (GtkContainer *container);
+GList *_gtk_container_focus_sort (GtkContainer *container,
+ GList *children,
+ GtkDirectionType direction,
+ GtkWidget *old_focus);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+#ifndef GTK_DISABLE_DEPRECATED
+#define gtk_container_border_width gtk_container_set_border_width
+#endif /* GTK_DISABLE_DEPRECATED */
+G_END_DECLS
#endif /* __GTK_CONTAINER_H__ */
projects / ~andy / gtk / blobdiff