X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=161e3e71d6523c5b014136944bc2937c183895de;hb=a0350e27b311db5cab49035752d3852ee68bf8a2;hp=fec463fd77c2ae7b24d35bb418366444a564ef67;hpb=25d1e3538be5719b238f7e62a949c409fef2af66;p=chaz%2Fopenbox

diff --git a/otk/widget.cc b/otk/widget.cc
index fec463fd..161e3e71 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -17,14 +17,14 @@ namespace otk {
 OtkWidget::OtkWidget(OtkWidget *parent, Direction direction)
   : OtkEventHandler(),
     _dirty(false), _focused(false),
-    _parent(parent), _style(parent->getStyle()), _direction(direction),
-    _cursor(parent->getCursor()), _bevel_width(parent->getBevelWidth()),
+    _parent(parent), _style(parent->style()), _direction(direction),
+    _cursor(parent->cursor()), _bevel_width(parent->bevelWidth()),
     _ignore_config(0),
     _visible(false), _grabbed_mouse(false),
     _grabbed_keyboard(false), _stretchable_vert(false),
     _stretchable_horz(false), _texture(0), _bg_pixmap(0), _bg_pixel(0),
-    _bcolor(0), _bwidth(0), _screen(parent->getScreen()), _fixed_width(false),
-    _fixed_height(false), _event_dispatcher(parent->getEventDispatcher())
+    _bcolor(0), _bwidth(0), _screen(parent->screen()), _fixed_width(false),
+    _fixed_height(false), _event_dispatcher(parent->eventDispatcher())
 {
   assert(parent);
   parent->addChild(this);
@@ -70,7 +70,7 @@ OtkWidget::~OtkWidget()
 void OtkWidget::create(void)
 {
   const ScreenInfo *scr_info = otk::OBDisplay::screenInfo(_screen);
-  Window p_window = _parent ? _parent->getWindow() : scr_info->getRootWindow();
+  Window p_window = _parent ? _parent->window() : scr_info->rootWindow();
 
   _rect.setRect(0, 0, 1, 1); // just some initial values
 
@@ -78,7 +78,7 @@ void OtkWidget::create(void)
   unsigned long create_mask = CWBackPixmap | CWBorderPixel | CWEventMask;
 
   attrib_create.background_pixmap = None;
-  attrib_create.colormap = scr_info->getColormap();
+  attrib_create.colormap = scr_info->colormap();
   attrib_create.event_mask = ButtonPressMask | ButtonReleaseMask |
     ButtonMotionMask | ExposureMask | StructureNotifyMask;
 
@@ -89,8 +89,8 @@ void OtkWidget::create(void)
 
   _window = XCreateWindow(otk::OBDisplay::display, p_window, _rect.x(),
                           _rect.y(), _rect.width(), _rect.height(), 0,
-                          scr_info->getDepth(), InputOutput,
-                          scr_info->getVisual(), create_mask, &attrib_create);
+                          scr_info->depth(), InputOutput,
+                          scr_info->visual(), create_mask, &attrib_create);
   _ignore_config++;
 }
 
@@ -187,12 +187,6 @@ void OtkWidget::hide(bool recursive)
 
 void OtkWidget::focus(void)
 {
-/*  if (! _visible)
-    return;
-
-  XSetInputFocus(otk::OBDisplay::display, _window, RevertToPointerRoot,
-  CurrentTime);*/
-
   _focused = true;
   
   OtkWidget::OtkWidgetList::iterator it = _children.begin(),
@@ -253,12 +247,13 @@ void OtkWidget::ungrabKeyboard(void)
 void OtkWidget::render(void)
 {
   if (!_texture) return;
-  
+
   _bg_pixmap = _texture->render(_rect.width(), _rect.height(), _bg_pixmap);
 
-  if (_bg_pixmap)
+  if (_bg_pixmap) {
     XSetWindowBackgroundPixmap(otk::OBDisplay::display, _window, _bg_pixmap);
-  else {
+    _bg_pixel = None;
+  } else {
     unsigned int pix = _texture->color().pixel();
     if (pix != _bg_pixel) {
       _bg_pixel = pix;
@@ -392,7 +387,6 @@ void OtkWidget::adjustVert(void)
 void OtkWidget::update(void)
 {
   if (_dirty) {
-    if (! _unmanaged)
     adjust();
     render();
     XClearWindow(OBDisplay::display, _window);
@@ -445,15 +439,6 @@ void OtkWidget::setStyle(Style *style)
   _style = style;
   _dirty = true;
 
-  // reset textures/colors
-  if (_focused) {
-    unfocus();
-    focus();
-  } else {
-    focus();
-    unfocus();
-  }
-
   OtkWidgetList::iterator it, end = _children.end();
   for (it = _children.begin(); it != end; ++it)
     (*it)->setStyle(style);