diff options
| author | stu <stwo@users.sourceforge.net> | 2017-05-20 11:47:46 (GMT) |
|---|---|---|
| committer | stu <stwo@users.sourceforge.net> | 2017-05-20 11:47:46 (GMT) |
| commit | 2afd7451e708c09b61ba7820e627a2d6fbecb3fb (patch) | |
| tree | 37e2fb2c7bf2677ee7a88230996bc9d70627cbad /unix/tkUnixRFont.c | |
| parent | 2f6784b43da06329dbec3b7f0442161a0d748ffb (diff) | |
| download | tk-2afd7451e708c09b61ba7820e627a2d6fbecb3fb.zip tk-2afd7451e708c09b61ba7820e627a2d6fbecb3fb.tar.gz tk-2afd7451e708c09b61ba7820e627a2d6fbecb3fb.tar.bz2 | |
Bring more TIP #59 to Tk.<br>
Move ::tk::pkgconfig setup code from unix/tkUnixRFont.c to new file generic/tkPkgConfig.c.<br>
Copied Tcl/tests/config.test into new file Tk/tests/pkgconfig.test.
I believe the name 'pkgconfig.test' is better.<br>
Adjust build system to accommodate.<br>
Use value 'x11' for when fontsystem 'xft' unavailable.<br>
Diffstat (limited to 'unix/tkUnixRFont.c')
| -rw-r--r-- | unix/tkUnixRFont.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index 9c1116d..379af05 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.c @@ -57,24 +57,13 @@ static Tcl_ThreadDataKey dataKey; /* * Package initialization: - * Nothing to do here except register the fact that we're using Xft in - * the TIP 59 configuration database. + * Nothing to do! */ -#ifndef TCL_CFGVAL_ENCODING -#define TCL_CFGVAL_ENCODING "ascii" -#endif - void TkpFontPkgInit( TkMainInfo *mainPtr) /* The application being created. */ { - static const Tcl_Config cfg[] = { - { "fontsystem", "xft" }, - { 0,0 } - }; - - Tcl_RegisterConfig(mainPtr->interp, "tk", cfg, TCL_CFGVAL_ENCODING); } static XftFont * |