various fixes to the otk widgets

[chaz/openbox] / otk / focuswidget.cc

diff --git a/otk/focuswidget.cc b/otk/focuswidget.cc
index c3629bbbc348fa849f6c9672c80a635533581439..b8e18d7875596580749836939224880293765bd4 100644 (file)
--- a/otk/focuswidget.cc
+++ b/otk/focuswidget.cc
@@ -20,7 +20,7 @@ FocusWidget::~FocusWidget()
 {
 }
 
-#include <stdio.h>
+
 void FocusWidget::focus(void)
 {
   if (_focused)
@@ -49,13 +49,15 @@ void FocusWidget::unfocus(void)
   update();
 }
 
-void FocusWidget::setTexture(Texture *texture)
+void FocusWidget::setTexture(RenderTexture *texture)
 {
   Widget::setTexture(texture);
   _focus_texture = texture;
+  if (!_focused)
+    Widget::setTexture(_unfocus_texture);
 }
 
-void FocusWidget::setBorderColor(const Color *color)
+void FocusWidget::setBorderColor(const RenderColor *color)
 {
   Widget::setBorderColor(color);
   _focus_bcolor = color;