Rewrote the public-facing OS X control macro.
This commit is contained in:
parent
7613d32bc1
commit
2cd336903d
|
@ -49,6 +49,7 @@ struct Sizing {
|
||||||
typedef struct uiControl uiControl;
|
typedef struct uiControl uiControl;
|
||||||
|
|
||||||
struct uiControl {
|
struct uiControl {
|
||||||
|
uiTyped t;
|
||||||
void *Internal; // for use by libui only
|
void *Internal; // for use by libui only
|
||||||
void (*CommitDestroy)(uiControl *);
|
void (*CommitDestroy)(uiControl *);
|
||||||
uintptr_t (*Handle)(uiControl *);
|
uintptr_t (*Handle)(uiControl *);
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
// 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 __LIBUI_UI_DARWIN_H__
|
||||||
|
#define __LIBUI_UI_DARWIN_H__
|
||||||
|
|
||||||
|
// TODO document
|
||||||
|
#define uiDarwinDefineControlWithOnDestroy(type, typefn, handlefield, onDestroy) \
|
||||||
|
static uintmax_t _ ## type ## Type = 0; \
|
||||||
|
uintmax_t typefn(void) \
|
||||||
|
{ \
|
||||||
|
if (_ ## type ## Type == 0) \
|
||||||
|
_ ## type ## Type = uiRegisterType(#type, uiDarwinControlType(), sizeof (type)); \
|
||||||
|
return _ ## type ## Type; \
|
||||||
|
} \
|
||||||
|
static void _ ## type ## CommitDestroy(uiControl *c) \
|
||||||
|
{ \
|
||||||
|
type *this = type(c); \
|
||||||
|
onDestroy; \
|
||||||
|
[this->handlefield release]; \
|
||||||
|
} \
|
||||||
|
static uintptr_t _ ## type ## Handle(uiControl *c) \
|
||||||
|
{ \
|
||||||
|
return type(c)->handlefield; \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define uiDarwinDefineControl(type, typefn, handlefield) \
|
||||||
|
uiDarwinDefineControlWithOnDestroy(type, typefn, handlefield, (void) this;)
|
||||||
|
|
||||||
|
#define uiDarwinFinishNewControl(variable, type) \
|
||||||
|
type(variable)->CommitDestroy = _ ## type ## CommitDestroy; \
|
||||||
|
type(variable)->Handle = _ ## type ## Handle; \
|
||||||
|
uiDarwinFinishControl(uiControl(variable));
|
||||||
|
|
||||||
|
// This is a function used to set up a control.
|
||||||
|
// Don't call it directly; use uiDarwinFinishNewControl() instead.
|
||||||
|
_UI_EXTERN void uiDarwinFinishControl(uiControl *c);
|
||||||
|
|
||||||
|
// Use this function as a shorthand for setting control fonts.
|
||||||
|
_UI_EXTERN void uiDarwinSetControlFont(NSControl *c, NSControlSize size);
|
||||||
|
|
||||||
|
// You can use this function from within your control implementations to return text strings that can be freed with uiFreeText().
|
||||||
|
_UI_EXTERN char *uiDarwinNSStringToText(NSString *);
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue