summaryrefslogtreecommitdiff
path: root/new
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2015-04-10 23:24:21 -0400
committerPietro Gagliardi <[email protected]>2015-04-10 23:24:21 -0400
commit4afca8f2c2f8a797263d54651366f9f1fbc2c09c (patch)
tree7fa3f8f4acc187112be17ebcd76ec70328820aa4 /new
parentc610c60ea6266fe68c2f06627c0bdbedaa5731bb (diff)
More of the previous commit. More TODOs.
Diffstat (limited to 'new')
-rw-r--r--new/TODO.md1
-rw-r--r--new/init_darwin.m4
-rw-r--r--new/newcontrol_darwin.m4
-rw-r--r--new/uipriv_darwin.h2
4 files changed, 6 insertions, 5 deletions
diff --git a/new/TODO.md b/new/TODO.md
index 78cbe17..9e87cd9 100644
--- a/new/TODO.md
+++ b/new/TODO.md
@@ -5,6 +5,7 @@
- deleted objects view
- assign control IDs on windows
- GWL(P)_ID
+- make sure all terminology is consistent
ultimately:
- make everything vtable-based
diff --git a/new/init_darwin.m b/new/init_darwin.m
index b1d88c3..4f14a0a 100644
--- a/new/init_darwin.m
+++ b/new/init_darwin.m
@@ -43,7 +43,7 @@
// we are not in control of the actual lifetimes and refcounts of NSViews (see http://stackoverflow.com/a/29523141/3408572)
// when we're done with a view, it'll be added as a subview of this one, and this one will be released on application shutdown
// we need this separate view because it's possible for controls to have no parent but still be alive
-NSView *deletedControlsView;
+NSView *destroyedControlsView;
uiInitOptions options;
@@ -57,7 +57,7 @@ const char *uiInit(uiInitOptions *o)
[NSApp setDelegate:[uiAppDelegate new]];
// we can use a stock NSView for this
- deletedControlsView = [[NSView alloc] initWithFrame:NSZeroRect];
+ destroyedControlsView = [[NSView alloc] initWithFrame:NSZeroRect];
return NULL;
}
diff --git a/new/newcontrol_darwin.m b/new/newcontrol_darwin.m
index 1fff8a8..5f70075 100644
--- a/new/newcontrol_darwin.m
+++ b/new/newcontrol_darwin.m
@@ -14,7 +14,7 @@ static void singleDestroy(uiControl *c)
{
singleView *s = (singleView *) (c->internal);
- [deletedControlsView addSubview:s->immediate];
+ [destroyedControlsView addSubview:s->immediate];
}
static uintptr_t singleHandle(uiControl *c)
@@ -117,7 +117,7 @@ BOOL uiDarwinControlFreeWhenAppropriate(uiControl *c, NSView *newSuperview)
{
singleView *s = (singleView *) (c->internal);
- if (newSuperview == deletedControlsView) {
+ if (newSuperview == destroyedControlsView) {
[s->immediate release]; // we don't need the reference anymore
uiFree(s);
uiFree(c);
diff --git a/new/uipriv_darwin.h b/new/uipriv_darwin.h
index e34b825..f91b84d 100644
--- a/new/uipriv_darwin.h
+++ b/new/uipriv_darwin.h
@@ -25,7 +25,7 @@
}
// init_darwin.m
-extern NSView *deletedControlsView;
+extern NSView *destroyedControlsView;
// util_darwin.m
extern void setStandardControlFont(NSControl *);