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

[features.git] / src / frontends / gtk / GScreen.h

diff --git a/src/frontends/gtk/GScreen.h b/src/frontends/gtk/GScreen.h
index baaea7e3f5d85334c17c15d1b4ba9a49ce6b0c7c..8e9a1694548b5036fa61b25235530292059d77c9 100644 (file)
--- a/src/frontends/gtk/GScreen.h
+++ b/src/frontends/gtk/GScreen.h
@@ -12,7 +12,7 @@
 #ifndef GSCREEN_H
 #define GSCREEN_H
 
-#include "screen.h"
+#include "frontends/GuiCursor.h"
 
 #include <gtkmm.h>
 
@@ -26,7 +26,7 @@ class GWorkArea;
     date and used to optimize drawing on the screen.
     This class also handles the drawing of the cursor and partly the selection.
  */
-class GScreen : public LyXScreen {
+class GScreen {
 public:
        ///
        GScreen(GWorkArea &);
@@ -40,9 +40,6 @@ public:
        virtual void removeCursor();
        ///
        virtual void showCursor(int x, int y, int h, Cursor_Shape shape);
-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);