From 4baa9397e6546e78e07b24bb8bbab785417e0378 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Wed, 28 May 2014 23:46:33 -0400 Subject: Merged back combobox_darwin.m, rewrote it to use boundListboxArray() instead of creating a whole new object, and implemented what appears to be a fix for NSPopUpButton selection. Will delete the unneeded select(-1) code later and test again... --- objc_darwin.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'objc_darwin.h') diff --git a/objc_darwin.h b/objc_darwin.h index 4b084ee..dca3faa 100644 --- a/objc_darwin.h +++ b/objc_darwin.h @@ -103,13 +103,6 @@ extern void buttonSetTargetAction(id, id); extern void buttonSetText(id, id); extern id buttonText(id); extern id makeCheckbox(void); -extern id makeCombobox(BOOL); -extern id comboboxText(id, BOOL); -extern void comboboxAppend(id, BOOL, id); -extern void comboboxInsertBefore(id, BOOL, id, intptr_t); -extern intptr_t comboboxSelectedIndex(id); -extern void comboboxDelete(id, intptr_t); -extern intptr_t comboboxLen(id); extern void comboboxSelectIndex(id, BOOL, intptr_t); extern id makeLineEdit(BOOL); extern void lineeditSetText(id, id); @@ -122,4 +115,13 @@ extern void windowSetContentSize(id, intptr_t, intptr_t); extern void setProgress(id, intptr_t); extern void setAreaSize(id, intptr_t, intptr_t); +/* combobox_darwin.m */ +extern id makeCombobox(BOOL); +extern id comboboxText(id, BOOL); +extern void comboboxAppend(id, BOOL, id); +extern void comboboxInsertBefore(id, BOOL, id, intptr_t); +extern intptr_t comboboxSelectedIndex(id); +extern void comboboxDelete(id, intptr_t); +extern intptr_t comboboxLen(id); + #endif -- cgit v1.2.3