X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fgtk%2FGScreen.h;h=94f35afa3b45b3c4ee84c5b4fcdb7073f63c9f8f;hb=8ebf862adbe377d032f888a82d88d4393aebc929;hp=8e9a1694548b5036fa61b25235530292059d77c9;hpb=d8ae51dbe178d6b10a56c747cfd399a4dbba8117;p=lyx.git

diff --git a/src/frontends/gtk/GScreen.h b/src/frontends/gtk/GScreen.h
index 8e9a169454..94f35afa3b 100644
--- 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);