From 5da68c64b3827bec83bc68582aa11506f7fa0a05 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Fri, 9 Oct 2015 14:39:26 -0400
Subject: [PATCH] Implemented uiComboboxSetSelected() on OS X and Windows;
 fixed editable combobox minimum widths on OS X.

---
 darwin/combobox.m  | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 windows/combobox.c |  6 ++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/darwin/combobox.m b/darwin/combobox.m
index 828bf04d..0d38910a 100644
--- a/darwin/combobox.m
+++ b/darwin/combobox.m
@@ -1,6 +1,26 @@
 // 14 august 2015
 #include "uipriv_darwin.h"
 
+// NSComboBoxes have no intrinsic width; we'll use the default Interface Builder width for them.
+// NSPopUpButton is fine.
+#define comboboxWidth 96
+
+@interface libui_intrinsicWidthNSComboBox : NSComboBox
+@end
+
+@implementation libui_intrinsicWidthNSComboBox
+
+- (NSSize)intrinsicContentSize
+{
+	NSSize s;
+
+	s = [super intrinsicContentSize];
+	s.width = comboboxWidth;
+	return s;
+}
+
+@end
+
 struct uiCombobox {
 	uiDarwinControl c;
 	BOOL editable;
@@ -114,6 +134,29 @@ intmax_t uiComboboxSelected(uiCombobox *c)
 	return [c->pb indexOfSelectedItem];
 }
 
+void uiComboboxSetSelected(uiCombobox *c, intmax_t n)
+{
+	if (c->editable) {
+		// see https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/ComboBox/Tasks/SettingComboBoxValue.html#//apple_ref/doc/uid/20000256
+		id delegate;
+
+		// this triggers the delegate; turn it off for now
+		delegate = [c->cb delegate];
+		[c->cb setDelegate:nil];
+
+		// this seems to work fine for -1 too
+		[c->cb selectItemAtIndex:n];
+		if (n == -1)
+			[c->cb setObjectValue:@""];
+		else
+			[c->cb setObjectValue:[c->cb objectValueOfSelectedItem]];
+
+		[c->cb setDelegate:delegate];
+		return;
+	}
+	[c->pb selectItemAtIndex:n];
+}
+
 void uiComboboxOnSelected(uiCombobox *c, void (*f)(uiCombobox *c, void *data), void *data)
 {
 	c->onSelected = f;
@@ -133,7 +176,7 @@ static uiCombobox *finishNewCombobox(BOOL editable)
 
 	c->editable = editable;
 	if (c->editable) {
-		c->cb = [[NSComboBox alloc] initWithFrame:NSZeroRect];
+		c->cb = [[libui_intrinsicWidthNSComboBox alloc] initWithFrame:NSZeroRect];
 		[c->cb setUsesDataSource:NO];
 		[c->cb setButtonBordered:YES];
 		[c->cb setCompletes:NO];
diff --git a/windows/combobox.c b/windows/combobox.c
index 56fe2e1c..4b08c1f6 100644
--- a/windows/combobox.c
+++ b/windows/combobox.c
@@ -67,6 +67,12 @@ intmax_t uiComboboxSelected(uiCombobox *c)
 	return (intmax_t) n;
 }
 
+void uiComboboxSetSelected(uiCombobox *c, intmax_t n)
+{
+	// TODO error check
+	SendMessageW(c->hwnd, CB_SETCURSEL, (WPARAM) n, 0);
+}
+
 void uiComboboxOnSelected(uiCombobox *c, void (*f)(uiCombobox *c, void *data), void *data)
 {
 	c->onSelected = f;