From a6c2a6d1546e467ffe1cf0d2f1f2c0cf3575f976 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 14 Oct 2002 16:43:47 +0000 Subject: [PATCH] Use fl_get_winorigin in preference to fl_get_wingeometry. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5397 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 6 ++++++ src/frontends/xforms/FeedbackController.C | 7 +++---- src/frontends/xforms/combox.C | 5 ++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 20f91375fd..8212116dcf 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,9 @@ +2002-10-08 Angus Leeming + + * FeedbackController.C (PrehandlerCB): + * combox.C (show): use fl_get_winorigin in preference to + fl_get_wingeometry. + 2002-10-14 Angus Leeming * Tooltips.h (set) make it private: diff --git a/src/frontends/xforms/FeedbackController.C b/src/frontends/xforms/FeedbackController.C index 0a77634f19..01dcc2bf29 100644 --- a/src/frontends/xforms/FeedbackController.C +++ b/src/frontends/xforms/FeedbackController.C @@ -92,10 +92,9 @@ void FeedbackController::PrehandlerCB(FL_OBJECT * ob, int event, int key) // 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_ && diff --git a/src/frontends/xforms/combox.C b/src/frontends/xforms/combox.C index 53ae537296..6100cdf17e 100644 --- a/src/frontends/xforms/combox.C +++ b/src/frontends/xforms/combox.C @@ -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;