Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preparation for allowing to use wxTimer in wxBase (heavily modified patch 1113088):

Browse Source 
1. Changed wxTimer to use wxTimerImpl
2. Added Unix-specific generic timer implementation
3. Added wxAppTraits::CreateTimerImpl()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-20 01:29:16 +00:00
parent a9c9588480
commit c2ca375c56
62 changed files with 1554 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/generic/timer.h → include/wx/generic/private/timer.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: timer.h
// Name: wx/generic/private/timer.h
// Purpose: Generic implementation of wxTimer class
// Author: Vaclav Slavik
// Id: $Id$
@@ -8,8 +8,10 @@
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_TIMER_H__
#define __WX_TIMER_H__
#ifndef _WX_GENERIC_PRIVATE_TIMER_H_
#define _WX_GENERIC_PRIVATE_TIMER_H_
#include "wx/private/timer.h"
//-----------------------------------------------------------------------------
// wxTimer
@@ -17,13 +19,11 @@
class wxTimerDesc;
class WXDLLEXPORT wxTimer : public wxTimerBase
class WXDLLEXPORT wxGenericTimerImpl : public wxTimerImpl
{
public:
wxTimer() { Init(); }
wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid)
{ Init(); }
virtual ~wxTimer();
wxGenericTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { Init(); }
virtual ~wxGenericTimerImpl();
virtual bool Start(int millisecs = -1, bool oneShot = false);
virtual void Stop();
@@ -38,8 +38,6 @@ protected:
private:
wxTimerDesc *m_desc;
DECLARE_ABSTRACT_CLASS(wxTimer)
};
#endif // __WX_TIMER_H__
#endif // _WX_GENERIC_PRIVATE_TIMER_H_