interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some other issues with builds. The Makefile will need tweaking...

This commit is contained in:
Pietro Gagliardi 2015-04-28 14:40:51 -04:00
parent 9b191999bf
commit 440949a60a
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
new/darwin/uipriv_darwin.h
View File

@ -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 <Cocoa/Cocoa.h>
#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 <NSApplicationDelegate>
@property menuManager *menuManager;
@property (strong) menuManager *menuManager;
@end
#define appDelegate() ((appDelegate *) [NSApp delegate])

23
new/ui_darwin.h Normal file
View File

@ -0,0 +1,23 @@
// 7 april 2015
/*
This file assumes that you have imported <Cocoa/Cocoa.h> 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

2
new/windows/uipriv_windows.h
View File

@ -26,8 +26,8 @@
#include <oleacc.h>
#include <stdio.h>
#include "../ui.h"
#include "../uipriv.h"
#include "../ui_windows.h"
#include "../uipriv.h"
// ui internal window messages
enum {