X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9aee1212251a85e7e52246a621e921af7da6be8d..b02dd12239c8a59b9a545d9fcb04974f8ad02c6b:/include/wx/evtloop.h?ds=inline diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h index 3ba5c71aed..aafd2bce55 100644 --- a/include/wx/evtloop.h +++ b/include/wx/evtloop.h @@ -17,8 +17,7 @@ // TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be // monitored using MsgWaitForMultipleObjects()) -#if defined(__WXOSX__) || defined(__WXGTK20__) || defined(__WXDFB__) || \ - (!wxUSE_GUI && defined(__UNIX__)) +#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__CYGWIN__)) #define wxUSE_EVENTLOOP_SOURCE 1 #else #define wxUSE_EVENTLOOP_SOURCE 0 @@ -234,9 +233,7 @@ private: // integration with MFC) but currently this is not done for all ports yet (e.g. // wxX11) so fall back to the old wxGUIEventLoop definition below for them -#if defined(__WXPALMOS__) - #include "wx/palmos/evtloop.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) // this header defines both console and GUI loops for MSW #include "wx/msw/evtloop.h" #elif defined(__WXOSX__) @@ -265,6 +262,19 @@ public: wxGUIEventLoop() { m_impl = NULL; } virtual ~wxGUIEventLoop(); +#if wxUSE_EVENTLOOP_SOURCE + // We need to define a base class pure virtual method but we can't provide + // a generic implementation for it so simply fail. + virtual wxEventLoopSource * + AddSourceForFD(int WXUNUSED(fd), + wxEventLoopSourceHandler * WXUNUSED(handler), + int WXUNUSED(flags)) + { + wxFAIL_MSG( "support for event loop sources not implemented" ); + return NULL; + } +#endif // wxUSE_EVENTLOOP_SOURCE + virtual int Run(); virtual void Exit(int rc = 0); virtual bool Pending() const; @@ -298,7 +308,7 @@ protected: #endif // wxUSE_GUI // include the header defining wxConsoleEventLoop for Unix systems -#if defined(__UNIX__) +#if defined(__UNIX__) && !defined(__CYGWIN__) #include "wx/unix/evtloop.h" #endif