Merge branch 'qt_more_event_loop_improvements' of https://github.com/GeoTeric/wxWidgets

Event loop and idle events improvements for wxQt

See https://github.com/wxWidgets/wxWidgets/pull/1171
This commit is contained in:
Vadim Zeitlin
2019-01-27 03:55:38 +01:00
2 changed files with 61 additions and 35 deletions

View File

@@ -8,7 +8,7 @@
#ifndef _WX_QT_EVTLOOP_H_
#define _WX_QT_EVTLOOP_H_
class QTimer;
class wxQtIdleTimer;
class QEventLoop;
class WXDLLIMPEXP_CORE wxQtEventLoopBase : public wxEventLoopBase
@@ -30,12 +30,11 @@ public:
#if wxUSE_EVENTLOOP_SOURCE
virtual wxEventLoopSource *AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags);
#endif // wxUSE_EVENTLOOP_SOURCE
protected:
private:
QEventLoop *m_qtEventLoop;
QTimer *m_qtIdleTimer;
wxObjectDataPtr<wxQtIdleTimer> m_qtIdleTimer;
wxDECLARE_NO_COPY_CLASS(wxQtEventLoopBase);
};