From 0a054a5fd8f0b9d3a8c711990953988565593f49 Mon Sep 17 00:00:00 2001 From: nagai Date: Thu, 2 Sep 2004 17:17:20 +0000 Subject: * ext/tcltklib/tcltklib.c: fix typo [ruby-talk:111266] * ext/tk/lib/tk/text.rb: fix typo * ext/tk/lib/multi-tk.rb: improve safe-level treatment on slave IPs git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tcltklib/README.1st | 18 ++++++++++-------- ext/tcltklib/README.ActiveTcl | 4 ++-- ext/tcltklib/tcltklib.c | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) (limited to 'ext/tcltklib') diff --git a/ext/tcltklib/README.1st b/ext/tcltklib/README.1st index 84a7826fdb..4d5cd93283 100644 --- a/ext/tcltklib/README.1st +++ b/ext/tcltklib/README.1st @@ -5,10 +5,10 @@ Tcl/Tk libraries or header files are installed but are not found, you can give the information by arguments of the 'configure' script. Please give some or all of the following options. - --with-tcllib= (e.g. libtcl8.3.so ==> --with-tcllib=tcl8.3) - --with-tklib= (e.g. libtk8.3.so ==> --with-tklib=tk8.3) + --with-tcllib= (e.g. libtcl8.4.so ==> --with-tcllib=tcl8.4) + --with-tklib= (e.g. libtk8.4.so ==> --with-tklib=tk8.4) - --enable-tcltk_stubs (if you force to enable stubs) + --enable-tcltk_stubs (if you force to enable stubs) --with-tcl-dir= equal to "--with-tcl-include=/include --with-tcl-lib=/lib" @@ -16,18 +16,20 @@ some or all of the following options. --with-tk-dir= equal to "--with-tk-include=/include --with-tk-lib=/lib" - --with-tcl-include= the directry containts 'tcl.h' - --with-tk-include= the directry containts 'tk.h' + --with-tcl-include= the directry containts 'tcl.h' + --with-tk-include= the directry containts 'tk.h' - --with-tcl-lib= the directry containts 'libtcl.so' - --with-tk-lib= the directry containts 'libtk.so' + --with-tcl-lib= the directry containts 'libtcl.so' + --with-tk-lib= the directry containts 'libtk.so' + + --enable-mac-tcltk-framework (Mac OSX only) use Tcl/Tk framework If you forgot to give the options when do 'configure' on toplevel directry of Ruby sources, please try something like as the followings. $ cd ext/tcltklib $ rm Makefile - $ CONFIGURE_ARGS='--with-tcl-include=/usr/local/include/tcl8.3/ --with-tcllib=tcl8.3 --with-tklib=tk8.3 --enable-tcltk_stubs' ruby extconf.rb + $ CONFIGURE_ARGS='--with-tcl-include=/usr/local/include/tcl8.4/ --with-tcllib=tcl8.4 --with-tklib=tk8.4' ruby extconf.rb *** ATTENTION *** diff --git a/ext/tcltklib/README.ActiveTcl b/ext/tcltklib/README.ActiveTcl index 42dcc72af5..3afb3f4cf6 100644 --- a/ext/tcltklib/README.ActiveTcl +++ b/ext/tcltklib/README.ActiveTcl @@ -19,8 +19,8 @@ For example, when you install ActiveTcl-8.4.x to '/usr/local/ActiveTcl', configure --with-tcl-dir=/usr/local/ActiveTcl/ \ --with-tk-dir=/usr/local/ActiveTcl/ \ - --with-tcllib=tcl8.4 \ - --with-tklib=tk8.4 \ + --with-tcllib=tclstub8.4 \ + --with-tklib=tkstub8.4 \ --enable-tcltk-stubs It depends on your environment that you have to add the directory of diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c index 3febc43313..b750e55d6f 100644 --- a/ext/tcltklib/tcltklib.c +++ b/ext/tcltklib/tcltklib.c @@ -4139,7 +4139,7 @@ invoke_queue_handler(evPtr, flags) if (rb_safe_level() != q->safe_level) { volatile VALUE q_dat; q_dat = Data_Wrap_Struct(rb_cData,invoke_queue_mark,0,q); - ret = rb_funcall(rb_proc_new(evq_safelevel_handler, q_dat), + ret = rb_funcall(rb_proc_new(ivq_safelevel_handler, q_dat), ID_call, 0); } else { DUMP2("call invoke_real (for caller thread:%lx)", q->thread); -- cgit v1.2.3