arcadia 0.9.3 → 0.10.0

data/tcl/{BWidget-1.9.2 → bwidget-1.9.4}/buttonbox.tcl

@@ -145,11 +145,16 @@ proc ButtonBox::insert { path idx args } {
 	set args [array get flags]
     }
 
-    eval [list Button::create $but \
-	      -background [Widget::getoption $path -background]\
-	      -padx       [Widget::getoption $path -padx] \
-	      -pady       [Widget::getoption $path -pady]] \
-        $args [list -default $style]
+    if { $::Widget::_theme} {
+        eval [list Button::create $but] \
+            $args [list -default $style]
+	} else {
+        eval [list Button::create $but \
+    	      -background [Widget::getoption $path -background]\
+	          -padx       [Widget::getoption $path -padx] \
+	          -pady       [Widget::getoption $path -pady]] \
+            $args [list -default $style]
+	}
 
     # ericm@scriptics.com:  set up tags, just like the menu items
     foreach tag $tags {

data/tcl/{BWidget-1.9.2 → bwidget-1.9.4}/dialog.tcl

@@ -1,7 +1,7 @@
 # ----------------------------------------------------------------------------
 #  dialog.tcl
 #  This file is part of Unifix BWidget Toolkit
-#  $Id: dialog.tcl,v 1.15 2004/09/24 23:56:59 hobbs Exp $
+#  $Id: dialog.tcl,v 1.15.2.1 2010/08/04 13:07:59 oehhar Exp $
 # ----------------------------------------------------------------------------
 #  Index of commands:
 #     - Dialog::create
@@ -118,7 +118,11 @@ proc Dialog::create { path args } {
     set _widget($path,realized) 0
     set _widget($path,nbut)     0
 
-    bind $path <Escape>  [list ButtonBox::invoke $path.bbox [Widget::getoption $path -cancel]]
+    set cancel [Widget::getoption $path -cancel]
+    bind $path <Escape>  [list ButtonBox::invoke $path.bbox $cancel]
+    if {$cancel != -1} {
+        wm protocol $path WM_DELETE_WINDOW [list ButtonBox::invoke $path.bbox $cancel]
+    }
     bind $path <Return>  [list ButtonBox::invoke $path.bbox default]
 
     return [Widget::create Dialog $path]
@@ -142,6 +146,14 @@ proc Dialog::configure { path args } {
             Separator::configure $path.sep -background $bg
         }
     }
+    if { [Widget::hasChanged $path -cancel cancel] } {
+        bind $path <Escape>  [list ButtonBox::invoke $path.bbox $cancel]
+        if {$cancel == -1} {
+            wm protocol $path WM_DELETE_WINDOW ""
+        } else {
+            wm protocol $path WM_DELETE_WINDOW [list ButtonBox::invoke $path.bbox $cancel]
+        }
+    }
     return $res
 }
 

data/tcl/{BWidget-1.9.2 → bwidget-1.9.4}/init.tcl

@@ -29,7 +29,21 @@ proc Widget::_opt_defaults {{prio widgetDefault}} {
 }
 Widget::_opt_defaults
 
-option read [file join $::BWIDGET::LIBRARY "lang" "en.rc"]
+# Try to load lang file corresponding to current msgcat locale
+proc Widget::_opt_lang {} {
+    set langfile [file join $::BWIDGET::LIBRARY "lang" "en.rc"]
+    if {0 != [llength [info commands ::msgcat::mcpreferences]]} {
+        foreach lang [::msgcat::mcpreferences] {
+            set l [file join $::BWIDGET::LIBRARY "lang" "$lang.rc"]
+            if {[file readable $l]} {
+                set langfile $l
+                break
+            }
+        }
+    }
+    option read $langfile
+}
+Widget::_opt_lang
 
 ## Add a TraverseIn binding to standard Tk widgets to handle some of
 ## the BWidget-specific things we do.

data/tcl/{BWidget-1.9.2 → bwidget-1.9.4}/label.tcl

@@ -1,7 +1,7 @@
 # ------------------------------------------------------------------------------
 #  label.tcl
 #  This file is part of Unifix BWidget Toolkit
-#  $Id: label.tcl,v 1.10 2003/10/20 21:23:52 damonc Exp $
+#  $Id: label.tcl,v 1.10.2.2 2010/11/21 19:35:48 oehhar Exp $
 # ------------------------------------------------------------------------------
 #  Index of commands:
 #     - Label::create
