diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-06-05 14:03:41 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-06-05 14:03:41 +0000 |
commit | 0e1bb14655658cbbcf5ee9456bb5d37f16241154 (patch) | |
tree | 8bd13da500738f72c52779b5cbd8e17fed541087 /ext | |
parent | 6cb79f15034c484d042b5cc4101439e9c836b1ad (diff) |
* ext/tk/lib/tk/console.rb: create console when required
* ext/tk/sample/tkextlib/tile/demo.rb: fix TypeError & create Console
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/tk/ChangeLog.tkextlib | 4 | ||||
-rw-r--r-- | ext/tk/lib/tk/console.rb | 22 | ||||
-rw-r--r-- | ext/tk/sample/tkextlib/tile/demo.rb | 2 |
3 files changed, 27 insertions, 1 deletions
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib index 7087eea6da..de65828c6d 100644 --- a/ext/tk/ChangeLog.tkextlib +++ b/ext/tk/ChangeLog.tkextlib @@ -1,3 +1,7 @@ +2005-06-05 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * sample/tkextlib/tile/demo.rb: fix TypeError & create Console + 2005-05-30 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * lib/tkextlib/blt.rb: add PACKAGE_NAME information of Tcl/Tk diff --git a/ext/tk/lib/tk/console.rb b/ext/tk/lib/tk/console.rb index 1a267b717c..26ce262caa 100644 --- a/ext/tk/lib/tk/console.rb +++ b/ext/tk/lib/tk/console.rb @@ -7,11 +7,13 @@ module TkConsole include Tk extend Tk - TkCommandNames = ['console'.freeze].freeze + TkCommandNames = ['console'.freeze, 'consoleinterp'.freeze].freeze def self.create TkCore::INTERP._create_console end + self.create # initialize console + def self.title(str=None) tk_call 'console', str end @@ -29,4 +31,22 @@ module TkConsole _fromUTF8(tk_call_without_enc('console', 'eval', _get_eval_enc_str(tcl_script))) end + def self.maininterp_eval(tcl_script) + # + # supports a Tcl script only + # I have no idea to support a Ruby script seamlessly. + # + _fromUTF8(tk_call_without_enc('consoleinterp', 'eval', + _get_eval_enc_str(tcl_script))) + + end + def self.maininterp_record(tcl_script) + # + # supports a Tcl script only + # I have no idea to support a Ruby script seamlessly. + # + _fromUTF8(tk_call_without_enc('consoleinterp', 'record', + _get_eval_enc_str(tcl_script))) + + end end diff --git a/ext/tk/sample/tkextlib/tile/demo.rb b/ext/tk/sample/tkextlib/tile/demo.rb index 7851e879cb..6603304b1f 100644 --- a/ext/tk/sample/tkextlib/tile/demo.rb +++ b/ext/tk/sample/tkextlib/tile/demo.rb @@ -130,6 +130,7 @@ end # updates the scrollbar's position. # def sbstub(sb, cmd, num, units = 'units') + num = TkComm.number(num) case cmd.to_s when 'moveto' sb.set(num, num+0.5) @@ -509,6 +510,7 @@ m_file.add(:checkbutton, :label=>'Text check', :underline=>5, m_file.insert(:end, :separator) if Tk.windowingsystem != 'x11' + TkConsole.create m_file.insert(:end, :checkbutton, :label=>'Console', :underline=>5, :variable=>$V.ref(:CONSOLE), :command=>proc{toggle_console()}) def toggle_console |