SF.net SVN: frontierkernel: [1170] Frontier/branches/MacOS9_Legacy/Common/source/quickdraw.c

[<and...@us...>]

Revision: 1170
Author:   andreradke
Date:     2006-03-28 13:58:28 -0800 (Tue, 28 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/frontierkernel/?rev=1170&view=rev

Log Message:
-----------
Revert revision 1161 because GetAvailableWindowPositioningBounds is a Carbon-only function.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/frontierkernel/?rev=1161&view=rev

Modified Paths:
--------------
    Frontier/branches/MacOS9_Legacy/Common/source/quickdraw.c
Modified: Frontier/branches/MacOS9_Legacy/Common/source/quickdraw.c
===================================================================
--- Frontier/branches/MacOS9_Legacy/Common/source/quickdraw.c	2006-03-28 21:46:44 UTC (rev 1169)
+++ Frontier/branches/MacOS9_Legacy/Common/source/quickdraw.c	2006-03-28 21:58:28 UTC (rev 1170)
@@ -1229,11 +1229,8 @@
 	
 	*r = screenBits.bounds; /*default return value, if no window open, or error*/
 	
-	/* commenting this out because we don't run on systems without color quickdraw anyway */
-	/*
 	if (!havecolorquickdraw ())
 		goto exit;
-	*/
 	
 	hdevice = GetDeviceList (); /*start with the first graphics device*/
 	
@@ -1243,14 +1240,12 @@
 			
 			if (hmost != nil) {
 				
-				/*
-					2006-03-27 SMD - let the OS tell us about the available bounds
-					this handles the menubar, the dock, and anything else the system knows about
-				*/
-				GetAvailableWindowPositioningBounds (hmost, r);
+				*r = (**hmost).gdRect;
+				
+				flmenubar = hmost == GetMainDevice ();
 				}
 			
-			break;  /* exit the while loop */
+			goto exit;
 			}
 		
 		if (((**hdevice).gdFlags | (1 << screenActive)) != 0) { /*screen is active*/
@@ -1271,6 +1266,10 @@
 		hdevice = GetNextDevice (hdevice); /*advance to next device in list*/
 		} /*while*/
 	
+	exit:
+	
+	if (flmenubar)
+		(*r).top += getmenubarheight ();
 #endif
 
 #ifdef WIN95VERSION


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.