Tk Source Code

Check-in [d65d0705]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Changes based on recommendations in http://code.activestate.com/lists/tcl-core/19816/. Cleanup old code.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | tk-stu-pkg
Files: files | file ages | folders
SHA3-256: d65d0705151eb38bc6956c4a3b523727020bc42520a7476e09b90e6c35d331ca
User & Date: stu 2018-07-04 09:33:47
Context
2019-04-14
15:41
Implement TIPs 482 and 483 check-in: 9978174e user: dkf tags: trunk
2018-07-04
09:33
Changes based on recommendations in http://code.activestate.com/lists/tcl-core/19816/. Cleanup old code. Closed-Leaf check-in: d65d0705 user: stu tags: tk-stu-pkg
2018-07-03
16:08
Merge trunk. check-in: ead36d87 user: stu tags: tk-stu-pkg
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tkPkgConfig.c.

83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
#else
#  define CFG_PROFILED		"0"
#endif

#if defined(_WIN32) || defined(__CYGWIN__)
#  define CFG_FONTSYSTEM	"gdi"
#elif defined(MAC_OSX_TK)
#  define CFG_FONTSYSTEM	"xft"
#elif defined(HAVE_XFT)
#  define CFG_FONTSYSTEM	"xft"
#else
#  define CFG_FONTSYSTEM	"x11"
#endif

static Tcl_Config const cfg[] = {







|







83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
#else
#  define CFG_PROFILED		"0"
#endif

#if defined(_WIN32) || defined(__CYGWIN__)
#  define CFG_FONTSYSTEM	"gdi"
#elif defined(MAC_OSX_TK)
#  define CFG_FONTSYSTEM	"cocoa"
#elif defined(HAVE_XFT)
#  define CFG_FONTSYSTEM	"xft"
#else
#  define CFG_FONTSYSTEM	"x11"
#endif

static Tcl_Config const cfg[] = {

Changes to macosx/tkMacOSXMenus.c.

283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
 *
 * Side effects:
 *	None.
 *
 *----------------------------------------------------------------------
 */

#if 0
static Tcl_Obj *
GetWidgetDemoPath(
    Tcl_Interp *interp)
{
    Tcl_Obj *libpath, *result = NULL;

    libpath = Tcl_GetVar2Ex(interp, "tk_library", NULL, TCL_GLOBAL_ONLY);
    if (libpath) {
	Tcl_Obj *demo[2] = {	Tcl_NewStringObj("demos", 5),
				Tcl_NewStringObj("widget", 6) };

	Tcl_IncrRefCount(libpath);
	result = Tcl_FSJoinToPath(libpath, 2, demo);
	Tcl_DecrRefCount(libpath);
    } else {
	Tcl_ResetResult(interp);
    }
    return result;
}
#else
static Tcl_Obj *
GetWidgetDemoPath(
    Tcl_Interp *interp)
{
    Tcl_Obj *result = NULL;

    if (Tcl_EvalEx(interp, "::tk::pkgconfig get demodir,runtime",
		   -1, TCL_EVAL_GLOBAL) == TCL_OK) {
	Tcl_Obj *libpath, *demo[1] = { Tcl_NewStringObj("widget", 6) };

	libpath = Tcl_GetObjResult(interp);
	Tcl_IncrRefCount(libpath);
	result = Tcl_FSJoinToPath(libpath, 1, demo);
	Tcl_DecrRefCount(libpath);
    }
    Tcl_ResetResult(interp);
    return result;
}
#endif

/*
 *----------------------------------------------------------------------
 *
 * TkMacOSXHandleMenuSelect --
 *
 *	Handles events that occur in the Menu bar.







<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<


















<







283
284
285
286
287
288
289





















290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307

308
309
310
311
312
313
314
 *
 * Side effects:
 *	None.
 *
 *----------------------------------------------------------------------
 */






















static Tcl_Obj *
GetWidgetDemoPath(
    Tcl_Interp *interp)
{
    Tcl_Obj *result = NULL;

    if (Tcl_EvalEx(interp, "::tk::pkgconfig get demodir,runtime",
		   -1, TCL_EVAL_GLOBAL) == TCL_OK) {
	Tcl_Obj *libpath, *demo[1] = { Tcl_NewStringObj("widget", 6) };

	libpath = Tcl_GetObjResult(interp);
	Tcl_IncrRefCount(libpath);
	result = Tcl_FSJoinToPath(libpath, 1, demo);
	Tcl_DecrRefCount(libpath);
    }
    Tcl_ResetResult(interp);
    return result;
}


/*
 *----------------------------------------------------------------------
 *
 * TkMacOSXHandleMenuSelect --
 *
 *	Handles events that occur in the Menu bar.