diff --git a/redo/windows/container.c b/redo/windows/container.c index 802217e4..877164f7 100644 --- a/redo/windows/container.c +++ b/redo/windows/container.c @@ -55,19 +55,12 @@ void uninitContainer(void) logLastError("error unregistering container window class in uninitContainer()"); } -// TODO make into a uiNewContainer() -void uiMakeContainer(uiControl *c) +uintptr_t uiMakeContainer(uiControl *c) { - uiWindowsMakeControlParams p; - - p.dwExStyle = 0; - p.lpClassName = containerClass; - p.lpWindowName = L""; - p.dwStyle = 0; - p.hInstance = hInstance; - p.lpParam = NULL; - p.useStandardControlFont = TRUE; - p.onDestroy = onDestroy; - p.onDestroyData = NULL; - uiWindowsMakeControl(c, &p); + setSingleHWNDFuncs(c); + return (uintptr_t) uiWindowsUtilCreateControlHWND(0, + containerClass, L"", + 0, + hInstance, NULL, + FALSE); } diff --git a/redo/windows/control.c b/redo/windows/control.c index 1a38efe1..d52afac5 100644 --- a/redo/windows/control.c +++ b/redo/windows/control.c @@ -55,7 +55,7 @@ void uiWindowsUtilResize(HWND hwnd, intmax_t x, intmax_t y, intmax_t width, intm moveWindow(hwnd, x, y, width, height, d); } -static void singleHWNDResize(HWND hwnd, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d) +static void singleHWNDResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d) { uiWindowsUtilResize(HWND(c), x, y, width, height, d); }