use FbPixmap

1 files changed, 6 insertions, 4 deletions

diff --git a/src/Shape.hh b/src/Shape.hh
index 0bc037f..53faaaa 100644
--- a/src/Shape.hh
+++ b/src/Shape.hh
@@ -19,15 +19,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Shape.hh,v 1.3 2003/12/16 23:32:02 fluxgen Exp $
+// $Id: Shape.hh,v 1.4 2004/01/11 15:02:11 fluxgen Exp $
 
 #ifndef SHAPE_HH
 #define SHAPE_HH
 
 #include <X11/Xlib.h>
+#include <memory>
 
 namespace FbTk {
 class FbWindow;
+class FbPixmap;
 }
 
 /// creates round corners on windows
@@ -49,16 +51,16 @@ public:
     void update(); 
     /// assign a new window
     void setWindow(FbTk::FbWindow &win);
+    unsigned int width() const;
+    unsigned int height() const;
     // sets shape notify mask
     static void setShapeNotify(const FbTk::FbWindow &win);
     /// @return true if window has shape
     static bool isShaped(const FbTk::FbWindow &win);
 private:
     FbTk::FbWindow *m_win; ///< window to be shaped
-    Pixmap m_shape; ///< our shape pixmap
+    std::auto_ptr<FbTk::FbPixmap> m_shape; ///< our shape pixmap
     int m_shapeplaces; ///< places to shape
-    unsigned int m_width; ///< width of window (the "old" size), if width != window width then shape resizes
-    unsigned int m_height; ///< height of window (the "old" size), if height != window height then shape resizes
 };
 
 #endif // SHAPE_HH