summaryrefslogtreecommitdiff
path: root/ext/tk/lib
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-09 14:38:15 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-09 14:38:15 +0000
commitedc03a2912b60f319d5b424460f385c9926d3e37 (patch)
treeae22ede91660a9e74cd8282f2cf28aa0d1408118 /ext/tk/lib
parent8edab1a9b47f91ac5b26844ac2890c9eaf163eec (diff)
* overrided instance methods, which are private methods on the super
class, are changed to 'private' git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib')
-rw-r--r--ext/tk/lib/tk.rb26
-rw-r--r--ext/tk/lib/tkcanvas.rb22
-rw-r--r--ext/tk/lib/tkdialog.rb1
-rw-r--r--ext/tk/lib/tkentry.rb2
-rw-r--r--ext/tk/lib/tkscrollbox.rb1
-rw-r--r--ext/tk/lib/tktext.rb3
6 files changed, 55 insertions, 0 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 69c214175a..a73f15e367 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -4458,6 +4458,8 @@ class TkRoot<TkWindow
def create_self
@path = '.'
end
+ private :create_self
+
def path
"."
end
@@ -4626,6 +4628,7 @@ class TkToplevel<TkWindow
tk_call 'toplevel', @path
end
end
+ private :create_self
def specific_class
@classname
@@ -4744,6 +4747,7 @@ class TkFrame<TkWindow
tk_call 'frame', @path
end
end
+ private :create_self
def database_classname
@classname
@@ -4801,6 +4805,7 @@ class TkLabelFrame<TkFrame
tk_call 'labelframe', @path
end
end
+ private :create_self
end
TkLabelframe = TkLabelFrame
@@ -4815,6 +4820,7 @@ class TkPanedWindow<TkWindow
tk_call 'panedwindow', @path
end
end
+ private :create_self
def add(*args)
keys = args.pop
@@ -4929,6 +4935,8 @@ class TkLabel<TkWindow
tk_call 'label', @path
end
end
+ private :create_self
+
def textvariable(v)
configure 'textvariable', tk_trace_variable(v)
end
@@ -4945,6 +4953,8 @@ class TkButton<TkLabel
tk_call 'button', @path
end
end
+ private :create_self
+
def invoke
tk_send 'invoke'
end
@@ -4965,6 +4975,8 @@ class TkRadioButton<TkButton
tk_call 'radiobutton', @path
end
end
+ private :create_self
+
def deselect
tk_send 'deselect'
self
@@ -4990,6 +5002,8 @@ class TkCheckButton<TkRadioButton
tk_call 'checkbutton', @path
end
end
+ private :create_self
+
def toggle
tk_send 'toggle'
self
@@ -5008,6 +5022,7 @@ class TkMessage<TkLabel
tk_call 'message', @path
end
end
+ private :create_self
end
class TkScale<TkWindow
@@ -5026,6 +5041,7 @@ class TkScale<TkWindow
tk_call 'scale', @path
end
end
+ private :create_self
def _wrap_command_arg(cmd)
proc{|val|
@@ -5094,6 +5110,7 @@ class TkScrollbar<TkWindow
tk_call 'scrollbar', @path
end
end
+ private :create_self
def delta(deltax=None, deltay=None)
number(tk_send('delta', deltax, deltay))
@@ -5130,6 +5147,7 @@ class TkTextWin<TkWindow
def create_self
fail RuntimeError, "TkTextWin is an abstract class"
end
+ private :create_self
def bbox(index)
list(tk_send('bbox', index))
@@ -5170,6 +5188,8 @@ module TkTreatListItemFont
def __item_pathname(tagOrId)
self.path + ';' + tagOrId.to_s
end
+
+ private :__conf_cmd, :__item_pathname
end
class TkListbox<TkTextWin
@@ -5187,6 +5207,7 @@ class TkListbox<TkTextWin
tk_call 'listbox', @path
end
end
+ private :create_self
def activate(y)
tk_send 'activate', y
@@ -5338,6 +5359,8 @@ module TkTreatMenuEntryFont
def __item_pathname(tagOrId)
self.path + ';' + tagOrId.to_s
end
+
+ private :__conf_cmd, :__item_pathname
end
class TkMenu<TkWindow
@@ -5354,6 +5377,8 @@ class TkMenu<TkWindow
tk_call 'menu', @path
end
end
+ private :create_self
+
def activate(index)
tk_send 'activate', index
self
@@ -5591,6 +5616,7 @@ class TkMenubutton<TkLabel
tk_call 'menubutton', @path
end
end
+ private :create_self
end
class TkOptionMenubutton<TkMenubutton
diff --git a/ext/tk/lib/tkcanvas.rb b/ext/tk/lib/tkcanvas.rb
index 58177584af..32b5ac7af8 100644
--- a/ext/tk/lib/tkcanvas.rb
+++ b/ext/tk/lib/tkcanvas.rb
@@ -23,6 +23,8 @@ module TkTreatCItemFont
self.path + ';' + tagOrId.to_s
end
end
+
+ private :__conf_cmd, :__item_pathname
end
class TkCanvas<TkWindow
@@ -44,6 +46,7 @@ class TkCanvas<TkWindow
tk_call 'canvas', @path
end
end
+ private :create_self
def tagid(tag)
if tag.kind_of?(TkcItem) || tag.kind_of?(TkcTag)
@@ -701,6 +704,7 @@ class TkcGroup<TkcTag
Tk_cGroup_ID[1].succ!
add(*args) if args != []
end
+ private :create_self
def include(*tags)
for i in tags
@@ -777,6 +781,7 @@ class TkcItem<TkObject
end
def create_self(*args); end
private :create_self
+
def id
@id
end
@@ -795,54 +800,71 @@ class TkcArc<TkcItem
def create_self(*args)
tk_call(@path, 'create', 'arc', *args)
end
+ private :create_self
end
+
class TkcBitmap<TkcItem
CItemTypeToClass['bitmap'] = self
def create_self(*args)
tk_call(@path, 'create', 'bitmap', *args)
end
+ private :create_self
end
+
class TkcImage<TkcItem
CItemTypeToClass['image'] = self
def create_self(*args)
tk_call(@path, 'create', 'image', *args)
end
+ private :create_self
end
+
class TkcLine<TkcItem
CItemTypeToClass['line'] = self
def create_self(*args)
tk_call(@path, 'create', 'line', *args)
end
+ private :create_self
end
+
class TkcOval<TkcItem
CItemTypeToClass['oval'] = self
def create_self(*args)
tk_call(@path, 'create', 'oval', *args)
end
+ private :create_self
end
+
class TkcPolygon<TkcItem
CItemTypeToClass['polygon'] = self
def create_self(*args)
tk_call(@path, 'create', 'polygon', *args)
end
+ private :create_self
end
+
class TkcRectangle<TkcItem
CItemTypeToClass['rectangle'] = self
def create_self(*args)
tk_call(@path, 'create', 'rectangle', *args)
end
+ private :create_self
end
+
class TkcText<TkcItem
CItemTypeToClass['text'] = self
def create_self(*args)
tk_call(@path, 'create', 'text', *args)
end
+ private :create_self
end
+
class TkcWindow<TkcItem
CItemTypeToClass['window'] = self
def create_self(*args)
tk_call(@path, 'create', 'window', *args)
end
+ private :create_self
end
class TkImage<TkObject
diff --git a/ext/tk/lib/tkdialog.rb b/ext/tk/lib/tkdialog.rb
index d5c13dca1a..a581f3becc 100644
--- a/ext/tk/lib/tkdialog.rb
+++ b/ext/tk/lib/tkdialog.rb
@@ -139,6 +139,7 @@ class TkDialog2 < TkWindow
@command.call(self)
end
end
+ private :create_self
def show
if @default_button.kind_of? String
diff --git a/ext/tk/lib/tkentry.rb b/ext/tk/lib/tkentry.rb
index e0589802d2..fe9a7b6277 100644
--- a/ext/tk/lib/tkentry.rb
+++ b/ext/tk/lib/tkentry.rb
@@ -117,6 +117,7 @@ class TkEntry<TkLabel
configure(keys)
end
end
+ private :create_self
def configure(slot, value=None)
if slot.kind_of? Hash
@@ -269,6 +270,7 @@ class TkSpinbox<TkEntry
configure(keys)
end
end
+ private :create_self
def identify(x, y)
tk_send 'identify', x, y
diff --git a/ext/tk/lib/tkscrollbox.rb b/ext/tk/lib/tkscrollbox.rb
index 6236430491..3f1191c740 100644
--- a/ext/tk/lib/tkscrollbox.rb
+++ b/ext/tk/lib/tkscrollbox.rb
@@ -26,4 +26,5 @@ class TkScrollbox<TkListbox
configure keys if keys
end
+ private :initialize_composite
end
diff --git a/ext/tk/lib/tktext.rb b/ext/tk/lib/tktext.rb
index d7cb055a40..44dc6cc3b8 100644
--- a/ext/tk/lib/tktext.rb
+++ b/ext/tk/lib/tktext.rb
@@ -21,6 +21,8 @@ module TkTreatTextTagFont
self.path + ';' + tagOrId
end
end
+
+ private :__conf_cmd, :__item_pathname
end
class TkText<TkTextWin
@@ -57,6 +59,7 @@ class TkText<TkTextWin
end
init_instance_variable
end
+ private :create_self
def index(index)
tk_send 'index', index