Did the GTK+ conversion to uiParent. Now to build.

1 files changed, 2 insertions, 22 deletions

diff --git a/new/uipriv_unix.h b/new/uipriv_unix.h
index 97e16e1..1af388b 100644
--- a/new/uipriv_unix.h
+++ b/new/uipriv_unix.h
@@ -7,25 +7,5 @@
 #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;
-	// this is what triggers the resizing of all the children
-	uiControl *child;
-	// these are the actual children widgets of the container as far as GTK+ is concerned
-	GPtrArray *children;		// for forall()
-	gboolean margined;
-};
-struct uiContainerClass {
-	GtkContainerClass parent_class;
-};
-extern GType uiContainer_get_type(void);
-extern GtkWidget *newContainer(void);
+#define gtkXMargin 12
+#define gtkYMargin 12