synchronize GTK2 minimum version in docs

[wxWidgets.git] / include / wx / evtloop.h

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 04f0a97761b8d7d95cb7e48cdfabdb6d0bde6825..51cfd8ed2388ef521fa5421fa4b85e6bc3c94c49 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -17,7 +17,7 @@
 
 // TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be
 //       monitored using MsgWaitForMultipleObjects())
 
 // TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be
 //       monitored using MsgWaitForMultipleObjects())

-#if defined(__WXOSX__) || defined(__UNIX__)
+#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__WXMSW__))

     #define wxUSE_EVENTLOOP_SOURCE 1
 #else
     #define wxUSE_EVENTLOOP_SOURCE 0
     #define wxUSE_EVENTLOOP_SOURCE 1
 #else
     #define wxUSE_EVENTLOOP_SOURCE 0


@@ -233,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
 
 // 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__)
     // this header defines both console and GUI loops for MSW
     #include "wx/msw/evtloop.h"
 #elif defined(__WXOSX__)


@@ -310,7 +308,7 @@ protected:
 #endif // wxUSE_GUI
 
 // include the header defining wxConsoleEventLoop for Unix systems
 #endif // wxUSE_GUI
 
 // include the header defining wxConsoleEventLoop for Unix systems

-#if defined(__UNIX__)
+#if defined(__UNIX__) && !defined(__WXMSW__)

 #include "wx/unix/evtloop.h"
 #endif
 
 #include "wx/unix/evtloop.h"
 #endif