Fix a few portaibility issues and a crash.

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

diff --git a/ChangeLog b/ChangeLog
index 6de26b0ab1ed079ba009c1e357b8cee0b46a3025..467c37c17bbb3ee061fc40a03991cab8a53a9870 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-06-28  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/insets/insetindex.C (Edit): add a callback when popup is
+       closed by the WM.
+
+       * src/insets/insettext.C (LocalDispatch): 
+       * src/insets/insetmarginal.h: 
+       * src/insets/insetlist.h: 
+       * src/insets/insetfoot.h: 
+       * src/insets/insetfloat.h: 
+       * src/insets/insetert.h: add a missing std:: qualifier.
+
 2000-06-28  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/support/lyxsum.C (sum): '\0' teminate file read when using

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e7da1a54f5119452041a298eb8cb0b8f3aa057a9..e913ba6d600ce2f1352fae7ea498b85a87f4cf5f 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,16 +41,19 @@ src/insets/insetcite.C
 src/insets/inseterror.C
 src/insets/insetert.C
 src/insets/insetexternal.C
+src/insets/insetfloat.C
 src/insets/insetfoot.C
 src/insets/insetgraphics.C
 src/insets/insetinclude.C
 src/insets/insetindex.C
 src/insets/insetinfo.C
 src/insets/insetlabel.C
+src/insets/insetlist.C
 src/insets/insetloa.C
 src/insets/insetlof.C
 src/insets/insetlot.C
 src/insets/insetmarginal.C
+src/insets/insetminipage.C
 src/insets/insetparent.C
 src/insets/insetref.C
 src/insets/insettabular.C

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 1a2c53d02e18c87dea6ce55543b70a33820d98a8..43deb1c0e8dcf6d99e8ff2cb9108c45c7b139f7e 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -34,7 +34,7 @@ public:
        ///
        ~InsetERT() {}
        ///
-       void Write(Buffer const * buf, ostream & os) const;
+       void Write(Buffer const * buf, std::ostream & os) const;
        ///
        Inset * Clone() const;
        ///

diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h
index 960ed603f2fa1f9f2c1fb7709e588b98913b6bc1..b76d4e0241a0905443ce2120885a92a1f79b5df7 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -31,7 +31,7 @@ public:
        ///
        ~InsetFloat() {}
        ///
-       void Write(Buffer const * buf, ostream & os) const;
+       void Write(Buffer const * buf, std::ostream & os) const;
        ///
        void Read(Buffer const * buf, LyXLex & lex);
        ///

diff --git a/src/insets/insetfoot.h b/src/insets/insetfoot.h
index 33f3eac1ade37b0414f24a52ba456462bd3d0cc6..0f417281d1561761b227b0773c3772100c98efdc 100644 (file)
--- a/src/insets/insetfoot.h
+++ b/src/insets/insetfoot.h
@@ -33,7 +33,7 @@ public:
        ///
        ~InsetFoot() {}
        ///
-       void Write(Buffer const * buf, ostream & os) const;
+       void Write(Buffer const * buf, std::ostream & os) const;
        ///
        Inset * Clone() const;
        ///

diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C
index 03e844d5d5021a270962d923aea1780bfa19b1aa..2ae9f5d22f40e720af18f20d9c84214338d5b399 100644 (file)
--- a/src/insets/insetindex.C
+++ b/src/insets/insetindex.C
@@ -90,9 +90,11 @@ void InsetIndex::Edit(BufferView * bv, int, int, unsigned int)
        if(bv->buffer()->isReadonly())
                WarnReadonly(bv->buffer()->fileName());
 
-       if (!index_form)
+       if (!index_form) {
                index_form = create_form_index_form();
-       
+               fl_set_form_atclose(index_form->index_form, CancelCloseBoxCB, 0);
+       }
+
        index_form->index_form->u_vdata = this;
        fl_set_input(index_form->key, getContents().c_str());
        if (index_form->index_form->visible) {

diff --git a/src/insets/insetlist.h b/src/insets/insetlist.h
index 3c75c5f15a3e4c3a23b5ab8b605dbf83f82f6420..a8e1a27c0f129374db548c725988ba1c4a2eb37e 100644 (file)
--- a/src/insets/insetlist.h
+++ b/src/insets/insetlist.h
@@ -31,7 +31,7 @@ public:
        ///
        ~InsetList() {}
        ///
-       void Write(Buffer const * buf, ostream & os) const;
+       void Write(Buffer const * buf, std::ostream & os) const;
        ///
        Inset * Clone() const;
        ///

diff --git a/src/insets/insetmarginal.h b/src/insets/insetmarginal.h
index a2c907025b91cb6b5fb9cb01488ce012923e9fa1..f8d650b97069a6bd880f8d2e2aedcb504b64430d 100644 (file)
--- a/src/insets/insetmarginal.h
+++ b/src/insets/insetmarginal.h
@@ -31,7 +31,7 @@ public:
        ///
        ~InsetMarginal() {}
        ///
-       void Write(Buffer const * buf, ostream & os) const;
+       void Write(Buffer const * buf, std::ostream & os) const;
        ///
        Inset * Clone() const;
        ///

diff --git a/src/insets/insetminipage.h b/src/insets/insetminipage.h
index 2587139c344caa62bf879cf77c846c17544a66ca..2c4cc024686eb60b38d827d1b33f6675c08ca408 100644 (file)
--- a/src/insets/insetminipage.h
+++ b/src/insets/insetminipage.h
@@ -31,7 +31,7 @@ public:
        ///
        ~InsetMinipage() {}
        ///
-       void Write(Buffer const * buf, ostream & os) const;
+       void Write(Buffer const * buf, std::ostream & os) const;
        ///
        Inset * Clone() const;
        ///

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 8a826ce10500052789bd85802b8685c30a9ab061..a38e02d82b26c7d29da848c4903859430cad11bd 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -757,7 +757,7 @@ InsetText::LocalDispatch(BufferView * bv,
            }
                        
 #ifdef HAVE_SSTREAM
-           istringstream istr(arg);
+           std::istringstream istr(arg);
 #else
            istrstream istr(arg.c_str());
 #endif