interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Started splitting out lifetime management code into its own place on the GTK+ backend.

This commit is contained in:
Pietro Gagliardi 2015-04-19 01:37:11 -04:00
parent 085e06d054
commit a5e4060b67
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
unix/GNUmakeinc.mk
View File

@ -5,6 +5,7 @@ OSCFILES = \
entry.c \ entry.c \
init.c \ init.c \
label.c \ label.c \
lifetimes.c \
main.c \ main.c \
newcontrol.c \ newcontrol.c \
parent.c \ parent.c \

17
unix/lifetimes.c Normal file
View File

@ -0,0 +1,17 @@
// 19 april 2015
#include "uipriv_unix.h"
static void destroyBlocker(GtkWidget *widget, gpointer data)
{
complain("trying to destroy object at %p before destroy function called", data);
}
gulong blockDestruction(GtkWidget *widget, void *object)
{
return g_signal_connect(widget, "destroy", G_CALLBACK(destroyBlocker), object);
}
void readyToDestroy(GtkWidget *widget, gulong block)
{
g_signal_handler_disconnect(widget, block);
}

9
unix/newcontrol.c
View File

@ -24,7 +24,7 @@ static void singleDestroy(uiControl *c)
// first call the widget's own destruction code // first call the widget's own destruction code
(*(s->onDestroy))(s->onDestroyData); (*(s->onDestroy))(s->onDestroyData);
// then mark that we are ready to be destroyed // then mark that we are ready to be destroyed
g_signal_handler_disconnect(s->immediate, s->destroyBlocker); readyToDestroy(s->immediate, s->destroyBlocker);
// then actually destroy (TODO sync these comments) // then actually destroy (TODO sync these comments)
gtk_widget_destroy(s->immediate); gtk_widget_destroy(s->immediate);
// and free ourselves // and free ourselves
@ -167,11 +167,6 @@ static void singleContainerDisable(uiControl *c)
gtk_widget_set_sensitive(s->immediate, FALSE); gtk_widget_set_sensitive(s->immediate, FALSE);
} }
static void destroyBlocker(GtkWidget *widget, gpointer data)
{
complain("trying to destroy control at %p before uiControlDestroy()", data);
}
void uiUnixNewControl(uiControl *c, GType type, gboolean inScrolledWindow, gboolean scrolledWindowHasBorder, void (*onDestroy)(void *), void *onDestroyData, const char *firstProperty, ...) void uiUnixNewControl(uiControl *c, GType type, gboolean inScrolledWindow, gboolean scrolledWindowHasBorder, void (*onDestroy)(void *), void *onDestroyData, const char *firstProperty, ...)
{ {
singleWidget *s; singleWidget *s;
@ -227,7 +222,7 @@ void uiUnixNewControl(uiControl *c, GType type, gboolean inScrolledWindow, gbool
c->ContainerDisable = singleContainerDisable; c->ContainerDisable = singleContainerDisable;
// let's stop premature destruction // let's stop premature destruction
s->destroyBlocker = g_signal_connect(s->immediate, "destroy", G_CALLBACK(destroyBlocker), c); s->destroyBlocker = blockDestruction(s->immediate, c);
// finally, call gtk_widget_show_all() here to set the initial visibility of the widget // finally, call gtk_widget_show_all() here to set the initial visibility of the widget
gtk_widget_show_all(s->immediate); gtk_widget_show_all(s->immediate);

4
unix/uipriv_unix.h
View File

@ -12,3 +12,7 @@
#define widget(c) uiControlHandle(uiControl(c)) #define widget(c) uiControlHandle(uiControl(c))
#define WIDGET(c) GTK_WIDGET(widget(c)) #define WIDGET(c) GTK_WIDGET(widget(c))
// lifetimes.c
extern gulong blockDestruction(GtkWidget *, void *);
extern void readyToDestroy(GtkWidget *, gulong);