various fixes

[lyx.git] / src / frontends / DialogBase.h

diff --git a/src/frontends/DialogBase.h b/src/frontends/DialogBase.h
index 5285da0c58e88b466e07de436dd48d6360fd43a2..7637ab4ab44a034e1b99ba4c3d9827b48d2fd0e0 100644 (file)
--- a/src/frontends/DialogBase.h
+++ b/src/frontends/DialogBase.h
@@ -8,7 +8,7 @@
  *           LyX, The Document Processor
  *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  *           This file Copyright 2000
  *           Allan Rae
@@ -18,14 +18,7 @@
 #define DIALOGBASE_H
 
 #include <sigc++/signal_system.h>
-
-// If we do not want to bring them in global namespace, they could be
-// defined inside DialogBase... (JMarc) 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Connection;
-using SigC::slot;
-#endif
-
+#include <boost/utility.hpp>
 
 /** Abstract base class of all dialogs.
     The outside world only needs some way to tell a dialog when to show, hide
@@ -33,35 +26,26 @@ using SigC::slot;
     satisfy that request.  Thus a dialog will have to "pull" the necessary
     details from the core of the program.
  */
-#ifdef SIGC_CXX_NAMESPACES
-class DialogBase : public SigC::Object
-#else
-class DialogBase : public Object
-#endif
+class DialogBase : public SigC::Object, boost::noncopyable
 {
 public:
        /**@name Constructors and Deconstructors */
        //@{
-       ///
+       /// Virtual base destructor
        virtual ~DialogBase() {}
        //@}
 
        /**@name Signal Targets */
        //@{
        ///
-       virtual void show() = 0;
+       //virtual void show() = 0;
        ///
        virtual void hide() = 0;
        ///
-       virtual void update() = 0;
-       //@}
-
+       virtual void update() {};
        ///
-       enum EnumDialogStatus {
-               DIALOG_UNMODIFIED,
-               DIALOG_MODIFIED,
-               DIALOG_READONLY
-       };
+       virtual void close() {};
+       //@}
 };
 
 #endif // DIALOGBASE_H