Introduce LFUN_PRINT.

[lyx.git] / src / frontends / xforms / FormDialogView.h

diff --git a/src/frontends/xforms/FormDialogView.h b/src/frontends/xforms/FormDialogView.h
index 7a34894d55aa6c6c0c2de720b59424d4b847a5d7..945cd746a5a0d956edac8459ecc395a5661938cc 100644 (file)
--- a/src/frontends/xforms/FormDialogView.h
+++ b/src/frontends/xforms/FormDialogView.h
@@ -6,7 +6,7 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 /* A base class for the MCV-ed xforms dialogs.
@@ -20,8 +20,6 @@
 #include "ButtonPolicies.h"
 #include "forms_fwd.h"
 
-#include "LString.h"
-#include <boost/scoped_ptr.hpp>
 #include <X11/Xlib.h> // for Pixmap
 
 class xformsBC;
@@ -33,7 +31,7 @@ class Tooltips;
 class FormDialogView : public Dialog::View {
 public:
        ///
-       FormDialogView(Dialog &, string const &, bool allowResize);
+       FormDialogView(Dialog &, std::string const &, bool allowResize);
        ///
        virtual ~FormDialogView();
 
@@ -80,7 +78,7 @@ protected:
        /** Send the warning message from the daughter class to the
            message_widget direct. The message will persist till the mouse
            movesto a new object. */
-       void postWarning(string const & warning);
+       void postWarning(std::string const & warning);
        /// Reset the message_widget_
        void clearMessage();
 
@@ -105,11 +103,11 @@ private:
 
        /** Get the feedback message for ob.
            Called if warning_posted_ == false. */
-       virtual string const getFeedback(FL_OBJECT * /* ob */)
-               { return string(); }
+       virtual std::string const getFeedback(FL_OBJECT * /* ob */)
+               { return std::string(); }
 
        /// Post the feedback message for ob to message_widget_
-       void postMessage(string const & message);
+       void postMessage(std::string const & message);
 
        /** Variable used to decide whether to remove the existing feedback
            message or not (if it is in fact a warning) */
@@ -123,8 +121,6 @@ private:
        int minh_;
        /// Can the dialog be resized after it has been created?
        bool allow_resize_;
-       /// dialog title, displayed by the window manager.
-       string title_;
        /// Passed to the window manager to give a pretty little symbol ;-)
        Pixmap icon_pixmap_;
        ///
@@ -138,7 +134,7 @@ template <class FL_dialog>
 class FormView: public FormDialogView {
 protected:
        ///
-       FormView(Dialog &, string const &, bool allowResize=true);
+       FormView(Dialog &, std::string const &, bool allowResize=true);
        /// Pointer to the actual instantiation of xform's form
        virtual FL_FORM * form() const;
        /// Real GUI implementation.
@@ -147,7 +143,7 @@ protected:
 
 
 template <class FL_dialog>
-FormView<FL_dialog>::FormView(Dialog & parent, string const & t,
+FormView<FL_dialog>::FormView(Dialog & parent, std::string const & t,
                              bool allowResize)
        : FormDialogView(parent, t, allowResize)
 {}
@@ -170,13 +166,13 @@ public:
 
 protected:
        ///
-       FormController(Dialog &, string const &, bool allowResize = true);
+       FormController(Dialog &, std::string const &, bool allowResize = true);
 };
 
 
 template <class Controller, class Base>
 FormController<Controller, Base>::FormController(Dialog & p,
-                                                string const & t, bool resize)
+                                                std::string const & t, bool resize)
        : Base(p, t, resize)
 {}
 
@@ -184,14 +180,14 @@ FormController<Controller, Base>::FormController(Dialog & p,
 template <class Controller, class Base>
 Controller & FormController<Controller, Base>::controller()
 {
-       return static_cast<Controller &>(getController());
+       return static_cast<Controller &>(this->getController());
 }
 
 
 template <class Controller, class Base>
 Controller const & FormController<Controller, Base>::controller() const
 {
-       return static_cast<Controller const &>(getController());
+       return static_cast<Controller const &>(this->getController());
 }