Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / gui / ewidget.cpp

diff --git a/lib/gui/ewidget.cpp b/lib/gui/ewidget.cpp
index a302cbc65dc8b30e8779bb3485a6db242e5fd62e..fea3524c8b717cdc51c70a57748461d4638413d2 100644 (file)
--- a/lib/gui/ewidget.cpp
+++ b/lib/gui/ewidget.cpp
@@ -54,6 +54,7 @@ void eWidget::resize(eSize size)
                   only once. */
        eSize old_size = m_size;
        eSize old_offset = m_client_offset;
+       m_client_size = size;
        m_client_offset = eSize(0, 0);
        event(evtWillChangeSize, &size, &m_client_offset);
        if (old_size == m_size)
@@ -88,7 +89,7 @@ void eWidget::invalidate(const gRegion &region)
        while (root && !root->m_desktop)
        {
                root = root->m_parent;
-               assert(root);
+               ASSERT(root);
                if (root->m_layer != -1)
                        target_layer = root->m_layer;
                abspos += root->position();
@@ -122,7 +123,7 @@ void eWidget::show()
                                        probably somebody already erased the root, but tries some
                                        operations on a child window. 
                                                                        ignore them for now. */
-                       /* assert(root); */
+                       /* ASSERT(root); */
                        return;
                }
                if (root->m_layer != -1)
@@ -162,7 +163,7 @@ void eWidget::hide()
                        return;
                abspos += root->position();
        }
-       assert(root->m_desktop);
+       ASSERT(root->m_desktop);
 
        gRegion abs = m_visible_with_childs;
        abs.moveBy(abspos);
@@ -218,7 +219,7 @@ ePoint eWidget::getAbsolutePosition()
        while (root && !root->m_desktop)
        {
                root = root->m_parent;
-               assert(root);
+               ASSERT(root);
                abspos += root->position();
        }
 
@@ -303,7 +304,7 @@ void eWidget::recalcClipRegionsWhenVisible()
                        break;
                }
                t = t->m_parent;
-               assert(t);
+               ASSERT(t);
        } while(1);
 }