X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuswidget.cc;h=c3629bbbc348fa849f6c9672c80a635533581439;hb=0dcbf985c11c850b30b2983e1e20cd8cf033f054;hp=f5b176bfc4bc1bd90dde1dc3fbbce33a9248e3b8;hpb=70eb03ad50e1a71fd64c8cb1ebabbff311850553;p=chaz%2Fopenbox

diff --git a/otk/focuswidget.cc b/otk/focuswidget.cc
index f5b176bf..c3629bbb 100644
--- a/otk/focuswidget.cc
+++ b/otk/focuswidget.cc
@@ -8,69 +8,56 @@
 
 namespace otk {
 
-OtkFocusWidget::OtkFocusWidget(OtkWidget *parent, Direction direction)
-  : OtkWidget(parent, direction), _unfocus_texture(0), _unfocus_bcolor(0)
+FocusWidget::FocusWidget(Widget *parent, Direction direction)
+  : Widget(parent, direction), _unfocus_texture(0), _unfocus_bcolor(0)
 {
   _focused = true;
-  _focus_texture = parent->getTexture();
-  _focus_bcolor = parent->getBorderColor();
+  _focus_texture = parent->texture();
+  _focus_bcolor = parent->borderColor();
 }
 
-OtkFocusWidget::~OtkFocusWidget()
+FocusWidget::~FocusWidget()
 {
 }
 
 #include <stdio.h>
-void OtkFocusWidget::focus(void)
+void FocusWidget::focus(void)
 {
-  if (!isVisible() || _focused)
+  if (_focused)
     return;
 
-  printf("FOCUS\n");
-  OtkWidget::focus();
+  Widget::focus();
 
   if (_focus_bcolor)
-    OtkWidget::setBorderColor(_focus_bcolor);
+    Widget::setBorderColor(_focus_bcolor);
 
-  OtkWidget::setTexture(_focus_texture);
-  OtkWidget::update();
+  Widget::setTexture(_focus_texture);
+  update();
 }
 
-void OtkFocusWidget::unfocus(void)
+void FocusWidget::unfocus(void)
 {
-  if (!isVisible() || !_focused)
+  if (!_focused)
     return;
 
-  printf("UNFOCUS\n");
-  OtkWidget::unfocus();
+  Widget::unfocus();
 
   if (_unfocus_bcolor)
-    OtkWidget::setBorderColor(_unfocus_bcolor);
+    Widget::setBorderColor(_unfocus_bcolor);
 
-  OtkWidget::setTexture(_unfocus_texture);
-  OtkWidget::update();
-
-  OtkWidget::OtkWidgetList children = OtkWidget::getChildren();
-
-  OtkWidget::OtkWidgetList::iterator it = children.begin(),
-    end = children.end();
-
-  OtkFocusWidget *tmp = 0;
-  for (; it != end; ++it) {
-    tmp = dynamic_cast<OtkFocusWidget*>(*it);
-    if (tmp) tmp->unfocus();
-  }
+  Widget::setTexture(_unfocus_texture);
+  update();
 }
 
-void OtkFocusWidget::setTexture(BTexture *texture)
+void FocusWidget::setTexture(Texture *texture)
 {
-  OtkWidget::setTexture(texture);
+  Widget::setTexture(texture);
   _focus_texture = texture;
 }
 
-void OtkFocusWidget::setBorderColor(const BColor *color)
+void FocusWidget::setBorderColor(const Color *color)
 {
-  OtkWidget::setBorderColor(color);
+  Widget::setBorderColor(color);
   _focus_bcolor = color;
 }