More build fixes. Almost linking now...

This commit is contained in:
Pietro Gagliardi 2015-06-14 20:02:38 -04:00
parent c5fa717c7d
commit 039bc5083b
15 changed files with 26 additions and 15 deletions

View File

@ -55,7 +55,6 @@ static int entryReadOnly(uiEntry *ee)
static void entrySetReadOnly(uiEntry *ee, int readonly) static void entrySetReadOnly(uiEntry *ee, int readonly)
{ {
struct entry *e = (struct entry *) ee; struct entry *e = (struct entry *) ee;
WPARAM ro;
PUT_CODE_HERE; PUT_CODE_HERE;
} }

View File

@ -3,6 +3,9 @@
struct spinbox { struct spinbox {
uiSpinbox s; uiSpinbox s;
OSTYPE OSHANDLE;
void (*onChanged)(uiSpinbox *, void *);
void *onChangedData;
}; };
uiDefineControlType(uiSpinbox, uiTypeSpinbox, struct spinbox) uiDefineControlType(uiSpinbox, uiTypeSpinbox, struct spinbox)

View File

@ -50,7 +50,7 @@ uiButton *uiNewButton(const char *text)
{ {
struct button *b; struct button *b;
b = (struct button *) MAKE_CONTROL_INSTANCE(uiTypeButton()); b = (struct button *) uiNewControl(uiTypeButton());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -64,7 +64,7 @@ uiCheckbox *uiNewCheckbox(const char *text)
{ {
struct checkbox *c; struct checkbox *c;
c = (struct checkbox *) MAKE_CONTROL_INSTANCE(uiTypeCheckbox()); c = (struct checkbox *) uiNewControl(uiTypeCheckbox());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -26,7 +26,7 @@ static uiCombobox *finishNewCombobox(GtkWidget (*newfunc)(void))
{ {
struct combobox *c; struct combobox *c;
c = (struct combobox *) MAKE_CONTROL_INSTANCE(uiTypeCombobox()); c = (struct combobox *) uiNewControl(uiTypeCombobox());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -15,11 +15,19 @@ static uintptr_t datetimepickerHandle(uiControl *c)
return (uintptr_t) (d->widget); return (uintptr_t) (d->widget);
} }
// TODO
typedef int OSTHING;
enum {
OSARGDATETIME,
OSARGDATEONLY,
OSARGTIMEONLY,
};
uiDateTimePicker *finishNewDateTimePicker(OSTHING OSARG) uiDateTimePicker *finishNewDateTimePicker(OSTHING OSARG)
{ {
struct datetimepicker *d; struct datetimepicker *d;
d = (struct datetimepicker *) MAKE_CONTROL_INSTANCE(uiTypeDateTimePicker()); d = (struct datetimepicker *) uiNewControl(uiTypeDateTimePicker());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -55,7 +55,6 @@ static int entryReadOnly(uiEntry *ee)
static void entrySetReadOnly(uiEntry *ee, int readonly) static void entrySetReadOnly(uiEntry *ee, int readonly)
{ {
struct entry *e = (struct entry *) ee; struct entry *e = (struct entry *) ee;
WPARAM ro;
PUT_CODE_HERE; PUT_CODE_HERE;
} }
@ -64,7 +63,7 @@ uiEntry *uiNewEntry(void)
{ {
struct entry *e; struct entry *e;
e = (struct entry *) MAKE_CONTROL_INSTANCE(uiTypeEntry()); e = (struct entry *) uiNewControl(uiTypeEntry());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -73,7 +73,7 @@ uiGroup *uiNewGroup(const char *text)
{ {
struct group *g; struct group *g;
g = (struct group *) MAKE_CONTROL_INSTANCE(uiTypeGroup()); g = (struct group *) uiNewControl(uiTypeGroup());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -35,7 +35,7 @@ uiLabel *uiNewLabel(const char *text)
{ {
struct label *l; struct label *l;
l = (struct label *) MAKE_CONTROL_INSTANCE(uiTypeLabel()); l = (struct label *) uiNewControl(uiTypeLabel());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -28,7 +28,7 @@ uiProgressBar *uiNewProgressBar(void)
{ {
struct progressbar *p; struct progressbar *p;
p = (struct progressbar *) MAKE_CONTROL_INSTANCE(uiTypeProgressBar()); p = (struct progressbar *) uiNewControl(uiTypeProgressBar());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -24,7 +24,7 @@ uiRadioButtons *uiNewRadioButtons(void)
{ {
struct radiobuttons *r; struct radiobuttons *r;
r = (struct radiobuttons *) MAKE_CONTROL_INSTANCE(uiTypeRadioButtons()); r = (struct radiobuttons *) uiNewControl(uiTypeRadioButtons());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -19,7 +19,7 @@ uiSeparator *uiNewHorizontalSeparator(void)
{ {
struct separator *s; struct separator *s;
s = (struct separator *) MAKE_CONTROL_INSTANCE(uiTypeSeparator()); s = (struct separator *) uiNewControl(uiTypeSeparator());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -48,7 +48,7 @@ uiSlider *uiNewSlider(intmax_t min, intmax_t max)
{ {
struct slider *s; struct slider *s;
s = (struct slider *) MAKE_CONTROL_INSTANCE(uiTypeSlider()); s = (struct slider *) uiNewControl(uiTypeSlider());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -3,6 +3,8 @@
struct spinbox { struct spinbox {
uiSpinbox s; uiSpinbox s;
void (*onChanged)(uiSpinbox *, void *);
void *onChangedData;
}; };
uiDefineControlType(uiSpinbox, uiTypeSpinbox, struct spinbox) uiDefineControlType(uiSpinbox, uiTypeSpinbox, struct spinbox)
@ -48,7 +50,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 = (struct spinbox *) MAKE_CONTROL_INSTANCE(uiTypeSpinbox()); s = (struct spinbox *) uiNewControl(uiTypeSpinbox());
PUT_CODE_HERE; PUT_CODE_HERE;

View File

@ -61,7 +61,7 @@ uiTab *uiNewTab(void)
{ {
struct tab *t; struct tab *t;
t = (struct tab *) MAKE_CONTROL_INSTANCE(uiTypeTab()); t = (struct tab *) uiNewControl(uiTypeTab());
PUT_CODE_HERE; PUT_CODE_HERE;