From 944d5416c0275de277af5188943c444332971683 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Fri, 18 May 2001 16:58:03 +0000
Subject: [PATCH] * TODO: Remove XView-related entries. * menu.h [HAVE_XVIEW]:
 Remove all XView-related code.

---
 src/ChangeLog |  5 +++++
 src/TODO      | 14 --------------
 src/menu.h    | 11 -----------
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 1073c7088..1f2b827e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-18  Pavel Roskin  <proski@gnu.org>
+
+	* TODO: Remove XView-related entries.
+	* menu.h [HAVE_XVIEW]: Remove all XView-related code.
+
 2001-05-17  Pavel Roskin  <proski@gnu.org>
 
 	* subshell.c (pty_open_master) [HAVE_SCO]: Fix ambigous `else'.
diff --git a/src/TODO b/src/TODO
index 91030f3a0..612137dd7 100644
--- a/src/TODO
+++ b/src/TODO
@@ -66,20 +66,6 @@
 
   - the interal editor adds it's entries to the wrong menu
 
-* XView/mc
-
-  - Dropping files on root window should create action icon.
-
-  - Fix the viewer.
-
-  - Fix help.
-
-  - Icons for buttonbar.
-
-  - Info panel.
-
-  - Tree panel.
-
 * Configuration 
 
 * Documentation
diff --git a/src/menu.h b/src/menu.h
index ecd027ca7..0e637aeee 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -1,11 +1,6 @@
 #ifndef __MENU_H
 #define __MENU_H
 
-/* IMPORTANT NOTE: This header is dependent on HAVE_X / HAVE_XVIEW. If you
- * include this header, you have to move it to the group of HAVE_X dependant
- * modules in {xv|tk}/Makefile.in !!!
- */
- 
 #include "dlg.h"
 #include "widget.h"
 
@@ -21,11 +16,6 @@ typedef struct {
     callfn call_back;
 } menu_entry;
 
-#ifdef HAVE_XVIEW
-#   ifndef xview_walkmenu_DEFINED
-        typedef unsigned long Menu;
-#   endif
-#else
 typedef struct {
     char   *name;
     int    count;
@@ -36,7 +26,6 @@ typedef struct {
     int    start_x;		/* position relative to menubar start */
 } sMenu;
 typedef sMenu *Menu;
-#endif
 
 extern int menubar_visible;