having broken Rob's word count update, I guess I should fix it too ;-)

[lyx.git] / src / frontends / xforms / Tooltips.C

diff --git a/src/frontends/xforms/Tooltips.C b/src/frontends/xforms/Tooltips.C
index d49797a3487cea8973d7352c10286e730d7933d3..d5e3defd6f807d3b3d9517f8844809151067f5cb 100644 (file)
--- a/src/frontends/xforms/Tooltips.C
+++ b/src/frontends/xforms/Tooltips.C
@@ -52,12 +52,10 @@ void Tooltips::toggleEnabled()
 void Tooltips::set()
 {
        if (tooltipsMap.empty())
-               // There are no objects with tooltips in this dialog, so
-               // just go away. Don't change the cursor to a question mark.
                return;
 
-       TooltipsMap::iterator it  = tooltipsMap.begin();
-       TooltipsMap::iterator end = tooltipsMap.end();
+       TooltipsMap::const_iterator it  = tooltipsMap.begin();
+       TooltipsMap::const_iterator end = tooltipsMap.end();
        for (; it != end; ++it) {
                FL_OBJECT * const ob = it->first;
                char const * const c_str = enabled_ ? it->second.c_str() : 0;
@@ -70,17 +68,13 @@ void Tooltips::init(FL_OBJECT * ob, string const & tip)
 {
        lyx::Assert(ob && ob->form);
 
-       // Paranoia check!
-       TooltipsMap::const_iterator it = tooltipsMap.find(ob);
-       if (it != tooltipsMap.end())
-               return;
-
-       string const str = trim(tip);
-       if (str.empty())
-               return;
-
        // Store the tooltip string
-       tooltipsMap[ob] = formatted(str, 400);
+       string const str = formatted(trim(tip), 400);
+       tooltipsMap[ob] = str;
+
+       // Set the tooltip
+       char const * const c_str = enabled_ ? str.c_str() : 0;
+       fl_set_object_helper(ob, c_str);
 }