Tk Source Code

Check-in [8c1ea956]
Login

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

Overview
Comment:function def in front
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-4-branch
Files: files | file ages | folders
SHA1: 8c1ea956470fe10ba65aa268b7656bfd5f71c5af
User & Date: jan.nijtmans 2012-06-08 22:11:29
Context
2012-06-10
14:47
[Bug 3534137]: $tcl_platform(platform) != [tk windowingsystem] check-in: c19c493c user: jan.nijtmans tags: core-8-4-branch
2012-06-08
22:19
eliminate some ANSI_ARGS check-in: 81bffa40 user: jan.nijtmans tags: core-8-5-branch
22:11
function def in front check-in: 8c1ea956 user: jan.nijtmans tags: core-8-4-branch
20:53
Implement TkCygwinMainEx for loading Cygwin's Tk_MainEx from the Tk dll check-in: 1a49039b user: jan.nijtmans tags: core-8-4-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tkMain.c.

30
31
32
33
34
35
36

37
38
39
40
41
42
43
#include "tkWinInt.h"
#include "../win/tclWinPort.h"
#endif
#ifdef MAC_OSX_TK
#include "tkMacOSXInt.h"
#endif



typedef struct ThreadSpecificData {
    Tcl_Interp *interp;         /* Interpreter for this thread. */
    Tcl_DString command;        /* Used to assemble lines of terminal input
				 * into Tcl commands. */
    Tcl_DString line;           /* Used to read the next line from the
				 * terminal input. */







>







30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
#include "tkWinInt.h"
#include "../win/tclWinPort.h"
#endif
#ifdef MAC_OSX_TK
#include "tkMacOSXInt.h"
#endif

extern int TkCygwinMainEx(int, char **, Tcl_AppInitProc *, Tcl_Interp *);

typedef struct ThreadSpecificData {
    Tcl_Interp *interp;         /* Interpreter for this thread. */
    Tcl_DString command;        /* Used to assemble lines of terminal input
				 * into Tcl commands. */
    Tcl_DString line;           /* Used to read the next line from the
				 * terminal input. */
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
     */

    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
	abort();
    }

#if defined(__WIN32__) && !defined(__WIN64__) && !defined(STATIC_BUILD)
    extern int TkCygwinMainEx(int, char **, Tcl_AppInitProc *, Tcl_Interp *);

    if (tclStubsPtr->reserved9) {
	/* We are running win32 Tk under Cygwin, so let's check
	 * whether the env("DISPLAY") variable or the -display
	 * argument is set. If so, we really want to run the
	 * Tk_MainEx function of libtk8.?.dll, not this one. */
	if (Tcl_GetVar2(interp, "env", "DISPLAY", TCL_GLOBAL_ONLY)) {







<







153
154
155
156
157
158
159

160
161
162
163
164
165
166
     */

    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
	abort();
    }

#if defined(__WIN32__) && !defined(__WIN64__) && !defined(STATIC_BUILD)


    if (tclStubsPtr->reserved9) {
	/* We are running win32 Tk under Cygwin, so let's check
	 * whether the env("DISPLAY") variable or the -display
	 * argument is set. If so, we really want to run the
	 * Tk_MainEx function of libtk8.?.dll, not this one. */
	if (Tcl_GetVar2(interp, "env", "DISPLAY", TCL_GLOBAL_ONLY)) {