From: Angus Leeming <leeming@lyx.org>
Date: Wed, 20 Mar 2002 12:36:14 +0000 (+0000)
Subject: Rename Help->What's this? as Help->Tooltips.
X-Git-Tag: 1.6.10~19612
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8eeed19540ddb3aa051e307645a0930db3d7c1d7;p=lyx.git

Rename Help->What's this? as Help->Tooltips.
Don't change the cursor to a ? when the tooltips are enabled.


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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 9147c7b612..f2c15b6cf2 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-20  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* ui/default.ui: Change "What's this?" to "Tooltips".
+
 2002-03-19  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* create_fonts_dir: 
diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index 7781300158..f7c1b0ec3f 100644
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -316,7 +316,7 @@ Menuset
 # HELP MENU
 #
     Menu "help"
-	Item "What's this?|W" "toggle-tooltips"
+	Item "Tooltips|o" "toggle-tooltips"
         Separator
 	Item "Introduction|I" "help-open Intro"
 	Item "Tutorial|T" "help-open Tutorial"
diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 899e332e5f..bad395c44e 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-20  Angus Leeming  <a.leeming@ic.ac.uk>
+
+	* xforms_helpers.C (setCursorColor):
+	* Tooltips.C (set): remove XC_question_arrow code.
+
 2002-03-19  André Pönitz <poenitz@gmx.net>
 
 	* FormParagraph.C: whitespace changes
@@ -7,7 +12,7 @@
 	* Tooltips.[Ch] (initTooltip): renamed init. In the 0.89 version, no
 	longer call fl_set_object_helper as this routine respects line breaks
 	only if the dialog is visible.
-	(getTooltip): renamed  get.
+	(getTooltip): renamed get.
 	(toggleTooltips): renamed set and made public,
 	
 	* FormBase.C (show):
diff --git a/src/frontends/xforms/Tooltips.C b/src/frontends/xforms/Tooltips.C
index 545dffc48f..fb1283163f 100644
--- a/src/frontends/xforms/Tooltips.C
+++ b/src/frontends/xforms/Tooltips.C
@@ -67,16 +67,6 @@ void Tooltips::set()
 		char const * const c_str = enabled_ ? it->second.c_str() : 0;
 		fl_set_object_helper(ob, c_str);
 	}
-
-	FL_OBJECT * const ob = tooltipsMap.begin()->first;
-
-	// The dialog is not visible
-	if (!ob->form->window)
-		return;
-
-	// Set the cursor to a question mark or back to the default.
-	int const cursor = enabled_ ? XC_question_arrow : FL_DEFAULT_CURSOR;
-	fl_set_cursor(ob->form->window, cursor);
 }
 
 
@@ -145,22 +135,7 @@ 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;
-
-	FL_OBJECT * const ob = tooltipsMap.begin()->first;
-
-	// The dialog is not visible
-	if (!ob->form->window)
-		return;
-
-	// Set the cursor to a question mark or back to the default.
-	int const cursor = enabled_ ? XC_question_arrow : FL_DEFAULT_CURSOR;
-	fl_set_cursor(ob->form->window, cursor);
-}
+{}
 
 
 void Tooltips::init(FL_OBJECT * ob, string const & tip)
diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C
index c6dd5bc457..fbf3287c47 100644
--- a/src/frontends/xforms/xforms_helpers.C
+++ b/src/frontends/xforms/xforms_helpers.C
@@ -418,7 +418,6 @@ string formatted(string const & sin, int w, int size, int style)
 void setCursorColor(int color)
 {
 	fl_set_cursor_color(FL_DEFAULT_CURSOR, color, FL_WHITE);
-	fl_set_cursor_color(XC_question_arrow, color, FL_WHITE);
 	fl_set_cursor_color(XC_xterm,          color, FL_WHITE);
 	fl_set_cursor_color(XC_watch,          color, FL_WHITE);
 	fl_set_cursor_color(XC_sb_right_arrow, color, FL_WHITE);