Implemented the various parenting and sizing changes on the Mac OS X backend; also moved a line in window_windows.go around for consistency.

1 files changed, 4 insertions, 14 deletions

diff --git a/redo/controls_darwin.m b/redo/controls_darwin.m
index 85de6c8..4ec42ef 100644
--- a/redo/controls_darwin.m
+++ b/redo/controls_darwin.m
@@ -9,24 +9,14 @@
 #define toNSControl(x) ((NSControl *) (x))
 #define toNSButton(x) ((NSButton *) (x))
 
-void unparent(id control)
+void parent(id control, id parentid)
 {
-	NSWindow *old;
-
-	[toNSView(control) retain];		// save from being freed when released by the removal selector below
-	old = [toNSView(control) window];
-	[toNSView(control) removeFromSuperview];
-	// redraw since we changed controls
-	windowRedraw((id) old);
+	[[toNSWindow(parentid) contentView] addSubview:toNSView(control)];
 }
 
-void parent(id control, id parentid, BOOL floating)
+void controlSetHidden(id control, BOOL hidden)
 {
-	[[toNSWindow(parentid) contentView] addSubview:toNSView(control)];
-	if (floating)		// previously unparented
-		[toNSView(control) release];
-	// redraw since we changed controls
-	windowRedraw(parentid);
+	[toNSView(control) setHidden:hidden];
 }
 
 static inline void setStandardControlFont(id control)