fixed FormPreferences hiding bug

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

diff --git a/ChangeLog b/ChangeLog
index 76fba8f415e752c3c7bc1745bdc0e9e332c09d3c..10e1a43ba985081ee7b80a1919ec9751f695d9a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
 2000-10-10  Allan Rae  <rae@lyx.org>
 
-       * src/BufferView_pimpl.C (buffer): don't call upadteBufferDependent
+       * src/frontends/xforms/FormPreferences.[Ch] (hide): Fix the problem
+       with closing dialog.  It seems that nested tabfolders require hiding
+       of inner tabfolders before hiding the dialog itself.  Actually all I
+       did was hide the active outer folder.
+
+       * src/BufferView_pimpl.C (buffer): don't call updateBufferDependent
        unless there really is a buffer.  hideBufferDependent is called
        instead.
 
-       * Makefile.in.in (POTFILES.in): one little tweak to ensure POTFILES.in
-       stays in $(srcdir).
+       * po/Makefile.in.in (POTFILES.in): one little tweak to ensure
+       POTFILES.in stays in $(srcdir).
 
 2000-10-09  Dekel Tsur  <dekelts@tau.ac.il>
 

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 90e7ccf9385e445f87ddbf3114d25a4050411be8..71e760039866dfc8c0c0ffec174dc7b47944c23b 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -55,6 +55,17 @@ FormPreferences::~FormPreferences()
 }
 
 
+void FormPreferences::hide()
+{
+       FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder_prefs);
+       if (outer_form
+           && outer_form->visible) {
+               fl_hide_form(outer_form);
+       }
+       FormBase::hide();
+}
+
+
 void FormPreferences::build()
 {
        dialog_ = build_preferences();

diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h
index a11b653d1d80b4043af4bb96aaee61c97881f3ad..5d376c9f6eb58a59dd12cb3d02eb99668b5a0138 100644 (file)
--- a/src/frontends/xforms/FormPreferences.h
+++ b/src/frontends/xforms/FormPreferences.h
@@ -48,6 +48,8 @@ private:
        virtual void connect();
        /// Update the dialog.
        virtual void update();
+       ///
+       virtual void hide();
        /// OK from dialog
        virtual void ok();
        /// Apply from dialog