Author: sh-sh-sh Date: Mon Jun 18 15:34:19 2007 New Revision: 38506 URL: http://svn.opensuse.org/viewcvs/yast?rev=38506&view=rev Log: fixed replaceWidget Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.cc branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog?rev=38506&r1=38505&r2=38506&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog Mon Jun 18 15:34:19 2007 @@ -96,6 +96,5 @@ * now derived from YSingleChildContainerWidget * removed YWidget::isReplacePoint() / YReplacePoint::isReplacePoint() * no more YContainerWidget::childAdded(), - reimplement YWidget::addChild() instead - (but remember to call YWidget::addChild() in that reimplemented function) + reimplement YReplacePoint::showChild() instead. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.cc?rev=38506&r1=38505&r2=38506&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.cc Mon Jun 18 15:34:19 2007 @@ -25,3 +25,10 @@ // NOP } + +void YReplacePoint::showChild() +{ + // NOP +} + + Modified: branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h?rev=38506&r1=38505&r2=38506&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h Mon Jun 18 15:34:19 2007 @@ -30,6 +30,19 @@ YReplacePoint( YWidget * parent ); /** + * Show a newly added child. The application using the ReplacePoint is + * required to call this after the new child is created. + * + * This cannot be done in the child widget's constructor (e.g., by + * overwriting YWidget::addChild()) since at that point + * YWidget::widgetRep() may or may not be initialized yet. + * + * This default implementation does nothing. Derived classes should + * reimplement this to make new child widgets visible. + **/ + virtual void showChild(); + + /** * Returns a descriptive name of this widget class for logging, * debugging etc. **/ 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=38506&r1=38505&r2=38506&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 Mon Jun 18 15:34:19 2007 @@ -22,7 +22,7 @@ #define VERBOSE_COMMANDS // pretty verbose logging of each UI command -#define VERBOSE_REPLACE_WIDGET 1 +#define VERBOSE_REPLACE_WIDGET 0 #include #include // pipe() @@ -1052,6 +1052,7 @@ YWidget * child = createWidgetTree( replacePoint, newContentTerm ); child->setParent( replacePoint ); + replacePoint->showChild(); #if VERBOSE_REPLACE_WIDGET replacePoint->dumpDialogWidgetTree(); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc?rev=38506&r1=38505&r2=38506&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc Mon Jun 18 15:34:19 2007 @@ -17,8 +17,6 @@ /-*/ -#define VERBOSE_REPLACE_WIDGET - #include #define y2log_component "ui" @@ -372,6 +370,8 @@ return 0; } + replacePoint->showChild(); + return replacePoint; } 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=38506&r1=38505&r2=38506&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Mon Jun 18 15:34:19 2007 @@ -128,6 +128,7 @@ { YUI_CHECK_WIDGET( this ); setBeingDestroyed(); + // y2debug( "Destructor of YWidget %p", this ); deleteChildren(); @@ -168,7 +169,7 @@ { if ( ! beingDestroyed() ) { - y2debug( "Removing widget at %p from %s", child, widgetClass() ); + // y2debug( "Removing widget at %p from %s", child, widgetClass() ); childrenManager()->remove( child ); } } @@ -186,7 +187,7 @@ if ( child->isValid() ) { - y2debug( "Deleting %s at %p", child->widgetClass(), child ); + // y2debug( "Deleting %s at %p", child->widgetClass(), child ); delete child; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org