From 71c8bfc539a5e9ba5661926d473d8599df29c5ba Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sat, 11 Jul 2015 17:02:01 -0400 Subject: [PATCH] More OS X control stuff. --- redo/darwin/button.m | 4 ++-- redo/darwin/checkbox.m | 4 ++-- redo/darwin/combobox.m | 4 ++-- redo/darwin/datetimepicker.m | 4 ++-- redo/darwin/entry.m | 4 ++-- redo/darwin/group.m | 4 ++-- redo/darwin/label.m | 4 ++-- redo/darwin/progressbar.m | 4 ++-- redo/darwin/radiobuttons.m | 2 +- redo/darwin/separator.m | 4 ++-- redo/darwin/slider.m | 4 ++-- redo/darwin/spinbox.m | 4 ++-- redo/darwin/tab.m | 4 ++-- redo/darwin/uipriv_darwin.h | 3 +++ 14 files changed, 28 insertions(+), 25 deletions(-) diff --git a/redo/darwin/button.m b/redo/darwin/button.m index f6738e7a..1bdadd43 100644 --- a/redo/darwin/button.m +++ b/redo/darwin/button.m @@ -1,9 +1,9 @@ // 10 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct button { uiButton b; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; void (*onClicked)(uiButton *, void *); void *onClickedData; }; diff --git a/redo/darwin/checkbox.m b/redo/darwin/checkbox.m index 6e912a19..91027c54 100644 --- a/redo/darwin/checkbox.m +++ b/redo/darwin/checkbox.m @@ -1,9 +1,9 @@ // 10 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct checkbox { uiCheckbox c; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; void (*onToggled)(uiCheckbox *, void *); void *onToggledData; }; diff --git a/redo/darwin/combobox.m b/redo/darwin/combobox.m index d90a2032..d8eb07f0 100644 --- a/redo/darwin/combobox.m +++ b/redo/darwin/combobox.m @@ -1,9 +1,9 @@ // 11 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct combobox { uiCombobox c; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; }; uiDefineControlType(uiCombobox, uiTypeCombobox, struct combobox) diff --git a/redo/darwin/datetimepicker.m b/redo/darwin/datetimepicker.m index 829e0e5d..3971584e 100644 --- a/redo/darwin/datetimepicker.m +++ b/redo/darwin/datetimepicker.m @@ -1,9 +1,9 @@ // 11 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct datetimepicker { uiDateTimePicker d; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; }; uiDefineControlType(uiDateTimePicker, uiTypeDateTimePicker, struct datetimepicker) diff --git a/redo/darwin/entry.m b/redo/darwin/entry.m index c4c3cb85..657c2171 100644 --- a/redo/darwin/entry.m +++ b/redo/darwin/entry.m @@ -1,9 +1,9 @@ // 11 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct entry { uiEntry e; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; void (*onChanged)(uiEntry *, void *); void *onChangedData; }; diff --git a/redo/darwin/group.m b/redo/darwin/group.m index 75a86d18..af318b12 100644 --- a/redo/darwin/group.m +++ b/redo/darwin/group.m @@ -1,9 +1,9 @@ // 11 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct group { uiGroup g; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; uiControl *child; int margined; }; diff --git a/redo/darwin/label.m b/redo/darwin/label.m index 04cb0111..95ebc2bb 100644 --- a/redo/darwin/label.m +++ b/redo/darwin/label.m @@ -1,9 +1,9 @@ // 11 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct label { uiLabel l; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; }; uiDefineControlType(uiLabel, uiTypeLabel, struct label) diff --git a/redo/darwin/progressbar.m b/redo/darwin/progressbar.m index 3f6592aa..222224ec 100644 --- a/redo/darwin/progressbar.m +++ b/redo/darwin/progressbar.m @@ -1,9 +1,9 @@ // 11 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct progressbar { uiProgressBar p; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; }; uiDefineControlType(uiProgressBar, uiTypeProgressBar, struct progressbar) diff --git a/redo/darwin/radiobuttons.m b/redo/darwin/radiobuttons.m index 57c88337..4d22f4e6 100644 --- a/redo/darwin/radiobuttons.m +++ b/redo/darwin/radiobuttons.m @@ -1,5 +1,5 @@ // 11 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct radiobuttons { uiRadioButtons r; diff --git a/redo/darwin/separator.m b/redo/darwin/separator.m index 041edecb..c99dcaf0 100644 --- a/redo/darwin/separator.m +++ b/redo/darwin/separator.m @@ -1,9 +1,9 @@ // 11 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct separator { uiSeparator s; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; }; uiDefineControlType(uiSeparator, uiTypeSeparator, struct separator) diff --git a/redo/darwin/slider.m b/redo/darwin/slider.m index e07c9a3e..e7881586 100644 --- a/redo/darwin/slider.m +++ b/redo/darwin/slider.m @@ -1,9 +1,9 @@ // 11 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct slider { uiSlider s; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; void (*onChanged)(uiSlider *, void *); void *onChangedData; }; diff --git a/redo/darwin/spinbox.m b/redo/darwin/spinbox.m index cb931243..00c9db30 100644 --- a/redo/darwin/spinbox.m +++ b/redo/darwin/spinbox.m @@ -1,9 +1,9 @@ // 11 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct spinbox { uiSpinbox s; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; void (*onChanged)(uiSpinbox *, void *); void *onChangedData; }; diff --git a/redo/darwin/tab.m b/redo/darwin/tab.m index d82cdf25..d1f343e5 100644 --- a/redo/darwin/tab.m +++ b/redo/darwin/tab.m @@ -1,9 +1,9 @@ // 11 june 2015 -#include "uipriv_OSHERE.h" +#include "uipriv_darwin.h" struct tab { uiTab t; - OSTYPE OSHANDLE; + OSTYPE *OSHANDLE; }; uiDefineControlType(uiTab, uiTypeTab, struct tab) diff --git a/redo/darwin/uipriv_darwin.h b/redo/darwin/uipriv_darwin.h index 17f282ac..7d8c6388 100644 --- a/redo/darwin/uipriv_darwin.h +++ b/redo/darwin/uipriv_darwin.h @@ -55,3 +55,6 @@ extern uiWindow *windowFromNSWindow(NSWindow *); // alloc.m extern void initAlloc(void); extern void uninitAlloc(void); + +// TODO +#define PUT_CODE_HERE 0