aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.hh
diff options
context:
space:
mode:
authormarkt <markt>2007-10-13 21:51:37 (GMT)
committermarkt <markt>2007-10-13 21:51:37 (GMT)
commita59428d67a95a9df16554962f0a6257d6378328a (patch)
treef856ed9300c34f7a17d499f22d895610cfbc08e5 /src/FbTk/Menu.hh
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/FbTk/Menu.hh')
-rw-r--r--src/FbTk/Menu.hh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 34df40a..06af08d 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -49,7 +49,8 @@ class MenuItem;
49class ImageControl; 49class ImageControl;
50 50
51/// Base class for menus 51/// Base class for menus
52class Menu: public FbTk::EventHandler, FbTk::FbWindowRenderer, protected FbTk::Observer { 52class Menu: public FbTk::EventHandler, FbTk::FbWindowRenderer,
53 public FbTk::Observer {
53public: 54public:
54 enum Alignment{ ALIGNDONTCARE = 1, ALIGNTOP, ALIGNBOTTOM }; 55 enum Alignment{ ALIGNDONTCARE = 1, ALIGNTOP, ALIGNBOTTOM };
55 enum { RIGHT = 1, LEFT }; 56 enum { RIGHT = 1, LEFT };
@@ -91,7 +92,6 @@ public:
91 /// cycle through menuitems 92 /// cycle through menuitems
92 void cycleItems(bool reverse); 93 void cycleItems(bool reverse);
93 void enterSubmenu(); 94 void enterSubmenu();
94 void enterParent();
95 95
96 void disableTitle(); 96 void disableTitle();
97 void enableTitle(); 97 void enableTitle();
@@ -193,7 +193,7 @@ protected:
193 193
194 virtual void internal_hide(bool first = true); 194 virtual void internal_hide(bool first = true);
195 195
196 void update(FbTk::Subject *); 196 virtual void update(FbTk::Subject *);
197 197
198private: 198private:
199 199