[Wgui-cvs] wgui/src wg_progress.cpp,1.12,1.13

[Rob W. <gre...@us...>]

Update of /cvsroot/wgui/wgui/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23997/src

Modified Files:
	wg_progress.cpp 
Log Message:
Converted CProgressBar to inherit from CRangeControl

Index: wg_progress.cpp
===================================================================
RCS file: /cvsroot/wgui/wgui/src/wg_progress.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** wg_progress.cpp	2 Apr 2004 17:26:16 -0000	1.12
--- wg_progress.cpp	4 May 2004 16:11:13 -0000	1.13
***************
*** 32,39 ****
  
  CProgress::CProgress(const CRect& WindowRect, CWindow* pParent, CRGBColor BarColor) :
! 	CWindow(WindowRect, pParent),
! 	m_iMin(0),
! 	m_iMax(100),
! 	m_iProgress(0),
  	m_BarColor(BarColor)
  {
--- 32,36 ----
  
  CProgress::CProgress(const CRect& WindowRect, CWindow* pParent, CRGBColor BarColor) :
! 	CRangeControl<int>(WindowRect, pParent, 0, 100, 1, 0),
  	m_BarColor(BarColor)
  {
***************
*** 48,66 ****
  
  
- void CProgress::SetLimits(int iMin, int iMax)
- {
- 	m_iMin = iMin;
- 	m_iMax = iMax;
- 	StartDrawProc();
- }
- 
- 
- void CProgress::SetProgress(int iProgress)
- {
- 	m_iProgress = iProgress;
- 	StartDrawProc();
- }
- 
- 
  void CProgress::Draw(void) const
  {
--- 45,48 ----
***************
*** 75,84 ****
  	Painter.DrawVLine(SubRect.Top(), SubRect.Bottom(), SubRect.Left(), COLOR_DARKGRAY);
  	SubRect.Grow(-2);
! 	if (m_iProgress > m_iMin)
  	{
! 		if (m_iProgress < m_iMax)
  		{
  			SubRect.SetRight(stdex::safe_static_cast<int>(SubRect.Left() +
! 				SubRect.Width() * (stdex::safe_static_cast<double>(m_iProgress - m_iMin) / (m_iMax - m_iMin))));
  		}
  		Painter.DrawRect(SubRect, true, m_BarColor, m_BarColor);
--- 57,66 ----
  	Painter.DrawVLine(SubRect.Top(), SubRect.Bottom(), SubRect.Left(), COLOR_DARKGRAY);
  	SubRect.Grow(-2);
! 	if (m_Value > m_MinLimit)
  	{
! 		if (m_Value < m_MaxLimit)
  		{
  			SubRect.SetRight(stdex::safe_static_cast<int>(SubRect.Left() +
! 				SubRect.Width() * (stdex::safe_static_cast<double>(m_Value - m_MinLimit) / (m_MaxLimit - m_MinLimit))));
  		}
  		Painter.DrawRect(SubRect, true, m_BarColor, m_BarColor);