Fixed redudant include guards and named enum
This commit is contained in:
parent
b07fd39e66
commit
93c4028463
1 changed files with 11 additions and 5 deletions
|
@ -19,18 +19,24 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
// $Id: Toolbar.hh,v 1.4 2002/01/20 02:11:51 fluxgen Exp $
|
||||||
|
|
||||||
#ifndef _TOOLBAR_HH_
|
#ifndef _TOOLBAR_HH_
|
||||||
#define _TOOLBAR_HH_
|
#define _TOOLBAR_HH_
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
|
#ifndef _BASEMENU_HH_
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include "Basemenu.hh"
|
#include "Basemenu.hh"
|
||||||
|
#endif
|
||||||
|
#ifndef _LINKEDLIST_HH_
|
||||||
#include "LinkedList.hh"
|
#include "LinkedList.hh"
|
||||||
|
#endif
|
||||||
|
#ifndef _TIMER_HH_
|
||||||
#include "Timer.hh"
|
#include "Timer.hh"
|
||||||
|
#endif
|
||||||
|
#ifndef _ICONBAR_HH_
|
||||||
#include "IconBar.hh"
|
#include "IconBar.hh"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// forward declaration
|
// forward declaration
|
||||||
|
@ -156,7 +162,7 @@ public:
|
||||||
|
|
||||||
virtual void timeout(void);
|
virtual void timeout(void);
|
||||||
|
|
||||||
enum { TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
|
enum Placement{ TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
|
||||||
BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT };
|
BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue