diff options
author | unknown <unknown> | 2002-01-11 11:59:54 (GMT) |
---|---|---|
committer | unknown <unknown> | 2002-01-11 11:59:54 (GMT) |
commit | 61661d638e34b3ce6c986d5a53b8c08c1051d422 (patch) | |
tree | f0b87676e95070afee163f76902efd0c4d5b5fe6 /src/Basemenu.hh | |
parent | f98c3c9045397bd9497621deb55b310366f8a5de (diff) | |
parent | a3d2a1cf0a5ab724e19a91915fe97842f52260d5 (diff) | |
download | fluxbox-c325ffaa4e094163340f957e87463c8a526b4d5b.zip fluxbox-c325ffaa4e094163340f957e87463c8a526b4d5b.tar.bz2 |
This commit was manufactured by cvs2svn to create tagRelease-0_1_6
'Release-0_1_6'.
Diffstat (limited to 'src/Basemenu.hh')
-rw-r--r-- | src/Basemenu.hh | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/Basemenu.hh b/src/Basemenu.hh index 27aed54..24c8078 100644 --- a/src/Basemenu.hh +++ b/src/Basemenu.hh | |||
@@ -1,3 +1,6 @@ | |||
1 | // Basemenu.hh for Fluxbox Window manager | ||
2 | // Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org) | ||
3 | // | ||
1 | // Basemenu.hh for Blackbox - an X11 Window manager | 4 | // Basemenu.hh for Blackbox - an X11 Window manager |
2 | // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) | 5 | // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) |
3 | // | 6 | // |
@@ -19,8 +22,10 @@ | |||
19 | // 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 |
20 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
21 | 24 | ||
22 | #ifndef __Basemenu_hh | 25 | // $Id: Basemenu.hh,v 1.4 2002/01/11 09:24:46 fluxgen Exp $ |
23 | #define __Basemenu_hh | 26 | |
27 | #ifndef _BASEMENU_HH_ | ||
28 | #define _BASEMENU_HH_ | ||
24 | 29 | ||
25 | #include <X11/Xlib.h> | 30 | #include <X11/Xlib.h> |
26 | 31 | ||
@@ -128,9 +133,10 @@ public: | |||
128 | virtual void show(void); | 133 | virtual void show(void); |
129 | virtual void hide(void); | 134 | virtual void hide(void); |
130 | 135 | ||
131 | enum { AlignDontCare = 1, AlignTop, AlignBottom }; | 136 | enum { ALIGNDONTCARE = 1, ALIGNTOP, ALIGNBOTTOM }; |
132 | enum { Right = 1, Left }; | 137 | enum { RIGHT = 1, LEFT }; |
133 | enum { Empty = 0, Square, Triangle, Diamond }; | 138 | enum { EMPTY = 0, SQUARE, TRIANGLE, DIAMOND }; |
139 | |||
134 | }; | 140 | }; |
135 | 141 | ||
136 | 142 | ||
@@ -142,10 +148,6 @@ private: | |||
142 | 148 | ||
143 | friend class Basemenu; | 149 | friend class Basemenu; |
144 | 150 | ||
145 | |||
146 | protected: | ||
147 | |||
148 | |||
149 | public: | 151 | public: |
150 | BasemenuItem(const char *lp, int fp, const char *ep = (const char *) 0) { | 152 | BasemenuItem(const char *lp, int fp, const char *ep = (const char *) 0) { |
151 | l = lp; | 153 | l = lp; |
@@ -189,4 +191,4 @@ public: | |||
189 | }; | 191 | }; |
190 | 192 | ||
191 | 193 | ||
192 | #endif // __Basemenu_hh | 194 | #endif // _BASEMENU_HH_ |