X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fsurface.hh;h=7a202491f188392b5e0f5d7e354bf2ea6f6febb2;hb=99cd843fc6dc7a7f55b6c90fd1162f233853aad2;hp=112bb39233f74ba30b50403b69239357e910c8f8;hpb=e6bfddf849009bef7bbb75be5147b4a533fa1ad2;p=chaz%2Fopenbox

diff --git a/otk/surface.hh b/otk/surface.hh
index 112bb392..7a202491 100644
--- a/otk/surface.hh
+++ b/otk/surface.hh
@@ -2,7 +2,7 @@
 #ifndef __surface_hh
 #define __surface_hh
 
-#include "point.hh"
+#include "size.hh"
 #include "truerendercontrol.hh"
 #include "pseudorendercontrol.hh"
 
@@ -19,7 +19,7 @@ class RenderColor;
 
 class Surface {
   int _screen;
-  Point _size;
+  Size _size;
   Pixmap _pixmap;
   XftDraw *_xftdraw;
 
@@ -31,14 +31,12 @@ protected:
   void setPixmap(const RenderColor &color);
   
 public:
-  Surface(int screen, const Point &size);
+  Surface(int screen, const Size &size);
   virtual ~Surface();
 
   inline int screen(void) const { return _screen; }
 
-  virtual const Point& size() const { return _size; }
-  virtual int width() const { return _size.x(); }
-  virtual int height() const { return _size.y(); }
+  virtual const Size& size() const { return _size; }
 
   virtual Pixmap pixmap() const { return _pixmap; }