diff --git a/new/darwin/uipriv_darwin.h b/new/darwin/uipriv_darwin.h index d5aac4d5..54be428d 100644 --- a/new/darwin/uipriv_darwin.h +++ b/new/darwin/uipriv_darwin.h @@ -2,8 +2,9 @@ #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_7 #define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_7 #import -#import "../uipriv.h" +#import "../ui.h" #import "../ui_darwin.h" +#import "../uipriv.h" #define toNSString(str) [NSString stringWithUTF8String:(str)] #define fromNSString(str) [(str) UTF8String] @@ -33,16 +34,16 @@ @interface menuManager : NSObject { NSMutableDictionary *items; } -@property NSMenuItem *quitItem; -@property NSMenuItem *preferencesItem; -@property NSMenuItem *aboutItem; +@property (strong) NSMenuItem *quitItem; +@property (strong) NSMenuItem *preferencesItem; +@property (strong) NSMenuItem *aboutItem; - (IBAction)onMenuItemClicked:(id)sender; - (NSMenu *)makeMenubar; @end // init.m @interface appDelegate : NSObject -@property menuManager *menuManager; +@property (strong) menuManager *menuManager; @end #define appDelegate() ((appDelegate *) [NSApp delegate]) diff --git a/new/ui_darwin.h b/new/ui_darwin.h new file mode 100644 index 00000000..cd0b14cb --- /dev/null +++ b/new/ui_darwin.h @@ -0,0 +1,23 @@ +// 7 april 2015 + +/* +This file assumes that you have imported and "ui.h" beforehand. It provides API-specific functions for interfacing with foreign controls on Mac OS X. +*/ + +#ifndef __UI_UI_DARWIN_H__ +#define __UI_UI_DARWIN_H__ + +// uiDarwinNewControl() initializes the given uiControl with the given Cocoa control inside. +// The second parameter should come from [RealControlType class]. +// The two scrollView parameters allow placing scrollbars on the new control. +// The two onDestroy parameters define a function and its parameter to call when the widget is destroyed. +extern void uiDarwinNewControl(uiControl *c, Class class, BOOL inScrollView, BOOL scrollViewHasBorder, void (*onDestroy)(void *), void *onDestroyData); + +// You can use this function from within your control implementations to return text strings that can be freed with uiTextFree(). +extern char *uiDarwinNSStringToText(NSString *); + +struct uiSizingSys { + // this structure currently left blank +}; + +#endif diff --git a/new/windows/uipriv_windows.h b/new/windows/uipriv_windows.h index 65733a1d..01fc0f23 100644 --- a/new/windows/uipriv_windows.h +++ b/new/windows/uipriv_windows.h @@ -26,8 +26,8 @@ #include #include #include "../ui.h" -#include "../uipriv.h" #include "../ui_windows.h" +#include "../uipriv.h" // ui internal window messages enum {