From 791769f2e40d4f0174347d3adbad120ddce0de99 Mon Sep 17 00:00:00 2001
From: "rpotts%netscape.com"
 <rpotts%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 29 Aug 1998 06:21:50 +0000
Subject: [PATCH] Changes to allow building when STRICT is defined.

git-svn-id: svn://10.0.0.236/trunk@8813 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/widget/src/windows/nsFileWidget.cpp |  2 +-
 mozilla/widget/src/windows/nsWindow.cpp     | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mozilla/widget/src/windows/nsFileWidget.cpp b/mozilla/widget/src/windows/nsFileWidget.cpp
index 0fa3b9246a7..5ff7b2972fd 100644
--- a/mozilla/widget/src/windows/nsFileWidget.cpp
+++ b/mozilla/widget/src/windows/nsFileWidget.cpp
@@ -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;
diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp
index dc904965637..6aeea5fbafc 100644
--- a/mozilla/widget/src/windows/nsWindow.cpp
+++ b/mozilla/widget/src/windows/nsWindow.cpp
@@ -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);