diff options
| -rw-r--r-- | redo/control_darwin.m | 20 | ||||
| -rw-r--r-- | redo/objc_darwin.h | 8 | ||||
| -rw-r--r-- | redo/table_darwin.m | 11 |
3 files changed, 25 insertions, 14 deletions
diff --git a/redo/control_darwin.m b/redo/control_darwin.m new file mode 100644 index 0000000..10fef8e --- /dev/null +++ b/redo/control_darwin.m @@ -0,0 +1,20 @@ +// 30 july 2014 + +#import "objc_darwin.h" +#import <Cocoa/Cocoa.h> + +#define toNSView(x) ((NSView *) (x)) + +// TODO verify this when we add more scrolling controls +id newScrollView(id content) +{ + NSScrollView *sv; + + sv = [[NSScrollView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]; + [sv setDocumentView:toNSView(content)]; + [sv setHasHorizontalScroller:YES]; + [sv setHasVerticalScroller:YES]; + [sv setAutohidesScrollers:YES]; + [sv setBorderType:NSBezelBorder]; + return (id) sv; +} diff --git a/redo/objc_darwin.h b/redo/objc_darwin.h index 299c9b5..05d6d40 100644 --- a/redo/objc_darwin.h +++ b/redo/objc_darwin.h @@ -31,7 +31,7 @@ extern void windowClose(id); extern id windowContentView(id); extern void windowRedraw(id); -/* controls_darwin.m */ +/* basicctrls_darwin.m */ extern void parent(id, id); extern void controlSetHidden(id, BOOL); extern void setStandardControlFont(id); @@ -51,7 +51,7 @@ extern id newLabel(void); /* sizing_darwin.m */ extern void moveControl(id, intptr_t, intptr_t, intptr_t, intptr_t); -/* containers_darwin.m */ +/* containerctrls_darwin.m */ extern id newTab(void *); extern id tabAppend(id, char *); @@ -59,7 +59,9 @@ extern id tabAppend(id, char *); extern id newTable(void); extern void tableAppendColumn(id, char *); extern void tableUpdate(id); -extern id newScrollView(id); extern void tableMakeDataSource(id, void *); +/* control_darwin.m */ +extern id newScrollView(id); + #endif diff --git a/redo/table_darwin.m b/redo/table_darwin.m index 7fdef24..1e823b4 100644 --- a/redo/table_darwin.m +++ b/redo/table_darwin.m @@ -5,7 +5,6 @@ #import <Cocoa/Cocoa.h> #define toNSTableView(x) ((NSTableView *) (x)) -#define toNSView(x) ((NSView *) (x)) @interface goTableDataSource : NSObject <NSTableViewDataSource> { @public @@ -68,16 +67,6 @@ void tableUpdate(id t) [toNSTableView(t) reloadData]; } -// TODO SPLIT -id newScrollView(id content) -{ - NSScrollView *sv; - - sv = [[NSScrollView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]; - [sv setDocumentView:toNSView(content)]; - return (id) sv; -} - void tableMakeDataSource(id table, void *gotable) { goTableDataSource *model; |