mirror of
https://github.com/ruby/ruby.git
synced 2025-08-24 21:44:30 +02:00
* ext/tcltklib/tcltklib.c (ip_init): change flag value for setting 'argv' and 'argv0' variable
* ext/tk/lib/remote-tk.rb: follow changes of multi-tk.rb git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ec44b345a5
commit
a4273db675
3 changed files with 43 additions and 2 deletions
|
@ -2884,12 +2884,14 @@ ip_init(argc, argv, self)
|
|||
/* without Tk */
|
||||
with_tk = 0;
|
||||
} else {
|
||||
Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), 0);
|
||||
/* Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), 0); */
|
||||
Tcl_SetVar(ptr->ip, "argv", StringValuePtr(opts), TCL_GLOBAL_ONLY);
|
||||
}
|
||||
case 1:
|
||||
/* argv0 */
|
||||
if (!NIL_P(argv0)) {
|
||||
Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 0);
|
||||
/* Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), 0); */
|
||||
Tcl_SetVar(ptr->ip, "argv0", StringValuePtr(argv0), TCL_GLOBAL_ONLY);
|
||||
}
|
||||
case 0:
|
||||
/* no args */
|
||||
|
@ -2917,6 +2919,7 @@ ip_init(argc, argv, self)
|
|||
|
||||
/* get main window */
|
||||
mainWin = Tk_MainWindow(ptr->ip);
|
||||
Tk_Preserve((ClientData)mainWin);
|
||||
|
||||
/* add ruby command to the interpreter */
|
||||
#if TCL_MAJOR_VERSION >= 8
|
||||
|
@ -3015,6 +3018,8 @@ ip_init(argc, argv, self)
|
|||
(ClientData)mainWin, (Tcl_CmdDeleteProc *)NULL);
|
||||
#endif
|
||||
|
||||
Tk_Release((ClientData)mainWin);
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue