diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2008-05-02 10:28:18 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2008-05-02 10:28:18 (GMT) |
| commit | 92a33ad5ca7cab82ebae7b4f54c3cbffa840d73d (patch) | |
| tree | a7387a33c99a4a8ebed374d7bf0f97e02dc144a6 /generic | |
| parent | 0c02362da257d3535b17206211d8acb98d6d9e27 (diff) | |
| download | tk-92a33ad5ca7cab82ebae7b4f54c3cbffa840d73d.zip tk-92a33ad5ca7cab82ebae7b4f54c3cbffa840d73d.tar.gz tk-92a33ad5ca7cab82ebae7b4f54c3cbffa840d73d.tar.bz2 | |
More elimination of pre-C89-isms.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkEntry.h | 4 | ||||
| -rw-r--r-- | generic/tkFont.h | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/generic/tkEntry.h b/generic/tkEntry.h index 7f8aa1f..764049d 100644 --- a/generic/tkEntry.h +++ b/generic/tkEntry.h @@ -48,7 +48,7 @@ typedef struct { * Fields that are set by widget commands other than "configure". */ - CONST char *string; /* Pointer to storage for string; + const char *string; /* Pointer to storage for string; * NULL-terminated; malloc-ed. */ int insertPos; /* Character index before which next typed * character will be inserted. */ @@ -138,7 +138,7 @@ typedef struct { * configuration settings above. */ - CONST char *displayString; /* String to use when displaying. This may be + const char *displayString; /* String to use when displaying. This may be * a pointer to string, or a pointer to * malloced memory with the same character * length as string but whose characters are diff --git a/generic/tkFont.h b/generic/tkFont.h index 448423d..1253700 100644 --- a/generic/tkFont.h +++ b/generic/tkFont.h @@ -10,7 +10,7 @@ * 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.10 2007/05/04 21:29:22 patthoyts Exp $ + * RCS: @(#) $Id: tkFont.h,v 1.11 2008/05/02 10:28:18 dkf Exp $ */ #ifndef _TKFONT @@ -195,18 +195,18 @@ typedef struct TkXLFDAttributes { #define TkInitFontAttributes(fa) memset((fa), 0, sizeof(TkFontAttributes)); #define TkInitXLFDAttributes(xa) memset((xa), 0, sizeof(TkXLFDAttributes)); -MODULE_SCOPE int TkFontParseXLFD(CONST char *string, +MODULE_SCOPE int TkFontParseXLFD(const char *string, TkFontAttributes *faPtr, TkXLFDAttributes *xaPtr); -MODULE_SCOPE char ** TkFontGetAliasList(CONST char *faceName); +MODULE_SCOPE char ** TkFontGetAliasList(const char *faceName); MODULE_SCOPE char *** TkFontGetFallbacks(void); MODULE_SCOPE int TkFontGetPixels(Tk_Window tkwin, int size); MODULE_SCOPE int TkFontGetPoints(Tk_Window tkwin, int size); MODULE_SCOPE char ** TkFontGetGlobalClass(void); MODULE_SCOPE char ** TkFontGetSymbolClass(void); MODULE_SCOPE int TkCreateNamedFont(Tcl_Interp *interp, Tk_Window tkwin, - CONST char *name, TkFontAttributes *faPtr); + const char *name, TkFontAttributes *faPtr); MODULE_SCOPE int TkDeleteNamedFont(Tcl_Interp *interp, - Tk_Window tkwin, CONST char *name); + Tk_Window tkwin, const char *name); MODULE_SCOPE int TkFontGetFirstTextLayout(Tk_TextLayout layout, Tk_Font *font, char *dst); @@ -217,10 +217,10 @@ MODULE_SCOPE int TkFontGetFirstTextLayout(Tk_TextLayout layout, MODULE_SCOPE void TkpDeleteFont(TkFont *tkFontPtr); MODULE_SCOPE void TkpFontPkgInit(TkMainInfo *mainPtr); MODULE_SCOPE TkFont * TkpGetFontFromAttributes(TkFont *tkFontPtr, - Tk_Window tkwin, CONST TkFontAttributes *faPtr); + Tk_Window tkwin, const TkFontAttributes *faPtr); MODULE_SCOPE void TkpGetFontFamilies(Tcl_Interp *interp, Tk_Window tkwin); -MODULE_SCOPE TkFont * TkpGetNativeFont(Tk_Window tkwin, CONST char *name); +MODULE_SCOPE TkFont * TkpGetNativeFont(Tk_Window tkwin, const char *name); #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT |