Changeset 6d788c2 in tol for tolbase/lib/toltk

Timestamp:

Nov 17, 2016, 12:38:12 PM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

606ed76

Parents:

20907d9

Message:

Refs #1933
Continúa [7342]

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7343 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tolbase/lib/toltk

Files:

• init_toltk.tcl (modified) (2 diffs)
• tolbase.tcl (modified) (3 diffs)

tolbase/lib/toltk/init_toltk.tcl

@@ -70 +70 @@
   namespace import msgcat::*
   package require Tktable
-  package require -exact BLT 2.4
+  package require rbc
   package require autoscroll 1.1
   package require tclodbc
@@ -267 +267 @@
 }
 
-if { ![info exists blt_libPath] } {
-  set blt_libPath [file join $toltk_library blt]
-}
-
-if { ![info exists env(BLT_LIBRARY)] } {
-  set env(BLT_LIBRARY) [file join $toltk_library blt]
+if { ![info exists rbc_libPath] } {
+  set rbc_libPath [file join $toltk_library rbc]
+}
+
+if { ![info exists env(RBC_LIBRARY)] } {
+  set env(RBC_LIBRARY) [file join $toltk_library rbc]
 }
 

tolbase/lib/toltk/tolbase.tcl

@@ -15 +15 @@
     lappend auto_path $toltk_library
   }
-  if { ![info exists blt_libPath] } {
-    set blt_libPath [file join $toltk_library blt]
-  }
-  if { ![info exists env(BLT_LIBRARY)] } {
-    set env(BLT_LIBRARY) [file join $toltk_library blt]
+  if { ![info exists rbc_libPath] } {
+    set rbc_libPath [file join $toltk_library rbc]
+  }
+  if { ![info exists env(RBC_LIBRARY)] } {
+    set env(RBC_LIBRARY) [file join $toltk_library rbc]
   }
   package require BWidget
@@ -1150 +1150 @@
        ::TolConsole::NewButtonB $tbTool funsearch [mc "Functions Search"] \
      [list ::funcSearch::Show] $TF
-     #SQL
-     ::TolConsole::NewButtonB $tbTool bysSql [mc "Bayes SQL"] \
-     [list ::SQLTable::TableBayesSQL] $TF
+     #@SQLTable #SQL
+     #@SQLTable ::TolConsole::NewButtonB $tbTool bysSql [mc "Bayes SQL"] \
+     #@SQLTable [list ::SQLTable::TableBayesSQL] $TF
      #Calendar
      ::TolConsole::NewButtonB $tbTool TimeSet [mc "Calendar Expert"] \
@@ -2369 +2369 @@
   
   $md add $id command -label [mc "TOL Inspector"] \
-    -command "$::project::widgets(mainmdi).slave1 restore; $::project::widgets(mainmdi).slave1 raise"
+      -command "$::project::widgets(mainmdi).slave1 restore; $::project::widgets(mainmdi).slave1 raise"
   $md add $id command -label [mc "&Functions Search"] \
       -command "::funcSearch::Show"
   $md add $id command -label [mc "&Calendar Expert"] \
       -command "::CalendarTms::ViewTimeSet"
-  $md add $id command -label [mc "&Bayes SQL"] \
+  #@SQLTable $md add $id command -label [mc "&Bayes SQL"] \
       -command "::SQLTable::TableBayesSQL"