add rendercolor class, with a cache of gcs for the colors

[chaz/openbox] / otk / rendercontrol.cc

diff --git a/otk/rendercontrol.cc b/otk/rendercontrol.cc
index ef49f7e1098b88eecd3483dbda74027787027183..0f84af892b22b2dc68c75f6d7df385056687229b 100644 (file)
--- a/otk/rendercontrol.cc
+++ b/otk/rendercontrol.cc
@@ -60,13 +60,12 @@ RenderControl::~RenderControl()
 
 }
 
-void RenderControl::drawString(Surface *sf, const Font &font, int x, int y,
+void RenderControl::drawString(Surface& sf, const Font &font, int x, int y,
                               const Color &color, const ustring &string) const
 {
-  assert(sf);
-  assert(sf->_screen == _screen);
-  XftDraw *d = sf->_xftdraw;
-  assert(d);
+  assert(sf._screen == _screen);
+  XftDraw *d = sf._xftdraw;
+  assert(d); // this means that the background hasn't been rendered yet!
   
   if (font._shadow) {
     XftColor c;