projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for wxPopupTransientWindow for wxMSW. Includes Patch #1181190,
[wxWidgets.git]
/
include
/
wx
/
msw
/
timer.h
diff --git
a/include/wx/msw/timer.h
b/include/wx/msw/timer.h
index 116e02e303f3a18692fc17e2bfefc51bb0f9c472..ffa150e111c6a4b4224c4b092bc92aa67679b7b9 100644
(file)
--- a/
include/wx/msw/timer.h
+++ b/
include/wx/msw/timer.h
@@
-22,11
+22,11
@@
friend void wxProcessTimer(wxTimer& timer);
public:
wxTimer() { Init(); }
public:
wxTimer() { Init(); }
- wxTimer(wxEvtHandler *owner, int id =
-1
) : wxTimerBase(owner, id)
+ wxTimer(wxEvtHandler *owner, int id =
wxID_ANY
) : wxTimerBase(owner, id)
{ Init(); }
~wxTimer();
{ Init(); }
~wxTimer();
- virtual bool Start(int milliseconds = -1, bool oneShot =
FALSE
);
+ virtual bool Start(int milliseconds = -1, bool oneShot =
false
);
virtual void Stop();
virtual bool IsRunning() const { return m_id != 0; }
virtual void Stop();
virtual bool IsRunning() const { return m_id != 0; }
@@
-34,7
+34,7
@@
public:
protected:
void Init();
protected:
void Init();
- long m_id;
+
unsigned
long m_id;
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTimer)
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTimer)