X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=698e856bd2bf838282bb20bb9547fdeb6c02ac7a;hb=674f2609c22d68c5645da22f42ef858182e8b791;hp=7d183c28963571b2e69cb1e48049275d27505388;hpb=d8d9b42777ace234f3471918e1210062578f8188;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index 7d183c28..698e856b 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -5,7 +5,7 @@
 #include "rect.hh"
 #include "point.hh"
 #include "rendertexture.hh"
-#include "style.hh"
+#include "renderstyle.hh"
 #include "eventdispatcher.hh"
 #include "display.hh"
 #include "surface.hh"
@@ -28,7 +28,7 @@ public:
   typedef std::list<Widget *> WidgetList;
 
   Widget(Widget *parent, Direction = Horizontal);
-  Widget(EventDispatcher *event_dispatcher, Style *style,
+  Widget(EventDispatcher *event_dispatcher, RenderStyle *style,
          Direction direction = Horizontal, Cursor cursor = 0,
          int bevel_width = 1, bool override_redirect = false);
 
@@ -81,8 +81,8 @@ public:
   virtual void setTexture(RenderTexture *texture)
     { _texture = texture; _dirty = true; }
 
-  inline const Color *borderColor(void) const { return _bcolor; }
-  virtual void setBorderColor(const Color *color) {
+  inline const RenderColor *borderColor(void) const { return _bcolor; }
+  virtual void setBorderColor(const RenderColor *color) {
     assert(color); _bcolor = color;
     XSetWindowBorder(**display, _window, color->pixel());
   }
@@ -115,8 +115,8 @@ public:
   inline Direction direction(void) const { return _direction; }
   void setDirection(Direction dir) { _direction = dir; }
 
-  inline Style *style(void) const { return _style; }
-  virtual void setStyle(Style *style);
+  inline RenderStyle *style(void) const { return _style; }
+  virtual void setStyle(RenderStyle *style);
 
   inline EventDispatcher *eventDispatcher(void)
     { return _event_dispatcher; }
@@ -133,14 +133,14 @@ protected:
   virtual void adjustVert(void);
   virtual void internalResize(int width, int height);
   virtual void render(void);
-  virtual void renderForeground(void) {} // for overriding
+  virtual void renderForeground() {} // for overriding
 
   Window _window;
 
   Widget *_parent;
   WidgetList _children;
 
-  Style *_style;
+  RenderStyle *_style;
   Direction _direction;
   Cursor _cursor;
   int _bevel_width;
@@ -158,7 +158,7 @@ protected:
   Pixmap _bg_pixmap;
   unsigned int _bg_pixel;
 
-  const Color *_bcolor;
+  const RenderColor *_bcolor;
   unsigned int _bwidth;
 
   Rect _rect;
@@ -167,7 +167,7 @@ protected:
   bool _fixed_width;
   bool _fixed_height;
 
-  Surface _surface;
+  Surface *_surface;
 
   EventDispatcher *_event_dispatcher;
 };