updated wrappers around the new otk widget system and style system

[chaz/openbox] / otk / rendercontrol.cc

diff --git a/otk/rendercontrol.cc b/otk/rendercontrol.cc
index ebd2cfc84b12711b8fbde0fcd21fbfccef9c3401..bf69a4e5c7c7694cd3322353fd74f86c57752776 100644 (file)
--- a/otk/rendercontrol.cc
+++ b/otk/rendercontrol.cc
@@ -9,6 +9,7 @@
 #include "pseudorendercontrol.hh"
 #include "rendertexture.hh"
 #include "rendercolor.hh"
+#include "renderstyle.hh"
 #include "display.hh"
 #include "screeninfo.hh"
 #include "surface.hh"
@@ -38,7 +39,7 @@ RenderControl *RenderControl::getRenderControl(int screen)
     return new PseudoRenderControl(screen);
   case GrayScale:
   case StaticGray:
-//    return new GrayRenderControl(screen);
+    return new PseudoRenderControl(screen);
   default:
     printf(_("RenderControl: Unsupported visual %d specified. Aborting.\n"),
           vclass);
@@ -50,15 +51,11 @@ RenderControl::RenderControl(int screen)
   : _screen(screen)
 {
   printf("Initializing RenderControl\n");
-
-  
 }
 
 RenderControl::~RenderControl()
 {
   printf("Destroying RenderControl\n");
-
-
 }
 
 void RenderControl::drawRoot(const RenderColor &color) const
@@ -120,7 +117,7 @@ void RenderControl::drawSolidBackground(Surface& sf,
   
   sf.setPixmap(texture.color());
 
-  int width = sf.width(), height = sf.height();
+  int width = sf.size().width(), height = sf.size().height();
   int left = 0, top = 0, right = width - 1, bottom = height - 1;
 
   if (texture.interlaced())