From 3367b3120135d52dbda9b108b579dda8d6882140 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 12 Sep 2001 13:12:22 +0000 Subject: [PATCH] tentative fix to docclass combox problems git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2741 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/combox.C | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 2609b3c3c3..a2bb28fd4a 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2001-09-12 Jean-Marc Lasgouttes + + * combox.C (hide): execute the callback _after_ closing the + combox. + 2001-09-12 Angus Leeming * forms/form_citation.fd: remove spurious shortcut to a labelframe! diff --git a/src/frontends/xforms/combox.C b/src/frontends/xforms/combox.C index 8509c4b0f3..3cbebf864d 100644 --- a/src/frontends/xforms/combox.C +++ b/src/frontends/xforms/combox.C @@ -338,8 +338,6 @@ void Combox::hide(int who) } XUngrabPointer(fl_get_display(), 0); XFlush(fl_get_display()); - if (!who && browser && label && callback) - callback(sel, cb_arg, this); if (form) { fl_hide_form(form); XSetInputFocus(fl_get_display(), save_window, @@ -352,6 +350,8 @@ void Combox::hide(int who) fl_redraw_object(button); } } + if (!who && browser && label && callback) + callback(sel, cb_arg, this); if (_post) _post(); }