Author: sh-sh-sh Date: Fri Jun 15 00:35:04 2007 New Revision: 38475 URL: http://svn.opensuse.org/viewcvs/yast?rev=38475&view=rev Log: fixed child deletion Modified: branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc?rev=38475&r1=38474&r2=38475&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc Fri Jun 15 00:35:04 2007 @@ -37,11 +37,6 @@ YContainerWidget::~YContainerWidget() { - if ( ! isValid() ) - { - y2error( "ERROR: Trying to destroy invalid container widget" ); - return; - } } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h?rev=38475&r1=38474&r2=38475&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h Fri Jun 15 00:35:04 2007 @@ -29,27 +29,27 @@ public: /** * Constructor - */ + **/ YEmpty( const YWidgetOpt & opt ); /** * Returns a descriptive name of this widget class for logging, * debugging etc. - */ + **/ virtual const char * widgetClass() { return "YEmpty"; } /** * Minimum size the widget should have to make it look and feel * nice. This is 0 for the empty widget. * @param dim Dimension, either YD_HORIZ or YD_VERT - */ + **/ long nicesize( YUIDimension dim ); /** * Returns true if this is a layout stretch space in dimension "dim". * Such widgets will receive special treatment in layout calculations. * Inherited from YWidget. - */ + **/ bool isLayoutStretch( YUIDimension dim ) const; }; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc?rev=38475&r1=38474&r2=38475&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Fri Jun 15 00:35:04 2007 @@ -22,7 +22,7 @@ #define VERBOSE_COMMANDS // pretty verbose logging of each UI command -#define VERBOSE_REPLACE_WIDGET 0 +#define VERBOSE_REPLACE_WIDGET 1 #include #include // pipe() Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc?rev=38475&r1=38474&r2=38475&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Fri Jun 15 00:35:04 2007 @@ -159,7 +159,6 @@ void YWidget::addChild( YWidget * child ) { - y2debug( "Adding child to %s", widgetClass() ); childrenManager()->add( child ); } @@ -168,19 +167,28 @@ YWidget::removeChild( YWidget * child ) { if ( ! beingDestroyed() ) + { + y2debug( "Removing widget at %p from %s", child, widgetClass() ); childrenManager()->remove( child ); + } } void YWidget::deleteChildren() { - for ( YWidgetList::const_iterator it = childrenBegin(); - it != childrenEnd(); - ++it ) + YWidgetList::const_iterator it = childrenBegin(); + + while ( it != childrenEnd() ) { - if ( (*it)->isValid() ) - delete *it; + YWidget * child = *it; + ++it; + + if ( child->isValid() ) + { + y2debug( "Deleting %s at %p", child->widgetClass(), child ); + delete child; + } } childrenManager()->clear(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org