diff --git a/redo/osxaltest/box.m b/redo/osxaltest/box.m index d17e3440..e9f2a3c2 100644 --- a/redo/osxaltest/box.m +++ b/redo/osxaltest/box.m @@ -1,16 +1,13 @@ // 31 july 2015 #import "osxaltest.h" -@interface tBox : NSObject { +@implementation tBox { NSMutableArray *children; NSView *sv; BOOL vertical; } -@end -@implementation tBox - -- (id)initVertical:(BOOL)vert +- (id)tInitVertical:(BOOL)vert { self = [super init]; if (self) { @@ -21,7 +18,7 @@ return self; } -- (void)addControl:(NSObject *)c stretchy:(BOOL)s +- (void)tAddControl:(id)c stretchy:(BOOL)s { // TODO } diff --git a/redo/osxaltest/button.m b/redo/osxaltest/button.m index 0e7e0d41..29924957 100644 --- a/redo/osxaltest/button.m +++ b/redo/osxaltest/button.m @@ -1,14 +1,11 @@ // 31 july 2015 #import "osxaltest.h" -@interface tButton : NSObject { +@implementation tButton { NSButton *b; } -@end -@implementation tButton - -- (id)initWithText:(NSString *)text +- (id)tInitWithText:(NSString *)text { self = [super init]; if (self) { diff --git a/redo/osxaltest/osxaltest b/redo/osxaltest/osxaltest deleted file mode 100755 index f20c5c9c..00000000 Binary files a/redo/osxaltest/osxaltest and /dev/null differ diff --git a/redo/osxaltest/osxaltest.h b/redo/osxaltest/osxaltest.h index dd56a4c7..e7ddb038 100644 --- a/redo/osxaltest/osxaltest.h +++ b/redo/osxaltest/osxaltest.h @@ -9,8 +9,17 @@ @end @interface tWindowDelegate : NSObject -- (void)tSetControl:(NSObject *)cc; +- (void)tSetControl:(id)cc; - (void)tRelayout; @end +@interface tBox : NSObject +- (id)tInitVertical:(BOOL)vert; +- (void)tAddControl:(id)c stretchy:(BOOL)s; +@end + +@interface tButton : NSObject +- (id)tInitWithText:(NSString *)text; +@end + extern NSString *tAutoLayoutKey(uintmax_t); diff --git a/redo/osxaltest/windelegate.m b/redo/osxaltest/windelegate.m index c7dd2f58..2df0b668 100644 --- a/redo/osxaltest/windelegate.m +++ b/redo/osxaltest/windelegate.m @@ -2,7 +2,7 @@ #import "osxaltest.h" @implementation tWindowDelegate { - NSObject *c; + id c; } - (id)init @@ -13,7 +13,7 @@ return self; } -- (void)tSetControl:(NSObject *)cc +- (void)tSetControl:(id)cc { self->c = cc; }