preparation for allowing to use wxTimer in wxBase (heavily modified patch 1113088):
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:
@@ -26,7 +26,6 @@
|
||||
#include "wx/hash.h"
|
||||
#include "wx/app.h"
|
||||
#include "wx/window.h"
|
||||
#include "wx/timer.h"
|
||||
#include "wx/module.h"
|
||||
#endif
|
||||
|
||||
@@ -34,6 +33,7 @@
|
||||
#include "wx/unix/private.h"
|
||||
#include "wx/x11/private.h"
|
||||
#include "X11/Xlib.h"
|
||||
#include "wx/generic/private/timer.h"
|
||||
|
||||
#if wxUSE_THREADS
|
||||
#include "wx/thread.h"
|
||||
@@ -165,7 +165,7 @@ int wxEventLoop::Run()
|
||||
while ( ! Pending() )
|
||||
{
|
||||
#if wxUSE_TIMER
|
||||
wxTimer::NotifyTimers(); // TODO: is this the correct place for it?
|
||||
wxGenericTimerImpl::NotifyTimers(); // TODO: is this the correct place for it?
|
||||
#endif
|
||||
if (!m_impl->SendIdleEvent())
|
||||
{
|
||||
|
Reference in New Issue
Block a user