From 587da1f40fd7aa64119657c30017da4a63eb1a68 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Tue, 7 Apr 2015 12:59:01 -0400 Subject: Added uiContainer, the GtkFixed equivalent for use by the GTK+ backend. Fixed up formatting of the uipriv_*.h files. --- new/uipriv_unix.h | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'new/uipriv_unix.h') diff --git a/new/uipriv_unix.h b/new/uipriv_unix.h index d7e4991..5cf2bff 100644 --- a/new/uipriv_unix.h +++ b/new/uipriv_unix.h @@ -1,5 +1,4 @@ // 6 april 2015 - #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_32 #define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_32 #define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_4 @@ -7,3 +6,23 @@ #include #include "uipriv.h" #include "ui_unix.h" + +// container_unix.c +#define uiContainerType (uiContainer_get_type()) +#define uiContainer(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), uiContainerType, uiContainer)) +#define uiIsContainer(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), uiContainerType)) +#define uiContainerClass(class) (G_TYPE_CHECK_CLASS_CAST((class), uiContainerType, uiContainerClass)) +#define uiIsContainerClass(class) (G_TYPE_CHECK_CLASS_TYPE((class), uiContainer)) +#define uiGetContainerClass(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), uiContainerType, uiContainerClass)) +typedef struct uiContainer uiContainer; +typedef struct uiContainerClass uiContainerClass; +struct uiContainer { + GtkContainer parent_instance; + // TODO + GPtrArray *children; // for forall() +}; +struct uiContainerClass { + GtkContainerClass parent_class; +}; +extern GType uiContainer_get_type(void); +extern GtkWidget *newContainer(void); -- cgit v1.2.3