Changeset 4906 for trunk/gsdl/src/recpt/vlistbrowserclass.cpp

Timestamp:

2003-07-12T08:58:10+12:00 (21 years ago)

Author:

sjboddie

Message:

Replaced overloaded get_formatted_string() functions in formattools with
a single function by using a text_tmap in place of the old link, text,
icon, and highlight variables.

File:

• trunk/gsdl/src/recpt/vlistbrowserclass.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -83 +83 @@
   }
 
+  text_tmap options;
+  options["link"] = link;
+  options["icon"] = icon;
+  if (highlight) options["highlight"] = "1";
+  else options["highlight"] = "0";
   textout << outconvert << disp 
       << get_formatted_string (collection, collectproto, 
                    section, disp, formatlistptr, 
-                   link, icon, highlight, logout);
+                   options, logout);
   
   if (use_table  || colnumber > 0) textout << outconvert << "</tr></table>\n";
@@ -127 +132 @@
   int item = 0, perline;; // set perline to 1 normally
   text_t fstring;
+
+  text_tmap options;
+  options["link"] = link;
+  options["icon"] = icon;
+  options["highlight"] = "0";
+
   if ( thissection != endsection ) { // only if there are results (else corrupts display)
-    fstring = 
-      get_formatted_string (collection, collectproto, 
-                *thissection, disp, formatlistptr, link, icon, false, logout);
+    fstring = get_formatted_string (collection, collectproto, *thissection,
+                                    disp, formatlistptr, options, logout);
     // if format string
     // has <td><t (e.g. <td><table>) then
@@ -152 +162 @@
       textout << outconvert << "<tr valign=top>\n";
 
+    options["link"] = link;
+    options["icon"] = icon;
+    if (highlight) options["highlight"] = "1";
+    else options["highlight"] = "0";
+    
     textout << outconvert << disp 
         << " " << get_formatted_string (collection, collectproto, *thissection, disp,
-                        formatlistptr, link, icon, highlight, logout);
+                        formatlistptr, options, logout);
 
     if ((item >= perline && use_table) || colnumber > 0) {