[Wgui-cvs] wgui/includes wg_progress.h,1.16,1.17 wg_range_control.h,1.2,1.3
Status: Beta
Brought to you by:
greenwire
|
From: Rob W. <gre...@us...> - 2004-05-04 16:11:55
|
Update of /cvsroot/wgui/wgui/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23997/includes Modified Files: wg_progress.h wg_range_control.h Log Message: Converted CProgressBar to inherit from CRangeControl Index: wg_range_control.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/wg_range_control.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wg_range_control.h 27 Apr 2004 18:13:50 -0000 1.2 --- wg_range_control.h 4 May 2004 16:11:13 -0000 1.3 *************** *** 27,30 **** --- 27,31 ---- #include "wg_window.h" + #include "wg_message_server.h" Index: wg_progress.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/wg_progress.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wg_progress.h 2 Apr 2004 17:26:14 -0000 1.16 --- wg_progress.h 4 May 2004 16:11:13 -0000 1.17 *************** *** 26,30 **** #define _WG_PROGRESS_H_ ! #include "wg_window.h" #include "wg_painter.h" --- 26,30 ---- #define _WG_PROGRESS_H_ ! #include "wg_range_control.h" #include "wg_painter.h" *************** *** 35,39 **** //! A progress bar display ! class CProgress : public CWindow { public: --- 35,39 ---- //! A progress bar display ! class CProgress : public CRangeControl<int> { public: *************** *** 47,65 **** virtual ~CProgress(void); - //! Set the limits of the progress bar - void SetLimits(int Min, int Max); - - //! \return The minimum limit of the progress bar - int GetMinLimit(void) { return m_iMin; } - - //! \return The maximum limit of the progress bar - int GetMaxLimit(void) { return m_iMax; } - - //! Set the current progress value. - void SetProgress(int iProgress); - - //! \return The current progress value - int GetProgress(void) { return m_iProgress; } - //! \return The bar color CRGBColor GetBarColor(void) { return m_BarColor; } --- 47,50 ---- *************** *** 75,90 **** ! private: ! //! The minimum value of the progress bar ! int m_iMin; ! ! //! The maximum value of the progress bar ! int m_iMax; ! ! //! The current value of the progress bar ! int m_iProgress; ! ! //! The color of the progress bar ! CRGBColor m_BarColor; --- 60,65 ---- ! protected: ! CRGBColor m_BarColor; //!< The color of the progress bar |