df13791078
This merges in the latest sources from GSoC 2014 wxQt project with just a few minor corrections, mostly undoing wrong changes to common files in that branch (results of a previous bad merge?) and getting rid of whitespace-only changes. Also remove debug logging from wxGrid. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
40 lines
975 B
C++
40 lines
975 B
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/qt/timer.h
|
|
// Author: Javier Torres
|
|
// Copyright: (c) Javier Torres
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_QT_TIMER_H_
|
|
#define _WX_QT_TIMER_H_
|
|
|
|
#if wxUSE_TIMER
|
|
|
|
#include "wx/private/timer.h"
|
|
|
|
#include <QtCore/QObject>
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxTimer
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxQtTimerImpl : public wxTimerImpl, QObject
|
|
{
|
|
public:
|
|
wxQtTimerImpl( wxTimer* timer );
|
|
|
|
virtual bool Start( int millisecs = -1, bool oneShot = false );
|
|
virtual void Stop();
|
|
virtual bool IsRunning() const;
|
|
|
|
protected:
|
|
virtual void timerEvent( QTimerEvent * event );
|
|
|
|
private:
|
|
int m_timerId;
|
|
};
|
|
|
|
#endif // wxUSE_TIMER
|
|
|
|
#endif // _WX_QT_TIMER_H_
|