merge updates from HEAD

1 files changed, 33 insertions, 34 deletions

diff --git a/library/ttk/altTheme.tcl b/library/ttk/altTheme.tcl
index d892175..e752fce 100644
--- a/library/ttk/altTheme.tcl
+++ b/library/ttk/altTheme.tcl
@@ -1,5 +1,5 @@
 #
-# $Id: altTheme.tcl,v 1.3.2.1 2007/11/21 16:46:27 dgp Exp $
+# $Id: altTheme.tcl,v 1.3.2.2 2007/12/10 18:39:30 dgp Exp $
 #
 # Ttk widget set: Alternate theme
 #
@@ -17,10 +17,9 @@ namespace eval ttk::theme::alt {
 	-selectfg	"#ffffff"
     }
 
-    namespace import -force ::ttk::style
-    style theme settings alt {
+    ttk::style theme settings alt {
 
-	style configure "." \
+	ttk::style configure "." \
 	    -background 	$colors(-frame) \
 	    -foreground 	black \
 	    -troughcolor	$colors(-darker) \
@@ -29,74 +28,74 @@ namespace eval ttk::theme::alt {
 	    -font 		TkDefaultFont \
 	    ;
 
-	style map "." -background \
+	ttk::style map "." -background \
 	    [list disabled $colors(-frame)  active $colors(-activebg)] ;
-	style map "." -foreground [list disabled $colors(-disabledfg)] ;
-        style map "." -embossed [list disabled 1] ;
+	ttk::style map "." -foreground [list disabled $colors(-disabledfg)] ;
+        ttk::style map "." -embossed [list disabled 1] ;
 
-	style configure TButton \
+	ttk::style configure TButton \
 	    -anchor center -width -11 -padding "1 1" \
 	    -relief raised -shiftrelief 1 \
 	    -highlightthickness 1 -highlightcolor $colors(-frame)
 
-	style map TButton -relief {
+	ttk::style map TButton -relief {
 	    {pressed !disabled} 	sunken
 	    {active !disabled} 	raised
 	} -highlightcolor {alternate black}
 
-	style configure TCheckbutton -indicatorcolor "#ffffff" -padding 2
-	style configure TRadiobutton -indicatorcolor "#ffffff" -padding 2
-	style map TCheckbutton -indicatorcolor \
+	ttk::style configure TCheckbutton -indicatorcolor "#ffffff" -padding 2
+	ttk::style configure TRadiobutton -indicatorcolor "#ffffff" -padding 2
+	ttk::style map TCheckbutton -indicatorcolor \
 	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
-	style map TRadiobutton -indicatorcolor \
+	ttk::style map TRadiobutton -indicatorcolor \
 	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
 
-	style configure TMenubutton \
+	ttk::style configure TMenubutton \
 	    -width -11 -padding "3 3" -relief raised
 
-	style configure TEntry -padding 1
-	style map TEntry -fieldbackground \
+	ttk::style configure TEntry -padding 1
+	ttk::style map TEntry -fieldbackground \
 		[list readonly $colors(-frame) disabled $colors(-frame)]
-	style configure TCombobox -padding 1
-	style map TCombobox -fieldbackground \
+	ttk::style configure TCombobox -padding 1
+	ttk::style map TCombobox -fieldbackground \
 		[list readonly $colors(-frame) disabled $colors(-frame)]
 
-	style configure Toolbutton -relief flat -padding 2
-	style map Toolbutton -relief \
+	ttk::style configure Toolbutton -relief flat -padding 2
+	ttk::style map Toolbutton -relief \
 	    {disabled flat selected sunken pressed sunken active raised}
-	style map Toolbutton -background \
+	ttk::style map Toolbutton -background \
 	    [list pressed $colors(-darker)  active $colors(-activebg)]
 
-	style configure TScrollbar -relief raised
+	ttk::style configure TScrollbar -relief raised
 
-	style configure TLabelframe -relief groove -borderwidth 2
+	ttk::style configure TLabelframe -relief groove -borderwidth 2
 
-	style configure TNotebook -tabmargins {2 2 1 0}
-	style configure TNotebook.Tab \
+	ttk::style configure TNotebook -tabmargins {2 2 1 0}
+	ttk::style configure TNotebook.Tab \
 	    -padding {4 2} -background $colors(-darker)
-	style map TNotebook.Tab \
+	ttk::style map TNotebook.Tab \
 	    -background [list selected $colors(-frame)] \
 	    -expand [list selected {2 2 1 0}] \
 	    ;
 
 	# Treeview:
-	style configure Heading -font TkHeadingFont -relief raised
-	style configure Row -background $colors(-window)
-	style configure Cell -background $colors(-window)
-	style map Row \
+	ttk::style configure Heading -font TkHeadingFont -relief raised
+	ttk::style configure Row -background $colors(-window)
+	ttk::style configure Cell -background $colors(-window)
+	ttk::style map Row \
 	    -background [list selected $colors(-selectbg)] \
 	    -foreground [list selected $colors(-selectfg)] ;
-	style map Cell \
+	ttk::style map Cell \
 	    -background [list selected $colors(-selectbg)] \
 	    -foreground [list selected $colors(-selectfg)] ;
-	style map Item \
+	ttk::style map Item \
 	    -background [list selected $colors(-selectbg)] \
 	    -foreground [list selected $colors(-selectfg)] ;
 
-	style configure TScale \
+	ttk::style configure TScale \
 	    -groovewidth 4 -troughrelief sunken \
 	    -sliderwidth raised -borderwidth 2
-	style configure TProgressbar \
+	ttk::style configure TProgressbar \
 	    -background $colors(-selectbg) -borderwidth 0
     }
 }