aboutsummaryrefslogtreecommitdiffstats
path: root/ext/tk
diff options
context:
space:
mode:
Diffstat (limited to 'ext/tk')
-rw-r--r--ext/tk/lib/tk.rb25
-rw-r--r--ext/tk/lib/tkfont.rb4
2 files changed, 2 insertions, 27 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 967d185053..26b3dca034 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -1564,31 +1564,6 @@ module TkXIM
end
end
-module TkXIM
- include Tk
- extend Tk
-
- def TkXIM.useinputmethods(window=nil,value=nil)
- if window
- if value
- tk_call 'tk', 'useinputmethods', '-displayof', window.path, value
- else
- tk_call 'tk', 'useinputmethods', '-displayof', window.path
- end
- else
- if value
- tk_call 'tk', 'useinputmethods', value
- else
- tk_call 'tk', 'useinputmethods'
- end
- end
- end
-
- def useinputmethods(value=nil)
- TkXIM.useinputmethods(self,value)
- end
-end
-
module TkWinfo
include Tk
extend Tk
diff --git a/ext/tk/lib/tkfont.rb b/ext/tk/lib/tkfont.rb
index 65842e0188..c44b215ee9 100644
--- a/ext/tk/lib/tkfont.rb
+++ b/ext/tk/lib/tkfont.rb
@@ -691,10 +691,10 @@ class TkFont
def metrics_core_tk8x(font, window, option=nil)
if option
if window
- number(tk_call('font', 'metrics', font, "-#{option}"))
- else
number(tk_call('font', 'metrics', font,
"-displayof", window, "-#{option}"))
+ else
+ number(tk_call('font', 'metrics', font, "-#{option}"))
end
else
l = tk_split_list(if window