ANSIfy

1 files changed, 70 insertions, 74 deletions

diff --git a/generic/tkFont.h b/generic/tkFont.h
index cc57167..c573750 100644
--- a/generic/tkFont.h
+++ b/generic/tkFont.h
@@ -1,35 +1,35 @@
 /*
  * tkFont.h --
  *
- *	Declarations for interfaces between the generic and platform-
- *	specific parts of the font package.  This information is not
- *	visible outside of the font package.
+ *	Declarations for interfaces between the generic and platform-specific
+ *	parts of the font package. This information is not visible outside of
+ *	the font package.
  *
  * Copyright (c) 1996-1997 Sun Microsystems, Inc.
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkFont.h,v 1.5 1999/04/16 01:51:14 stanton Exp $
+ * RCS: @(#) $Id: tkFont.h,v 1.6 2005/11/07 15:43:51 dkf Exp $
  */
 
 #ifndef _TKFONT
 #define _TKFONT
 
 #ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
 #endif
 
 /*
- * The following structure keeps track of the attributes of a font.  It can
- * be used to keep track of either the desired attributes or the actual
+ * The following structure keeps track of the attributes of a font. It can be
+ * used to keep track of either the desired attributes or the actual
  * attributes gotten when the font was instantiated.
  */
 
 typedef struct TkFontAttributes {
-    Tk_Uid family;		/* Font family, or NULL to represent
-				 * plaform-specific default system font. */
+    Tk_Uid family;		/* Font family, or NULL to represent plaform-
+				 * specific default system font. */
     int size;			/* Pointsize of font, 0 for default size, or
 				 * negative number meaning pixel size. */
     int weight;			/* Weight flag; see below for def'n. */
@@ -47,7 +47,7 @@ typedef struct TkFontAttributes {
 #define TK_FW_NORMAL	0
 #define TK_FW_BOLD	1
 
-#define TK_FW_UNKNOWN	-1	/* Unknown weight.  This value is used for
+#define TK_FW_UNKNOWN	-1	/* Unknown weight. This value is used for
 				 * error checking and is never actually stored
 				 * in the weight field. */
 
@@ -55,21 +55,21 @@ typedef struct TkFontAttributes {
  * Possible values for the "slant" field in a TkFontAttributes structure.
  */
 
-#define TK_FS_ROMAN	0	
+#define TK_FS_ROMAN	0
 #define TK_FS_ITALIC	1
-#define TK_FS_OBLIQUE	2	/* This value is only used when parsing X
-				 * font names to determine the closest
-				 * match.  It is only stored in the
-				 * XLFDAttributes structure, never in the
-				 * slant field of the TkFontAttributes. */
+#define TK_FS_OBLIQUE	2	/* This value is only used when parsing X font
+				 * names to determine the closest match. It is
+				 * only stored in the XLFDAttributes
+				 * structure, never in the slant field of the
+				 * TkFontAttributes. */
 
-#define TK_FS_UNKNOWN	-1	/* Unknown slant.  This value is used for
-				 * error checking and is never actually stored
-				 * in the slant field. */
+#define TK_FS_UNKNOWN	-1	/* Unknown slant. This value is used for error
+				 * checking and is never actually stored in
+				 * the slant field. */
 
 /*
  * The following structure keeps track of the metrics for an instantiated
- * font.  The metrics are the physical properties of the font itself.
+ * font. The metrics are the physical properties of the font itself.
  */
 
 typedef struct TkFontMetrics {
@@ -82,9 +82,9 @@ typedef struct TkFontMetrics {
 
 /*
  * The following structure is used to keep track of the generic information
- * about a font.  Each platform-specific font is represented by a structure
- * with the following structure at its beginning, plus any platform-
- * specific stuff after that.
+ * about a font. Each platform-specific font is represented by a structure
+ * with the following structure at its beginning, plus any platform-specific
+ * stuff after that.
  */
 
 typedef struct TkFont {
@@ -94,14 +94,14 @@ typedef struct TkFont {
 
     int resourceRefCount;	/* Number of active uses of this font (each
 				 * active use corresponds to a call to
-				 * Tk_AllocFontFromTable or Tk_GetFont).
-				 * If this count is 0, then this TkFont
-				 * structure is no longer valid and it isn't
-				 * present in a hash table: it is being
-				 * kept around only because there are objects
-				 * referring to it.  The structure is freed
-				 * when resourceRefCount and objRefCount
-				 * are both 0. */
+				 * Tk_AllocFontFromTable or Tk_GetFont). If
+				 * this count is 0, then this TkFont structure
+				 * is no longer valid and it isn't present in
+				 * a hash table: it is being kept around only
+				 * because there are objects referring to it.
+				 * The structure is freed when
+				 * resourceRefCount and objRefCount are both
+				 * 0. */
     int objRefCount;		/* The number of Tcl objects that reference
 				 * this structure. */
     Tcl_HashEntry *cacheHashPtr;/* Entry in font cache for this structure,
@@ -112,9 +112,9 @@ typedef struct TkFont {
 				 * was not based on a named font. */
     Screen *screen;		/* The screen where this font is valid. */
     int tabWidth;		/* Width of tabs in this font (pixels). */
-    int	underlinePos;		/* Offset from baseline to origin of
-				 * underline bar (used for drawing underlines
-				 * on a non-underlined font). */
+    int	underlinePos;		/* Offset from baseline to origin of underline
+				 * bar (used for drawing underlines on a
+				 * non-underlined font). */
     int underlineHeight;	/* Height of underline bar (used for drawing
 				 * underlines on a non-underlined font). */
 
@@ -124,33 +124,33 @@ typedef struct TkFont {
      */
 
     Font fid;			/* For backwards compatibility with XGCValues
-				 * structures.  Remove when TkGCValues is
-				 * implemented.  */
+				 * structures. Remove when TkGCValues is
+				 * implemented. */
     TkFontAttributes fa;	/* Actual font attributes obtained when the
 				 * the font was created, as opposed to the
 				 * desired attributes passed in to
-				 * TkpGetFontFromAttributes().  The desired
+				 * TkpGetFontFromAttributes(). The desired
 				 * metrics can be determined from the string
 				 * that was used to create this font. */
     TkFontMetrics fm;		/* Font metrics determined when font was
 				 * created. */
     struct TkFont *nextPtr;	/* Points to the next TkFont structure with
-				 * the same name.  All fonts with the
-				 * same name (but different displays) are
-				 * chained together off a single entry in
-				 * a hash table. */
+				 * the same name. All fonts with the same name
+				 * (but different displays) are chained
+				 * together off a single entry in a hash
+				 * table. */
 } TkFont;
 
 /*
- * The following structure is used to return attributes when parsing an
- * XLFD.  The extra information is of interest to the Unix-specific code
- * when attempting to find the closest matching font.
+ * The following structure is used to return attributes when parsing an XLFD.
+ * The extra information is of interest to the Unix-specific code when
+ * attempting to find the closest matching font.
  */
 
 typedef struct TkXLFDAttributes {
     Tk_Uid foundry;		/* The foundry of the font. */
-    int slant;			/* The tristate value for the slant, which
-				 * is significant under X. */
+    int slant;			/* The tristate value for the slant, which is
+				 * significant under X. */
     int setwidth;		/* The proportionate width, see below for
 				 * definition. */
     Tk_Uid charset;		/* The actual charset string. */
@@ -165,8 +165,8 @@ typedef struct TkXLFDAttributes {
 #define TK_SW_NORMAL	0
 #define TK_SW_CONDENSE	1
 #define TK_SW_EXPAND	2
-#define TK_SW_UNKNOWN	3	/* Unknown setwidth.  This value may be
-				 * stored in the setwidth field. */
+#define TK_SW_UNKNOWN	3	/* Unknown setwidth. This value may be stored
+				 * in the setwidth field. */
 
 /*
  * The following defines specify the meaning of the fields in a fully
@@ -195,32 +195,28 @@ typedef struct TkXLFDAttributes {
 #define TkInitFontAttributes(fa)   memset((fa), 0, sizeof(TkFontAttributes));
 #define TkInitXLFDAttributes(xa)   memset((xa), 0, sizeof(TkXLFDAttributes));
 
-EXTERN int		TkFontParseXLFD _ANSI_ARGS_((CONST char *string,
-			    TkFontAttributes *faPtr, TkXLFDAttributes *xaPtr));
-EXTERN char **		TkFontGetAliasList _ANSI_ARGS_((CONST char *faceName));
-EXTERN char ***		TkFontGetFallbacks _ANSI_ARGS_((void));
-EXTERN int		TkFontGetPixels _ANSI_ARGS_((Tk_Window tkwin, 
-			    int size));
-EXTERN int		TkFontGetPoints _ANSI_ARGS_((Tk_Window tkwin, 
-			    int size));
-EXTERN char **		TkFontGetGlobalClass _ANSI_ARGS_((void));
-EXTERN char **		TkFontGetSymbolClass _ANSI_ARGS_((void));
+EXTERN int		TkFontParseXLFD(CONST char *string,
+			    TkFontAttributes *faPtr, TkXLFDAttributes *xaPtr);
+EXTERN char **		TkFontGetAliasList(CONST char *faceName);
+EXTERN char ***		TkFontGetFallbacks(void);
+EXTERN int		TkFontGetPixels(Tk_Window tkwin, int size);
+EXTERN int		TkFontGetPoints(Tk_Window tkwin, int size);
+EXTERN char **		TkFontGetGlobalClass(void);
+EXTERN char **		TkFontGetSymbolClass(void);
 
 /*
- * Low-level API exported by platform-specific code to generic code. 
+ * Low-level API exported by platform-specific code to generic code.
  */
 
-EXTERN void		TkpDeleteFont _ANSI_ARGS_((TkFont *tkFontPtr));
-EXTERN void		TkpFontPkgInit _ANSI_ARGS_((TkMainInfo *mainPtr));
-EXTERN TkFont *		TkpGetFontFromAttributes _ANSI_ARGS_((
-			    TkFont *tkFontPtr, Tk_Window tkwin,
-			    CONST TkFontAttributes *faPtr));
-EXTERN void		TkpGetFontFamilies _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tk_Window tkwin));
-EXTERN TkFont *		TkpGetNativeFont _ANSI_ARGS_((Tk_Window tkwin,
-			    CONST char *name));
-
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
+EXTERN void		TkpDeleteFont(TkFont *tkFontPtr);
+EXTERN void		TkpFontPkgInit(TkMainInfo *mainPtr);
+EXTERN TkFont *		TkpGetFontFromAttributes(TkFont *tkFontPtr,
+			    Tk_Window tkwin, CONST TkFontAttributes *faPtr);
+EXTERN void		TkpGetFontFamilies(Tcl_Interp *interp,
+			    Tk_Window tkwin);
+EXTERN TkFont *		TkpGetNativeFont(Tk_Window tkwin, CONST char *name);
+
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
 
 #endif	/* _TKFONT */