From e21990f8f34c0b348d804598a79453e791ea08ee Mon Sep 17 00:00:00 2001 From: mathias <mathias> Date: Mon, 27 Feb 2006 21:43:01 +0000 Subject: forgotten cosmetics --- src/Slit.cc | 1 + src/Toolbar.cc | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Slit.cc b/src/Slit.cc index e6ceb57..f12991e 100644 --- a/src/Slit.cc +++ b/src/Slit.cc @@ -59,6 +59,7 @@ #include "SlitClient.hh" #include "Xutil.hh" #include "FbAtoms.hh" +#include "FbTk/App.hh" #include "FbTk/MenuSeparator.hh" #include "FbTk/StringUtil.hh" #include "FbTk/I18n.hh" diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 1b14855..2a9eb8b 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc @@ -32,7 +32,7 @@ // themes #include "ToolbarTheme.hh" -#include "FbTk/I18n.hh" +#include "fluxbox.hh" #include "Screen.hh" #include "IntResMenuItem.hh" #include "BoolMenuItem.hh" @@ -45,6 +45,7 @@ #include "CommandParser.hh" #include "Layer.hh" +#include "FbTk/I18n.hh" #include "FbTk/ImageControl.hh" #include "FbTk/MacroCommand.hh" #include "FbTk/EventManager.hh" @@ -819,17 +820,17 @@ void Toolbar::setupMenus() { m_rc_width_percent, 0, 100, menu()); // min/max value - + toolbar_menuitem->setCommand(reconfig_toolbar_and_save_resource); menu().insert(toolbar_menuitem); - + menu().insert(new BoolMenuItem(_FBTEXT(Common, MaximizeOver, "Maximize Over", "Maximize over this thing when maximizing"), *m_rc_maximize_over, reconfig_toolbar_and_save_resource)); menu().insert(_FBTEXT(Menu, Layer, "Layer...", "Title of Layer menu"), &layerMenu()); - +#ifdef XINERAMA if (screen().hasXinerama()) { menu().insert(_FBTEXT(Menu, OnHead, "On Head...", "Title of On Head menu"), new XineramaHeadMenu<Toolbar>(screen().menuTheme(), @@ -840,6 +841,7 @@ void Toolbar::setupMenus() { _FBTEXT(Toolbar, OnHead, "Toolbar on Head", "Title of toolbar on head menu"))); } +#endif // XINERAMA typedef pair<const char*, Toolbar::Placement> PlacementP; typedef list<PlacementP> Placements; -- cgit v0.11.2