make the Pen/Brush code backward compatible as discussed on wx-dev; marked the blocks...

[wxWidgets.git] / src / unix / evtloopunix.cpp

diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp
index 39afb42db065a142ddfc7eae4ff88a0a1688ccdd..ec07e2559d5ab3c80caf63a48f962a319d0ea272 100644 (file)
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -27,6 +27,7 @@
 #endif
 
 #include <errno.h>
 #endif
 
 #include <errno.h>

+#include "wx/apptrait.h"

 #include "wx/evtloop.h"
 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/evtloop.h"
 #include "wx/thread.h"
 #include "wx/module.h"


@@ -125,15 +126,9 @@ wxConsoleEventLoop::wxConsoleEventLoop()
         return;
     }
 
         return;
     }
 

-#ifdef wxUSE_EPOLL_DISPATCHER
-    m_dispatcher = wxEpollDispatcher::Get();
+    m_dispatcher = wxFDIODispatcher::Get();

     if ( !m_dispatcher )
     if ( !m_dispatcher )

-#endif // wxUSE_EPOLL_DISPATCHER
-#if wxUSE_SELECT_DISPATCHER
-        m_dispatcher = wxSelectDispatcher::Get();
-#endif // wxUSE_WCHAR_T
-
-    wxCHECK_RET( m_dispatcher, _T("failed to create IO dispatcher") );
+        return;

 
     m_dispatcher->RegisterFD
                   (
 
     m_dispatcher->RegisterFD
                   (


@@ -181,7 +176,7 @@ void wxConsoleEventLoop::OnNextIteration()
         timeout = wxFDIODispatcher::TIMEOUT_INFINITE;
     }
 
         timeout = wxFDIODispatcher::TIMEOUT_INFINITE;
     }
 

-    m_dispatcher->RunLoop(timeout);
+    m_dispatcher->Dispatch(timeout);

 
 #if wxUSE_TIMER
     wxTimerScheduler::Get().NotifyExpired();
 
 #if wxUSE_TIMER
     wxTimerScheduler::Get().NotifyExpired();


@@ -191,4 +186,10 @@ void wxConsoleEventLoop::OnNextIteration()
     wxTheApp->CheckSignal();
 }
 
     wxTheApp->CheckSignal();
 }
 

+
+wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
+{
+    return new wxEventLoop();
+}
+

 #endif // wxUSE_CONSOLE_EVENTLOOP
 #endif // wxUSE_CONSOLE_EVENTLOOP