[Squeak-Commits] squeak/platforms/Mac OS/vm sqPlatformSpecific.h,1.11,1.12

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

Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv31791/squeak/platforms/Mac OS/vm

Modified Files:
	sqPlatformSpecific.h 
Log Message:
3.5.1b1 Changed plugin def to browserplugin to avoid confusion. 

Index: sqPlatformSpecific.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqPlatformSpecific.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sqPlatformSpecific.h	6 Aug 2002 21:55:38 -0000	1.11
--- sqPlatformSpecific.h	19 May 2003 07:20:23 -0000	1.12
***************
*** 10,14 ****
  *
  *   Jan 22nd 2002, JMM type for squeak file offset
! *   May 5th, 2002, JMM added define for PLUGIN for CW
  *   May 12th, 2002, JMM added SQUEAK_BUILTIN_PLUGIN for CW Pro
  *   3.2.8b1 July 24th, 2002 JMM support for os-x plugin under IE 5.x
--- 10,14 ----
  *
  *   Jan 22nd 2002, JMM type for squeak file offset
! *   May 5th, 2002, JMM added define for plugin for CW
  *   May 12th, 2002, JMM added SQUEAK_BUILTIN_PLUGIN for CW Pro
  *   3.2.8b1 July 24th, 2002 JMM support for os-x plugin under IE 5.x
***************
*** 24,32 ****
     macro from sq.h, you must first #undef it, then provide the new definition.
     
!    Define PLUGIN for Netscape Plugin building, needed for CodeWarrior
  */
  
  #ifdef macintoshSqueak
! //#define PLUGIN
  #define SQUEAK_BUILTIN_PLUGIN
  /* replace the image file manipulation macros with functions */
--- 24,32 ----
     macro from sq.h, you must first #undef it, then provide the new definition.
     
!    Define plugin for Netscape Plugin building, needed for CodeWarrior
  */
  
  #ifdef macintoshSqueak
! //#define BROWSERPLUGIN
  #define SQUEAK_BUILTIN_PLUGIN
  /* replace the image file manipulation macros with functions */
***************
*** 119,122 ****
--- 119,134 ----
  int sqShrinkMemoryBy(int memoryLimit, int delta);
  int sqMemoryExtraBytesLeft(Boolean flag);
+ #ifdef BROWSERPLUGIN
+     #undef insufficientMemorySpecifiedError
+     #undef insufficientMemoryAvailableError
+     #undef unableToReadImageError
+     #undef browserPluginReturnIfNeeded
+     #undef browserPluginInitialiseIfNeeded
+     #define insufficientMemorySpecifiedError() plugInNotifyUser("The amount of memory specified by the 'memory' EMBED tag is not enough for the installed Squeak image file.")
+     #define insufficientMemoryAvailableError() plugInNotifyUser("There is not enough memory to give Squeak the amount specified by the 'memory' EMBED tag.")
+     #define unableToReadImageError() plugInNotifyUser("Read failed or premature end of image file")
+     #define browserPluginReturnIfNeeded() if (plugInTimeToReturn()) {ReturnFromInterpret();}
+     #define browserPluginInitialiseIfNeeded()
+ #endif
  
  #endif /* macintoshSqueak */