From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Tue, 1 Aug 2000 18:11:14 +0000 (+0000)
Subject: some fixes to prev patch
X-Git-Tag: 1.6.10~22062
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9f674c6eff82f56d838665c5d4fadf1fdee3a928;p=features.git

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 c3b2d5607c..f460dfc21f 100644
--- 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 4762979cef..4d800eec7f 100644
--- 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 aa8a9cbdf5..76781bac88 100644
--- 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 f30861f908..c115b9f993 100644
--- 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 02b8a1e372..6bb5d0ea14 100644
--- 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 81f58781c5..524cfa9fb2 100644
--- 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_;