diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2011-03-23 11:02:15 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2011-03-23 11:02:15 (GMT) |
commit | e850b0191977da47eb7233e248dbab7ebd1d21f0 (patch) | |
tree | d3a3e33f1d4524147ddaa2b6b21e05bd142fc367 /src/LayerMenu.cc | |
parent | 7ece90ad4f360b3cf11e46a00d4c1ec5b60213e9 (diff) | |
download | fluxbox_paul-e850b0191977da47eb7233e248dbab7ebd1d21f0.zip fluxbox_paul-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/LayerMenu.cc')
-rw-r--r-- | src/LayerMenu.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/LayerMenu.cc b/src/LayerMenu.cc index 0638366..94a6622 100644 --- a/src/LayerMenu.cc +++ b/src/LayerMenu.cc | |||
@@ -42,12 +42,12 @@ LayerMenu::LayerMenu(FbTk::ThemeProxy<FbTk::MenuTheme> &tm, | |||
42 | int layernum; | 42 | int layernum; |
43 | } layer_menuitems[] = { | 43 | } layer_menuitems[] = { |
44 | //TODO: nls | 44 | //TODO: nls |
45 | {0, 0, _FB_XTEXT(Layer, AboveDock, "Above Dock", "Layer above dock"), Layer::ABOVE_DOCK}, | 45 | {0, 0, _FB_XTEXT(Layer, AboveDock, "Above Dock", "Layer above dock"), ResourceLayer::ABOVE_DOCK}, |
46 | {0, 0, _FB_XTEXT(Layer, Dock, "Dock", "Layer dock"), Layer::DOCK}, | 46 | {0, 0, _FB_XTEXT(Layer, Dock, "Dock", "Layer dock"), ResourceLayer::DOCK}, |
47 | {0, 0, _FB_XTEXT(Layer, Top, "Top", "Layer top"), Layer::TOP}, | 47 | {0, 0, _FB_XTEXT(Layer, Top, "Top", "Layer top"), ResourceLayer::TOP}, |
48 | {0, 0, _FB_XTEXT(Layer, Normal, "Normal", "Layer normal"), Layer::NORMAL}, | 48 | {0, 0, _FB_XTEXT(Layer, Normal, "Normal", "Layer normal"), ResourceLayer::NORMAL}, |
49 | {0, 0, _FB_XTEXT(Layer, Bottom, "Bottom", "Layer bottom"), Layer::BOTTOM}, | 49 | {0, 0, _FB_XTEXT(Layer, Bottom, "Bottom", "Layer bottom"), ResourceLayer::BOTTOM}, |
50 | {0, 0, _FB_XTEXT(Layer, Desktop, "Desktop", "Layer desktop"), Layer::DESKTOP}, | 50 | {0, 0, _FB_XTEXT(Layer, Desktop, "Desktop", "Layer desktop"), ResourceLayer::DESKTOP}, |
51 | }; | 51 | }; |
52 | 52 | ||
53 | FbTk::RefCount<FbTk::Command<void> > saverc_cmd(new FbCommands::SaveResources()); | 53 | FbTk::RefCount<FbTk::Command<void> > saverc_cmd(new FbCommands::SaveResources()); |