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

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

diff --git a/src/frontends/xforms/xscreen.h b/src/frontends/xforms/xscreen.h
index 829ac96230bf28a18f91155b706d6c27efd1fa57..27f1d2c3f4c92cef6af0359e1c243c898c6ff1ce 100644 (file)
--- a/src/frontends/xforms/xscreen.h
+++ b/src/frontends/xforms/xscreen.h
@@ -13,7 +13,8 @@
 #ifndef XSCREEN_H
 #define XSCREEN_H
 
-#include "screen.h"
+#include "frontends/GuiCursor.h"
+
 #include <X11/Xlib.h> // for Pixmap, GC
 
 class WorkArea;
@@ -28,7 +29,7 @@ class XWorkArea;
     date and used to optimize drawing on the screen.
     This class also handles the drawing of the cursor and partly the selection.
  */
-class XScreen : public LyXScreen {
+class XScreen {
 public:
        ///
        XScreen(XWorkArea &);
@@ -39,10 +40,6 @@ public:
        /// Sets the cursor color to LColor::cursor.
        virtual void setCursorColor();
 
-protected:
-       /// get the work area
-       virtual WorkArea & workarea();
-
        /// Copies specified area of pixmap to screen
        virtual void expose(int x, int y, int w, int h);