X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.h;h=752a6771461de01d61d08976fe40fa0cb1e08097;hb=3167fc223ea82851ae954b348a5ff1c0ce6b6d79;hp=f4368229ba9964cdb313292acae3ab2590fe3218;hpb=fbc7607fbd1a380428a53094e727ac7631871bd4;p=chaz%2Fopenbox

diff --git a/openbox/menu.h b/openbox/menu.h
index f4368229..752a6771 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -19,11 +19,9 @@
 #ifndef __menu_h
 #define __menu_h
 
-#include "action.h"
 #include "window.h"
 #include "geom.h"
 #include "render/render.h"
-#include "parser/parse.h"
 
 #include <glib.h>
 
@@ -65,6 +63,8 @@ struct _ObMenu
     gunichar shortcut;
     /*! The shortcut's position in the string */
     guint shortcut_position;
+    /*! If the shortcut was specified by & and should always be drawn */
+    gboolean shortcut_always_show;
 
     /*! If the shortcut key should be shown in menu entries even when it
       is the first character in the string */
@@ -106,6 +106,8 @@ struct _ObNormalMenuEntry {
     gunichar shortcut;
     /*! The shortcut's position in the string */
     guint shortcut_position;
+    /*! If the shortcut was specified by & and should always be drawn */
+    gboolean shortcut_always_show;
 
     /* state */
     gboolean enabled;
@@ -161,8 +163,6 @@ void menu_shutdown(gboolean reconfig);
 void menu_entry_ref(ObMenuEntry *self);
 void menu_entry_unref(ObMenuEntry *self);
 
-/*! @param allow_shortcut this should be false when the label is coming from
-           outside data like window or desktop titles */
 ObMenu* menu_new(const gchar *name, const gchar *title,
                  gboolean allow_shortcut_selection, gpointer data);
 void menu_free(ObMenu *menu);