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 255b40c12313d9a64cced7fa98653dfda73fec18..d5e3defd6f807d3b3d9517f8844809151067f5cb 100644 (file)
--- a/src/frontends/xforms/Tooltips.C
+++ b/src/frontends/xforms/Tooltips.C
@@ -1,9 +1,11 @@
-/*
+/**
  * \file Tooltips.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Angus Leeming, a.leeming@ic.ac.uk
+ * \author Angus Leeming 
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 /* Tooltips for xforms. xforms 0.89 supports them directly, but 0.88 needs
@@ -19,7 +21,6 @@
 #endif
 
 #include "Tooltips.h"
-#include "Dialogs.h"
 #include "xforms_helpers.h" // formatted
 #include "gettext.h"
 #include "support/lstrings.h"
@@ -35,13 +36,8 @@ boost::signal0<void> Tooltips::toggled;
 
 #if FL_VERSION > 0 || FL_REVISION >= 89
 
-Tooltips::Tooltips(Dialogs & d)
+Tooltips::Tooltips()
 {
-       static bool first = true;
-       if (first) {
-               first = false;
-               d.toggleTooltips.connect(boost::bind(&Tooltips::toggleEnabled));
-       }
        toggled.connect(boost::bind(&Tooltips::set, this));
 }
 
@@ -56,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;
@@ -74,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);
 }
 
 
@@ -115,14 +105,9 @@ static void C_TooltipTimerCB(FL_OBJECT * ob, long data)
 }
 
 
-Tooltips::Tooltips(Dialogs & d)
+Tooltips::Tooltips()
        : tooltip_timer_(0)
 {
-       static bool first = true;
-       if (first) {
-               first = false;
-               d.toggleTooltips.connect(boost::bind(&Tooltips::toggleEnabled));
-       }
        toggled.connect(boost::bind(&Tooltips::set, this));
 }