Extracted from r14281

[lyx.git] / src / frontends / GuiCursor.h

diff --git a/src/frontends/GuiCursor.h b/src/frontends/GuiCursor.h
index cc45d8c143ab7b785288ee042f24be0811d49482..e6ee4674148b41fc94c68478dba3bfa90b8c79db 100644 (file)
--- a/src/frontends/GuiCursor.h
+++ b/src/frontends/GuiCursor.h
@@ -11,6 +11,22 @@
  * Full author contact details are available in file CREDITS.
  */
 
+// X11 use a define called CursorShape, and we really want to use
+// that name our selves. Therefore we do something similar to what is done
+// in kde/fixx11h.h:
+namespace X {
+#ifdef CursorShape
+#ifndef FIXX11H_CursorShape
+#define FIXX11H_CursorShape
+int const XCursorShape = CursorShape;
+#undef CursorShape
+int const CursorShape = CursorShape;
+#endif
+#undef CursorShape
+#endif
+
+} // namespace X
+
 #ifndef GUI_CURSOR_H
 #define GUI_CURSOR_H
 
@@ -26,7 +42,7 @@ namespace frontend {
 class WorkArea;
 
 /// types of cursor in work area
-enum Cursor_Shape {
+enum CursorShape {
        /// normal I-beam
        BAR_SHAPE,
        /// L-shape for locked insets of a different language