updated wrappers around the new otk widget system and style system

[chaz/openbox] / otk / surface.cc

diff --git a/otk/surface.cc b/otk/surface.cc
index 99fa82b04bf7e329569c7e71278378d7c2782b00..aabbf85af8bc4d9042734367f6e8d666cbc6fc06 100644 (file)
--- a/otk/surface.cc
+++ b/otk/surface.cc
@@ -7,7 +7,7 @@
 #include "surface.hh"
 #include "display.hh"
 #include "screeninfo.hh"
-#include "gccache.hh"
+#include "rendercolor.hh"
 
 extern "C" {
 #include <X11/Xutil.h>
@@ -15,7 +15,7 @@ extern "C" {
 
 namespace otk {
 
-Surface::Surface(int screen, const Point &size)
+Surface::Surface(int screen, const Size &size)
   : _screen(screen),
     _size(size),
     _pixmap(None),
@@ -28,27 +28,25 @@ Surface::~Surface()
   destroyObjects();
 }
 
-void Surface::setPixmap(const Color &color)
+void Surface::setPixmap(const RenderColor &color)
 {
   if (_pixmap == None)
     createObjects();
 
-  Pen p(color);
-  XFillRectangle(**display, _pixmap, p.gc(), 0, 0,
-                 _size.x(), _size.y());
+  XFillRectangle(**display, _pixmap, color.gc(), 0, 0,
+                 _size.width(), _size.height());
 }
 
 void Surface::setPixmap(XImage *image)
 {
-  printf("SET PIXMAP\n");
-  assert(image->width == _size.x());
-  assert(image->height == _size.y());
+  assert((unsigned)image->width == _size.width());
+  assert((unsigned)image->height == _size.height());
   
   if (_pixmap == None)
     createObjects();
 
   XPutImage(**display, _pixmap, DefaultGC(**display, _screen),
-            image, 0, 0, 0, 0, _size.x(), _size.y());
+            image, 0, 0, 0, 0, _size.width(), _size.height());
 }
 
 void Surface::createObjects()
@@ -58,10 +56,12 @@ void Surface::createObjects()
   const ScreenInfo *info = display->screenInfo(_screen);
   
   _pixmap = XCreatePixmap(**display, info->rootWindow(),
-                          _size.x(), _size.y(), info->depth());
+                          _size.width(), _size.height(), info->depth());
+  assert(_pixmap != None);
     
   _xftdraw = XftDrawCreate(**display, _pixmap,
                            info->visual(), info->colormap());
+  assert(_xftdraw);
 }
 
 void Surface::destroyObjects()