formatting

[chaz/openbox] / otk / rendercontrol.hh

diff --git a/otk/rendercontrol.hh b/otk/rendercontrol.hh
index a512060f2dbbeecd370f6e668f6fbd008533b25d..781c32d47a991b4cf50472a53a4d79655c02eec8 100644 (file)
--- a/otk/rendercontrol.hh
+++ b/otk/rendercontrol.hh
@@ -13,7 +13,7 @@ class ScreenInfo;
 class Surface;
 class RenderTexture;
 class Font;
-class Color;
+class RenderColor;
 class ustring;
 
 class RenderControl {
@@ -63,17 +63,23 @@ protected:
 
   RenderControl(int screen);
 
+  virtual void drawSolidBackground(Surface& sf,
+                                   const RenderTexture& texture) const;
+  
 public:
   virtual ~RenderControl();
 
   static RenderControl *getRenderControl(int screen);
 
+  virtual void drawRoot(const RenderColor &color) const;
+  
   //! Draws a string onto a Surface
-  virtual void drawString(Surface *sf, const Font &font, int x, int y,
-                         const Color &color, const ustring &string) const;
+  virtual void drawString(Surface &sf, const Font &font, int x, int y,
+                         const RenderColor &color,
+                          const ustring &string) const;
 
   //! Draws a background onto a Surface, as specified by a RenderTexture
-  virtual void drawBackground(Surface *sf,
+  virtual void drawBackground(Surface &sf,
                              const RenderTexture &texture) const = 0;
 };