From ce82174013911ad33d187a31278bc926abf528f7 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 26 Jul 2015 13:53:35 -0400
Subject: [PATCH] More OS X control work.

---
 redo/OSXparams       | 29 +++++++++++++++++++++++++----
 redo/darwin/slider.m | 20 ++++++++++++++++----
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/redo/OSXparams b/redo/OSXparams
index f3eaeb92..da7730fa 100644
--- a/redo/OSXparams
+++ b/redo/OSXparams
@@ -17,8 +17,29 @@ separator
 	seems to be an internal subclass of NSBox
 	need to generate a nib to observe its properties
 
-horizontal slider
-	NSSlider
-	Style		Linear
-	Tick Marks	Position Above
+slider
+	check 10.9
 
+combo box
+	bordered button
+	system regular font
+
+popup button
+	type popup
+	arrow bottom
+	menu edge bottom
+	font menu 13 ??????????????
+		check 10.9
+
+radio buttons
+	mode radio
+	selection rectangular, not empty
+	buttons
+		style radio
+		type radio
+		not bordered, not transparent
+		font system regular
+
+progress bar
+	style bar
+	display when stopped
diff --git a/redo/darwin/slider.m b/redo/darwin/slider.m
index e7881586..3bc47aac 100644
--- a/redo/darwin/slider.m
+++ b/redo/darwin/slider.m
@@ -1,9 +1,11 @@
 // 11 june 2015
 #include "uipriv_darwin.h"
 
+// TODO events
+
 struct slider {
 	uiSlider s;
-	OSTYPE *OSHANDLE;
+	NSSlider *slider;
 	void (*onChanged)(uiSlider *, void *);
 	void *onChangedData;
 };
@@ -14,7 +16,7 @@ static uintptr_t sliderHandle(uiControl *c)
 {
 	struct slider *s = (struct slider *) c;
 
-	return (uintptr_t) (s->OSHANDLE);
+	return (uintptr_t) (s->slider);
 }
 
 static void defaultOnChanged(uiSlider *s, void *data)
@@ -47,10 +49,20 @@ static void sliderOnChanged(uiSlider *ss, void (*f)(uiSlider *, void *), void *d
 uiSlider *uiNewSlider(intmax_t min, intmax_t max)
 {
 	struct slider *s;
+	NSSliderCell *cell;
 
-	s = (struct slider *) MAKE_CONTROL_INSTANCE(uiTypeSlider());
+	s = (struct slider *) uiNewControl(uiTypeSlider());
 
-	PUT_CODE_HERE;
+	s->slider = [[NSSlider alloc] initWithFrame:NSZeroRect];
+	// TODO vertical is defined by wider than tall
+	[s->slider setMinValue:min];
+	[s->slider setMaxValue:max];
+	// TODO NSTickMarkAbove?
+
+	cell = (NSSliderCell *) [s->slider cell];
+	[cell setSliderType:NSLinearSlider];
+
+	uiDarwinMakeSingleViewControl(uiControl(s), s->slider, NO);
 
 	s->onChanged = defaultOnChanged;