Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Make sure the stubbed variants of Tcl_ObjSetVar2/Tcl_NewStringObj are never used in winMain.c/tkAppInit.c |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
34f2a92b65bcf86a75d48a3b6687b323 |
| User & Date: | jan.nijtmans 2013-02-22 09:30:20 |
Context
|
2013-02-25
| ||
| 20:33 | Put mutex around XInitThreads call, making sure it is only called once. check-in: 557c73ca user: jan.nijtmans tags: trunk | |
|
2013-02-22
| ||
| 10:09 | merge novem check-in: 9629eb92 user: jan.nijtmans tags: novem-support | |
| 09:30 | Make sure the stubbed variants of Tcl_ObjSetVar2/Tcl_NewStringObj are never used in winMain.c/tkAppInit.c check-in: 34f2a92b user: jan.nijtmans tags: trunk | |
| 08:44 | Replace all Tcl_TraceVar/Tcl_UntraceVar with Tcl_TraceVar2/Tcl_UntraceVar2 calls: The former are just thin wrappers around the latter. check-in: fd565de1 user: jan.nijtmans tags: trunk | |
Changes
Changes to unix/tkAppInit.c.
| ︙ | ︙ | |||
40 41 42 43 44 45 46 47 48 49 50 51 52 53 | * script, prime the library or encoding paths, fiddle with the argv, etc., * without needing to rewrite Tk_Main() */ #ifdef TK_LOCAL_MAIN_HOOK MODULE_SCOPE int TK_LOCAL_MAIN_HOOK(int *argc, char ***argv); #endif /* *---------------------------------------------------------------------- * * main -- * * This is the main program for the application. | > > > > | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | * script, prime the library or encoding paths, fiddle with the argv, etc., * without needing to rewrite Tk_Main() */ #ifdef TK_LOCAL_MAIN_HOOK MODULE_SCOPE int TK_LOCAL_MAIN_HOOK(int *argc, char ***argv); #endif /* Make sure the stubbed variants of those are never used. */ #undef Tcl_ObjSetVar2 #undef Tcl_NewStringObj /* *---------------------------------------------------------------------- * * main -- * * This is the main program for the application. |
| ︙ | ︙ | |||
134 135 136 137 138 139 140 |
/*
* Specify a user-specific startup file to invoke if the application is
* run interactively. Typically the startup file is "~/.apprc" where "app"
* is the name of the application. If this line is deleted then no user-
* specific startup file will be run under any conditions.
*/
| | | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 |
/*
* Specify a user-specific startup file to invoke if the application is
* run interactively. Typically the startup file is "~/.apprc" where "app"
* is the name of the application. If this line is deleted then no user-
* specific startup file will be run under any conditions.
*/
Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
Tcl_NewStringObj("~/.wishrc", -1), TCL_GLOBAL_ONLY);
return TCL_OK;
}
/*
* Local Variables:
* mode: c
* c-basic-offset: 4
* fill-column: 78
* End:
*/
|
Changes to win/winMain.c.
| ︙ | ︙ | |||
59 60 61 62 63 64 65 66 67 68 69 70 71 72 | * script, prime the library or encoding paths, fiddle with the argv, etc., * without needing to rewrite Tk_Main() */ #ifdef TK_LOCAL_MAIN_HOOK MODULE_SCOPE int TK_LOCAL_MAIN_HOOK(int *argc, TCHAR ***argv); #endif /* *---------------------------------------------------------------------- * * _tWinMain -- * * Main entry point from Windows. | > > > > | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | * script, prime the library or encoding paths, fiddle with the argv, etc., * without needing to rewrite Tk_Main() */ #ifdef TK_LOCAL_MAIN_HOOK MODULE_SCOPE int TK_LOCAL_MAIN_HOOK(int *argc, TCHAR ***argv); #endif /* Make sure the stubbed variants of those are never used. */ #undef Tcl_ObjSetVar2 #undef Tcl_NewStringObj /* *---------------------------------------------------------------------- * * _tWinMain -- * * Main entry point from Windows. |
| ︙ | ︙ | |||
223 224 225 226 227 228 229 |
/*
* Specify a user-specific startup file to invoke if the application is
* run interactively. Typically the startup file is "~/.apprc" where "app"
* is the name of the application. If this line is deleted then no user-
* specific startup file will be run under any conditions.
*/
| | | 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 |
/*
* Specify a user-specific startup file to invoke if the application is
* run interactively. Typically the startup file is "~/.apprc" where "app"
* is the name of the application. If this line is deleted then no user-
* specific startup file will be run under any conditions.
*/
Tcl_ObjSetVar2(interp, Tcl_NewStringObj("tcl_rcFileName", -1), NULL,
Tcl_NewStringObj("~/wishrc.tcl", -1), TCL_GLOBAL_ONLY);
return TCL_OK;
}
#if defined(TK_TEST)
/*
*----------------------------------------------------------------------
|
| ︙ | ︙ |