From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 16 Apr 1998 06:27:06 +0000 (+0000)
Subject: Make screen_y_extra patch more clever so that it works right under
X-Git-Tag: 20090517-FFI~4812
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=a060f1c38ce59fcfafc9873947a4b5fe951a0ca3;p=mit-scheme.git

Make screen_y_extra patch more clever so that it works right under
Watcom and Visual C++.
---

diff --git a/v7/src/microcode/ntscreen.c b/v7/src/microcode/ntscreen.c
index be79326fb..16ef9a9dd 100644
--- a/v7/src/microcode/ntscreen.c
+++ b/v7/src/microcode/ntscreen.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ntscreen.c,v 1.34 1998/04/16 06:06:26 cph Exp $
+$Id: ntscreen.c,v 1.35 1998/04/16 06:27:06 cph Exp $
 
 Copyright (c) 1993-98 Massachusetts Institute of Technology
 
@@ -233,7 +233,14 @@ screen_y_extra (SCREEN screen)
 {
   return (((GetSystemMetrics (SM_CYFRAME)) * 2)
 	  + (GetSystemMetrics (SM_CYCAPTION))
-	  + ((GetMenu (screen -> hWnd)) ? (GetSystemMetrics (SM_CYMENU)) : 0));
+	  + ((GetMenu (screen -> hWnd)) ? (GetSystemMetrics (SM_CYMENU)) : 0)
+#ifdef __WATCOMC__
+	  /* Magic: when the combination of cyframe*2 and cycaption is
+	     28, AdjustWindowRect indicates that it should be 27.  I
+	     don't know why this only happens under Watcom.  */
+	  - 1
+#endif
+	  );
 }
 
 static long