Set up work for making a 3.5 prerelease.

[chaz/openbox] / openbox / menuframe.h

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index daac34d2d2803860be63baa8094a23eba106b8f0..87a718e79fbf377bb44492ce618a75a1f547dcf1 100644 (file)
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -22,7 +22,7 @@
 
 #include "geom.h"
 #include "window.h"
-#include "render/render.h"
+#include "obrender/render.h"
 
 #include <glib.h>
 
@@ -53,6 +53,9 @@ struct _ObMenuFrame
 
     GList *entries;
     ObMenuEntryFrame *selected;
+    /* if a submenu was selected, then this holds the entry for that submenu
+       until it is closed */
+    ObMenuEntryFrame *open_submenu;
 
     /* show entries from the menu starting at this index */
     guint show_from;
@@ -117,7 +120,7 @@ gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
 gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
                                  ObMenuEntryFrame *parent_entry);
 
-void menu_frame_hide_all();
+void menu_frame_hide_all(void);
 void menu_frame_hide_all_client(struct _ObClient *client);
 
 void menu_frame_render(ObMenuFrame *self);