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

Made refcounting for new control on GTK+ and OS X consistent.

This commit is contained in:
Pietro Gagliardi 2015-04-30 17:57:54 -04:00
parent 40dee5a693
commit 185d9cf122
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
darwin/newcontrol.m
View File

@ -19,9 +19,10 @@ static void singleDestroy(uiControl *c)
if (s->parent != NULL) if (s->parent != NULL)
complain("attempt to destroy a uiControl at %p while it still has a parent", c); complain("attempt to destroy a uiControl at %p while it still has a parent", c);
[s->immediate retain]; // to keep alive when removing
(*(s->onDestroy))(s->onDestroyData); (*(s->onDestroy))(s->onDestroyData);
// release the reference we took on creation to destroy the widget
[s->immediate release]; [s->immediate release];
uiFree(s);
} }
static uintptr_t singleHandle(uiControl *c) static uintptr_t singleHandle(uiControl *c)
@ -31,7 +32,6 @@ static uintptr_t singleHandle(uiControl *c)
return (uintptr_t) (s->view); return (uintptr_t) (s->view);
} }
// TODO update refcounting here and in the GTK+ port
static void singleSetParent(uiControl *c, uiContainer *parent) static void singleSetParent(uiControl *c, uiContainer *parent)
{ {
singleView *s = (singleView *) (c->Internal); singleView *s = (singleView *) (c->Internal);

10
unix/newcontrol.c
View File

@ -150,15 +150,7 @@ void uiUnixNewControl(uiControl *c, GType type, gboolean inScrolledWindow, gbool
} }
// we need to keep an extra reference on the immediate widget // we need to keep an extra reference on the immediate widget
// this is so uiControlDestroy() can work regardless of when it is called and who calls it // this is so we can reparent the control freely
// without this:
// - end user call works (only one ref)
// - call in uiContainer destructor fails (uiContainer ref freed)
// with this:
// - end user call works (shoudn't be in any container)
// - call in uiContainer works (both refs freed)
// this also ensures singleRemoveParent() works properly
// TODO double-check this for new parenting rules
g_object_ref_sink(s->immediate); g_object_ref_sink(s->immediate);
s->onDestroy = onDestroy; s->onDestroy = onDestroy;