From b1e1fed484f6caa991cd71408d2309a9992fb1a0 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Thu, 14 May 2015 22:33:19 -0400 Subject: [PATCH] Removed some uses of initialParent. --- redo/windows/control.c | 2 +- redo/windows/parent.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/redo/windows/control.c b/redo/windows/control.c index 38063425..e701575e 100644 --- a/redo/windows/control.c +++ b/redo/windows/control.c @@ -193,7 +193,7 @@ void uiWindowsMakeControl(uiControl *c, uiWindowsMakeControlParams *p) 0, 0, // use a nonzero initial size just in case some control breaks with a zero initial size 100, 100, - initialParent, NULL, p->hInstance, p->lpParam); + utilWindow, NULL, p->hInstance, p->lpParam); if (s->hwnd == NULL) logLastError("error creating control in uiWindowsMakeControl()"); s->onWM_COMMAND = p->onWM_COMMAND; diff --git a/redo/windows/parent.c b/redo/windows/parent.c index 4df6ebd2..8b71d32e 100644 --- a/redo/windows/parent.c +++ b/redo/windows/parent.c @@ -115,7 +115,7 @@ BOOL handleParentMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LR // bounce back to the control in question // except if to the initial parent, in which case act as if the message was ignored control = (HWND) lParam; - if (control != NULL && IsChild(initialParent, control) == 0) { + if (control != NULL && IsChild(utilWindow, control) == 0) { *lResult = SendMessageW(control, msgCOMMAND, wParam, lParam); return TRUE; } @@ -123,7 +123,7 @@ BOOL handleParentMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LR case WM_NOTIFY: // same as WM_COMMAND control = nm->hwndFrom; - if (control != NULL && IsChild(initialParent, control) == 0) { + if (control != NULL && IsChild(utilWindow, control) == 0) { *lResult = SendMessageW(control, msgNOTIFY, wParam, lParam); return TRUE; }