@@ -16,8 +16,13 @@
 namespace eval Label {
     Widget::define Label label DragSite DropSite DynamicHelp
 
-    Widget::tkinclude Label label .l \
-        remove { -foreground -text -textvariable -underline }
+    if {$::Widget::_theme} {
+        Widget::tkinclude Label label .l \
+            remove { -foreground -text -textvariable -underline -state}
+	} else {
+        Widget::tkinclude Label label .l \
+            remove { -foreground -text -textvariable -underline }
+	}
 
     Widget::declare Label {
         {-name               String     ""     0}
@@ -56,21 +61,32 @@ namespace eval Label {
 proc Label::create { path args } {
     array set maps [list Label {} .l {}]
     array set maps [Widget::parseArgs Label $args]
-    frame $path -class Label -borderwidth 0 -highlightthickness 0 -relief flat
+    frame $path -class Label -borderwidth 0 -highlightthickness 0 -relief flat -padx 0 -pady 0
     Widget::initFromODB Label $path $maps(Label)
 
-    eval [list label $path.l] $maps(.l)
+    if {$::Widget::_theme} {
+        eval [list ttk::label $path.l] $maps(.l)
+    } else {
+        eval [list label $path.l] $maps(.l)
+	}
 
-    if { [Widget::cget $path -state] == "normal" } {
-        set fg [Widget::cget $path -foreground]
+    if {$::Widget::_theme} {
+        if { [Widget::cget $path -state] != "normal" } {
+            $path.l state disabled
+		}
     } else {
-        set fg [Widget::cget $path -disabledforeground]
-    }
+        if { [Widget::cget $path -state] == "normal" } {
+            set fg [Widget::cget $path -foreground]
+        } else {
+            set fg [Widget::cget $path -disabledforeground]
+        }
+        $path.l configure -foreground $fg
+	}
 
     set var [Widget::cget $path -textvariable]
     if {  $var == "" &&
           [Widget::cget $path -image] == "" &&
-          [Widget::cget $path -bitmap] == ""} {
+          ($::Widget::_theme || [Widget::cget $path -bitmap] == "")} {
         set desc [BWidget::getname [Widget::cget $path -name]]
         if { $desc != "" } {
             set text  [lindex $desc 0]
@@ -85,7 +101,7 @@ proc Label::create { path args } {
     }
 
     $path.l configure -text $text -textvariable $var \
-	    -underline $under -foreground $fg
+	    -underline $under
 
     set accel [string tolower [string index $text $under]]
     if { $accel != "" } {
@@ -118,20 +134,38 @@ proc Label::configure { path args } {
     set res [Widget::configure $path $args]
 
     set cfg  [Widget::hasChanged $path -foreground fg]
-    set cdfg [Widget::hasChanged $path -disabledforeground dfg]
     set cst  [Widget::hasChanged $path -state state]
 
-    if { $cst || $cfg || $cdfg } {
-        if { $state == "normal" } {
+    if {$::Widget::_theme} {
+        if { $cfg } {
             $path.l configure -fg $fg
-        } else {
-            $path.l configure -fg $dfg
         }
-    }
+        if { $cst } {
+            if { $state == "normal" } {
+                $path.l state !disabled
+            } else {
+                $path.l state disabled
+            }
+        }
+    } else {
+        set cdfg [Widget::hasChanged $path -disabledforeground dfg]
+        if { $cst || $cfg || $cdfg } {
+            if { $state == "normal" } {
+                $path.l configure -fg $fg
+            } else {
+                $path.l configure -fg $dfg
+            }
+        }
+	}
 
     set cv [Widget::hasChanged $path -textvariable var]
     set cb [Widget::hasChanged $path -image img]
-    set ci [Widget::hasChanged $path -bitmap bmp]
+    if {$::Widget::_theme} {
+        set ci 0
+        set bmp ""
+	} else {
+        set ci [Widget::hasChanged $path -bitmap bmp]
+	}
     set cn [Widget::hasChanged $path -name name]
     set ct [Widget::hasChanged $path -text text]
     set cu [Widget::hasChanged $path -underline under]
@@ -175,6 +209,30 @@ proc Label::cget { path option } {
 }
 
 
+# ----------------------------------------------------------------------------
+#  Command Label::identify
+# ----------------------------------------------------------------------------
+proc Label::identify { path args } {
+    eval $path.l identify $args
+}
+
+
+# ----------------------------------------------------------------------------
+#  Command Label::instate
+# ----------------------------------------------------------------------------
+proc Label::instate { path args } {
+    eval $path.l instate $args
+}
+
+
+# ----------------------------------------------------------------------------
+#  Command Label::state
+# ----------------------------------------------------------------------------
+proc Label::state { path args } {
+    eval $path.l state $args
+}
+
+
 # ------------------------------------------------------------------------------
 #  Command Label::setfocus
 # ------------------------------------------------------------------------------

data/tcl/{BWidget-1.9.2 → bwidget-1.9.4}/mainframe.tcl

@@ -1,7 +1,7 @@
 # ----------------------------------------------------------------------------
 #  mainframe.tcl
 #  This file is part of Unifix BWidget Toolkit
-#  $Id: mainframe.tcl,v 1.24 2009/07/01 14:41:30 oehhar Exp $
+#  $Id: mainframe.tcl,v 1.24.2.1 2010/11/09 16:05:43 oehhar Exp $
 # ------------------------------------------------------------------------------
 #  Index of commands:
 #     - MainFrame::create
@@ -518,7 +518,8 @@ proc MainFrame::_create_menubar { path descmenu } {
 	}
     }
 
-    if {![Widget::theme] && $tcl_platform(platform) == "unix"} {
+    if { ![Widget::theme] && $tcl_platform(platform) == "unix"
+        && [tk windowingsystem] !="aqua" } {
 	set menuopts [list -background [Widget::getoption $path -background] \
 			  -borderwidth 1]
     } else {

data/tcl/{BWidget-1.9.2 → bwidget-1.9.4}/pkgIndex.tcl

@@ -1,7 +1,7 @@
 if {[catch {package require Tcl}]} return
-package ifneeded BWidget 1.9.2 "\
+package ifneeded BWidget 1.9.4 "\
     package require Tk 8.1.1;\
-    [list tclPkgSetup $dir BWidget 1.9.2 {
+    [list tclPkgSetup $dir BWidget 1.9.4 {
 {arrow.tcl source {ArrowButton ArrowButton::create ArrowButton::use}}
 {labelframe.tcl source {LabelFrame LabelFrame::create LabelFrame::use}}
 {labelentry.tcl source {LabelEntry LabelEntry::create LabelEntry::use}}

data/tcl/{BWidget-1.9.2 → bwidget-1.9.4}/scrollw.tcl

@@ -1,7 +1,7 @@
 # -----------------------------------------------------------------------------
 #  scrollw.tcl
 #  This file is part of Unifix BWidget Toolkit
-#  $Id: scrollw.tcl,v 1.13 2009/06/29 13:28:24 oehhar Exp $
+#  $Id: scrollw.tcl,v 1.13.2.1 2010/11/23 08:21:17 oehhar Exp $
 # -----------------------------------------------------------------------------
 #  Index of commands:
 #     - ScrolledWindow::create
@@ -47,21 +47,31 @@ proc ScrolledWindow::create { path args } {
 
     set bg     [Widget::cget $path -background]
     set sbsize [Widget::cget $path -size]
-    set sw     [eval [list frame $path \
-			  -relief flat -borderwidth 0 -background $bg \
-			  -highlightthickness 0 -takefocus 0] \
-		    [Widget::subcget $path :cmd]]
-
-    scrollbar $path.hscroll \
-	    -highlightthickness 0 -takefocus 0 \
-	    -orient	 horiz	\
-	    -relief	 sunken	\
-	    -bg	 $bg
-    scrollbar $path.vscroll \
-	    -highlightthickness 0 -takefocus 0 \
-	    -orient	 vert	\
-	    -relief	 sunken	\
-	    -bg	 $bg
+
+    if { $::Widget::_theme } {
+        set sw     [eval [list ttk::frame $path \
+                      -relief flat -borderwidth 0 -takefocus 0] \
+                        [Widget::subcget $path :cmd]]
+        ttk::scrollbar $path.hscroll \
+            -takefocus 0 -orient horiz
+        ttk::scrollbar $path.vscroll \
+            -takefocus 0 -orient vert
+    } else {
+        set sw     [eval [list frame $path \
+                      -relief flat -borderwidth 0 -background $bg \
+                      -highlightthickness 0 -takefocus 0] \
+                        [Widget::subcget $path :cmd]]
+        scrollbar $path.hscroll \
+            -highlightthickness 0 -takefocus 0 \
+            -orient	 horiz	\
+            -relief	 sunken	\
+            -bg	 $bg
+        scrollbar $path.vscroll \
+            -highlightthickness 0 -takefocus 0 \
+            -orient	 vert	\
+            -relief	 sunken	\
+            -bg	 $bg
+    }
 
     set data(realized) 0
 
@@ -77,11 +87,13 @@ proc ScrolledWindow::create { path args } {
 	set data(hsb,packed) 0
 	set data(vsb,packed) 0
     }
-    if {$sbsize} {
-	$path.vscroll configure -width $sbsize
-	$path.hscroll configure -width $sbsize
-    } else {
-	set sbsize [$path.vscroll cget -width]
+    if { ! $::Widget::_theme } {
+        if {$sbsize} {
+            $path.vscroll configure -width $sbsize
+            $path.hscroll configure -width $sbsize
+        } else {
+            set sbsize [$path.vscroll cget -width]
+        }
     }
     set data(ipad) [Widget::cget $path -ipad]
 
@@ -141,10 +153,10 @@ proc ScrolledWindow::configure { path args } {
     Widget::getVariable $path data
 
     set res [Widget::configure $path $args]
-    if { [Widget::hasChanged $path -background bg] } {
-	$path configure -background $bg
-	catch {$path.hscroll configure -background $bg}
-	catch {$path.vscroll configure -background $bg}
+    if { ! $::Widget::_theme && [Widget::hasChanged $path -background bg] } {
+        $path configure -background $bg
+        catch {$path.hscroll configure -background $bg}
+        catch {$path.vscroll configure -background $bg}
     }
 
     if {[Widget::hasChanged $path -scrollbar scrollbar] | \