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

diff --git a/otk/focuswidget.cc b/otk/focuswidget.cc
index f5b176bf..e2eef1ee 100644
--- a/otk/focuswidget.cc
+++ b/otk/focuswidget.cc
@@ -12,8 +12,8 @@ OtkFocusWidget::OtkFocusWidget(OtkWidget *parent, Direction direction)
   : OtkWidget(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()
@@ -23,43 +23,30 @@ OtkFocusWidget::~OtkFocusWidget()
 #include <stdio.h>
 void OtkFocusWidget::focus(void)
 {
-  if (!isVisible() || _focused)
+  if (_focused)
     return;
 
-  printf("FOCUS\n");
   OtkWidget::focus();
 
   if (_focus_bcolor)
     OtkWidget::setBorderColor(_focus_bcolor);
 
   OtkWidget::setTexture(_focus_texture);
-  OtkWidget::update();
+  update();
 }
 
 void OtkFocusWidget::unfocus(void)
 {
-  if (!isVisible() || !_focused)
+  if (!_focused)
     return;
 
-  printf("UNFOCUS\n");
   OtkWidget::unfocus();
 
   if (_unfocus_bcolor)
     OtkWidget::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();
-  }
+  update();
 }
 
 void OtkFocusWidget::setTexture(BTexture *texture)