aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.hh
diff options
context:
space:
mode:
authorTomas Janousek <tomi@nomi.cz>2008-01-28 08:58:23 (GMT)
committerTomas Janousek <tomi@nomi.cz>2008-01-28 08:58:23 (GMT)
commit880209a43821c8f56e4a46b2debf7a72f68658c8 (patch)
tree22f68473e939c1cf8cb838ece3943e4184ff7392 /src/Toolbar.hh
parenta61b37da70e0cd1556617c56890455ef89ee1fb0 (diff)
parent5c85fcbe648b5b4581db1ca2303d5f849a63c28c (diff)
downloadfluxbox-880209a43821c8f56e4a46b2debf7a72f68658c8.zip
fluxbox-880209a43821c8f56e4a46b2debf7a72f68658c8.tar.bz2
Merge branch 'xinerama_randr'
Diffstat (limited to 'src/Toolbar.hh')
-rw-r--r--src/Toolbar.hh7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index c528102..c295e24 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -31,6 +31,10 @@
31#include "ToolTheme.hh" 31#include "ToolTheme.hh"
32#include "Layer.hh" 32#include "Layer.hh"
33 33
34#ifdef XINERAMA
35#include "Xinerama.hh"
36#endif // XINERAMA
37
34#include "FbTk/Timer.hh" 38#include "FbTk/Timer.hh"
35#include "FbTk/Resource.hh" 39#include "FbTk/Resource.hh"
36#include "FbTk/Observer.hh" 40#include "FbTk/Observer.hh"
@@ -159,6 +163,9 @@ private:
159 FbTk::XLayerItem m_layeritem; ///< layer item, must be declared before layermenu 163 FbTk::XLayerItem m_layeritem; ///< layer item, must be declared before layermenu
160 LayerMenu m_layermenu; 164 LayerMenu m_layermenu;
161 FbMenu m_placementmenu, m_toolbarmenu; 165 FbMenu m_placementmenu, m_toolbarmenu;
166#ifdef XINERAMA
167 XineramaHeadMenu<Toolbar> *m_xineramaheadmenu;
168#endif // XINERAMA
162 169
163 170
164 // themes 171 // themes