[Gcblue-commits] gcb_wx/include/sim tcCreditView.h,1.7,1.8 tcEditControl.h,1.4,1.5 tcTime.h,1.4,1.5
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-05-14 23:37:16
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1674/include/sim Modified Files: tcCreditView.h tcEditControl.h tcTime.h Log Message: Index: tcEditControl.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcEditControl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcEditControl.h 30 Nov 2003 17:23:52 -0000 1.4 --- tcEditControl.h 14 May 2004 23:37:07 -0000 1.5 *************** *** 24,28 **** #include "tcCustomControl.h" - #include "tcTime.h" #define MAX_EDITCONTROL_CHAR 96 --- 24,27 ---- *************** *** 44,48 **** virtual ~tcEditControl(void); protected: - tcTime mcTime; Gdiplus::RectF mrectTextBar; // region for text to be displayed Gdiplus::RectF mrectTextCaption; // caption region --- 43,46 ---- Index: tcTime.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcTime.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcTime.h 18 Feb 2004 23:55:48 -0000 1.4 --- tcTime.h 14 May 2004 23:37:07 -0000 1.5 *************** *** 21,37 **** #include <wx/wx.h> class tcTime { public: ! static UINT32 snCount_30Hz; // 30 Hz counter ! static LARGE_INTEGER snFrequency; ! static DWORD snDeltaCount; ! static DWORD snLastCount; ! static UINT32 Get30HzCount(); ! static void Init(void); ! static void Update(void); ! tcTime(void); ! virtual ~tcTime(void); }; \ No newline at end of file --- 21,43 ---- #include <wx/wx.h> + class tcTime { public: ! static tcTime* Get(); ///< accessor for singleton instance ! unsigned snCount_30Hz; ///< 30 Hz counter value ! LARGE_INTEGER snFrequency; ! DWORD snDeltaCount; ! DWORD snLastCount; ! unsigned Get30HzCount(); ! unsigned GetUpdated30HzCount(); ! ! void Update(); ! private: ! void Init(); ! ! tcTime(); ! ~tcTime(); }; \ No newline at end of file Index: tcCreditView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCreditView.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcCreditView.h 20 Mar 2004 18:46:46 -0000 1.7 --- tcCreditView.h 14 May 2004 23:37:07 -0000 1.8 *************** *** 30,34 **** #include "tcSound.h" #include "aerror.h" - #include "tcTime.h" #include "tcString.h" --- 30,33 ---- *************** *** 46,53 **** public: void AddCredit(tcString& s, float afTrailSpace, int effect); ! bool Init(void); ! int Draw(void); void OnLButtonDown(wxMouseEvent& event); ! void Rewind(void); tcCreditView(wxWindow *parent, const wxPoint& pos, const wxSize& size, --- 45,52 ---- public: void AddCredit(tcString& s, float afTrailSpace, int effect); ! bool Init(); ! int Draw(); void OnLButtonDown(wxMouseEvent& event); ! void Rewind(); tcCreditView(wxWindow *parent, const wxPoint& pos, const wxSize& size, *************** *** 62,66 **** Gdiplus::Font *mpFontSmall; Gdiplus::Pen *mpPen; - tcTime mcTime; UINT32 mnStartTime; // 30 Hz counter to mark start of sequence int mnXStart,mnYStart; --- 61,64 ---- |