[Squeak-Commits] squeak/platforms/Mac OS/vm sqMacNSPlugin.c,1.17,1.18

[John M M. <jo...@us...>]

Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7223/squeak/platforms/Mac OS/vm

Modified Files:
	sqMacNSPlugin.c 
Log Message:
3.7.5b3 Minor changes to better support full screen mode

Index: sqMacNSPlugin.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacNSPlugin.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** sqMacNSPlugin.c	3 Aug 2004 02:46:43 -0000	1.17
--- sqMacNSPlugin.c	22 Sep 2004 18:55:24 -0000	1.18
***************
*** 78,81 ****
--- 78,82 ----
  #include "sqMacImageIO.h"
  #include "sqMacEncoding.h"
+ #include "sqMacMemory.h"
  
  #include <Events.h>
***************
*** 226,230 ****
  extern PixMapHandle	stPixMap;
  extern ThreadID  gSqueakThread;
- GDHandle getDominateDevice( WindowPtr theWindow,Rect *windRect);
  int checkForModifierKeys();
  
--- 227,230 ----
***************
*** 965,968 ****
--- 965,970 ----
  	if (squeakHeapMBytes == 0) 
  	    squeakHeapMBytes = STARTINGsqueakHeapMBytes;
+ 	if (squeakHeapMBytes < sqGetAvailableMemory())
+ 		squeakHeapMBytes = sqGetAvailableMemory();
  	    
  	readImageFromFileHeapSizeStartingAt(f, squeakHeapMBytes, 0);
***************
*** 1234,1238 ****
  int ioSetFullScreen(int fullScreen) {
  	short desiredWidth,desiredHeight;
- 	Rect  windRect;
      GDHandle   dominantGDevice;
  	
--- 1236,1239 ----
***************
*** 1244,1252 ****
  		oldNetscapeWindow = netscapeWindow;
  		oldStWindow = stWindow;
! #if defined ( __APPLE__ ) && defined ( __MACH__ )
!                 GetWindowGreatestAreaDevice((WindowPtr) FrontWindow(),kWindowContentRgn,&dominantGDevice,&windRect); 
! #else
!                 dominantGDevice = getDominateDevice(stWindow,&windRect);
! #endif
  		setFullScreenFlag(true);  //JMM Moved before to test
  		BeginFullScreen	(&gRestorableStateForScreen,
--- 1245,1249 ----
  		oldNetscapeWindow = netscapeWindow;
  		oldStWindow = stWindow;
! 		dominantGDevice = getThatDominateGDevice();
  		setFullScreenFlag(true);  //JMM Moved before to test
  		BeginFullScreen	(&gRestorableStateForScreen,