Cleaning out my tree so that I can post a proper patch for those 
broken tooltips...

Just using the right xforms call in my work-around for proken 
tabfolders. Ok to apply?

Angus
? xforms.diff
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.558
diff -u -p -r1.558 ChangeLog
--- ChangeLog	14 Oct 2002 13:25:15 -0000	1.558
+++ ChangeLog	14 Oct 2002 15:53:48 -0000
@@ -1,3 +1,8 @@
+2002-10-08  Angus Leeming  <[EMAIL PROTECTED]>
+
+	* FeedbackController.C (PrehandlerCB):
+	* combox.C (show): use fl_get_winorigin in preference to
+	fl_get_wingeometry.
 
 2002-10-14  Andr� P�nitz <[EMAIL PROTECTED]>
 
Index: FeedbackController.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FeedbackController.C,v
retrieving revision 1.15
diff -u -p -r1.15 FeedbackController.C
--- FeedbackController.C	4 Oct 2002 13:48:36 -0000	1.15
+++ FeedbackController.C	14 Oct 2002 15:53:48 -0000
@@ -92,10 +92,9 @@ void FeedbackController::PrehandlerCB(FL
 		// in case the FL_ENTER event is not caught.
 
 		FL_FORM * const folder = fl_get_active_folder(ob);
-		if (folder->window) {
-			FL_Coord w, h;
-			fl_get_wingeometry(folder->window,
-					   &(folder->x), &(folder->y), &w, &h);
+		if (folder && folder->window) {
+			fl_get_winorigin(folder->window,
+					 &(folder->x), &(folder->y));
 		}
 
 	} else if (message_widget_ &&
Index: combox.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/combox.C,v
retrieving revision 1.18
diff -u -p -r1.18 combox.C
--- combox.C	4 Oct 2002 10:39:01 -0000	1.18
+++ combox.C	14 Oct 2002 15:53:49 -0000
@@ -290,10 +290,9 @@ void Combox::show()
 	// Angus 4 Oct, 2002.
 	if (label->form->window) {
 		FL_FORM * lf = label->form;
-		FL_Coord w, h;
-		fl_get_wingeometry(lf->window, &(lf->x), &(lf->y), &w, &h);
+		fl_get_winorigin(lf->window, &(lf->x), &(lf->y));
 	}
-	
+
 	int const x = label->form->x + label->x;
 	int const y = label->form->y + label->y + label->h;
 

Reply via email to