Added wxUSE_CONSOLE_EVENTLOOP and wxUSE_SELECT/EPOLLDISPATCHER guards;

put checks for them in the new Unix-specific wx/unix/chkconf.h file


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/unix/evtloopunix.cpp

@@ -19,7 +19,7 @@
 // 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"
@@ -27,6 +27,7 @@
 #endif
 
 #include <errno.h>
+#include "wx/evtloop.h"
 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/unix/private/timer.h"
@@ -35,10 +36,6 @@
 
 #define TRACE_EVENTS _T("events")
 
-//this code should not be compiled when GUI is defined
-//(monolithic build issue)
-#if !wxUSE_GUI
-
 // ===========================================================================
 // wxEventLoop::PipeIOHandler implementation
 // ===========================================================================
@@ -128,13 +125,13 @@ wxConsoleEventLoop::wxConsoleEventLoop()
         return;
     }
 
-#ifdef HAVE_SYS_EPOLL_H
+#ifdef wxUSE_EPOLL_DISPATCHER
     m_dispatcher = wxEpollDispatcher::Get();
     if ( !m_dispatcher )
-#endif // HAVE_SYS_EPOLL_H
-    {
+#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") );
 
@@ -194,4 +191,4 @@ void wxConsoleEventLoop::OnNextIteration()
     wxTheApp->CheckSignal();
 }
 
-#endif // !wxUSE_GUI
+#endif // wxUSE_CONSOLE_EVENTLOOP