aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 9a29f79..a000c99 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// 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
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.85 2003/05/19 14:26:30 rathnor Exp $ 25// $Id: Toolbar.cc,v 1.86 2003/05/19 15:32:47 rathnor Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -42,10 +42,7 @@
42#include "RootTheme.hh" 42#include "RootTheme.hh"
43#include "BoolMenuItem.hh" 43#include "BoolMenuItem.hh"
44#include "FbWinFrameTheme.hh" 44#include "FbWinFrameTheme.hh"
45
46#ifdef XINERAMA
47#include "Xinerama.hh" 45#include "Xinerama.hh"
48#endif XINERAMA
49 46
50// use GNU extensions 47// use GNU extensions
51#ifndef _GNU_SOURCE 48#ifndef _GNU_SOURCE
@@ -138,7 +135,7 @@ void setupMenus(Toolbar &tbar) {
138 menu.setInternalMenu(); 135 menu.setInternalMenu();
139 136
140 menu.insert("Layer...", &tbar.layermenu()); 137 menu.insert("Layer...", &tbar.layermenu());
141#ifdef XINERAMA 138
142 if (tbar.screen().hasXinerama()) { 139 if (tbar.screen().hasXinerama()) {
143 menu.insert("On Head...", new XineramaHeadMenu<Toolbar>( 140 menu.insert("On Head...", new XineramaHeadMenu<Toolbar>(
144 *tbar.screen().menuTheme(), 141 *tbar.screen().menuTheme(),
@@ -148,8 +145,6 @@ void setupMenus(Toolbar &tbar) {
148 &tbar 145 &tbar
149 )); 146 ));
150 } 147 }
151
152#endif //XINERAMA
153 148
154 // setup items in placement menu 149 // setup items in placement menu
155 struct { 150 struct {