Changeset 1224

Timestamp:

Nov 18, 2008, 8:25:45 PM (16 years ago)

Author:

gah

Message:

added delete image callback to htmlviewer

File:

• trunk/gui/scripts/htmlviewer.tcl (modified) (3 diffs)

trunk/gui/scripts/htmlviewer.tcl

@@ -53 +53 @@
 
     protected method _getImage {file}
-    private common _icons        ;# maps file name => image handle
+    protected method _freeImage {file}
+    private common _file2icon        ;# maps file name => image handle
+    private common _icon2file        ;# maps image handle => file name
     private variable _dirlist "" ;# list of directories where HTML came from
 }
@@ -320 +322 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::HTMLviewer::_getImage {fileName} {
-    if {[info exists _icons($fileName)]} {
-        return $_icons($fileName)
+    if {[info exists _file2icon($fileName)]} {
+        set imh $_file2icon($fileName)
+        return [list $imh [itcl::code $this _freeImage]]
     }
 
@@ -333 +336 @@
     foreach name $searchlist {
         if {[catch {image create photo -file $name} imh] == 0} {
-            set _icons($fileName) $imh
-            return $imh
+            set _file2icon($fileName) $imh
+            set _icon2file($imh) $fileName
+            return [list $imh [itcl::code $this _freeImage]]
         }
     }
     return [Rappture::icon exclaim]
+}
+
+itcl::body Rappture::HTMLviewer::_freeImage { imh } {
+    if {[info exists _icon2file($imh)]} {
+        image delete $imh
+        set fileName $_icon2file($imh)
+        unset _icon2file($imh)
+        unset _file2icon($fileName)
+    }
 }