From 87e4245e343c080048a9e3c9920f255c47f58053 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Tue, 28 Jul 2015 14:14:41 -0400 Subject: [PATCH] Fixed some compiler errors. --- redo/darwin/button.m | 2 +- redo/darwin/checkbox.m | 2 +- redo/darwin/combobox.m | 4 ++-- redo/darwin/entry.m | 2 -- redo/darwin/group.m | 4 ++-- redo/darwin/progressbar.m | 6 +++--- redo/darwin/separator.m | 4 ++-- redo/darwin/uipriv_darwin.h | 2 +- redo/ui_darwin.h | 2 +- 9 files changed, 13 insertions(+), 15 deletions(-) diff --git a/redo/darwin/button.m b/redo/darwin/button.m index db3e0ced..ef0c905b 100644 --- a/redo/darwin/button.m +++ b/redo/darwin/button.m @@ -80,7 +80,7 @@ uiButton *uiNewButton(const char *text) b = (struct button *) uiNewControl(uiTypeButton()); - b->button = [[NSButton alloc] initWithFrame:NSZeroFrame]; + b->button = [[NSButton alloc] initWithFrame:NSZeroRect]; [b->button setTitle:toNSString(text)]; [b->button setButtonType:NSMomentaryPushInButton]; [b->button setBordered:YES]; diff --git a/redo/darwin/checkbox.m b/redo/darwin/checkbox.m index 75cde823..e4f0a35c 100644 --- a/redo/darwin/checkbox.m +++ b/redo/darwin/checkbox.m @@ -97,7 +97,7 @@ uiCheckbox *uiNewCheckbox(const char *text) c = (struct checkbox *) uiNewControl(uiTypeCheckbox()); // TODO make a macro for the below - c->checkbox = [[NSCheckbox alloc] initWithFrame:NSZeroRect]; + c->checkbox = [[NSButton alloc] initWithFrame:NSZeroRect]; [c->checkbox setTitle:toNSString(text)]; [c->checkbox setButtonType:NSSwitchButton]; [c->checkbox setBordered:NO]; diff --git a/redo/darwin/combobox.m b/redo/darwin/combobox.m index 3e2d2f71..e7ea29a7 100644 --- a/redo/darwin/combobox.m +++ b/redo/darwin/combobox.m @@ -37,10 +37,10 @@ static uiCombobox *finishNewCombobox(BOOL editable) c->cb = [[NSComboBox alloc] initWithFrame:NSZeroRect]; [c->cb setUsesDataSource:NO]; [c->cb setButtonBordered:YES]; -NSLog(@"TEST intercellSpacing %@", NSStringFromSize([c->cb intercellSpacing]); +NSLog(@"TEST intercellSpacing %@", NSStringFromSize([c->cb intercellSpacing])); [c->cb setCompletes:NO]; uiDarwinMakeSingleViewControl(uiControl(c), c->cb, YES); -NSLog(@"TEST intercellSpacing %@", NSStringFromSize([c->cb intercellSpacing]); +NSLog(@"TEST intercellSpacing %@", NSStringFromSize([c->cb intercellSpacing])); } else { c->pb = [[NSPopUpButton alloc] initWithFrame:NSZeroRect pullsDown:NO]; // TODO preferred edge diff --git a/redo/darwin/entry.m b/redo/darwin/entry.m index 9ab6eefe..5d85fb94 100644 --- a/redo/darwin/entry.m +++ b/redo/darwin/entry.m @@ -123,8 +123,6 @@ uiEntry *uiNewEntry(void) [e->delegate setEntry:uiEntry(e)]; [e->delegate setOnChanged:defaultOnChanged data:NULL]; - e->onChanged = defaultOnChanged; - uiControl(e)->Handle = entryHandle; uiEntry(e)->Text = entryText; diff --git a/redo/darwin/group.m b/redo/darwin/group.m index 4f369342..0b34b134 100644 --- a/redo/darwin/group.m +++ b/redo/darwin/group.m @@ -73,11 +73,11 @@ uiGroup *uiNewGroup(const char *text) { struct group *g; - g = (struct group *) MAKE_CONTROL_INSTANCE(uiTypeGroup()); + g = (struct group *) uiNewControl(uiTypeGroup()); g->box = [[NSBox alloc] initWithFrame:NSZeroRect]; [g->box setBoxType:NSBoxPrimary]; - [g->box setBorderType:TODO]; +//TODO [g->box setBorderType:TODO]; [g->box setTransparent:NO]; [g->box setTitlePosition:NSAtTop]; diff --git a/redo/darwin/progressbar.m b/redo/darwin/progressbar.m index aaf4bb25..124a35b7 100644 --- a/redo/darwin/progressbar.m +++ b/redo/darwin/progressbar.m @@ -28,15 +28,15 @@ uiProgressBar *uiNewProgressBar(void) { struct progressbar *p; - p = (struct progressbar *) MAKE_CONTROL_INSTANCE(uiTypeProgressBar()); + p = (struct progressbar *) uiNewControl(uiTypeProgressBar()); p->pi = [[NSProgressIndicator alloc] initWithFrame:NSZeroRect]; -NSLog(@"TEST thread %d tint %d stopped %d", (int) [p->pi usesThreadedAnimation], [p->pi controlTint], (int) [p->pi displayedWhenStopped]); +NSLog(@"TEST thread %d tint %d stopped %d", (int) [p->pi usesThreadedAnimation], [p->pi controlTint], (int) [p->pi isDisplayedWhenStopped]); [p->pi setControlSize:NSRegularControlSize]; [p->pi setBezeled:YES]; [p->pi setStyle:NSProgressIndicatorBarStyle]; [p->pi setIndeterminate:NO]; -NSLog(@"TEST thread %d tint %d stopped %d", (int) [p->pi usesThreadedAnimation], [p->pi controlTint], (int) [p->pi displayedWhenStopped]); +NSLog(@"TEST thread %d tint %d stopped %d", (int) [p->pi usesThreadedAnimation], [p->pi controlTint], (int) [p->pi isDisplayedWhenStopped]); uiDarwinMakeSingleViewControl(uiControl(p), p->pi, NO); uiControl(p)->Handle = progressbarHandle; diff --git a/redo/darwin/separator.m b/redo/darwin/separator.m index 5ae46872..81c91101 100644 --- a/redo/darwin/separator.m +++ b/redo/darwin/separator.m @@ -21,11 +21,11 @@ uiSeparator *uiNewHorizontalSeparator(void) { struct separator *s; - s = (struct separator *) MAKE_CONTROL_INSTANCE(uiTypeSeparator()); + s = (struct separator *) uiNewControl(uiTypeSeparator()); s->box = [[NSBox alloc] initWithFrame:NSZeroRect]; [s->box setBoxType:NSBoxSeparator]; - [s->box setBorderType:TODO]; +//TODO [s->box setBorderType:TODO]; [s->box setTransparent:NO]; [s->box setTitlePosition:NSNoTitle]; diff --git a/redo/darwin/uipriv_darwin.h b/redo/darwin/uipriv_darwin.h index b7a3ce14..1857d95e 100644 --- a/redo/darwin/uipriv_darwin.h +++ b/redo/darwin/uipriv_darwin.h @@ -2,7 +2,7 @@ #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_7 #define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_7 #import -#import "../ui.h" +#import "../out/ui.h" #import "../ui_darwin.h" #import "../uipriv.h" diff --git a/redo/ui_darwin.h b/redo/ui_darwin.h index bfe5425a..7753ca86 100644 --- a/redo/ui_darwin.h +++ b/redo/ui_darwin.h @@ -8,7 +8,7 @@ This file assumes that you have imported and "ui.h" beforehand. #define __UI_UI_DARWIN_H__ // TODO document -_UI_EXTERN void uiDarwinMakeSingleViewControl(uiControl *, NSView *); +_UI_EXTERN void uiDarwinMakeSingleViewControl(uiControl *, NSView *, BOOL); // You can use this function from within your control implementations to return text strings that can be freed with uiFreeText(). _UI_EXTERN char *uiDarwinNSStringToText(NSString *);