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

Merged back the basic controls on Mac OS X.

This commit is contained in:
Pietro Gagliardi 2015-04-29 10:28:17 -04:00
parent 3249092061
commit ec7f461af1
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
new/darwin/GNUmakeinc.mk
View File

@ -3,8 +3,12 @@
osMFILES = \ osMFILES = \
darwin/alloc.m \ darwin/alloc.m \
darwin/bin.m \ darwin/bin.m \
darwin/button.m \
darwin/checkbox.m \
darwin/container.m \ darwin/container.m \
darwin/entry.m \
darwin/init.m \ darwin/init.m \
darwin/label.m \
darwin/main.m \ darwin/main.m \
darwin/menu.m \ darwin/menu.m \
darwin/newcontrol.m \ darwin/newcontrol.m \

2
darwin/button.m → new/darwin/button.m
View File

@ -82,7 +82,7 @@ uiButton *uiNewButton(const char *text)
uiDarwinNewControl(uiControl(b), [NSButton class], NO, NO, destroy, b); uiDarwinNewControl(uiControl(b), [NSButton class], NO, NO, destroy, b);
b->button = (NSButton *) VIEW(b); b->button = (NSButton *) uiControlHandle(uiControl(b));
[b->button setTitle:toNSString(text)]; [b->button setTitle:toNSString(text)];
[b->button setButtonType:NSMomentaryPushInButton]; [b->button setButtonType:NSMomentaryPushInButton];

2
darwin/checkbox.m → new/darwin/checkbox.m
View File

@ -100,7 +100,7 @@ uiCheckbox *uiNewCheckbox(const char *text)
uiDarwinNewControl(uiControl(c), [NSButton class], NO, NO, destroy, c); uiDarwinNewControl(uiControl(c), [NSButton class], NO, NO, destroy, c);
c->checkbox = (NSButton *) VIEW(c); c->checkbox = (NSButton *) uiControlHandle(uiControl(c));
[c->checkbox setTitle:toNSString(text)]; [c->checkbox setTitle:toNSString(text)];
[c->checkbox setButtonType:NSSwitchButton]; [c->checkbox setButtonType:NSSwitchButton];

2
darwin/entry.m → new/darwin/entry.m
View File

@ -51,7 +51,7 @@ uiEntry *uiNewEntry(void)
uiDarwinNewControl(uiControl(e), [NSTextField class], NO, NO, destroy, e); uiDarwinNewControl(uiControl(e), [NSTextField class], NO, NO, destroy, e);
e->textfield = (NSTextField *) VIEW(e); e->textfield = (NSTextField *) uiControlHandle(uiControl(e));
[e->textfield setSelectable:YES]; // otherwise the setting is masked by the editable default of YES [e->textfield setSelectable:YES]; // otherwise the setting is masked by the editable default of YES
finishNewTextField(e->textfield, YES); finishNewTextField(e->textfield, YES);

2
darwin/label.m → new/darwin/label.m
View File

@ -35,7 +35,7 @@ uiLabel *uiNewLabel(const char *text)
uiDarwinNewControl(uiControl(l), [NSTextField class], NO, NO, destroy, l); uiDarwinNewControl(uiControl(l), [NSTextField class], NO, NO, destroy, l);
l->label = (NSTextField *) VIEW(l); l->label = (NSTextField *) uiControlHandle(uiControl(l));
[l->label setStringValue:toNSString(text)]; [l->label setStringValue:toNSString(text)];
[l->label setEditable:NO]; [l->label setEditable:NO];