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/Window.hh | |
parent | 7ece90ad4f360b3cf11e46a00d4c1ec5b60213e9 (diff) | |
download | fluxbox-e850b0191977da47eb7233e248dbab7ebd1d21f0.zip fluxbox-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/Window.hh')
-rw-r--r-- | src/Window.hh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Window.hh b/src/Window.hh index 607ff69..bb27060 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -25,6 +25,12 @@ | |||
25 | #ifndef WINDOW_HH | 25 | #ifndef WINDOW_HH |
26 | #define WINDOW_HH | 26 | #define WINDOW_HH |
27 | 27 | ||
28 | #include "FbWinFrame.hh" | ||
29 | #include "Focusable.hh" | ||
30 | #include "FocusableTheme.hh" | ||
31 | #include "FocusControl.hh" | ||
32 | #include "WinButton.hh" | ||
33 | |||
28 | #include "FbTk/DefaultValue.hh" | 34 | #include "FbTk/DefaultValue.hh" |
29 | #include "FbTk/Timer.hh" | 35 | #include "FbTk/Timer.hh" |
30 | #include "FbTk/Subject.hh" | 36 | #include "FbTk/Subject.hh" |
@@ -33,13 +39,6 @@ | |||
33 | #include "FbTk/LayerItem.hh" | 39 | #include "FbTk/LayerItem.hh" |
34 | #include "FbTk/Signal.hh" | 40 | #include "FbTk/Signal.hh" |
35 | 41 | ||
36 | #include "FbWinFrame.hh" | ||
37 | #include "Focusable.hh" | ||
38 | #include "FocusableTheme.hh" | ||
39 | #include "FocusControl.hh" | ||
40 | #include "WinButton.hh" | ||
41 | |||
42 | |||
43 | #include <sys/time.h> | 42 | #include <sys/time.h> |
44 | #include <vector> | 43 | #include <vector> |
45 | #include <string> | 44 | #include <string> |