diff options
Diffstat (limited to 'alf/alf.cpp')
| -rw-r--r-- | alf/alf.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/alf/alf.cpp b/alf/alf.cpp index c83ac4a..78eed99 100644 --- a/alf/alf.cpp +++ b/alf/alf.cpp @@ -3,11 +3,11 @@ /* ALF App and Window */ static void -ALF_InitializeWindowPriv(HWND hwnd, ALFWindowPriv *priv, ALFWindowInstanceParams *params) +ALF_InitializeWindowPriv(HWND hwnd, ALFWindowPriv *priv, void *closure) { priv->vtbl = (ALFWindowVTable*)GetClassLongPtr(hwnd, 0); priv->app = (ALFAPP)GetClassLongPtr(hwnd, sizeof(void*)); - priv->closure = params->closure; + priv->closure = closure; ALF_ListInit(&priv->widgets); priv->defid = (WORD)-1; } @@ -486,10 +486,9 @@ ALF_WindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { if (msg == WM_NCCREATE) { CREATESTRUCT *cs = (CREATESTRUCT*)(void*)lparam; - ALFWindowInstanceParams *params = (ALFWindowInstanceParams*)cs->lpCreateParams; ALFWindowPriv *priv = (ALFWindowPriv*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY|HEAP_GENERATE_EXCEPTIONS, sizeof(ALFWindowPriv)); SetWindowLongPtr(hwnd, 0, (LONG_PTR)priv); - ALF_InitializeWindowPriv(hwnd, priv, params); + ALF_InitializeWindowPriv(hwnd, priv, cs->lpCreateParams); } ALFWindowPriv *priv = (ALFWindowPriv*)(void*)GetWindowLongPtr(hwnd, 0); @@ -555,18 +554,18 @@ ALF_RegisterWindowClass(ALFAPP app, const ALFWindowClassParams *params) return MAKEINTATOM(classatom); } -HWND ALF_InstantiateWindow(ALFAPP app, LPCTSTR className, const ALFWindowInstanceParams* params) +HWND ALF_InstantiateWindow(ALFAPP app, LPCTSTR className, HWND hwndParent, void *closure) { - return CreateWindowEx(params->windowExStyle, + return CreateWindowEx(0, className, L"Window", - params->windowStyle, + WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, CW_USEDEFAULT, CW_USEDEFAULT, 300, 100, //FIXME - params->hwndParent, + hwndParent, NULL, app->hInstance, - (void*)params); + closure); } ALFAPP |