aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-01-20 02:11:51 (GMT)
committerfluxgen <fluxgen>2002-01-20 02:11:51 (GMT)
commit93c402846372b6cb532ec07f0563dc26b91596e6 (patch)
tree2940fdfc7fdd95a723735e6d5688f050c8c98524
parentb07fd39e663e2e0b32ef8633041678e36dcf596f (diff)
downloadfluxbox_paul-93c402846372b6cb532ec07f0563dc26b91596e6.zip
fluxbox_paul-93c402846372b6cb532ec07f0563dc26b91596e6.tar.bz2
Fixed redudant include guards and named enum
-rw-r--r--src/Toolbar.hh16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index bd59a8c..0812fce 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -19,18 +19,24 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Toolbar.hh,v 1.4 2002/01/20 02:11:51 fluxgen Exp $
23
22#ifndef _TOOLBAR_HH_ 24#ifndef _TOOLBAR_HH_
23#define _TOOLBAR_HH_ 25#define _TOOLBAR_HH_
24 26
25#include <X11/Xlib.h> 27#include <X11/Xlib.h>
26 28#ifndef _BASEMENU_HH_
27
28
29
30#include "Basemenu.hh" 29#include "Basemenu.hh"
30#endif
31#ifndef _LINKEDLIST_HH_
31#include "LinkedList.hh" 32#include "LinkedList.hh"
33#endif
34#ifndef _TIMER_HH_
32#include "Timer.hh" 35#include "Timer.hh"
36#endif
37#ifndef _ICONBAR_HH_
33#include "IconBar.hh" 38#include "IconBar.hh"
39#endif
34 40
35 41
36// forward declaration 42// forward declaration
@@ -156,7 +162,7 @@ public:
156 162
157 virtual void timeout(void); 163 virtual void timeout(void);
158 164
159 enum { TOPLEFT = 1, BOTTOMLEFT, TOPCENTER, 165 enum Placement{ TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
160 BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT }; 166 BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT };
161}; 167};
162 168