[ruby-dev:26724] Re: refactoring tcltklib.c (deleted ip check)
From:
Hidetoshi NAGAI <nagai@...>
Date:
2005-08-03 04:43:50 UTC
List:
ruby-dev #26724
永井@知能.九工大です.
From: H.Yamamoto <ocean@m2.ccsnet.ne.jp>
Subject: [ruby-dev:26719] Re: refactoring tcltklib.c (deleted ip check)
Date: Wed, 3 Aug 2005 06:11:39 +0900
Message-ID: <20050803061135.5AF2A230.ocean@m2.ccsnet.ne.jp>
> コミットしておきました。
ありがとうございます.
> ところで、最初はまったのですが、Tk::Tile::TButton などは
> 'T' がついているのに、Tk::Tile::Treeview が Tk::Tile::TTreeview でないのは
> 一貫性を欠く気がします。
「歴史的な事情」ですね.(^_^;
最初に tile 拡張の wrapper を作成していた頃は,
Tcl/Tk でのコマンド名が ::tbutton などであったので
そのような名前にしてましたが,より新しいバージョンでは
::ttk::button になったんですよね.
treeview は ::tbutton の頃には存在しなかったので
TTreeview にはなってないと.
まぁ,確かに一貫性を欠くというのは言えそうですので,
以下のような patch ではいかがでしょう?
Index: ext/tk/lib/tkextlib/tile.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile.rb,v
retrieving revision 1.1.2.9
diff -u -r1.1.2.9 tile.rb
--- ext/tk/lib/tkextlib/tile.rb 1 Aug 2005 10:25:50 -0000 1.1.2.9
+++ ext/tk/lib/tkextlib/tile.rb 3 Aug 2005 04:29:49 -0000
@@ -110,39 +110,63 @@
######################################
autoload :TButton, 'tkextlib/tile/tbutton'
+ autoload :Button, 'tkextlib/tile/tbutton'
autoload :TCheckButton, 'tkextlib/tile/tcheckbutton'
+ autoload :CheckButton, 'tkextlib/tile/tcheckbutton'
autoload :TCheckbutton, 'tkextlib/tile/tcheckbutton'
+ autoload :Checkbutton, 'tkextlib/tile/tcheckbutton'
autoload :TEntry, 'tkextlib/tile/tentry'
+ autoload :Entry, 'tkextlib/tile/tentry'
+
autoload :TCombobox, 'tkextlib/tile/tcombobox'
+ autoload :Combobox, 'tkextlib/tile/tcombobox'
autoload :TFrame, 'tkextlib/tile/tframe'
+ autoload :Frame, 'tkextlib/tile/tframe'
+
autoload :TLabelframe, 'tkextlib/tile/tlabelframe'
+ autoload :Labelframe, 'tkextlib/tile/tlabelframe'
autoload :TLabel, 'tkextlib/tile/tlabel'
+ autoload :Label, 'tkextlib/tile/tlabel'
autoload :TMenubutton, 'tkextlib/tile/tmenubutton'
+ autoload :Menubutton, 'tkextlib/tile/tmenubutton'
autoload :TNotebook, 'tkextlib/tile/tnotebook'
+ autoload :Notebook, 'tkextlib/tile/tnotebook'
autoload :TPaned, 'tkextlib/tile/tpaned'
+ autoload :Paned, 'tkextlib/tile/tpaned'
autoload :TProgressbar, 'tkextlib/tile/tprogressbar'
+ autoload :Progressbar, 'tkextlib/tile/tprogressbar'
autoload :TRadioButton, 'tkextlib/tile/tradiobutton'
+ autoload :RadioButton, 'tkextlib/tile/tradiobutton'
autoload :TRadiobutton, 'tkextlib/tile/tradiobutton'
+ autoload :Radiobutton, 'tkextlib/tile/tradiobutton'
autoload :TScale, 'tkextlib/tile/tscale'
+ autoload :Scale, 'tkextlib/tile/tscale'
autoload :TProgress, 'tkextlib/tile/tscale'
+ autoload :Progress, 'tkextlib/tile/tscale'
autoload :TScrollbar, 'tkextlib/tile/tscrollbar'
+ autoload :Scrollbar, 'tkextlib/tile/tscrollbar'
autoload :TSeparator, 'tkextlib/tile/tseparator'
+ autoload :Separator, 'tkextlib/tile/tseparator'
autoload :TSquare, 'tkextlib/tile/tsquare'
+ autoload :Square, 'tkextlib/tile/tsquare'
+ autoload :TTreeview, 'tkextlib/tile/treeview'
autoload :Treeview, 'tkextlib/tile/treeview'
+ autoload :TTreeView, 'tkextlib/tile/treeview'
+ autoload :TreeView, 'tkextlib/tile/treeview'
autoload :Style, 'tkextlib/tile/style'
end
Index: ext/tk/lib/tkextlib/tile/tbutton.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tbutton.rb,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 tbutton.rb
--- ext/tk/lib/tkextlib/tile/tbutton.rb 9 Apr 2005 09:27:26 -0000 1.1.2.4
+++ ext/tk/lib/tkextlib/tile/tbutton.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TButton < TkButton
end
+ Button = TButton
end
end
Index: ext/tk/lib/tkextlib/tile/tcheckbutton.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tcheckbutton.rb,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 tcheckbutton.rb
--- ext/tk/lib/tkextlib/tile/tcheckbutton.rb 9 Apr 2005 09:27:26 -0000 1.1.2.4
+++ ext/tk/lib/tkextlib/tile/tcheckbutton.rb 3 Aug 2005 04:29:49 -0000
@@ -10,6 +10,8 @@
class TCheckButton < TkCheckButton
end
TCheckbutton = TCheckButton
+ CheckButton = TCheckButton
+ Checkbutton = TCheckButton
end
end
Index: ext/tk/lib/tkextlib/tile/tcombobox.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tcombobox.rb,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 tcombobox.rb
--- ext/tk/lib/tkextlib/tile/tcombobox.rb 9 Apr 2005 09:27:26 -0000 1.1.2.2
+++ ext/tk/lib/tkextlib/tile/tcombobox.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TCombobox < Tk::Tile::TEntry
end
+ Combobox = TCombobox
end
end
Index: ext/tk/lib/tkextlib/tile/tentry.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tentry.rb,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 tentry.rb
--- ext/tk/lib/tkextlib/tile/tentry.rb 9 Apr 2005 09:27:26 -0000 1.1.2.2
+++ ext/tk/lib/tkextlib/tile/tentry.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TEntry < TkEntry
end
+ Entry = TEntry
end
end
Index: ext/tk/lib/tkextlib/tile/tframe.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tframe.rb,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 tframe.rb
--- ext/tk/lib/tkextlib/tile/tframe.rb 9 Apr 2005 09:27:26 -0000 1.1.2.2
+++ ext/tk/lib/tkextlib/tile/tframe.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TFrame < TkFrame
end
+ Frame = TFrame
end
end
Index: ext/tk/lib/tkextlib/tile/tlabel.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tlabel.rb,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 tlabel.rb
--- ext/tk/lib/tkextlib/tile/tlabel.rb 9 Apr 2005 09:27:26 -0000 1.1.2.4
+++ ext/tk/lib/tkextlib/tile/tlabel.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TLabel < TkLabel
end
+ Label = TLabel
end
end
Index: ext/tk/lib/tkextlib/tile/tlabelframe.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tlabelframe.rb,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 tlabelframe.rb
--- ext/tk/lib/tkextlib/tile/tlabelframe.rb 9 Apr 2005 09:27:26 -0000 1.1.2.2
+++ ext/tk/lib/tkextlib/tile/tlabelframe.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TLabelframe < Tk::Tile::TFrame
end
+ Labelframe = TLabelframe
end
end
Index: ext/tk/lib/tkextlib/tile/tmenubutton.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tmenubutton.rb,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 tmenubutton.rb
--- ext/tk/lib/tkextlib/tile/tmenubutton.rb 9 Apr 2005 09:27:26 -0000 1.1.2.4
+++ ext/tk/lib/tkextlib/tile/tmenubutton.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TMenubutton < TkMenubutton
end
+ Menubutton = TMenubutton
end
end
Index: ext/tk/lib/tkextlib/tile/tnotebook.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tnotebook.rb,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 tnotebook.rb
--- ext/tk/lib/tkextlib/tile/tnotebook.rb 9 Apr 2005 09:27:26 -0000 1.1.2.4
+++ ext/tk/lib/tkextlib/tile/tnotebook.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TNotebook < TkWindow
end
+ Notebook = TNotebook
end
end
Index: ext/tk/lib/tkextlib/tile/tpaned.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tpaned.rb,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 tpaned.rb
--- ext/tk/lib/tkextlib/tile/tpaned.rb 9 Apr 2005 09:27:26 -0000 1.1.2.1
+++ ext/tk/lib/tkextlib/tile/tpaned.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TPaned < TkWindow
end
+ Paned = TPaned
end
end
Index: ext/tk/lib/tkextlib/tile/tprogressbar.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tprogressbar.rb,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 tprogressbar.rb
--- ext/tk/lib/tkextlib/tile/tprogressbar.rb 2 Aug 2005 11:48:29 -0000 1.1.2.3
+++ ext/tk/lib/tkextlib/tile/tprogressbar.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TProgressbar < TkWindow
end
+ Progressbar = TProgressbar
end
end
Index: ext/tk/lib/tkextlib/tile/tradiobutton.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tradiobutton.rb,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 tradiobutton.rb
--- ext/tk/lib/tkextlib/tile/tradiobutton.rb 9 Apr 2005 09:27:26 -0000 1.1.2.4
+++ ext/tk/lib/tkextlib/tile/tradiobutton.rb 3 Aug 2005 04:29:49 -0000
@@ -10,6 +10,8 @@
class TRadioButton < TkRadioButton
end
TRadiobutton = TRadioButton
+ RadioButton = TRadioButton
+ Radiobutton = TRadioButton
end
end
Index: ext/tk/lib/tkextlib/tile/treeview.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/treeview.rb,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 treeview.rb
--- ext/tk/lib/tkextlib/tile/treeview.rb 2 Aug 2005 21:05:17 -0000 1.1.2.4
+++ ext/tk/lib/tkextlib/tile/treeview.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,9 @@
module Tile
class Treeview < TkWindow
end
+ TTreeview = Treeview
+ TTreeView = Treeview
+ TreeView = Treeview
module TreeviewConfig
include TkItemConfigMethod
Index: ext/tk/lib/tkextlib/tile/tscale.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tscale.rb,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 tscale.rb
--- ext/tk/lib/tkextlib/tile/tscale.rb 9 Apr 2005 09:27:26 -0000 1.1.2.1
+++ ext/tk/lib/tkextlib/tile/tscale.rb 3 Aug 2005 04:29:49 -0000
@@ -9,8 +9,11 @@
module Tile
class TScale < TkScale
end
+ Scale = TScale
+
class TProgress < TScale
end
+ Progress = TProgress
end
end
Index: ext/tk/lib/tkextlib/tile/tscrollbar.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tscrollbar.rb,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 tscrollbar.rb
--- ext/tk/lib/tkextlib/tile/tscrollbar.rb 9 Apr 2005 09:27:26 -0000 1.1.2.2
+++ ext/tk/lib/tkextlib/tile/tscrollbar.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TScrollbar < TkScrollbar
end
+ Scrollbar = TScrollbar
end
end
Index: ext/tk/lib/tkextlib/tile/tseparator.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tseparator.rb,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 tseparator.rb
--- ext/tk/lib/tkextlib/tile/tseparator.rb 9 Apr 2005 09:27:26 -0000 1.1.2.2
+++ ext/tk/lib/tkextlib/tile/tseparator.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TSeparator < TkWindow
end
+ Separator = TSeparator
end
end
Index: ext/tk/lib/tkextlib/tile/tsquare.rb
===================================================================
RCS file: /var/cvs/src/ruby/ext/tk/lib/tkextlib/tile/tsquare.rb,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 tsquare.rb
--- ext/tk/lib/tkextlib/tile/tsquare.rb 9 Apr 2005 09:27:26 -0000 1.1.2.2
+++ ext/tk/lib/tkextlib/tile/tsquare.rb 3 Aug 2005 04:29:49 -0000
@@ -9,6 +9,7 @@
module Tile
class TSquare < TkWindow
end
+ Square = TSquare
end
end
--
永井 秀利 (九工大 知能情報)
nagai@ai.kyutech.ac.jp