Changes to allow building when STRICT is defined.
git-svn-id: svn://10.0.0.236/trunk@8813 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
e61cbfd632
commit
791769f2e4
@ -161,7 +161,7 @@ void nsFileWidget:: Create(nsIWidget *aParent,
|
||||
nsIToolkit *aToolkit,
|
||||
void *aInitData)
|
||||
{
|
||||
mWnd = (aParent) ? aParent->GetNativeData(NS_NATIVE_WINDOW) : 0;
|
||||
mWnd = (HWND) ((aParent) ? aParent->GetNativeData(NS_NATIVE_WINDOW) : 0);
|
||||
mTitle.SetLength(0);
|
||||
mTitle.Append(aTitle);
|
||||
mMode = aMode;
|
||||
|
||||
@ -342,7 +342,13 @@ LRESULT CALLBACK nsWindow::WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM
|
||||
}
|
||||
}
|
||||
|
||||
return ::CallWindowProc((FARPROC)someWindow->GetPrevWindowProc(), hWnd, msg, wParam, lParam);
|
||||
#if defined(STRICT)
|
||||
return ::CallWindowProc((WNDPROC)someWindow->GetPrevWindowProc(), hWnd,
|
||||
msg, wParam, lParam);
|
||||
#else
|
||||
return ::CallWindowProc((FARPROC)someWindow->GetPrevWindowProc(), hWnd,
|
||||
msg, wParam, lParam);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@ -627,7 +633,7 @@ void nsWindow::Create(nsNativeWidget aParent,
|
||||
aRect.y,
|
||||
aRect.width,
|
||||
GetHeight(aRect.height),
|
||||
aParent,
|
||||
(HWND)aParent,
|
||||
NULL,
|
||||
nsToolkit::mDllInstance,
|
||||
NULL);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user