Fixed *some* errors...
This commit is contained in:
parent
af4c9ae0c9
commit
d3f18ccae6
|
@ -64,7 +64,7 @@ uiTyped *newTyped(uintmax_t type)
|
||||||
struct typeinfo *ti;
|
struct typeinfo *ti;
|
||||||
uiTyped *instance;
|
uiTyped *instance;
|
||||||
|
|
||||||
if (type == 0 || id >= types->len)
|
if (type == 0 || type >= types->len)
|
||||||
complain("invalid type ID given to newTyped()");
|
complain("invalid type ID given to newTyped()");
|
||||||
ti = ptrArrayIndex(types, struct typeinfo *, type);
|
ti = ptrArrayIndex(types, struct typeinfo *, type);
|
||||||
instance = (uiTyped *) uiAlloc(ti->size, ti->name);
|
instance = (uiTyped *) uiAlloc(ti->size, ti->name);
|
||||||
|
|
16
redo/ui.idl
16
redo/ui.idl
|
@ -66,7 +66,7 @@ interface Control {
|
||||||
func SysFunc(p *uiControlSysFuncParams);
|
func SysFunc(p *uiControlSysFuncParams);
|
||||||
func StartZOrder(p *uiControlSysFuncParams) int;
|
func StartZOrder(p *uiControlSysFuncParams) int;
|
||||||
func CommitDestroy(void);
|
func CommitDestroy(void);
|
||||||
func CommitSetParent(uiControl *);
|
func CommitSetParent(parent *uiControl);
|
||||||
func CommitShow(void);
|
func CommitShow(void);
|
||||||
func CommitHide(void);
|
func CommitHide(void);
|
||||||
func CommitEnable(void);
|
func CommitEnable(void);
|
||||||
|
@ -76,13 +76,13 @@ interface Control {
|
||||||
|
|
||||||
func NewControl(type uintmax_t) *Control;
|
func NewControl(type uintmax_t) *Control;
|
||||||
|
|
||||||
raw "#define uiDefineControlType(typename, funcname, realtype) \";
|
raw "#define uiDefineControlType(typename, funcname, realtype) \\";
|
||||||
raw " static uintmax_t type_ ## typename = 0; \";
|
raw " static uintmax_t type_ ## typename = 0; \\";
|
||||||
raw " uintmax_t funcname(void) \";
|
raw " uintmax_t funcname(void) \\";
|
||||||
raw " { \";
|
raw " { \\";
|
||||||
raw " if (type_ ## typename == 0) \";
|
raw " if (type_ ## typename == 0) \\";
|
||||||
raw " type_ ## typename = uiRegisterType(#typename, uiTypeControl(), sizeof (realtype)); \";
|
raw " type_ ## typename = uiRegisterType(#typename, uiTypeControl(), sizeof (realtype)); \\";
|
||||||
raw " return type_ ## typename; \";
|
raw " return type_ ## typename; \\";
|
||||||
raw " }";
|
raw " }";
|
||||||
|
|
||||||
func FreeSizing(d *Sizing);
|
func FreeSizing(d *Sizing);
|
||||||
|
|
|
@ -89,7 +89,7 @@ uiButton *uiNewButton(const char *text)
|
||||||
struct button *b;
|
struct button *b;
|
||||||
WCHAR *wtext;
|
WCHAR *wtext;
|
||||||
|
|
||||||
b = (struct button *) uiWindowsNewControl(uiTypeButton());
|
b = (struct button *) uiWindowsNewSingleHWNDControl(uiTypeButton());
|
||||||
|
|
||||||
wtext = toUTF16(text);
|
wtext = toUTF16(text);
|
||||||
b->hwnd = uiWindowsUtilCreateControlHWND(0,
|
b->hwnd = uiWindowsUtilCreateControlHWND(0,
|
||||||
|
|
Loading…
Reference in New Issue