From ee16c6dfc0268060144dd4de0d40d43d2b25622c Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 28 Jun 2000 14:55:57 +0000 Subject: [PATCH] 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 --- ChangeLog | 12 ++++++++++++ po/POTFILES.in | 3 +++ src/insets/insetert.h | 2 +- src/insets/insetfloat.h | 2 +- src/insets/insetfoot.h | 2 +- src/insets/insetindex.C | 6 ++++-- src/insets/insetlist.h | 2 +- src/insets/insetmarginal.h | 2 +- src/insets/insetminipage.h | 2 +- src/insets/insettext.C | 2 +- 10 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6de26b0ab1..467c37c17b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2000-06-28 Jean-Marc Lasgouttes + + * 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 * src/support/lyxsum.C (sum): '\0' teminate file read when using diff --git a/po/POTFILES.in b/po/POTFILES.in index e7da1a54f5..e913ba6d60 100644 --- 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 1a2c53d02e..43deb1c0e8 100644 --- 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 960ed603f2..b76d4e0241 100644 --- 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 33f3eac1ad..0f417281d1 100644 --- 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 03e844d5d5..2ae9f5d22f 100644 --- 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 3c75c5f15a..a8e1a27c0f 100644 --- 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 a2c907025b..f8d650b970 100644 --- 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 2587139c34..2c4cc02468 100644 --- 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 8a826ce105..a38e02d82b 100644 --- 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