This is the merging of the GUI API cleanup branch that was developed in svn+ssh:...

[features.git] / src / frontends / xforms / XWorkArea.h

diff --git a/src/frontends/xforms/XWorkArea.h b/src/frontends/xforms/XWorkArea.h
index 9138fdd50ad62ad51b2744ddc348c51427b1b1cc..2f83c933a69aeb5bda2bf0a1290888492baab49d 100644 (file)
--- a/src/frontends/xforms/XWorkArea.h
+++ b/src/frontends/xforms/XWorkArea.h
@@ -14,6 +14,7 @@
 #define XWORKAREA_H
 
 #include "frontends/WorkArea.h"
+#include "frontends/Clipboard.h"
 #include "XPainter.h"
 
 #include "LayoutEngine.h"
@@ -25,7 +26,7 @@ class LyXView;
 namespace lyx {
 namespace frontend {
 
-class XWorkArea : public WorkArea {
+class XWorkArea {
 public:
        ///
        XWorkArea(LyXView & owner, int width, int height);
@@ -56,11 +57,11 @@ public:
        /// xforms callback from scrollbar
        void scroll_cb();
        /// a selection exists
-       virtual void haveSelection(bool) const;
+       virtual void haveSelection(bool);
        ///
        virtual std::string const getClipboard() const;
        ///
-       virtual void putClipboard(std::string const &) const;
+       virtual void putClipboard(std::string const &);
 
        /// handles SelectionRequest X Event, to fill the clipboard
        int event_cb(XEvent * xev);