aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2011-03-23 11:02:15 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2011-03-23 11:02:15 (GMT)
commite850b0191977da47eb7233e248dbab7ebd1d21f0 (patch)
treed3a3e33f1d4524147ddaa2b6b21e05bd142fc367 /src/Toolbar.cc
parent7ece90ad4f360b3cf11e46a00d4c1ec5b60213e9 (diff)
downloadfluxbox_pavel-e850b0191977da47eb7233e248dbab7ebd1d21f0.zip
fluxbox_pavel-e850b0191977da47eb7233e248dbab7ebd1d21f0.tar.bz2
compile fix: sunCC 5.11 (sunstudio 12) compiles and links again
biggest change: renaming of 'class Layer' to 'class ResourceLayer' in Layer.hh to handle complaints about 'ambiguous Layer: Layer or FbTk::Layer'. 'ResourceLayer' sounds crappy, but that was the best I could come up with right now.
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 1e43b5c..471f5ec 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -190,15 +190,15 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::Layer &layer, size_t width):
190 m_layeritem(frame.window, layer), 190 m_layeritem(frame.window, layer),
191 m_layermenu(scrn.menuTheme(), 191 m_layermenu(scrn.menuTheme(),
192 scrn.imageControl(), 192 scrn.imageControl(),
193 *scrn.layerManager().getLayer(Layer::MENU), 193 *scrn.layerManager().getLayer(ResourceLayer::MENU),
194 this, 194 this,
195 true), 195 true),
196 m_placementmenu(scrn.menuTheme(), 196 m_placementmenu(scrn.menuTheme(),
197 scrn.imageControl(), 197 scrn.imageControl(),
198 *scrn.layerManager().getLayer(Layer::MENU)), 198 *scrn.layerManager().getLayer(ResourceLayer::MENU)),
199 m_toolbarmenu(scrn.menuTheme(), 199 m_toolbarmenu(scrn.menuTheme(),
200 scrn.imageControl(), 200 scrn.imageControl(),
201 *scrn.layerManager().getLayer(Layer::MENU)), 201 *scrn.layerManager().getLayer(ResourceLayer::MENU)),
202#ifdef XINERAMA 202#ifdef XINERAMA
203 m_xineramaheadmenu(0), 203 m_xineramaheadmenu(0),
204#endif // XINERAMA 204#endif // XINERAMA
@@ -215,7 +215,7 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::Layer &layer, size_t width):
215 scrn.name() + ".toolbar.widthPercent", scrn.altName() + ".Toolbar.WidthPercent"), 215 scrn.name() + ".toolbar.widthPercent", scrn.altName() + ".Toolbar.WidthPercent"),
216 m_rc_alpha(scrn.resourceManager(), 255, 216 m_rc_alpha(scrn.resourceManager(), 255,
217 scrn.name() + ".toolbar.alpha", scrn.altName() + ".Toolbar.Alpha"), 217 scrn.name() + ".toolbar.alpha", scrn.altName() + ".Toolbar.Alpha"),
218 m_rc_layernum(scrn.resourceManager(), Layer(Layer::DOCK), 218 m_rc_layernum(scrn.resourceManager(), ResourceLayer(ResourceLayer::DOCK),
219 scrn.name() + ".toolbar.layer", scrn.altName() + ".Toolbar.Layer"), 219 scrn.name() + ".toolbar.layer", scrn.altName() + ".Toolbar.Layer"),
220 m_rc_on_head(scrn.resourceManager(), 1, 220 m_rc_on_head(scrn.resourceManager(), 1,
221 scrn.name() + ".toolbar.onhead", scrn.altName() + ".Toolbar.onHead"), 221 scrn.name() + ".toolbar.onhead", scrn.altName() + ".Toolbar.onHead"),
@@ -829,7 +829,7 @@ void Toolbar::setupMenus(bool skip_new_placement) {
829 new XineramaHeadMenu<Toolbar>(screen().menuTheme(), 829 new XineramaHeadMenu<Toolbar>(screen().menuTheme(),
830 screen(), 830 screen(),
831 screen().imageControl(), 831 screen().imageControl(),
832 *screen().layerManager().getLayer(::Layer::MENU), 832 *screen().layerManager().getLayer(::ResourceLayer::MENU),
833 *this, 833 *this,
834 _FB_XTEXT(Toolbar, OnHead, "Toolbar on Head", 834 _FB_XTEXT(Toolbar, OnHead, "Toolbar on Head",
835 "Title of toolbar on head menu"))); 835 "Title of toolbar on head menu")));