From 50bab453e681a8853c3fc98dc700106f9237fc4a Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sat, 22 Aug 2015 11:17:13 -0400 Subject: [PATCH] More TODO resolution. --- redo/reredo/darwin/group.m | 5 +---- redo/reredo/darwin/main.m | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/redo/reredo/darwin/group.m b/redo/reredo/darwin/group.m index 8dbc3573..36d6a0ff 100644 --- a/redo/reredo/darwin/group.m +++ b/redo/reredo/darwin/group.m @@ -1,9 +1,6 @@ // 14 august 2015 #import "uipriv_darwin.h" -// TODO -// - even with the uiDarwinControlRelayoutParent() calls, we still need to click the button twice for the ambiguity to go away - struct uiGroup { uiDarwinControl c; NSBox *box; @@ -57,7 +54,7 @@ static void groupRelayout(uiDarwinControl *c) char *uiGroupTitle(uiGroup *g) { - return PUT_CODE_HERE; + return uiDarwinNSStringToText([g->box title]); } void uiGroupSetTitle(uiGroup *g, const char *title) diff --git a/redo/reredo/darwin/main.m b/redo/reredo/darwin/main.m index b80dc9eb..bb50d806 100644 --- a/redo/reredo/darwin/main.m +++ b/redo/reredo/darwin/main.m @@ -89,8 +89,9 @@ const char *uiInit(uiInitOptions *o) void uiUninit(void) { uninitMenus(); - // TODO free application delegate - // TODO free NSApplication resources (main menu, etc.) + [realNSApp() setDelegate:nil]; + [appDelegate() release]; + [realNSApp() release]; uninitTypes(); uninitAlloc(); }