port shape fixes stage 2 from trunk

1 files changed, 5 insertions, 2 deletions

diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index 4f42aab..bdc2add 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -33,6 +33,7 @@
 #include "FbTk/XLayerItem.hh"
 #include "FbTk/TextButton.hh"
 #include "Container.hh"
+#include "Shape.hh"
 
 #include <vector>
 #include <list>
@@ -194,6 +195,8 @@ public:
  
     void reconfigure();
     void setUseShape(bool value);
+    void setShapingClient(FbTk::FbWindow *win, bool always_update);
+    void updateShape() { m_shape.update(); }
 
     /**
        @name accessors
@@ -392,9 +395,9 @@ private:
         FbWinFrame &m_frame;
     };
     ThemeListener m_themelistener;
-    std::auto_ptr<Shape> m_shape;
-    bool m_disable_shape;
+    Shape m_shape;
 
+    bool m_disable_themeshape;
 };
 
 #endif // FBWINFRAME_HH