diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-09 14:15:24 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-09 14:15:24 +0000 |
commit | 849892636f88dcc25deb90ca738c1c61494df944 (patch) | |
tree | c71d54e68ac35b56d4d3d393c5aa974a12620911 /ext/tk/sample/demos-en | |
parent | 99a6e8a3edaddb1fa065cb601584429bb6dedbe5 (diff) |
* ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
* ext/tk/tcltklib.c: avoid error on a shared object.
* ext/tk/extconf.rb: support --with-tcltkversion
* ext/tk/README.tcltklib: add document about --with-tcltkversion
* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget,
ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb,
ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb:
bug fix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/sample/demos-en')
-rw-r--r-- | ext/tk/sample/demos-en/bind.rb | 2 | ||||
-rw-r--r-- | ext/tk/sample/demos-en/style.rb | 2 | ||||
-rw-r--r-- | ext/tk/sample/demos-en/widget | 21 |
3 files changed, 21 insertions, 4 deletions
diff --git a/ext/tk/sample/demos-en/bind.rb b/ext/tk/sample/demos-en/bind.rb index 5d6ec84edb..d4e6717483 100644 --- a/ext/tk/sample/demos-en/bind.rb +++ b/ext/tk/sample/demos-en/bind.rb @@ -122,4 +122,4 @@ txt = TkText.new($bind_demo){|t| } txt.width 60 -txt.width 24 +txt.height 24 diff --git a/ext/tk/sample/demos-en/style.rb b/ext/tk/sample/demos-en/style.rb index 8606893c9b..06952f41b8 100644 --- a/ext/tk/sample/demos-en/style.rb +++ b/ext/tk/sample/demos-en/style.rb @@ -64,7 +64,7 @@ TkText.new($style_demo){|t| style_tag_bold = TkTextTag.new(t, 'font'=>[family, 12, :bold, :italic]) style_tag_big = TkTextTag.new(t, 'font'=>[family, 14, :bold]) style_tag_verybig = TkTextTag.new(t, 'font'=>['Helvetica', 24, :bold]) - style_tag_small = TkTextTag.new(t, 'font'=>['Times 8 bold']) + style_tag_small = TkTextTag.new(t, 'font'=>'Times 8 bold') end ### # case($tk_version) diff --git a/ext/tk/sample/demos-en/widget b/ext/tk/sample/demos-en/widget index 391d8532b6..4456f8ab5b 100644 --- a/ext/tk/sample/demos-en/widget +++ b/ext/tk/sample/demos-en/widget @@ -257,7 +257,10 @@ the demonstration. Once the demonstration window appears, you can \ click the "See Code" button to see the Ruby/Tk code that created the \ demonstration. If you wish, you can edit the code and click the \ "Rerun Demo" button in the code window to reinvoke the demonstration \ -with the modified code. +with the modified code. \ +Don't worry about breaking the source code. \ +Your modifications are not reflected on the original file. \ +Please try many kind of changes. Some demo scripts require the recent version of Tk library \ (e.g. Tk8.4 or later) \ @@ -266,6 +269,20 @@ required by the demo script, the demo doesn't work. \ In such a case, please re-compile tcltklib with the later Tk library \ which supports the required functions. +If your Tk supports Ttk (Tile) extension (included or installed), \ +please try the demo of Ttk extension (sample/tkextlib/tile/demo.rb) too. +( Probably, Ttk extension \ +#{ +begin + require 'tkextlib/tile' + "is already installed on your environment" +rescue + "is not installed on your environment yet" +end +}\ +. ) +Ttk extension is a standard feature of Tk8.5 or later. + EOT @@ -914,7 +931,7 @@ end # def aboutBox Tk.messageBox('icon'=>'info', 'type'=>'ok', 'title'=>'About Widget Demo', - 'message'=>"Ruby/Tk widget demonstration Ver.1.6.3-en\n\n" + + 'message'=>"Ruby/Tk widget demonstration Ver.1.6.4-en\n\n" + "based on demos of Tk8.1 -- 8.5 " + "( Copyright:: " + "(c) 1996-1997 Sun Microsystems, Inc. / " + |