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

Migrated the uiNewControl() definitions on OS X. This just leaves uiMenu.

This commit is contained in:
Pietro Gagliardi 2016-04-24 16:03:13 -04:00
parent b2c9577cb9
commit 5efad5e850
19 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/controlsigs.h
View File

@ -1,5 +1,6 @@
// 24 april 2016 // 24 april 2016
#define uiAreaSignature 0x41726561
#define uiBoxSignature 0x426F784C #define uiBoxSignature 0x426F784C
#define uiButtonSignature 0x42746F6E #define uiButtonSignature 0x42746F6E
#define uiCheckboxSignature 0x43686B62 #define uiCheckboxSignature 0x43686B62

2
darwin/area.m
View File

@ -357,7 +357,7 @@ uiArea *uiNewArea(uiAreaHandler *ah)
{ {
uiArea *a; uiArea *a;
a = (uiArea *) uiNewControl(uiAreaType()); a = (uiArea *) uiNewControl(uiArea);
a->ah = ah; a->ah = ah;
a->scrolling = NO; a->scrolling = NO;

2
darwin/box.m
View File

@ -272,7 +272,7 @@ static uiBox *finishNewBox(BOOL vertical)
{ {
uiBox *b; uiBox *b;
b = (uiBox *) uiNewControl(uiBoxType()); b = (uiBox *) uiNewControl(uiBox);
b->view = [[NSView alloc] initWithFrame:NSZeroRect]; b->view = [[NSView alloc] initWithFrame:NSZeroRect];

2
darwin/button.m
View File

@ -90,7 +90,7 @@ uiButton *uiNewButton(const char *text)
{ {
uiButton *b; uiButton *b;
b = (uiButton *) uiNewControl(uiButtonType()); b = (uiButton *) uiNewControl(uiButton);
b->button = [[NSButton alloc] initWithFrame:NSZeroRect]; b->button = [[NSButton alloc] initWithFrame:NSZeroRect];
[b->button setTitle:toNSString(text)]; [b->button setTitle:toNSString(text)];

2
darwin/checkbox.m
View File

@ -109,7 +109,7 @@ uiCheckbox *uiNewCheckbox(const char *text)
{ {
uiCheckbox *c; uiCheckbox *c;
c = (uiCheckbox *) uiNewControl(uiCheckboxType()); c = (uiCheckbox *) uiNewControl(uiCheckbox);
c->button = [[NSButton alloc] initWithFrame:NSZeroRect]; c->button = [[NSButton alloc] initWithFrame:NSZeroRect];
[c->button setTitle:toNSString(text)]; [c->button setTitle:toNSString(text)];

2
darwin/combobox.m
View File

@ -169,7 +169,7 @@ static uiCombobox *finishNewCombobox(BOOL editable)
{ {
uiCombobox *c; uiCombobox *c;
c = (uiCombobox *) uiNewControl(uiComboboxType()); c = (uiCombobox *) uiNewControl(uiCombobox);
c->editable = editable; c->editable = editable;
if (c->editable) { if (c->editable) {

2
darwin/datetimepicker.m
View File

@ -15,7 +15,7 @@ static uiDateTimePicker *finishNewDateTimePicker(NSDatePickerElementFlags elemen
{ {
uiDateTimePicker *d; uiDateTimePicker *d;
d = (uiDateTimePicker *) uiNewControl(uiDateTimePickerType()); d = (uiDateTimePicker *) uiNewControl(uiDateTimePicker);
d->dp = [[NSDatePicker alloc] initWithFrame:NSZeroRect]; d->dp = [[NSDatePicker alloc] initWithFrame:NSZeroRect];
[d->dp setBordered:NO]; [d->dp setBordered:NO];

2
darwin/entry.m
View File

@ -148,7 +148,7 @@ uiEntry *uiNewEntry(void)
{ {
uiEntry *e; uiEntry *e;
e = (uiEntry *) uiNewControl(uiEntryType()); e = (uiEntry *) uiNewControl(uiEntry);
e->textfield = newEditableTextField(); e->textfield = newEditableTextField();

2
darwin/fontbutton.m
View File

@ -172,7 +172,7 @@ uiFontButton *uiNewFontButton(void)
{ {
uiFontButton *b; uiFontButton *b;
b = (uiFontButton *) uiNewControl(uiFontButtonType()); b = (uiFontButton *) uiNewControl(uiFontButton);
b->button = [[fontButton alloc] initWithFrame:NSZeroRect libuiFontButton:b]; b->button = [[fontButton alloc] initWithFrame:NSZeroRect libuiFontButton:b];
uiDarwinSetControlFont(b->button, NSRegularControlSize); uiDarwinSetControlFont(b->button, NSRegularControlSize);

2
darwin/group.m
View File

@ -101,7 +101,7 @@ uiGroup *uiNewGroup(const char *title)
{ {
uiGroup *g; uiGroup *g;
g = (uiGroup *) uiNewControl(uiGroupType()); g = (uiGroup *) uiNewControl(uiGroup);
g->box = [[NSBox alloc] initWithFrame:NSZeroRect]; g->box = [[NSBox alloc] initWithFrame:NSZeroRect];
[g->box setTitle:toNSString(title)]; [g->box setTitle:toNSString(title)];

2
darwin/label.m
View File

@ -27,7 +27,7 @@ uiLabel *uiNewLabel(const char *text)
{ {
uiLabel *l; uiLabel *l;
l = (uiLabel *) uiNewControl(uiLabelType()); l = (uiLabel *) uiNewControl(uiLabel);
l->textfield = [[NSTextField alloc] initWithFrame:NSZeroRect]; l->textfield = [[NSTextField alloc] initWithFrame:NSZeroRect];
[l->textfield setStringValue:toNSString(text)]; [l->textfield setStringValue:toNSString(text)];

2
darwin/multilineentry.m
View File

@ -70,7 +70,7 @@ uiMultilineEntry *uiNewMultilineEntry(void)
uiMultilineEntry *e; uiMultilineEntry *e;
NSFont *font; NSFont *font;
e = (uiMultilineEntry *) uiNewControl(uiMultilineEntryType()); e = (uiMultilineEntry *) uiNewControl(uiMultilineEntry);
e->sv = [[NSScrollView alloc] initWithFrame:NSZeroRect]; e->sv = [[NSScrollView alloc] initWithFrame:NSZeroRect];
// TODO verify against Interface Builder // TODO verify against Interface Builder

2
darwin/progressbar.m
View File

@ -31,7 +31,7 @@ uiProgressBar *uiNewProgressBar(void)
{ {
uiProgressBar *p; uiProgressBar *p;
p = (uiProgressBar *) uiNewControl(uiProgressBarType()); p = (uiProgressBar *) uiNewControl(uiProgressBar);
p->pi = [[NSProgressIndicator alloc] initWithFrame:NSZeroRect]; p->pi = [[NSProgressIndicator alloc] initWithFrame:NSZeroRect];
[p->pi setControlSize:NSRegularControlSize]; [p->pi setControlSize:NSRegularControlSize];

2
darwin/radiobuttons.m
View File

@ -46,7 +46,7 @@ uiRadioButtons *uiNewRadioButtons(void)
uiRadioButtons *r; uiRadioButtons *r;
NSButtonCell *cell; NSButtonCell *cell;
r = (uiRadioButtons *) uiNewControl(uiRadioButtonsType()); r = (uiRadioButtons *) uiNewControl(uiRadioButtons);
// we have to set up the NSMatrix this way (prototype first) // we have to set up the NSMatrix this way (prototype first)
// otherwise we won't be able to change its properties (such as the button type) // otherwise we won't be able to change its properties (such as the button type)

2
darwin/separator.m
View File

@ -20,7 +20,7 @@ uiSeparator *uiNewHorizontalSeparator(void)
{ {
uiSeparator *s; uiSeparator *s;
s = (uiSeparator *) uiNewControl(uiSeparatorType()); s = (uiSeparator *) uiNewControl(uiSeparator);
s->box = [[NSBox alloc] initWithFrame:NSMakeRect(0, 0, separatorFrameWidth, separatorFrameHeight)]; s->box = [[NSBox alloc] initWithFrame:NSMakeRect(0, 0, separatorFrameWidth, separatorFrameHeight)];
[s->box setBoxType:NSBoxSeparator]; [s->box setBoxType:NSBoxSeparator];

2
darwin/slider.m
View File

@ -110,7 +110,7 @@ uiSlider *uiNewSlider(intmax_t min, intmax_t max)
uiSlider *s; uiSlider *s;
NSSliderCell *cell; NSSliderCell *cell;
s = (uiSlider *) uiNewControl(uiSliderType()); s = (uiSlider *) uiNewControl(uiSlider);
// a horizontal slider is defined as one where the width > height, not by a flag // a horizontal slider is defined as one where the width > height, not by a flag
// to be safe, don't use NSZeroRect, but make it horizontal from the get-go // to be safe, don't use NSZeroRect, but make it horizontal from the get-go

2
darwin/spinbox.m
View File

@ -162,7 +162,7 @@ uiSpinbox *uiNewSpinbox(intmax_t min, intmax_t max)
if (min >= max) if (min >= max)
complain("error: min >= max in uiNewSpinbox()"); complain("error: min >= max in uiNewSpinbox()");
s = (uiSpinbox *) uiNewControl(uiSpinboxType()); s = (uiSpinbox *) uiNewControl(uiSpinbox);
s->spinbox = [[libui_spinbox alloc] initWithFrame:NSZeroRect spinbox:s]; s->spinbox = [[libui_spinbox alloc] initWithFrame:NSZeroRect spinbox:s];
[s->spinbox setMinimum:min]; [s->spinbox setMinimum:min];

2
darwin/tab.m
View File

@ -148,7 +148,7 @@ uiTab *uiNewTab(void)
{ {
uiTab *t; uiTab *t;
t = (uiTab *) uiNewControl(uiTabType()); t = (uiTab *) uiNewControl(uiTab);
t->tabview = [[NSTabView alloc] initWithFrame:NSZeroRect]; t->tabview = [[NSTabView alloc] initWithFrame:NSZeroRect];
// also good for NSTabView (same selector and everything) // also good for NSTabView (same selector and everything)

2
darwin/window.m
View File

@ -192,7 +192,7 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
finalizeMenus(); finalizeMenus();
w = (uiWindow *) uiNewControl(uiWindowType()); w = (uiWindow *) uiNewControl(uiWindow);
w->window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, (CGFloat) width, (CGFloat) height) w->window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, (CGFloat) width, (CGFloat) height)
styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask) styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)