(enum text_cursor_kinds): Removed.

(struct output_w32) <current_cursor, desired_cursor, cursor_width>
<blink_off_cursor, blink_off_cursor_width>: Members removed.
(FRAME_DESIRED_CURSOR, FRAME_CURSOR_WIDTH, FRAME_BLINK_OFF_CURSOR)
(FRAME_BLINK_OFF_CURSOR_WIDTH): Macros removed.

diff --git a/src/w32term.h b/src/w32term.h
index ae9ee098ecb2969bb42d6ace9e56df2ce61bc46a..a2620ecff5b379e9ebe4fd6ff8670ca4b3f0edd7 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -63,14 +63,6 @@ extern BOOL bUseDflt;
 
 extern struct frame *x_window_to_frame ();
 
-enum text_cursor_kinds {
-  NO_CURSOR = -1,
-  FILLED_BOX_CURSOR,
-  HOLLOW_BOX_CURSOR,
-  BAR_CURSOR,
-  HBAR_CURSOR
-};
-
 /* Structure recording bitmaps and reference count.
    If REFCOUNT is 0 then this record is free to be reused.  */
 
@@ -369,24 +361,6 @@ struct w32_output
   /* Flag to set when the window needs to be completely repainted.  */
   int needs_exposure;
 
-  /* What kind of text cursor is drawn in this window right now?
-     (If there is no cursor (phys_cursor_x < 0), then this means nothing.)  */
-  enum text_cursor_kinds current_cursor;
-
-  /* What kind of text cursor should we draw in the future?
-     This should always be filled_box_cursor or bar_cursor.  */
-  enum text_cursor_kinds desired_cursor;
-
-  /* Width of bar cursor (if we are using that).  */
-  int cursor_width;
-
-  /* What kind of text cursor should we draw when the cursor blinks off?
-     This can be filled_box_cursor or bar_cursor or no_cursor.  */
-  enum text_cursor_kinds blink_off_cursor;
-
-  /* Width of bar cursor (if we are using that) for blink-off state.  */
-  int blink_off_cursor_width;
-
   DWORD dwStyle;
 
   /* The size of the extra width currently allotted for vertical
@@ -488,11 +462,6 @@ enum
 #define PIXEL_WIDTH(f) ((f)->output_data.w32->pixel_width)
 #define PIXEL_HEIGHT(f) ((f)->output_data.w32->pixel_height)
 
-#define FRAME_DESIRED_CURSOR(f) ((f)->output_data.w32->desired_cursor)
-#define FRAME_BLINK_OFF_CURSOR(f) ((f)->output_data.w32->blink_off_cursor)
-#define FRAME_CURSOR_WIDTH(f) ((f)->output_data.w32->cursor_width)
-#define FRAME_BLINK_OFF_CURSOR_WIDTH(f) ((f)->output_data.w32->blink_off_cursor_width)
-
 /* Value is the smallest width of any character in any font on frame F.  */
 
 #define FRAME_SMALLEST_CHAR_WIDTH(F) \