1 files changed, 16 insertions, 6 deletions
diff --git a/ext/tk/sample/demos-en/clrpick.rb b/ext/tk/sample/demos-en/clrpick.rb
index 9486fde314..431439d55d 100644
--- a/ext/tk/sample/demos-en/clrpick.rb
+++ b/ext/tk/sample/demos-en/clrpick.rb
@@ -4,6 +4,8 @@
 #
 # widget demo prompts the user to select a color (called by 'widget')
 #
+#  Note: don't support ttk_wrapper. work with standard widgets only.
+#
 
 # toplevel widget
 if defined?($clrpick_demo) && $clrpick_demo
@@ -18,13 +20,18 @@ $clrpick_demo = TkToplevel.new {|w|
   positionWindow(w)
 }
 
+base_frame = TkFrame.new($clrpick_demo).pack(:fill=>:both, :expand=>true)
+
 # label
-TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+#TkLabel.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
+Tk::Label.new($clrpick_demo,'font'=>$font,'wraplength'=>'4i','justify'=>'left',
             'text'=>"Press the buttons below to choose the foreground and background colors for the widgets in this window.").pack('side'=>'top')
 
 # frame
-TkFrame.new($clrpick_demo) {|frame|
-  TkButton.new(frame) {
+#TkFrame.new($clrpick_demo) {|frame|
+Tk::Frame.new($clrpick_demo) {|frame|
+  # TkButton.new(frame) {
+  Tk::Button.new(frame) {
     text 'Dismiss'
     command proc{
       tmppath = $clrpick_demo
@@ -33,20 +40,23 @@ TkFrame.new($clrpick_demo) {|frame|
     }
   }.pack('side'=>'left', 'expand'=>'yes')
 
-  TkButton.new(frame) {
+  # TkButton.new(frame) {
+  Tk::Button.new(frame) {
     text 'Show Code'
     command proc{showCode 'clrpick'}
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
 # button 
-TkButton.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
+# TkButton.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
+Tk::Button.new($clrpick_demo, 'text'=>'Set background color ...') {|b|
   command(proc{setColor $clrpick_demo, b, 'background', 
               ['background', 'highlightbackground']})
   pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
 }
 
-TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
+# TkButton.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
+Tk::Button.new($clrpick_demo, 'text'=>'Set foreground color ...') {|b|
   command(proc{setColor $clrpick_demo, b, 'foreground', ['foreground']})
   pack('side'=>'top', 'anchor'=>'c', 'pady'=>'2m')
 }