commit forgotten files.

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

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 90629d100a7107f61eee6c4e67e2c90fe6dc72fd..ab51038e4b02ea0566588b76bfb785b729f9cc73 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-10  Angus Leeming  <leeming@lyx.org>
+
+       * math_gridinset.[Ch] (d-tor): added to ensure that the tabular
+       dialog is hidden when the inset is deleted and the two are connected.
 
 2003-03-05  Ling Li <ling@caltech.edu>
 

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index 26579027a021ea37c2aab4443d85e3db740ae0de..5b05e54b98f10a59cb39a3f399f7a4c43e6b00ff 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -138,6 +138,13 @@ MathGridInset::MathGridInset(col_type m, row_type n, char v, string const & h)
 }
 
 
+MathGridInset::~MathGridInset()
+{
+       GridInsetMailer mailer(*this);
+       mailer.hideDialog();
+}
+
+
 MathInset * MathGridInset::clone() const
 {
        return new MathGridInset(*this);
@@ -1002,7 +1009,7 @@ dispatch_result MathGridInset::dispatch
                                write(ws);
                                GridInsetMailer mailer(*this);
                                lyxerr << "mailer " << mailer.name() << " active\n";
-                               mailer.showDialog();
+                               mailer.showDialog(cmd.view());
                                return DISPATCHED;
                        }
                        break;
@@ -1010,7 +1017,7 @@ dispatch_result MathGridInset::dispatch
 
                case LFUN_INSET_DIALOG_UPDATE: {
                        GridInsetMailer mailer(*this);
-                       mailer.updateDialog();
+                       mailer.updateDialog(cmd.view());
                        break;
                }
 

diff --git a/src/mathed/math_gridinset.h b/src/mathed/math_gridinset.h
index a7df3eb5853802478547a856c1ae4e8e61061aa2..1a94eb36a1d48a07c36962a6c1ae8d3e04d48fa9 100644 (file)
--- a/src/mathed/math_gridinset.h
+++ b/src/mathed/math_gridinset.h
@@ -87,6 +87,8 @@ public:
        MathGridInset(col_type m, row_type n);
        ///
        MathGridInset(col_type m, row_type n, char valign, string const & halign);
+       /// Ensures that the dialog is closed.
+       ~MathGridInset();
        ///
        MathInset * clone() const;
        ///