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

FINALLY implemented uiTabDeletePage() on Mac OS X.

This commit is contained in:
Pietro Gagliardi 2015-04-19 11:53:31 -04:00
parent 3da538b41e
commit 8534261f35
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
darwin/tab.m
View File

@ -3,7 +3,6 @@
// TODO // TODO
// - verify margins against extra space around the tab // - verify margins against extra space around the tab
// - free child containers properly
struct tab { struct tab {
uiTab t; uiTab t;
@ -57,8 +56,19 @@ static void tabAddPage(uiTab *tt, const char *name, uiControl *child)
static void tabDeletePage(uiTab *tt, uintmax_t n) static void tabDeletePage(uiTab *tt, uintmax_t n)
{ {
struct tab *t = (struct tab *) tt; struct tab *t = (struct tab *) tt;
NSValue *v;
uiParent *p;
NSTabViewItem *i;
v = (NSValue *) [t->pages objectAtIndex:n];
p = (uiParent *) [v pointerValue];
[t->pages removeObjectAtIndex:n]; [t->pages removeObjectAtIndex:n];
// make sure the children of the tab aren't destroyed
uiParentSetMainControl(p, NULL);
// TODO negotiate lifetimes better
i = [t->tabview tabViewItemAtIndex:n];
[t->tabview removeTabViewItem:i];
} }
uiTab *uiNewTab(void) uiTab *uiNewTab(void)
@ -79,6 +89,7 @@ uiTab *uiNewTab(void)
uiControl(t)->PreferredSize = preferredSize; uiControl(t)->PreferredSize = preferredSize;
uiTab(t)->AddPage = tabAddPage; uiTab(t)->AddPage = tabAddPage;
uiTab(t)->DeletePage = tabDeletePage;
return uiTab(t); return uiTab(t);
} }