some fixes to prev patch

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

diff --git a/ChangeLog b/ChangeLog
index c3b2d5607cb3c3b31aab9426cdb592330a1a0e9a..f460dfc21f5e6d8d6bb14b4ee5f106ec4aec9d90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-08-01  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * src/insets/insetcommand.h: Signals is not copyable so anoter
+       scheme for automatic hiding of forms must be used.
+
+       * src/frontends/xforms/FormCitation.h: don't inerit from
+       noncopyable, FormCommand already does that.
+       * src/frontends/xforms/FormToc.h: ditto
+       * src/frontends/xforms/FormUrl.h: ditto
+
+       * src/frontends/xforms/FormCitation.C: add include <algorithm>
+
 2000-08-01  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * src/insets/insetcommand.h (hide): new SigC::Signal0

diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C
index 4762979ceff6be0c2e6ab1b62cf1bcb3e7d34d5d..4d800eec7f486d5ad573d0dca4fdd3d47338b6a0 100644 (file)
--- a/src/frontends/xforms/FormCitation.C
+++ b/src/frontends/xforms/FormCitation.C
@@ -13,6 +13,8 @@
 
 #include FORMS_H_LOCATION
 
+#include <algorithm>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif

diff --git a/src/frontends/xforms/FormCitation.h b/src/frontends/xforms/FormCitation.h
index aa8a9cbdf55ebe8f0491cdee0727dfbca4115c52..76781bac88592fafa53430a3145f3df9d897ac8f 100644 (file)
--- a/src/frontends/xforms/FormCitation.h
+++ b/src/frontends/xforms/FormCitation.h
@@ -21,7 +21,7 @@ struct FD_form_citation;
 
 /** This class provides an XForms implementation of the FormCitation Dialog.
  */
-class FormCitation : public FormCommand, public noncopyable {
+class FormCitation : public FormCommand {
 public:
        ///
        enum State {

diff --git a/src/frontends/xforms/FormToc.h b/src/frontends/xforms/FormToc.h
index f30861f908e8e5b83350cd1a21053c7d22da64eb..c115b9f9934da246b5674b841b1f55d260ef9fc2 100644 (file)
--- a/src/frontends/xforms/FormToc.h
+++ b/src/frontends/xforms/FormToc.h
@@ -21,7 +21,7 @@ struct FD_form_toc;
 
 /** This class provides an XForms implementation of the FormToc Dialog.
  */
-class FormToc : public FormCommand, public noncopyable {
+class FormToc : public FormCommand {
 public:
        /**@name Constructors and Destructors */
        //@{

diff --git a/src/frontends/xforms/FormUrl.h b/src/frontends/xforms/FormUrl.h
index 02b8a1e37205efcb4e18573a60ecb97accc6e61b..6bb5d0ea14a3c7daa3bf5f5a4ad65a81fc5d9c82 100644 (file)
--- a/src/frontends/xforms/FormUrl.h
+++ b/src/frontends/xforms/FormUrl.h
@@ -21,7 +21,7 @@ struct FD_form_url;
 
 /** This class provides an XForms implementation of the FormUrl Dialog.
  */
-class FormUrl : public FormCommand, public noncopyable {
+class FormUrl : public FormCommand {
 public:
        /**@name Constructors and Destructors */
        //@{

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 81f58781c57d70720cd4724aba66387786f9e99d..524cfa9fb2435d13e20addf2c4ede772a8ad9888 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -78,7 +78,7 @@ public:
        explicit
        InsetCommand(InsetCommandParams const &);
        ///
-       virtual ~InsetCommand() { hide(); };
+       virtual ~InsetCommand() { /*hide();*/ };
        ///
        void Write(Buffer const *, std::ostream &) const;
 
@@ -129,7 +129,7 @@ public:
        ///
        void setParams(InsetCommandParams const &);
        ///
-       Signal0<void> hide;
+       //Signal0<void> hide;
 private:
        ///
        InsetCommandParams p_;