Index: tolbase/lib/toltk/ImageManager.tcl
===================================================================
--- tolbase/lib/toltk/ImageManager.tcl	(revision ab2f6942f6cc27a5b2fcb74a996098cc0ec2dbeb)
+++ tolbase/lib/toltk/ImageManager.tcl	(revision 301385f7608b00fbb89188f4c0bd5b6115c2553f)
@@ -5,5 +5,8 @@
   set rvar "__getImageResourceId__"
   set tolExpr [ string map [ list %N $imageName %RV $rvar ] {
-    Text %RV = GuiTools::ImageManager::getImageResourceId( "%N" );
+    Text %RV = {
+      Real test = ObjectExist( "Code", "GuiTools::ImageManager::getImageResourceId" );
+      Text If( test, GuiTools::ImageManager::getImageResourceId( "%N" ), "" )
+    }
   } ]
   tol::console eval $tolExpr
@@ -13,2 +16,20 @@
   return $value
 }
+
+proc ::ImageManager::getIconForClass { className } {
+  set rvar "__getIconForClass__"
+  set tolExpr [ string map [ list %N $className %RV $rvar ] {
+    Text %RV = {
+      Real test = ObjectExist( "Code", "GuiTools::ImageManager::getIconForClass" );
+      Text imageName = If( test, 
+                           GuiTools::ImageManager::getIconForClass( "%N" ), 
+                           "" );
+      Text GuiTools::ImageManager::getImageResourceId( imageName )
+    }
+  } ]
+  tol::console eval $tolExpr
+  set info [ tol::info variable [ list Text $rvar ] ]
+  set value [ string trim [ lindex $info 2 ] \" ]
+  tol::console stack release $rvar
+  return $value
+}