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.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index 68da564..6c52566 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -22,6 +22,8 @@
 #ifndef FBWINFRAME_HH
 #define FBWINFRAME_HH
 
+#include "WindowState.hh"
+
 #include "FbTk/FbWindow.hh"
 #include "FbTk/EventHandler.hh"
 #include "FbTk/RefCount.hh"
@@ -33,10 +35,6 @@
 #include "FbTk/Container.hh"
 #include "FbTk/Shape.hh"
 
-#include "WindowState.hh"
-
-#include <X11/Xutil.h>
-
 #include <vector>
 #include <memory>
 
@@ -50,7 +48,6 @@ namespace FbTk {
 class ImageControl;
 template <class T> class Command;
 class Texture;
-class Layer;
 }
 
 /// holds a window frame with a client window