moved derivation from noncopyable to DialogBase from FormBase.

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

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index 664f1bca8fc964a825bd7c328bbe10d4a6e3ca8b..020d70153eea9db645c03346c89db04acb07a147 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-19  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * DialogBase.h: derived from noncopyable, rather than deriving
+       xforms/FormBase from it.
+
 2001-02-12  John Levon  <moz@compsoc.man.ac.uk>
 
        * DialogBase.C: add close(), non-pure. This is

diff --git a/src/frontends/DialogBase.h b/src/frontends/DialogBase.h
index 126968b4c5a0fe700b7183bef61643f649ed451c..dec7d884f14afede484dc41c3d8366c026d508bb 100644 (file)
--- a/src/frontends/DialogBase.h
+++ b/src/frontends/DialogBase.h
@@ -18,6 +18,7 @@
 #define DIALOGBASE_H
 
 #include <sigc++/signal_system.h>
+#include <boost/utility.hpp>
 
 // If we do not want to bring them in global namespace, they could be
 // defined inside DialogBase... (JMarc) 
@@ -25,7 +26,6 @@
 using SigC::Connection;
 using SigC::slot;
 using SigC::Object;
-
 #endif
 
 
@@ -35,7 +35,7 @@ using SigC::Object;
     satisfy that request.  Thus a dialog will have to "pull" the necessary
     details from the core of the program.
  */
-class DialogBase : public Object
+class DialogBase : public Object, public noncopyable
 {
 public:
        /**@name Constructors and Deconstructors */

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 9c0ea0bbc088739a529c5ccfbaee0c8e18b6e1d5..ee597a0f367f8200c9482241e30610c97e6d6937 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-19  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * FormBase.h: moved noncopyable derivation to DialogBase.
+
 2001-02-19  Juergen Vigna  <jug@sad.it>
 
        * FormTabular.C (build): make all input field accepted only after

diff --git a/src/frontends/xforms/FormBase.h b/src/frontends/xforms/FormBase.h
index 5a25fd2a10fa2157d5e965b96ada70d41b755f77..1cf0f693b1531b3836b376cac5136841247370b0 100644 (file)
--- a/src/frontends/xforms/FormBase.h
+++ b/src/frontends/xforms/FormBase.h
@@ -14,7 +14,6 @@
 
 #include "DialogBase.h"
 #include "LString.h"
-#include <boost/utility.hpp>
 #include FORMS_H_LOCATION
 #include "ButtonController.h"
 #include "gettext.h"
@@ -34,7 +33,7 @@ class LyXView;
     @author Angus Leeming
  */
 
-class FormBase : public DialogBase, public noncopyable {
+class FormBase : public DialogBase {
 public:
        /// Callback functions
        static  int WMHideCB(FL_FORM *, void *);