aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/FbTk/Menu.hh9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 7108045..0feab76 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Menu.hh,v 1.3 2003/01/09 16:43:54 fluxgen Exp $ 25// $Id: Menu.hh,v 1.4 2003/01/10 00:46:54 fluxgen Exp $
26 26
27#ifndef FBTK_MENU_HH 27#ifndef FBTK_MENU_HH
28#define FBTK_MENU_HH 28#define FBTK_MENU_HH
@@ -36,12 +36,11 @@
36#include "RefCount.hh" 36#include "RefCount.hh"
37#include "Command.hh" 37#include "Command.hh"
38 38
39class BImageControl;
40
41namespace FbTk { 39namespace FbTk {
42 40
43class MenuItem; 41class MenuItem;
44class MenuTheme; 42class MenuTheme;
43class ImageControl;
45 44
46 45
47/// Base class for menus 46/// Base class for menus
@@ -55,7 +54,7 @@ public:
55 */ 54 */
56 enum { EMPTY = 0, SQUARE, TRIANGLE, DIAMOND }; 55 enum { EMPTY = 0, SQUARE, TRIANGLE, DIAMOND };
57 56
58 Menu(MenuTheme &tm, int screen_num, BImageControl &imgctrl); 57 Menu(MenuTheme &tm, int screen_num, ImageControl &imgctrl);
59 virtual ~Menu(); 58 virtual ~Menu();
60 59
61 /** 60 /**
@@ -154,7 +153,7 @@ private:
154 Display *m_display; 153 Display *m_display;
155 const int m_screen_num; 154 const int m_screen_num;
156 Menu *m_parent; 155 Menu *m_parent;
157 BImageControl &m_image_ctrl; 156 ImageControl &m_image_ctrl;
158 Menuitems menuitems; 157 Menuitems menuitems;
159 158
160 const unsigned int m_screen_width, m_screen_height; 159 const unsigned int m_screen_width, m_screen_height;