Migrated the Windows basic controls. Rewrite in the new/ folder done!
This commit is contained in:
parent
b134967ab0
commit
0ca0dcaf2d
|
@ -3,10 +3,14 @@
|
||||||
osCFILES = \
|
osCFILES = \
|
||||||
windows/alloc.c \
|
windows/alloc.c \
|
||||||
windows/bin.c \
|
windows/bin.c \
|
||||||
|
windows/button.c \
|
||||||
|
windows/checkbox.c \
|
||||||
windows/comctl32.c \
|
windows/comctl32.c \
|
||||||
windows/container.c \
|
windows/container.c \
|
||||||
windows/debug.c \
|
windows/debug.c \
|
||||||
|
windows/entry.c \
|
||||||
windows/init.c \
|
windows/init.c \
|
||||||
|
windows/label.c \
|
||||||
windows/main.c \
|
windows/main.c \
|
||||||
windows/menu.c \
|
windows/menu.c \
|
||||||
windows/newcontrol.c \
|
windows/newcontrol.c \
|
||||||
|
|
|
@ -100,7 +100,7 @@ uiButton *uiNewButton(const char *text)
|
||||||
uiWindowsNewControl(uiControl(b), &p);
|
uiWindowsNewControl(uiControl(b), &p);
|
||||||
uiFree(wtext);
|
uiFree(wtext);
|
||||||
|
|
||||||
b->hwnd = HWND(b);
|
b->hwnd = (HWND) uiControlHandle(uiControl(b));
|
||||||
|
|
||||||
b->onClicked = defaultOnClicked;
|
b->onClicked = defaultOnClicked;
|
||||||
|
|
|
@ -115,7 +115,7 @@ uiCheckbox *uiNewCheckbox(const char *text)
|
||||||
uiWindowsNewControl(uiControl(c), &p);
|
uiWindowsNewControl(uiControl(c), &p);
|
||||||
uiFree(wtext);
|
uiFree(wtext);
|
||||||
|
|
||||||
c->hwnd = HWND(c);
|
c->hwnd = (HWND) uiControlHandle(uiControl(c));
|
||||||
|
|
||||||
c->onToggled = defaultOnToggled;
|
c->onToggled = defaultOnToggled;
|
||||||
|
|
|
@ -62,7 +62,7 @@ uiEntry *uiNewEntry(void)
|
||||||
p.onDestroyData = e;
|
p.onDestroyData = e;
|
||||||
uiWindowsNewControl(uiControl(e), &p);
|
uiWindowsNewControl(uiControl(e), &p);
|
||||||
|
|
||||||
e->hwnd = HWND(e);
|
e->hwnd = (HWND) uiControlHandle(uiControl(e));
|
||||||
|
|
||||||
uiControl(e)->PreferredSize = preferredSize;
|
uiControl(e)->PreferredSize = preferredSize;
|
||||||
|
|
|
@ -68,7 +68,7 @@ uiLabel *uiNewLabel(const char *text)
|
||||||
uiWindowsNewControl(uiControl(l), &p);
|
uiWindowsNewControl(uiControl(l), &p);
|
||||||
uiFree(wtext);
|
uiFree(wtext);
|
||||||
|
|
||||||
l->hwnd = HWND(l);
|
l->hwnd = (HWND) uiControlHandle(uiControl(l));
|
||||||
|
|
||||||
uiControl(l)->PreferredSize = preferredSize;
|
uiControl(l)->PreferredSize = preferredSize;
|
||||||
|
|
Loading…
Reference in New Issue