Fix broken tooltips.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5396 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/xforms/ChangeLog

@@ -1,3 +1,10 @@
+2002-10-14  Angus Leeming  <leeming@lyx.org>
+
+	* Tooltips.h (set) make it private:
+	* Tooltips.C (set): don't forget to initialise the FL_OBJECT!
+
+	* FormBase.C (show):
+	* FormBaseDeprecated.C (show): no longer invoke Tooltips::set().
 
 2002-10-14  André Pönitz <poenitz@gmx.net>
 

src/frontends/xforms/FormBase.C

@@ -157,10 +157,6 @@ void FormBase::show()
 			     iconify_policy,
 			     maximize_title.c_str());
 	}
-
-	// For some strange reason known only to xforms, the tooltips can only
-	// be set on a form that is already visible...
-	tooltips().set();
 }
 
 

src/frontends/xforms/FormBaseDeprecated.C

@@ -166,10 +166,6 @@ void FormBaseDeprecated::show()
 			     iconify_policy,
 			     maximize_title.c_str());
 	}
-
-	// For some strange reason known only to xforms, the tooltips can only
-	// be set on a form that is already visible...
-	tooltips().set();
 }
 
 

src/frontends/xforms/Tooltips.C

@@ -81,6 +81,10 @@ void Tooltips::init(FL_OBJECT * ob, string const & tip)
 
 	// Store the tooltip string
 	tooltipsMap[ob] = formatted(str, 400);
+
+	// Set the tooltip
+	char const * const c_str = enabled_ ? str.c_str() : 0;
+	fl_set_object_helper(ob, c_str);
 }
 
 

src/frontends/xforms/Tooltips.h

@@ -43,9 +43,6 @@ public:
 	/// Are the tooltips on or off?
 	static bool enabled() { return enabled_; }
 
-	/// This method is connected to the tooltipsToggled signal.
-	void set();
-
 #if FL_VERSION < 1 && FL_REVISION < 89
 
 	/** Return the tooltip associated with this object.
@@ -62,6 +59,9 @@ public:
 
 private:
 
+	/// This method is connected to the Tooltips::toggled signal.
+	void set();
+
 	/// Are the tooltips on or off?
 	static bool enabled_;