John's small fixes to qt2 and xforms + his elegant replacement to FL_TRANSIENT

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index c95d9db1b3ec9404b0b615e32be5e8fcc019ce3e..2f4a7129dbaa26297e5aeb75fb9326da774e9dd7 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-16  John Levon  <moz@compsoc.man.ac.uk>
+
+       * FormParagraph.C: fix bview->update()
+
 2001-01-24  Edwin Leuven  <leuven@fee.uva.nl>
 
        *FormParagraph.C:

diff --git a/src/frontends/qt2/FormParagraph.C b/src/frontends/qt2/FormParagraph.C
index aaabe701ec9c7ea77b49431f8fba2fc3dd8d28d9..6fd2c80864fdb3fd5c1b1674d4dff81f1b67bdf0 100644 (file)
--- a/src/frontends/qt2/FormParagraph.C
+++ b/src/frontends/qt2/FormParagraph.C
@@ -171,7 +171,11 @@ void FormParagraph::apply()
                dialog_->getHfillBetween(),
                dialog_->getStartNewMinipage());
 
-       lv_->view()->update(BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE);
+       lv_->view()->update(lv_->view()->text,
+                           BufferView::SELECT |
+                           BufferView::FITCUR |
+                           BufferView::CHANGE);
+       
        lv_->buffer()->markDirty();
        setMinibuffer(lv_, _("Paragraph layout set"));
 }

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index bb8bac6e05a62393a8243883197f45f118068ee2..c68efe4e1c1388b7e693d2bc136de45d2bcea380 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-23  John Levon  <moz@compsoc.man.ac.uk>
+
+       * FormBase.C: no longer transient dialogs, XMapWindow()
+         in attempt to de-iconify
+
+       * FormDocument.C: remove DO_USE_DEFAULT_LANGUAGE
+
 2001-02-21  Dekel Tsur  <dekelts@tau.ac.il>
 
        * FormDocument.C (checkMarginValues): Activate "use geometry" button 

diff --git a/src/frontends/xforms/FormBase.C b/src/frontends/xforms/FormBase.C
index 3502e471ded2205067777bb825dd21675f5a9ef7..37a9c5db0825513f48f9cd615d38723da363a336 100644 (file)
--- a/src/frontends/xforms/FormBase.C
+++ b/src/frontends/xforms/FormBase.C
@@ -99,13 +99,21 @@ void FormBase::show()
 
        if (form()->visible) {
                fl_raise_form(form());
+               /* This XMapWindow() will hopefully ensure that
+                * iconified dialogs are de-iconified. Mad props
+                * out to those crazy Xlib guys for forgetting a
+                * XDeiconifyWindow(). At least WindowMaker, when
+                * being notified of the redirected MapRequest will
+                * specifically de-iconify. From source, fvwm2 seems
+                * to do the same.
+                */
+               XMapWindow(fl_get_display(), form()->window);
        } else {
                // calls to fl_set_form_minsize/maxsize apply only to the next
                // fl_show_form(), so connect() comes first.
                connect();
                fl_show_form(form(),
-                            FL_PLACE_MOUSE | FL_FREE_SIZE,
-                            FL_TRANSIENT,
+                            FL_PLACE_MOUSE | FL_FREE_SIZE, 0,
                             title.c_str());
        }
 }

diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index 2953743035d09df94bc3da050b27d00358279597..c7aed5ed2024ef208f2fe7803a9bf79dc38a5b4f 100644 (file)
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -223,10 +223,7 @@ void FormDocument::build()
     combo_language->shortcut("#L",1);
     combo_language->setcallback(ComboInputCB, this);
     fl_end_form();
-    // "default" is not part of the languages array any more.
-#ifdef DO_USE_DEFAULT_LANGUAGE
-    combo_language->addto("default");
-#endif
+
     for (Languages::const_iterator cit = languages.begin();
        cit != languages.end(); ++cit) {
        combo_language->addto((*cit).second.lang());