aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTool.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/IconbarTool.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/IconbarTool.cc')
-rw-r--r--src/IconbarTool.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 932121f..dc0eaeb 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -266,7 +266,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme,
266 m_rc_use_pixmap(screen.resourceManager(), true, 266 m_rc_use_pixmap(screen.resourceManager(), true,
267 screen.name() + ".iconbar.usePixmap", screen.altName() + ".Iconbar.UsePixmap"), 267 screen.name() + ".iconbar.usePixmap", screen.altName() + ".Iconbar.UsePixmap"),
268 m_menu(screen.menuTheme(), screen.imageControl(), 268 m_menu(screen.menuTheme(), screen.imageControl(),
269 *screen.layerManager().getLayer(Layer::MENU)), 269 *screen.layerManager().getLayer(ResourceLayer::MENU)),
270 m_alpha(255) { 270 m_alpha(255) {
271 271
272 // setup mode menu 272 // setup mode menu