diff options
| author | fvogel <fvogelnew1@free.fr> | 2017-06-05 18:32:24 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2017-06-05 18:32:24 (GMT) |
| commit | fbac4859a673c9a5f0c8936ed8d18ea9e9145304 (patch) | |
| tree | 4e184d638205d9ce2ef854ebea9393e5d8d91bd3 /generic/tkFont.h | |
| parent | 452ee6a6849e04a6a94bc7488e935129614041f8 (diff) | |
| parent | fd3fd3d844d9ff5f83c3fd26ee88f2c02892c180 (diff) | |
| download | tk-fbac4859a673c9a5f0c8936ed8d18ea9e9145304.zip tk-fbac4859a673c9a5f0c8936ed8d18ea9e9145304.tar.gz tk-fbac4859a673c9a5f0c8936ed8d18ea9e9145304.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tkFont.h')
| -rw-r--r-- | generic/tkFont.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkFont.h b/generic/tkFont.h index b8de885..de479bf 100644 --- a/generic/tkFont.h +++ b/generic/tkFont.h @@ -23,7 +23,7 @@ struct TkFontAttributes { Tk_Uid family; /* Font family, or NULL to represent plaform- * specific default system font. */ - int size; /* Pointsize of font, 0 for default size, or + double size; /* Pointsize of font, 0.0 for default size, or * negative number meaning pixel size. */ int weight; /* Weight flag; see below for def'n. */ int slant; /* Slant flag; see below for def'n. */ @@ -198,8 +198,8 @@ MODULE_SCOPE int TkFontParseXLFD(const char *string, TkFontAttributes *faPtr, TkXLFDAttributes *xaPtr); MODULE_SCOPE const char *const * TkFontGetAliasList(const char *faceName); MODULE_SCOPE const char *const *const * TkFontGetFallbacks(void); -MODULE_SCOPE int TkFontGetPixels(Tk_Window tkwin, int size); -MODULE_SCOPE int TkFontGetPoints(Tk_Window tkwin, int size); +MODULE_SCOPE double TkFontGetPixels(Tk_Window tkwin, double size); +MODULE_SCOPE double TkFontGetPoints(Tk_Window tkwin, double size); MODULE_SCOPE const char *const * TkFontGetGlobalClass(void); MODULE_SCOPE const char *const * TkFontGetSymbolClass(void); MODULE_SCOPE int TkCreateNamedFont(Tcl_Interp *interp, Tk_Window tkwin, |