| | 1 | *** ../../tk2.3/main.c Wed Aug 19 08:10:32 1992 |
| | 2 | --- main.c Tue Oct 6 17:27:56 1992 |
| | 3 | *************** |
| | 4 | *** 19,24 |
| | 5 | |
| | 6 | #include "tkConfig.h" |
| | 7 | #include "tkInt.h" |
| | 8 | |
| | 9 | /* |
| | 10 | * Declarations for library procedures: |
| | 11 | |
| | 12 | --- 19,29 ----- |
| | 13 | |
| | 14 | #include "tkConfig.h" |
| | 15 | #include "tkInt.h" |
| | 16 | + #define TK_EXTENDED |
| | 17 | + #ifdef TK_EXTENDED |
| | 18 | + # include "tclExtend.h" |
| | 19 | + Tcl_Interp *tk_mainInterp; /* Need to process signals */ |
| | 20 | + #endif |
| | 21 | |
| | 22 | /* |
| | 23 | * Declarations for library procedures: |
| | 24 | *************** |
| | 25 | *** 30,35 |
| | 26 | * Command used to initialize wish: |
| | 27 | */ |
| | 28 | |
| | 29 | char initCmd[] = "source $tk_library/wish.tcl"; |
| | 30 | |
| | 31 | Tk_Window w; /* NULL means window has been deleted. */ |
| | 32 | |
| | 33 | --- 35,43 ----- |
| | 34 | * Command used to initialize wish: |
| | 35 | */ |
| | 36 | |
| | 37 | + #ifdef TK_EXTENDED |
| | 38 | + char initCmd[] = "load wishx.tcl"; |
| | 39 | + #else |
| | 40 | char initCmd[] = "source $tk_library/wish.tcl"; |
| | 41 | #endif |
| | 42 | |
| | 43 | *************** |
| | 44 | *** 31,36 |
| | 45 | */ |
| | 46 | |
| | 47 | char initCmd[] = "source $tk_library/wish.tcl"; |
| | 48 | |
| | 49 | Tk_Window w; /* NULL means window has been deleted. */ |
| | 50 | Tk_TimerToken timeToken = 0; |
| | 51 | |
| | 52 | --- 39,45 ----- |
| | 53 | char initCmd[] = "load wishx.tcl"; |
| | 54 | #else |
| | 55 | char initCmd[] = "source $tk_library/wish.tcl"; |
| | 56 | + #endif |
| | 57 | |
| | 58 | Tk_Window w; /* NULL means window has been deleted. */ |
| | 59 | Tk_TimerToken timeToken = 0; |
| | 60 | *************** |
| | 61 | *** 219,224 |
| | 62 | int result; |
| | 63 | Tk_3DBorder border; |
| | 64 | |
| | 65 | interp = Tcl_CreateInterp(); |
| | 66 | #ifdef TCL_MEM_DEBUG |
| | 67 | Tcl_InitMemory(interp); |
| | 68 | |
| | 69 | --- 228,236 ----- |
| | 70 | int result; |
| | 71 | Tk_3DBorder border; |
| | 72 | |
| | 73 | + #ifdef TK_EXTENDED |
| | 74 | + tk_mainInterp = interp = Tcl_CreateExtendedInterp(); |
| | 75 | + #else |
| | 76 | interp = Tcl_CreateInterp(); |
| | 77 | #endif |
| | 78 | #ifdef TCL_MEM_DEBUG |
| | 79 | *************** |
| | 80 | *** 220,225 |
| | 81 | Tk_3DBorder border; |
| | 82 | |
| | 83 | interp = Tcl_CreateInterp(); |
| | 84 | #ifdef TCL_MEM_DEBUG |
| | 85 | Tcl_InitMemory(interp); |
| | 86 | #endif |
| | 87 | |
| | 88 | --- 232,238 ----- |
| | 89 | tk_mainInterp = interp = Tcl_CreateExtendedInterp(); |
| | 90 | #else |
| | 91 | interp = Tcl_CreateInterp(); |
| | 92 | + #endif |
| | 93 | #ifdef TCL_MEM_DEBUG |
| | 94 | Tcl_InitMemory(interp); |
| | 95 | #endif |
| | 96 | *************** |
| | 97 | *** 284,289 |
| | 98 | if (geometry != NULL) { |
| | 99 | Tcl_SetVar(interp, "geometry", geometry, TCL_GLOBAL_ONLY); |
| | 100 | } |
| | 101 | result = Tcl_Eval(interp, initCmd, 0, (char **) NULL); |
| | 102 | if (result != TCL_OK) { |
| | 103 | goto error; |
| | 104 | |
| | 105 | --- 297,312 ----- |
| | 106 | if (geometry != NULL) { |
| | 107 | Tcl_SetVar(interp, "geometry", geometry, TCL_GLOBAL_ONLY); |
| | 108 | } |
| | 109 | + #ifdef TK_EXTENDED |
| | 110 | + tclAppName = "Wish"; |
| | 111 | + tclAppLongname = "Wish - Tk Shell"; |
| | 112 | + tclAppVersion = TK_VERSION; |
| | 113 | + Tcl_ShellEnvInit (interp, TCLSH_ABORT_STARTUP_ERR, |
| | 114 | + name, |
| | 115 | + 0, NULL, /* argv var already set */ |
| | 116 | + fileName == NULL, /* interactive? */ |
| | 117 | + NULL); /* Standard default file */ |
| | 118 | + #endif |
| | 119 | result = Tcl_Eval(interp, initCmd, 0, (char **) NULL); |
| | 120 | if (result != TCL_OK) { |
| | 121 | goto error; |
projects / micropolis / blame_incremental