From ebcbaa129de05909a39e6a6884eac94629d46083 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 16 May 2014 06:49:29 -0400 Subject: [PATCH] Combined all the Objective-C headers into objc_darwin.h. --- area_darwin.go | 1 - area_darwin.h | 10 ----- area_darwin.m | 1 - delegate_darwin.go | 1 - delegateuitask_darwin.h | 10 ----- delegateuitask_darwin.m | 1 - dialog_darwin.go | 1 - dialog_darwin.h | 4 -- dialog_darwin.m | 1 - listbox_darwin.go | 1 - listbox_darwin.h | 20 ---------- listbox_darwin.m | 1 - objc_darwin.h | 81 +++++++++++++++++++++++++++++++++++++++++ prefsize_darwin.go | 1 - prefsize_darwin.h | 5 --- prefsize_darwin.m | 1 - sysdata_darwin.go | 1 - sysdata_darwin.h | 36 ------------------ sysdata_darwin.m | 1 - uitask_darwin.go | 1 - 20 files changed, 81 insertions(+), 98 deletions(-) delete mode 100644 area_darwin.h delete mode 100644 delegateuitask_darwin.h delete mode 100644 dialog_darwin.h delete mode 100644 listbox_darwin.h delete mode 100644 prefsize_darwin.h delete mode 100644 sysdata_darwin.h diff --git a/area_darwin.go b/area_darwin.go index 768b8c0..0d95adf 100644 --- a/area_darwin.go +++ b/area_darwin.go @@ -11,7 +11,6 @@ import ( // #include //// #include // #include "objc_darwin.h" -// #include "area_darwin.h" import "C" func makeArea(parentWindow C.id, alternate bool, s *sysData) C.id { diff --git a/area_darwin.h b/area_darwin.h deleted file mode 100644 index e670624..0000000 --- a/area_darwin.h +++ /dev/null @@ -1,10 +0,0 @@ -/* 13 may 2014 */ - -extern id makeArea(void); -extern void drawImage(void *, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t); -extern uintptr_t modifierFlags(id); -extern struct xpoint getTranslatedEventPoint(id, id); -extern intptr_t buttonNumber(id); -extern intptr_t clickCount(id); -extern uintptr_t pressedMouseButtons(void); -extern uintptr_t keyCode(id); diff --git a/area_darwin.m b/area_darwin.m index 9592e28..6c58910 100644 --- a/area_darwin.m +++ b/area_darwin.m @@ -1,7 +1,6 @@ // 13 may 2014 #include "objc_darwin.h" -#include "area_darwin.h" #include "_cgo_export.h" #include #include diff --git a/delegate_darwin.go b/delegate_darwin.go index 8e8c7f1..d6ff6ce 100644 --- a/delegate_darwin.go +++ b/delegate_darwin.go @@ -18,7 +18,6 @@ This creates a class goAppDelegate that will be used as the delegate for /everyt // #cgo LDFLAGS: -lobjc -framework Foundation -framework AppKit // #include // #include "objc_darwin.h" -// #include "delegateuitask_darwin.h" import "C" var ( diff --git a/delegateuitask_darwin.h b/delegateuitask_darwin.h deleted file mode 100644 index cccc6a2..0000000 --- a/delegateuitask_darwin.h +++ /dev/null @@ -1,10 +0,0 @@ -/* 13 may 2014 */ - -//#include "common_darwin.h" - -extern id makeAppDelegate(void); -extern id windowGetContentView(id); -extern BOOL initCocoa(id); -extern void douitask(id, void *); -extern void breakMainLoop(void); -extern void cocoaMainLoop(void); diff --git a/delegateuitask_darwin.m b/delegateuitask_darwin.m index 91eb83b..9aeabaf 100644 --- a/delegateuitask_darwin.m +++ b/delegateuitask_darwin.m @@ -1,7 +1,6 @@ // 13 may 2014 #include "objc_darwin.h" -#include "delegateuitask_darwin.h" #include "_cgo_export.h" #include #include diff --git a/dialog_darwin.go b/dialog_darwin.go index 2ba4d6a..39ee056 100644 --- a/dialog_darwin.go +++ b/dialog_darwin.go @@ -8,7 +8,6 @@ import ( // #cgo LDFLAGS: -lobjc -framework Foundation -framework AppKit // #include "objc_darwin.h" -// #include "dialog_darwin.h" import "C" func _msgBox(primarytext string, secondarytext string, style uintptr) { diff --git a/dialog_darwin.h b/dialog_darwin.h deleted file mode 100644 index 9e113c5..0000000 --- a/dialog_darwin.h +++ /dev/null @@ -1,4 +0,0 @@ -/* 15 may 2014 */ - -extern void msgBox(id, id); -extern void msgBoxError(id, id); diff --git a/dialog_darwin.m b/dialog_darwin.m index 73f5a18..7bd7a8f 100644 --- a/dialog_darwin.m +++ b/dialog_darwin.m @@ -1,7 +1,6 @@ // 15 may 2014 #include "objc_darwin.h" -#include "dialog_darwin.h" #include static void alert(NSString *primary, NSString *secondary, NSAlertStyle style) diff --git a/listbox_darwin.go b/listbox_darwin.go index b7ac3c2..6183a2d 100644 --- a/listbox_darwin.go +++ b/listbox_darwin.go @@ -21,7 +21,6 @@ TODO - change the name of some of these functions? specifically the functions th // #cgo LDFLAGS: -lobjc -framework Foundation -framework AppKit // #include // #include "objc_darwin.h" -// #include "listbox_darwin.h" import "C" /* diff --git a/listbox_darwin.h b/listbox_darwin.h deleted file mode 100644 index bbdea63..0000000 --- a/listbox_darwin.h +++ /dev/null @@ -1,20 +0,0 @@ -// 13 may 2014 - -extern id toListboxItem(id, id); -extern id fromListboxItem(id, id); -extern id newListboxArray(void); -extern void listboxArrayAppend(id, id); -extern void listboxArrayInsertBefore(id, id, uintptr_t); -extern void listboxArrayDelete(id, uintptr_t); -extern id listboxArrayItemAt(id, uintptr_t); -extern void bindListboxArray(id, id, id, id); -extern id boundListboxArray(id, id); -extern id makeListboxTableColumn(id); -extern id listboxTableColumn(id, id); -extern id makeListbox(id, BOOL); -extern id listboxSelectedRowIndexes(id); -extern uintptr_t listboxIndexesCount(id); -extern uintptr_t listboxIndexesFirst(id); -extern uintptr_t listboxIndexesNext(id, uintptr_t); -extern intptr_t listboxLen(id); -extern void listboxDeselectAll(id); diff --git a/listbox_darwin.m b/listbox_darwin.m index 60cc25e..5f3fe88 100644 --- a/listbox_darwin.m +++ b/listbox_darwin.m @@ -1,7 +1,6 @@ // 13 may 2014 #include "objc_darwin.h" -#include "listbox_darwin.h" #include #include #include diff --git a/objc_darwin.h b/objc_darwin.h index 887f343..d20eb46 100644 --- a/objc_darwin.h +++ b/objc_darwin.h @@ -39,4 +39,85 @@ extern id makeScrollView(id); extern void giveScrollViewBezelBorder(id); extern id scrollViewContent(id); +/* area_darwin.m */ +extern id makeArea(void); +extern void drawImage(void *, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t); +extern uintptr_t modifierFlags(id); +extern struct xpoint getTranslatedEventPoint(id, id); +extern intptr_t buttonNumber(id); +extern intptr_t clickCount(id); +extern uintptr_t pressedMouseButtons(void); +extern uintptr_t keyCode(id); + +/* delegateuitask_darwin.m */ +extern id makeAppDelegate(void); +extern id windowGetContentView(id); +extern BOOL initCocoa(id); +extern void douitask(id, void *); +extern void breakMainLoop(void); +extern void cocoaMainLoop(void); + +/* dialog_darwin.m */ +extern void msgBox(id, id); +extern void msgBoxError(id, id); + +/* listbox_darwin.m */ +extern id toListboxItem(id, id); +extern id fromListboxItem(id, id); +extern id newListboxArray(void); +extern void listboxArrayAppend(id, id); +extern void listboxArrayInsertBefore(id, id, uintptr_t); +extern void listboxArrayDelete(id, uintptr_t); +extern id listboxArrayItemAt(id, uintptr_t); +extern void bindListboxArray(id, id, id, id); +extern id boundListboxArray(id, id); +extern id makeListboxTableColumn(id); +extern id listboxTableColumn(id, id); +extern id makeListbox(id, BOOL); +extern id listboxSelectedRowIndexes(id); +extern uintptr_t listboxIndexesCount(id); +extern uintptr_t listboxIndexesFirst(id); +extern uintptr_t listboxIndexesNext(id, uintptr_t); +extern intptr_t listboxLen(id); +extern void listboxDeselectAll(id); + +/* prefsize_darwin.m */ +extern struct xsize controlPrefSize(id); +extern struct xsize listboxPrefSize(id); +extern struct xsize pbarPrefSize(id); + +/* sysdata_darwin.m */ +extern void addControl(id, id); +extern void controlShow(id); +extern void controlHide(id); +extern void applyStandardControlFont(id); +extern id makeWindow(id); +extern void windowShow(id); +extern void windowHide(id); +extern void windowSetTitle(id, id); +extern id windowTitle(id); +extern id makeButton(void); +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); /* TODO I accidentally left this as taking no arguments and clang didn't complain when compiling sysdata_darwin.m?! */ +extern void lineeditSetText(id, id); +extern id lineeditText(id); +extern id makeLabel(void); +extern id makeProgressBar(void); +extern void setRect(id, intptr_t, intptr_t, intptr_t, intptr_t); +extern BOOL isCheckboxChecked(id); +extern void windowSetContentSize(id, intptr_t, intptr_t); +extern void setProgress(id, intptr_t); +extern void setAreaSize(id, intptr_t, intptr_t); + #endif diff --git a/prefsize_darwin.go b/prefsize_darwin.go index 69ac670..f102f89 100644 --- a/prefsize_darwin.go +++ b/prefsize_darwin.go @@ -4,7 +4,6 @@ package ui // #cgo LDFLAGS: -lobjc -framework Foundation -framework AppKit // #include "objc_darwin.h" -// #include "prefsize_darwin.h" import "C" /* diff --git a/prefsize_darwin.h b/prefsize_darwin.h deleted file mode 100644 index afe1573..0000000 --- a/prefsize_darwin.h +++ /dev/null @@ -1,5 +0,0 @@ -/* 15 may 2014 */ - -extern struct xsize controlPrefSize(id); -extern struct xsize listboxPrefSize(id); -extern struct xsize pbarPrefSize(id); diff --git a/prefsize_darwin.m b/prefsize_darwin.m index 40f6b11..2dc7095 100644 --- a/prefsize_darwin.m +++ b/prefsize_darwin.m @@ -1,7 +1,6 @@ // 15 may 2014 #include "objc_darwin.h" -#include "prefsize_darwin.h" #include #include #include diff --git a/sysdata_darwin.go b/sysdata_darwin.go index c4ae3e9..1f9370c 100644 --- a/sysdata_darwin.go +++ b/sysdata_darwin.go @@ -9,7 +9,6 @@ import ( // #cgo LDFLAGS: -lobjc -framework Foundation -framework AppKit // #include "objc_darwin.h" -// #include "sysdata_darwin.h" import "C" type sysData struct { diff --git a/sysdata_darwin.h b/sysdata_darwin.h deleted file mode 100644 index 49824fc..0000000 --- a/sysdata_darwin.h +++ /dev/null @@ -1,36 +0,0 @@ -/* 12 may 2014 */ - -//#include "common_darwin.h" - -extern void addControl(id, id); -extern void controlShow(id); -extern void controlHide(id); -extern void applyStandardControlFont(id); -extern id makeWindow(id); -extern void windowShow(id); -extern void windowHide(id); -extern void windowSetTitle(id, id); -extern id windowTitle(id); -extern id makeButton(void); -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); // TODO I accidentally left this as taking no arguments and clang didn't complain when compiling sysdata_darwin.m?! -extern void lineeditSetText(id, id); -extern id lineeditText(id); -extern id makeLabel(void); -extern id makeProgressBar(void); -extern void setRect(id, intptr_t, intptr_t, intptr_t, intptr_t); -extern BOOL isCheckboxChecked(id); -extern void windowSetContentSize(id, intptr_t, intptr_t); -extern void setProgress(id, intptr_t); -extern void setAreaSize(id, intptr_t, intptr_t); diff --git a/sysdata_darwin.m b/sysdata_darwin.m index 3c1124b..bb2b1a7 100644 --- a/sysdata_darwin.m +++ b/sysdata_darwin.m @@ -1,6 +1,5 @@ // 12 may 2014 -//#include "sysdata_darwin.h" #include "objc_darwin.h" #include #include diff --git a/uitask_darwin.go b/uitask_darwin.go index 6427b07..fefdcab 100644 --- a/uitask_darwin.go +++ b/uitask_darwin.go @@ -10,7 +10,6 @@ import ( // #cgo LDFLAGS: -lobjc -framework Foundation -framework AppKit // #include "objc_darwin.h" -// #include "delegateuitask_darwin.h" import "C" var uitask chan func()