summaryrefslogtreecommitdiff
path: root/ext/tk/lib/tkextlib/bwidget
diff options
context:
space:
mode:
Diffstat (limited to 'ext/tk/lib/tkextlib/bwidget')
-rw-r--r--ext/tk/lib/tkextlib/bwidget/labelentry.rb6
-rw-r--r--ext/tk/lib/tkextlib/bwidget/listbox.rb12
-rw-r--r--ext/tk/lib/tkextlib/bwidget/notebook.rb6
-rw-r--r--ext/tk/lib/tkextlib/bwidget/spinbox.rb6
-rw-r--r--ext/tk/lib/tkextlib/bwidget/tree.rb12
5 files changed, 28 insertions, 14 deletions
diff --git a/ext/tk/lib/tkextlib/bwidget/labelentry.rb b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
index 1425ef7730..19e92d7ae4 100644
--- a/ext/tk/lib/tkextlib/bwidget/labelentry.rb
+++ b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
@@ -28,7 +28,8 @@ class Tk::BWidget::LabelEntry
# self
#end
def entrybind(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
@@ -42,7 +43,8 @@ class Tk::BWidget::LabelEntry
# self
#end
def entrybind_append(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/bwidget/listbox.rb b/ext/tk/lib/tkextlib/bwidget/listbox.rb
index 7f218c923c..178866f699 100644
--- a/ext/tk/lib/tkextlib/bwidget/listbox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/listbox.rb
@@ -49,7 +49,8 @@ class Tk::BWidget::ListBox
# self
#end
def imagebind(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
@@ -64,7 +65,8 @@ class Tk::BWidget::ListBox
# self
#end
def imagebind_append(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
@@ -88,7 +90,8 @@ class Tk::BWidget::ListBox
# self
#end
def textbind(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
@@ -103,7 +106,8 @@ class Tk::BWidget::ListBox
# self
#end
def textbind_append(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/bwidget/notebook.rb b/ext/tk/lib/tkextlib/bwidget/notebook.rb
index 8888ab224b..01299d2de8 100644
--- a/ext/tk/lib/tkextlib/bwidget/notebook.rb
+++ b/ext/tk/lib/tkextlib/bwidget/notebook.rb
@@ -46,7 +46,8 @@ class Tk::BWidget::NoteBook
# self
#end
def tabbind(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
@@ -61,7 +62,8 @@ class Tk::BWidget::NoteBook
# self
#end
def tabbind_append(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/bwidget/spinbox.rb b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
index 66501ed702..52dfa30abc 100644
--- a/ext/tk/lib/tkextlib/bwidget/spinbox.rb
+++ b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
@@ -27,7 +27,8 @@ class Tk::BWidget::SpinBox
# self
#end
def entrybind(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
@@ -41,7 +42,8 @@ class Tk::BWidget::SpinBox
# self
#end
def entrybind_append(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
diff --git a/ext/tk/lib/tkextlib/bwidget/tree.rb b/ext/tk/lib/tkextlib/bwidget/tree.rb
index 16ca8e8927..dadf3d5161 100644
--- a/ext/tk/lib/tkextlib/bwidget/tree.rb
+++ b/ext/tk/lib/tkextlib/bwidget/tree.rb
@@ -46,7 +46,8 @@ class Tk::BWidget::Tree
# self
#end
def imagebind(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
@@ -61,7 +62,8 @@ class Tk::BWidget::Tree
# self
#end
def imagebind_append(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
@@ -85,7 +87,8 @@ class Tk::BWidget::Tree
# self
#end
def textbind(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new
@@ -100,7 +103,8 @@ class Tk::BWidget::Tree
# self
#end
def textbind_append(context, *args)
- if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+ if TkComm._callback_entry?(args[0])
cmd = args.shift
else
cmd = Proc.new