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

Fixed some errors in the OS X build. IT WORKS! AND IS MUCH CLEANER NOW TOO!!!!

This commit is contained in:
Pietro Gagliardi 2015-04-17 18:54:17 -04:00
parent 7b0004cfff
commit 47368bdfe9
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
darwin/button.m
View File

@ -7,7 +7,7 @@
void *onClickedData; void *onClickedData;
} }
- (IBAction)buttonClicked:(id)sender; - (IBAction)buttonClicked:(id)sender;
- (void)setButton(uiButton *)b; - (void)setButton:(uiButton *)b;
- (void)setOnClicked:(void (*)(uiButton *, void *))f data:(void *)data; - (void)setOnClicked:(void (*)(uiButton *, void *))f data:(void *)data;
@end @end

2
darwin/checkbox.m
View File

@ -102,7 +102,7 @@ uiCheckbox *uiNewCheckbox(const char *text)
c->checkbox = (NSButton *) VIEW(c); c->checkbox = (NSButton *) VIEW(c);
[c-checkbox setTitle:toNSString(text)]; [c->checkbox setTitle:toNSString(text)];
[c->checkbox setButtonType:NSSwitchButton]; [c->checkbox setButtonType:NSSwitchButton];
[c->checkbox setBordered:NO]; [c->checkbox setBordered:NO];
setStandardControlFont(c->checkbox); setStandardControlFont(c->checkbox);

2
darwin/entry.m
View File

@ -4,7 +4,7 @@
struct entry { struct entry {
uiEntry e; uiEntry e;
NSTextField *textfield; NSTextField *textfield;
} };
static void destroy(void *data) static void destroy(void *data)
{ {

4
ui_darwin.h
View File

@ -13,8 +13,8 @@ This file assumes that you have imported <Cocoa/Cocoa.h> and "ui.h" beforehand.
// The two onDestroy parameters define a function and its parameter to call when the widget is destroyed. // The two onDestroy parameters define a function and its parameter to call when the widget is destroyed.
// Your control must call uiDarwinControlFreeWhenAppropriate() on the returned uiControl in its -[viewDidMoveToSuperview] method. // Your control must call uiDarwinControlFreeWhenAppropriate() on the returned uiControl in its -[viewDidMoveToSuperview] method.
// If it returns a value other than NO, then the uiControl has been freed and you should set references to it to NULL. // If it returns a value other than NO, then the uiControl has been freed and you should set references to it to NULL.
extern void uiDarwinNewControl(uiControl *c, Class class, BOOL inScrollView, BOOL scrollViewHasBorder); extern void uiDarwinNewControl(uiControl *c, Class class, BOOL inScrollView, BOOL scrollViewHasBorder, void (*onDestroy)(void *), void *onDestroyData);
extern BOOL uiDarwinControlFreeWhenAppropriate(uiControl *c, NSView *newSuperview, void (*onDestroy)(void *), void *onDestroyData); extern BOOL uiDarwinControlFreeWhenAppropriate(uiControl *c, NSView *newSuperview);
// You can use this function from within your control implementations to return text strings that can be freed with uiTextFree(). // You can use this function from within your control implementations to return text strings that can be freed with uiTextFree().
extern char *uiDarwinNSStringToText(NSString *); extern char *uiDarwinNSStringToText(NSString *);