Merge commit '20070318' into HEAD

[ion3.git] / mod_menu / menu.h

diff --git a/mod_menu/menu.h b/mod_menu/menu.h
index a79d36a08f0446b7eecf56a986cc97c763e596aa..8d856e0c509986e24a8a955bed34f4303fdf05a5 100644 (file)
--- a/mod_menu/menu.h
+++ b/mod_menu/menu.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_menu/menu.h
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
  * Ion is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by
@@ -16,6 +16,7 @@
 #include <ioncore/window.h>
 #include <ioncore/gr.h>
 #include <ioncore/rectangle.h>
+#include <ioncore/binding.h>
 
 INTRCLASS(WMenu);
 INTRSTRUCT(WMenuEntry);
@@ -25,6 +26,7 @@ INTRSTRUCT(WMenuEntry);
 DECLSTRUCT(WMenuEntry){
     char *title;
     int flags;
+    GrStyleSpec attr;
 };
 
 DECLCLASS(WMenu){
@@ -49,6 +51,8 @@ DECLCLASS(WMenu){
     char *typeahead;
     
     uint gm_kcb, gm_state;
+    
+    /*WBindmap *cycle_bindmap;*/
 };