put constant in define

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

diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp
index ff12e32638aa20b1eaaa1b42431009561a827793..5bd8b1050f6b2dae19ccdd3aa8cc58054afa9384 100644 (file)
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -19,7 +19,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/evtloop.h"
+#if wxUSE_CONSOLE_EVENTLOOP

 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"


@@ -27,21 +27,15 @@
 #endif
 
 #include <errno.h>
 #endif
 
 #include <errno.h>

+#include "wx/evtloop.h"

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

+#include "wx/unix/private/timer.h"

 #include "wx/unix/private/epolldispatcher.h"
 #include "wx/private/selectdispatcher.h"
 
 #include "wx/unix/private/epolldispatcher.h"
 #include "wx/private/selectdispatcher.h"
 

-#if wxUSE_TIMER
-    #include "wx/generic/private/timer.h"
-#endif
-

 #define TRACE_EVENTS _T("events")
 
 #define TRACE_EVENTS _T("events")
 

-//this code should not be compiled when GUI is defined
-//(monolithic build issue)
-#if !wxUSE_GUI
-

 // ===========================================================================
 // wxEventLoop::PipeIOHandler implementation
 // ===========================================================================
 // ===========================================================================
 // wxEventLoop::PipeIOHandler implementation
 // ===========================================================================


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

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

     if ( !m_dispatcher )
     if ( !m_dispatcher )

-#endif // HAVE_SYS_EPOLL_H
-    {
-        m_dispatcher = wxSelectDispatcher::Get();
-    }
-
-    wxCHECK_RET( m_dispatcher, _T("failed to create IO dispatcher") );
+        return;

 
     m_dispatcher->RegisterFD
                   (
 
     m_dispatcher->RegisterFD
                   (


@@ -147,7 +135,7 @@ wxConsoleEventLoop::wxConsoleEventLoop()
                     &m_wakeupPipe,
                     wxFDIO_INPUT
                   );
                     &m_wakeupPipe,
                     wxFDIO_INPUT
                   );

-};
+}

 
 //-----------------------------------------------------------------------------
 // events dispatch and loop handling
 
 //-----------------------------------------------------------------------------
 // events dispatch and loop handling


@@ -187,7 +175,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();


@@ -197,4 +185,4 @@ void wxConsoleEventLoop::OnNextIteration()
     wxTheApp->CheckSignal();
 }
 
     wxTheApp->CheckSignal();
 }
 

-#endif // !wxUSE_GUI
+#endif // wxUSE_CONSOLE_EVENTLOOP