Fix breakage caused by bad commits.

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

diff --git a/src/frontends/gtk/GScreen.h b/src/frontends/gtk/GScreen.h
index 8e9a1694548b5036fa61b25235530292059d77c9..94f35afa3b45b3c4ee84c5b4fcdb7073f63c9f8f 100644 (file)
--- a/src/frontends/gtk/GScreen.h
+++ b/src/frontends/gtk/GScreen.h
@@ -12,10 +12,13 @@
 #ifndef GSCREEN_H
 #define GSCREEN_H
 
-#include "frontends/GuiCursor.h"
+#include "frontends/WorkArea.h"
 
 #include <gtkmm.h>
 
+// FIXME: defined in X.h, spuriously pulled in by some gui headers
+#undef CursorShape
+
 namespace lyx {
 namespace frontend {
 
@@ -39,7 +42,7 @@ public:
        ///
        virtual void removeCursor();
        ///
-       virtual void showCursor(int x, int y, int h, Cursor_Shape shape);
+       virtual void showCursor(int x, int y, int h, CursorShape shape);
 
        /// Copies specified area of pixmap to screen
        virtual void expose(int x, int y, int w, int h);