1. wxTimer::Start() returns bool in wxGTK too (other minor corrections
to this class, such as "const" addition, Notify() is = 0 now...) 2. wxGTK::wxTextCtrl::Delete renamed to Clear for consistency 3. wx/wx_prec.h now includes wx/setup.h even if !wxUSE_PRECOMP because otherwise (recently added) tests "#if wxUSE_IOSTREAMH" donb't work. 4. Other compilation fixes for wxGTK (now it compiles again) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,27 +18,35 @@
|
||||
|
||||
#include "wx/object.h"
|
||||
|
||||
class WXDLLEXPORT wxTimer: public wxObject
|
||||
class WXDLLEXPORT wxTimer : public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxTimer)
|
||||
public:
|
||||
wxTimer();
|
||||
~wxTimer();
|
||||
|
||||
public:
|
||||
bool oneShot ;
|
||||
int milli ;
|
||||
int lastMilli ;
|
||||
virtual bool Start(int milliseconds = -1,
|
||||
bool one_shot = FALSE); // Start timer
|
||||
virtual void Stop(); // Stop timer
|
||||
|
||||
long id;
|
||||
public:
|
||||
wxTimer(void);
|
||||
~wxTimer(void);
|
||||
virtual bool Start(int milliseconds = -1,bool one_shot = FALSE); // Start timer
|
||||
virtual void Stop(void); // Stop timer
|
||||
virtual void Notify(void) = 0; // Override this member
|
||||
inline int Interval(void) { return milli ; }; // Returns the current interval time (0 if stop)
|
||||
virtual void Notify() = 0; // Override this member
|
||||
|
||||
// Returns the current interval time (0 if stop)
|
||||
int Interval() const { return milli; };
|
||||
bool OneShot() const { return oneShot; }
|
||||
|
||||
protected:
|
||||
bool oneShot ;
|
||||
int milli ;
|
||||
int lastMilli ;
|
||||
|
||||
long id;
|
||||
|
||||
private:
|
||||
DECLARE_ABSTRACT_CLASS(wxTimer)
|
||||
};
|
||||
|
||||
// Timer functions (milliseconds)
|
||||
void WXDLLEXPORT wxStartTimer(void);
|
||||
void WXDLLEXPORT wxStartTimer();
|
||||
// Gets time since last wxStartTimer or wxGetElapsedTime
|
||||
long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
|
||||
|
||||
@@ -46,7 +54,7 @@ long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
|
||||
bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);
|
||||
|
||||
// Get number of seconds since 00:00:00 GMT, Jan 1st 1970.
|
||||
long WXDLLEXPORT wxGetCurrentTime(void);
|
||||
long WXDLLEXPORT wxGetCurrentTime();
|
||||
|
||||
#endif
|
||||
// _WX_TIMERH_
|
||||
|
Reference in New Issue
Block a user