From 63439daffcb64e33046d186d25bb58a24a35831c Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sat, 1 Aug 2015 14:22:45 -0400 Subject: [PATCH] Some cleanup in the Auto Layout test. --- redo/osxaltest/box.m | 9 +++------ redo/osxaltest/button.m | 7 ++----- redo/osxaltest/osxaltest | Bin 28880 -> 0 bytes redo/osxaltest/osxaltest.h | 11 ++++++++++- redo/osxaltest/windelegate.m | 4 ++-- 5 files changed, 17 insertions(+), 14 deletions(-) delete mode 100755 redo/osxaltest/osxaltest 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 f20c5c9c23310523fa0d506400d280bc2edcd270..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28880 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 -- (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; }