[Squeak-Commits] squeak/platforms/win32/plugins/FontPlugin sqWin32FontPlugin.c,1.2,1.3

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

Update of /cvsroot/squeak/squeak/platforms/win32/plugins/FontPlugin
In directory sc8-pr-cvs1:/tmp/cvs-serv11039/plugins/FontPlugin

Modified Files:
	sqWin32FontPlugin.c 
Log Message:
update to 3.6.1

Index: sqWin32FontPlugin.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/FontPlugin/sqWin32FontPlugin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sqWin32FontPlugin.c	1 Aug 2003 18:49:37 -0000	1.2
--- sqWin32FontPlugin.c	2 Nov 2003 19:52:39 -0000	1.3
***************
*** 336,345 ****
  

  /* Font name cache */

! struct sqFontDescription {

    LOGFONT logFont;

    int fontType;

! };

  

! static sqFontName *fontNameCache = NULL;

  static int numFontNames = 0;

  static int maxFontNames = 0;

--- 336,345 ----
  

  /* Font name cache */

! typedef struct sqFontDescription {

    LOGFONT logFont;

    int fontType;

! } sqFontDescription;

  

! static sqFontDescription *fontNameCache = NULL;

  static int numFontNames = 0;

  static int maxFontNames = 0;

***************
*** 383,387 ****
  	if(!fontNameCache) return NULL;

  	if(fontIndex >= numFontNames) return NULL;

! 	return fontNameCache[fontIndex].font.lfFaceName;

  }

  

--- 383,387 ----
  	if(!fontNameCache) return NULL;

  	if(fontIndex >= numFontNames) return NULL;

! 	return fontNameCache[fontIndex].logFont.lfFaceName;

  }

  

***************
*** 399,403 ****
    if(fontIndex == 0 || fontIndex >= numFontNames)

      return -1;

!   desc = fontNameCache[fontIndex];

    switch(desc->fontType) {

      case TRUETYPE_FONTTYPE: return 1;

--- 399,403 ----
    if(fontIndex == 0 || fontIndex >= numFontNames)

      return -1;

!   desc = fontNameCache + fontIndex;

    switch(desc->fontType) {

      case TRUETYPE_FONTTYPE: return 1;