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

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

diff --git a/src/frontends/gtk/GScreen.C b/src/frontends/gtk/GScreen.C
index ee711bba9ccf6e6247cdf3822c2d126f053ee765..2014e734630c9571317ebdd10d80e20e540132a9 100644 (file)
--- a/src/frontends/gtk/GScreen.C
+++ b/src/frontends/gtk/GScreen.C
@@ -30,10 +30,8 @@
 #include "lyxtext.h"
 #include "lyxrow.h"
 
-#include "frontends/screen.h"
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
-#include "frontends/WorkArea.h"
 
 #include "insets/insettext.h"
 
@@ -43,7 +41,7 @@ namespace lyx {
 namespace frontend {
 
 GScreen::GScreen(GWorkArea & o)
-       : LyXScreen(), owner_(o)
+       : owner_(o)
 {
        // the cursor isnt yet visible
        cursorX_ = 0;
@@ -58,12 +56,6 @@ GScreen::~GScreen()
 }
 
 
-WorkArea & GScreen::workarea()
-{
-       return owner_;
-}
-
-
 void GScreen::setCursorColor(Glib::RefPtr<Gdk::GC> gc)
 {
        Gdk::Color * clr = owner_.getColorHandler().