diff options
Diffstat (limited to 'ext/tk/lib/multi-tk.rb')
| -rw-r--r-- | ext/tk/lib/multi-tk.rb | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb index 750a2b79d9..288b5be443 100644 --- a/ext/tk/lib/multi-tk.rb +++ b/ext/tk/lib/multi-tk.rb @@ -306,7 +306,8 @@ class MultiTkIp # check 'display' if !new_keys.key?('display') begin - new_keys['display'] = @interp._eval('winfo screen .') + #new_keys['display'] = @interp._invoke('winfo screen .') + new_keys['display'] = @interp._invoke('winfo', 'screen', '.') rescue if ENV[DISPLAY] new_keys['display'] = ENV[DISPLAY] @@ -323,7 +324,8 @@ class MultiTkIp case new_keys['use'] when TkWindow new_keys['use'] = TkWinfo.id(new_keys['use']) - assoc_display = @interp._eval('winfo screen .') + #assoc_display = @interp._eval('winfo screen .') + assoc_display = @interp._invoke('winfo', 'screen', '.') when /^\..*/ new_keys['use'] = @interp._invoke('winfo', 'id', new_keys['use']) assoc_display = @interp._invoke('winfo', 'screen', new_keys['use']) @@ -925,6 +927,14 @@ class << MultiTkIp __getip._fromUTF8(str, encoding) end + def _thread_vwait(var) + __getip._thread_vwait(var) + end + + def _thread_tkwait(mode, target) + __getip._thread_tkwait(mode, target) + end + def _return_value __getip._return_value end @@ -1039,6 +1049,14 @@ class MultiTkIp @interp._fromUTF8(str, encoding) end + def _thread_vwait(var) + @interp._thread_vwait(var) + end + + def _thread_tkwait(mode, target) + @interp._thread_tkwait(mode, target) + end + def _return_value @interp._return_value end |