widegt using new render system

[chaz/openbox] / otk / surface.hh

diff --git a/otk/surface.hh b/otk/surface.hh
index 53738128a2d8b06328f43e48eea56d7cd50450a5..d325b3937a59da6c3f93217a9e1e1da53d6cd0c0 100644 (file)
--- a/otk/surface.hh
+++ b/otk/surface.hh
@@ -18,27 +18,27 @@ class ScreenInfo;
 class Surface {
   int _screen;
   Point _size;
-  XImage *_im;
-  Pixmap _pm;
+  Pixmap _pixmap;
   XftDraw *_xftdraw;
 
+protected:
   void createObjects();
   void destroyObjects();
-  
-protected:
-  Surface(int screen);
-  Surface(int screen, const Point &size);
-
-  virtual void setSize(int w, int h);
 
+  void setPixmap(XImage *image);
+  void setPixmap(const Color &color);
+  
 public:
+  Surface(int screen, const Point &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 Pixmap pixmap() const { return _pm; } // TEMP
+
+  virtual Pixmap pixmap() const { return _pixmap; }
 
   // The RenderControl classes use the internal objects in this class to render
   // to it. Noone else needs them tho, so they are private.