From 60ee060f62309f0cd7ee84b77dcfa8f392d5ccda Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Tue, 9 Feb 1999 18:20:18 +0000 Subject: [PATCH] Fixed problem with marshalling the window create method git-svn-id: svn://10.0.0.236/trunk@20145 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/windows/nsWindow.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp index 1974678a11b..bbd1cfd7604 100644 --- a/mozilla/widget/src/windows/nsWindow.cpp +++ b/mozilla/widget/src/windows/nsWindow.cpp @@ -398,12 +398,12 @@ PRBool nsWindow::DispatchStandardEvent(PRUint32 aMsg) //------------------------------------------------------------------------- LRESULT CALLBACK nsWindow::WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - // Get the window which caused the event and ask it to process the message + + // Get the window which caused the event and ask it to process the message nsWindow *someWindow = (nsWindow*)::GetWindowLong(hWnd, GWL_USERDATA); - - // Re-direct a tab change message destined for it's parent window to the - // the actual window which generated the event. + // Re-direct a tab change message destined for it's parent window to the + // the actual window which generated the event. if (msg == WM_NOTIFY) { LPNMHDR pnmh = (LPNMHDR) lParam; if (pnmh->code == TCN_SELCHANGE) { @@ -467,18 +467,19 @@ nsresult nsWindow::StandardWindowCreate(nsIWidget *aParent, // nsToolkit* toolkit = (nsToolkit *)mToolkit; - if (! toolkit->IsGuiThread()) { - DWORD args[5]; + if (!toolkit->IsGuiThread()) { + DWORD args[7]; args[0] = (DWORD)aParent; args[1] = (DWORD)&aRect; args[2] = (DWORD)aHandleEventFunction; args[3] = (DWORD)aContext; - args[4] = (DWORD)aToolkit; - args[5] = (DWORD)aInitData; + args[4] = (DWORD)aAppShell; + args[5] = (DWORD)aToolkit; + args[6] = (DWORD)aInitData; if (nsnull != aParent) { // nsIWidget parent dispatch - MethodInfo info(this, nsWindow::CREATE, 6, args); + MethodInfo info(this, nsWindow::CREATE, 7, args); toolkit->CallMethod(&info); return NS_OK; }