More .m file restructuring on the Mac OS X backend.

3 files changed, 27 insertions, 32 deletions

diff --git a/redo/basicctrls_darwin.m b/redo/basicctrls_darwin.m
index 2dbcfed..c4395c6 100644
--- a/redo/basicctrls_darwin.m
+++ b/redo/basicctrls_darwin.m
@@ -4,36 +4,9 @@
 #import "_cgo_export.h"
 #import <Cocoa/Cocoa.h>
 
-#define toNSView(x) ((NSView *) (x))
-#define toNSWindow(x) ((NSWindow *) (x))
-#define toNSControl(x) ((NSControl *) (x))
 #define toNSButton(x) ((NSButton *) (x))
 #define toNSTextField(x) ((NSTextField *) (x))
 
-// TODO move to control_darwin.m
-
-void parent(id control, id parentid)
-{
-	[toNSView(parentid) addSubview:toNSView(control)];
-}
-
-void controlSetHidden(id control, BOOL hidden)
-{
-	[toNSView(control) setHidden:hidden];
-}
-
-// also fine for NSCells
-void setStandardControlFont(id control)
-{
-	[toNSControl(control) setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]]];
-}
-
-// also fine for NSCells
-void setSmallControlFont(id control)
-{
-	[toNSControl(control) setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
-}
-
 @interface goControlDelegate : NSObject {
 @public
 	void *gocontrol;
diff --git a/redo/control_darwin.m b/redo/control_darwin.m
index f34f3c2..bc6dbe6 100644
--- a/redo/control_darwin.m
+++ b/redo/control_darwin.m
@@ -3,8 +3,30 @@
 #import "objc_darwin.h"
 #import <Cocoa/Cocoa.h>
 
-#define toNSControl(x) ((NSControl *) (x))
 #define toNSView(x) ((NSView *) (x))
+#define toNSControl(x) ((NSControl *) (x))
+
+void parent(id control, id parentid)
+{
+	[toNSView(parentid) addSubview:toNSView(control)];
+}
+
+void controlSetHidden(id control, BOOL hidden)
+{
+	[toNSView(control) setHidden:hidden];
+}
+
+// also fine for NSCells
+void setStandardControlFont(id control)
+{
+	[toNSControl(control) setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSRegularControlSize]]];
+}
+
+// also fine for NSCells
+void setSmallControlFont(id control)
+{
+	[toNSControl(control) setFont:[NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:NSSmallControlSize]]];
+}
 
 // also good for NSTableView (TODO might not do what we want) and NSProgressIndicator
 struct xsize controlPreferredSize(id control)
diff --git a/redo/objc_darwin.h b/redo/objc_darwin.h
index e531e39..4006716 100644
--- a/redo/objc_darwin.h
+++ b/redo/objc_darwin.h
@@ -56,10 +56,6 @@ extern id windowContentView(id);
 extern void windowRedraw(id);
 
 /* basicctrls_darwin.m */
-extern void parent(id, id);
-extern void controlSetHidden(id, BOOL);
-extern void setStandardControlFont(id);
-extern void setSmallControlFont(id);
 extern id newButton(void);
 extern void buttonSetDelegate(id, void *);
 extern const char *buttonText(id);
@@ -90,6 +86,10 @@ extern void tableUpdate(id);
 extern void tableMakeDataSource(id, void *);
 
 /* control_darwin.m */
+extern void parent(id, id);
+extern void controlSetHidden(id, BOOL);
+extern void setStandardControlFont(id);
+extern void setSmallControlFont(id);
 extern struct xsize controlPreferredSize(id);
 extern id newScrollView(id);