diff options
author | Tomas Janousek <tomi@nomi.cz> | 2008-01-28 08:58:23 (GMT) |
---|---|---|
committer | Tomas Janousek <tomi@nomi.cz> | 2008-01-28 08:58:23 (GMT) |
commit | 880209a43821c8f56e4a46b2debf7a72f68658c8 (patch) | |
tree | 22f68473e939c1cf8cb838ece3943e4184ff7392 /src/Slit.hh | |
parent | a61b37da70e0cd1556617c56890455ef89ee1fb0 (diff) | |
parent | 5c85fcbe648b5b4581db1ca2303d5f849a63c28c (diff) | |
download | fluxbox_lack-880209a43821c8f56e4a46b2debf7a72f68658c8.zip fluxbox_lack-880209a43821c8f56e4a46b2debf7a72f68658c8.tar.bz2 |
Merge branch 'xinerama_randr'
Diffstat (limited to 'src/Slit.hh')
-rw-r--r-- | src/Slit.hh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/Slit.hh b/src/Slit.hh index 64ae6b4..a7f8e40 100644 --- a/src/Slit.hh +++ b/src/Slit.hh | |||
@@ -29,6 +29,10 @@ | |||
29 | #include "LayerMenu.hh" | 29 | #include "LayerMenu.hh" |
30 | #include "Layer.hh" | 30 | #include "Layer.hh" |
31 | 31 | ||
32 | #ifdef XINERAMA | ||
33 | #include "Xinerama.hh" | ||
34 | #endif // XINERAMA | ||
35 | |||
32 | #include "FbTk/Menu.hh" | 36 | #include "FbTk/Menu.hh" |
33 | #include "FbTk/FbWindow.hh" | 37 | #include "FbTk/FbWindow.hh" |
34 | #include "FbTk/Timer.hh" | 38 | #include "FbTk/Timer.hh" |
@@ -144,6 +148,9 @@ private: | |||
144 | SlitClients m_client_list; | 148 | SlitClients m_client_list; |
145 | std::auto_ptr<LayerMenu> m_layermenu; | 149 | std::auto_ptr<LayerMenu> m_layermenu; |
146 | FbMenu m_clientlist_menu, m_slitmenu; | 150 | FbMenu m_clientlist_menu, m_slitmenu; |
151 | #ifdef XINERAMA | ||
152 | XineramaHeadMenu<Slit> *m_xineramaheadmenu; | ||
153 | #endif // XINERAMA | ||
147 | std::string m_filename; | 154 | std::string m_filename; |
148 | 155 | ||
149 | struct frame { | 156 | struct frame { |