projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxSizerFlags::GetDefaultBorder()
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
timer.h
diff --git
a/include/wx/cocoa/timer.h
b/include/wx/cocoa/timer.h
index 27aa354e6e39292a526e927808b24063f6b2ad31..fb1677a97748d8129df96046aa69d85b57bf94a4 100644
(file)
--- a/
include/wx/cocoa/timer.h
+++ b/
include/wx/cocoa/timer.h
@@
-25,7
+25,7
@@
public:
wxTimer() { Init(); }
wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid)
{ Init(); }
wxTimer() { Init(); }
wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid)
{ Init(); }
- ~wxTimer();
+
virtual
~wxTimer();
virtual bool Start(int millisecs = -1, bool oneShot = false);
virtual void Stop();
virtual bool Start(int millisecs = -1, bool oneShot = false);
virtual void Stop();
@@
-40,7
+40,6
@@
protected:
private:
WX_NSTimer m_cocoaNSTimer;
private:
WX_NSTimer m_cocoaNSTimer;
- static const wxObjcAutoRefFromAlloc<struct objc_object *> sm_cocoaDelegate;
DECLARE_ABSTRACT_CLASS(wxTimer)
};
DECLARE_ABSTRACT_CLASS(wxTimer)
};