aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.hh
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.hh
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.hh')
-rw-r--r--src/Toolbar.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 1f41ed5..3c9d048 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -187,7 +187,7 @@ private:
187 FbTk::Resource<bool> m_rc_auto_hide, m_rc_maximize_over, m_rc_visible; 187 FbTk::Resource<bool> m_rc_auto_hide, m_rc_maximize_over, m_rc_visible;
188 FbTk::Resource<int> m_rc_width_percent; 188 FbTk::Resource<int> m_rc_width_percent;
189 FbTk::Resource<int> m_rc_alpha; 189 FbTk::Resource<int> m_rc_alpha;
190 FbTk::Resource<class Layer> m_rc_layernum; 190 FbTk::Resource<class ResourceLayer> m_rc_layernum;
191 FbTk::Resource<int> m_rc_on_head; 191 FbTk::Resource<int> m_rc_on_head;
192 FbTk::Resource<Placement> m_rc_placement; 192 FbTk::Resource<Placement> m_rc_placement;
193 FbTk::Resource<int> m_rc_height; 193 FbTk::Resource<int> m_rc_height;