[yast-commit] r48134 - /branches/tmp/sh/ncurses-cleanup/ncurses/src/
Author: sh-sh-sh
Date: Fri Jun 6 18:41:20 2008
New Revision: 48134
URL: http://svn.opensuse.org/viewcvs/yast?rev=48134&view=rev
Log:
even more dead code, but that one still smells
Modified:
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.cc
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.h
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.cc
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.h
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.cc
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFrame.cc
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFrame.h
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCImage.cc
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCImage.h
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLabel.cc
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLabel.h
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCLayoutBox.h
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCPopupInfo.h
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCProgressBar.cc
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCProgressBar.h
branches/tmp/sh/ncurses-cleanup/ncurses/src/NCReplacePoint.h
Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.cc?rev=48134&r1=48133&r2=48134&view=diff
==============================================================================
--- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.cc (original)
+++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.cc Fri Jun 6 18:41:20 2008
@@ -107,22 +107,18 @@
}
-
-long NCBusyIndicator::nicesize( YUIDimension dim )
-{
- return dim == YD_HORIZ ? wGetDefsze().W : wGetDefsze().H;
-}
-
int NCBusyIndicator::preferredWidth()
{
return wGetDefsze().W;
}
+
int NCBusyIndicator::preferredHeight()
{
return wGetDefsze().H;
}
+
void NCBusyIndicator::setEnabled( bool do_bv )
{
NCWidget::setEnabled( do_bv );
Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.h?rev=48134&r1=48133&r2=48134&view=diff
==============================================================================
--- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.h (original)
+++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCBusyIndicator.h Fri Jun 6 18:41:20 2008
@@ -76,8 +76,6 @@
int timeout = 1000 );
virtual ~NCBusyIndicator();
- virtual long nicesize( YUIDimension dim );
-
virtual int preferredWidth();
virtual int preferredHeight();
Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.cc?rev=48134&r1=48133&r2=48134&view=diff
==============================================================================
--- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.cc (original)
+++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.cc Fri Jun 6 18:41:20 2008
@@ -53,23 +53,6 @@
}
-
-long NCCheckBoxFrame::nicesize( YUIDimension dim )
-{
- //space to add - keep vertical dim, add horizontal space
- //for checkbox
- wpair plussize = wpair( 0, 4 );
- defsze = wsze( firstChild()->preferredWidth(),
- firstChild()->preferredHeight() );
-
- if ( label.width() > ( unsigned )defsze.W )
- defsze.W = label.width();
-
- defsze += framedim.Sze + plussize;
-
- return dim == YD_HORIZ ? defsze.W : defsze.H;
-}
-
int NCCheckBoxFrame::preferredWidth()
{
defsze.W = firstChild()->preferredWidth();
@@ -82,6 +65,7 @@
return defsze.W;
}
+
int NCCheckBoxFrame::preferredHeight()
{
defsze.H = firstChild()->preferredHeight() + framedim.Sze.H;
@@ -90,7 +74,6 @@
}
-
void NCCheckBoxFrame::setSize( int newwidth, int newheight )
{
wsze csze( newheight, newwidth );
Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.h?rev=48134&r1=48133&r2=48134&view=diff
==============================================================================
--- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.h (original)
+++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCCheckBoxFrame.h Fri Jun 6 18:41:20 2008
@@ -55,8 +55,6 @@
bool checked );
virtual ~NCCheckBoxFrame();
- virtual long nicesize( YUIDimension dim );
-
virtual int preferredWidth();
virtual int preferredHeight();
Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.cc?rev=48134&r1=48133&r2=48134&view=diff
==============================================================================
--- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.cc (original)
+++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.cc Fri Jun 6 18:41:20 2008
@@ -1247,7 +1247,7 @@
if ( helpPopup )
{
- helpPopup->setNiceSize( NCurses::cols() / 3, NCurses::lines() / 3 );
+ helpPopup->setPreferredSize( NCurses::cols() / 3, NCurses::lines() / 3 );
if ( !helpPopup->isVisible() )
{
Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h?rev=48134&r1=48133&r2=48134&view=diff
==============================================================================
--- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h (original)
+++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCDialog.h Fri Jun 6 18:41:20 2008
@@ -163,15 +163,9 @@
NCursesEvent userInput( int timeout_millisec = -1 );
NCursesEvent pollInput();
- //virtual long nicesize( YUIDimension dim );
virtual int preferredWidth();
virtual int preferredHeight();
-
- /**
- * Set the new size of the widget.
- *
- * Reimplemented from YWidget.
- **/
+
virtual void setSize( int newWidth, int newHeight );
/**
Modified: branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFrame.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFrame.cc?rev=48134&r1=48133&r2=48134&view=diff
==============================================================================
--- branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFrame.cc (original)
+++ branches/tmp/sh/ncurses-cleanup/ncurses/src/NCFrame.cc Fri Jun 6 18:41:20 2008
@@ -31,33 +31,17 @@
wstate = NC::WSdumb;
framedim.Pos = wpos( 1 );
framedim.Sze = wsze( 2 );
- //setLabel( getLabel() );
setLabel( YFrame::label() );
hotlabel = &label;
}
-
NCFrame::~NCFrame()
{
yuiDebug() << endl;
}
-
-long NCFrame::nicesize( YUIDimension dim )
-{
- defsze = wsze( firstChild()->preferredWidth(),
- firstChild()->preferredHeight() );
-
- if ( label.width() > ( unsigned )defsze.W )
- defsze.W = label.width();
-
- defsze += framedim.Sze;
-
- return dim == YD_HORIZ ? defsze.W : defsze.H;
-}
-
int NCFrame::preferredWidth()
{
defsze.W = firstChild()->preferredWidth();
@@ -70,6 +54,7 @@
return defsze.W;
}
+
int NCFrame::preferredHeight()
{
defsze.H = firstChild()->preferredHeight() + framedim.Sze.H;
@@ -78,7 +63,6 @@
}
-
void NCFrame::setSize( int newwidth, int newheight )
{
wsze csze( newheight, newwidth );
@@ -88,16 +72,15 @@
}
-
void NCFrame::setLabel( const string & nlabel )
{
YFrame::setLabel( nlabel );
- //label = NCstring( getLabel() );
label = NCstring( YFrame::label() );
label.stripHotkey();
Redraw();
}
+
void NCFrame::setEnabled( bool do_bv )
{
//Use setEnabled() from the parent, it should work out (#256707) :-)
@@ -106,20 +89,6 @@
}
-
-//void NCFrame::setEnabling( bool do_bv )
-//{
-// enabled = do_bv; // in YWidget
-// for ( tnode
participants (1)
-
sh-sh-sh@svn.opensuse.org