X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fsurface.hh;h=18733517aaefc52a10fdb493fea5a7081f41e87e;hb=5face4c6f35172761367f63ac0b6eaf62d84e532;hp=53738128a2d8b06328f43e48eea56d7cd50450a5;hpb=9b6e5f9cf49df78be25720f9c4b33a733b856c9b;p=chaz%2Fopenbox

diff --git a/otk/surface.hh b/otk/surface.hh
index 53738128..18733517 100644
--- a/otk/surface.hh
+++ b/otk/surface.hh
@@ -14,31 +14,32 @@ extern "C" {
 namespace otk {
 
 class ScreenInfo;
+class RenderColor;
 
 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 RenderColor &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.