From 3756657921aa453ba2471fdf4f3a3c1d19ea579b Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Thu, 23 Apr 2015 10:17:16 -0400
Subject: [PATCH] Finished uiWindow Unix work.

---
 new/ui.idl        |  1 +
 new/unix/window.c | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/new/ui.idl b/new/ui.idl
index 52be2c80..f9b1f117 100644
--- a/new/ui.idl
+++ b/new/ui.idl
@@ -78,6 +78,7 @@ interface Window {
 	func SetTitle(title *const char);
 	func Show(void);
 	func Hide(void);
+	// TODO really return int?
 	func OnClosing(f *func(w *Window, data *void) int, data *void);
 	func SetChild(c *Control);
 	func Margined(void) int;
diff --git a/new/unix/window.c b/new/unix/window.c
index 59620130..93c249ad 100644
--- a/new/unix/window.c
+++ b/new/unix/window.c
@@ -16,6 +16,11 @@ struct window {
 
 	// the OS container for the uiWindow
 	uiOSContainer *content;
+	GtkWidget *contentWidget;
+
+	// events
+	int (*onClosing)(uiWindow *, void *);
+	void *onClosingData;
 
 	int margined;
 };
@@ -43,7 +48,7 @@ static void windowDestroy(uiWindow *ww)
 	// first, hide the window to avoid flicker
 	gtk_widget_hide(w->widget);
 	// next, remove the uiOSContainer from the vbox
-	gtk_container_remove(w->vboxcontainer, GTK_WIDGET(uiOSContainerHandle(w->content)));
+	gtk_container_remove(w->vboxcontainer, GTK_WIDGET(w->contentWidget));
 	// next, destroy the uiOSContainer, which will destroy its child widget
 	uiOSContainerDestroy(w->content);
 	// TODO menus
@@ -147,10 +152,11 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubars)
 
 	// and add the OS container
 	w->content = uiNewOSContainer((uintptr_t) (w->vboxcontainer));
-	gtk_widget_set_hexpand(GTK_WIDGET(w->content), TRUE);
-	gtk_widget_set_halign(GTK_WIDGET(w->content), GTK_ALIGN_FILL);
-	gtk_widget_set_vexpand(GTK_WIDGET(w->content), TRUE);
-	gtk_widget_set_valign(GTK_WIDGET(w->content), GTK_ALIGN_FILL);
+	w->contentWidget = GTK_WIDGET(uiOSContainerHandle(w->content));
+	gtk_widget_set_hexpand(w->contentWidget, TRUE);
+	gtk_widget_set_halign(w->contentWidget, GTK_ALIGN_FILL);
+	gtk_widget_set_vexpand(w->contentWidget, TRUE);
+	gtk_widget_set_valign(w->contentWidget, GTK_ALIGN_FILL);
 
 	// show everything in the vbox, but not the GtkWindow itself
 	gtk_widget_show_all(w->vboxwidget);