using stls should not enable new CAPAs

[apps/madmutt.git] / lib-ui / menu.h

diff --git a/lib-ui/menu.h b/lib-ui/menu.h
index 96c2c53..173c094 100644 (file)
--- a/lib-ui/menu.h
+++ b/lib-ui/menu.h
@@ -8,13 +8,10 @@
  */
 #ifndef _MUTT_MENU_H
 #define _MUTT_MENU_H
-/*
- * This file is named mutt_menu.h so it doesn't collide with ncurses menu.h
- */
 
-#include "keymap.h"
+#include <lib-lib/lib-lib.h>
 
-#include "lib/rx.h"
+#include "keymap.h"
 
 #define REDRAW_INDEX           (1)
 #define REDRAW_MOTION          (1<<1)
@@ -29,8 +26,7 @@
 #define M_MODEFMT "-- Madmutt: %s"
 
 typedef struct menu_t {
-  char *title;                  /* the title of this menu */
-  char *help;                   /* quickref for the current menu */
+  const char *title;            /* the title of this menu */
   void *data;                   /* extra data for the current menu */
   int current;                  /* current entry */
   int max;                      /* the number of entries in the menu */
@@ -46,8 +42,8 @@ typedef struct menu_t {
    * prompt keys override movement keys.
    */
   char **dialog;                /* dialog lines themselves */
-  char *prompt;                 /* prompt for user, similar to mutt_multi_choice */
-  char *keys;                   /* keys used in the prompt */
+  const char *prompt;           /* prompt for user, similar to mutt_multi_choice */
+  const char *keys;             /* keys used in the prompt */
 
   /* callback to generate an index line for the requested element */
   void (*make_entry) (char *, ssize_t, struct menu_t *, int);
@@ -92,7 +88,7 @@ void menu_current_top (MUTTMENU *);
 void menu_current_middle (MUTTMENU *);
 void menu_current_bottom (MUTTMENU *);
 void menu_check_recenter (MUTTMENU *);
-void menu_status_line (char *, size_t, MUTTMENU *, const char *);
+void menu_status_line (char *, ssize_t, MUTTMENU *, const char *);
 
 MUTTMENU *mutt_new_menu (void);
 void mutt_menuDestroy (MUTTMENU **);