Author: gs Date: Thu Sep 27 15:38:48 2007 New Revision: 41143 URL: http://svn.opensuse.org/viewcvs/yast?rev=41143&view=rev Log: don't call 'delete' for helpPopup use deleteTopmostDialog() instead Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc?rev=41143&r1=41142&r2=41143&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc Thu Sep 27 15:38:48 2007 @@ -187,31 +187,6 @@ delete helpPopup; } } -#if 0 -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCDialog::nicesize -// METHOD TYPE : long -// -// DESCRIPTION : -// -long NCDialog::nicesize( YUIDimension dim ) -{ - if ( hasDefaultSize() || !childrenCount() ) { - return dim == YD_HORIZ ? wGetDefsze().W : wGetDefsze().H; - } - - //wsze csze( child( 0 )->nicesize( YD_VERT ), - // child( 0 )->nicesize( YD_HORIZ ) ); - wsze csze( firstChild()->preferredHeight(), - firstChild()->preferredWidth() ); - csze = wsze::min( wGetDefsze(), - wsze::max( csze, wsze( 1 ) ) ); - - return dim == YD_HORIZ ? csze.W : csze.H; -} -#endif int NCDialog::preferredWidth() { @@ -1254,7 +1229,8 @@ else { helpPopup->popdown(); - delete helpPopup; + // don't call 'delete' for helpPopup use deleteTopmostDialog() instead + YDialog::deleteTopmostDialog(); helpPopup = 0; pendingEvent = getHotkeyEvent( ch ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org