From 1e263930ebc6d1871c43bb70bc21c4917efaff1e Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Tue, 7 Apr 2015 22:46:15 -0400 Subject: Started working on code to monitor creation and deletion of UI objects correctly. --- new/window_unix.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'new/window_unix.c') diff --git a/new/window_unix.c b/new/window_unix.c index acdede7..9f61289 100644 --- a/new/window_unix.c +++ b/new/window_unix.c @@ -8,6 +8,14 @@ struct uiWindow { void *onClosingData; }; +static void onDestroy(GtkWindow *window, gpointer data) +{ + uiWindow *w = (uiWindow *) data; + +printf("destroying window; freeing uiWindow\n"); + uiFree(w); +} + uiWindow *uiNewWindow(char *title, int width, int height) { uiWindow *w; @@ -16,6 +24,7 @@ uiWindow *uiNewWindow(char *title, int width, int height) w->widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(w->widget), title); gtk_window_resize(GTK_WINDOW(w->widget), width, height); + g_signal_connect(w->widget, "destroy", G_CALLBACK(onDestroy), w); w->container = newContainer(); gtk_container_add(GTK_CONTAINER(w->widget), w->container); return w; @@ -24,7 +33,6 @@ uiWindow *uiNewWindow(char *title, int width, int height) void uiWindowDestroy(uiWindow *w) { gtk_widget_destroy(w->widget); - uiFree(w); } uintptr_t uiWindowHandle(uiWindow *w) @@ -44,7 +52,6 @@ void uiWindowHide(uiWindow *w) gtk_widget_hide(w->widget); } -// TODO will not free w static gboolean onClosing(GtkWidget *win, GdkEvent *e, gpointer data) { uiWindow *w = (uiWindow *) data; -- cgit v1.2.3