Changeset 3634546 in tol for tolbase/lib/renderpane

Timestamp:

Dec 10, 2015, 12:53:36 PM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

e87e769

Parents:

00d6ed4

Message:

Se modifica el uso que se hace del paquete trycatch para evitar incompatibilidades con tcl8.6:

+ No se importan los métodos del paquete
+ Se llaman las llamadas a try haciendo uso del namespace: ::trycatach::try

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

Location:

tolbase/lib/renderpane

Files:

• renderpane.tcl (modified) (2 diffs)
• userprefs.tcl (modified) (2 diffs)

tolbase/lib/renderpane/renderpane.tcl

@@ -4 +4 @@
 package require markupparser
 
-namespace import trycatch::*
+#(pgea) Se utilizará trycatch sin importar sus métodos
+#(pgea) para hacer el código compatible con tcl8.6
+# namespace import trycatch::*
 interp alias {} prefs {} ::Notebook::prefs
 
@@ -813 +815 @@
         }
 
-        try {
+        ::trycatch::try {
             set images [LoadImage $fileName $opts(-width) $opts(-height)]
         } catch -msg msg {

tolbase/lib/renderpane/userprefs.tcl

@@ -139 +139 @@
 
         if {[file exists $fname]} {
-            try {
+            ::trycatch::try {
                 source [PrefFileName]
                 tk scaling $prefs(scaling)
@@ -150 +150 @@
     # Save the preferences and notify observers.
     method save {} {
-        try {
+        ::trycatch::try {
             set f [open [PrefFileName] w]