X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4934653e18265ea5c128cff6215e5c84bd4d7514..ba49d2acf95d53517719c4fd9ac2ad5aaa13540b:/src/msw/evtloop.cpp

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 9734216483..eb97f85bab 100644
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/msw/evtloop.cpp
-// Purpose:     implements wxEventLoop for MSW
+// Purpose:     implements wxEventLoop for wxMSW port
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.06.01
@@ -27,9 +27,7 @@
 #include "wx/evtloop.h"
 
 #ifndef WX_PRECOMP
-    #if wxUSE_GUI
-        #include "wx/window.h"
-    #endif
+    #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/log.h"
 #endif //WX_PRECOMP
@@ -39,115 +37,15 @@
 #include "wx/msw/private.h"
 #include "wx/scopeguard.h"
 
-#if wxUSE_GUI
-    #include "wx/tooltip.h"
-    #if wxUSE_THREADS
-        // define the list of MSG strutures
-        WX_DECLARE_LIST(MSG, wxMsgList);
-
-        #include "wx/listimpl.cpp"
-
-        WX_DEFINE_LIST(wxMsgList)
-    #endif // wxUSE_THREADS
-#endif //wxUSE_GUI
-
-#if wxUSE_BASE
-
-// ============================================================================
-// wxMSWEventLoopBase implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// ctor/dtor
-// ----------------------------------------------------------------------------
-
-wxMSWEventLoopBase::wxMSWEventLoopBase()
-{
-    m_shouldExit = false;
-    m_exitcode = 0;
-}
-
-// ----------------------------------------------------------------------------
-// wxEventLoop message processing dispatching
-// ----------------------------------------------------------------------------
-
-bool wxMSWEventLoopBase::Pending() const
-{
-    MSG msg;
-    return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0;
-}
-
-bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg)
-{
-    const BOOL rc = ::GetMessage(msg, NULL, 0, 0);
-
-    if ( rc == 0 )
-    {
-        // got WM_QUIT
-        return false;
-    }
-
-    if ( rc == -1 )
-    {
-        // should never happen, but let's test for it nevertheless
-        wxLogLastError(wxT("GetMessage"));
-
-        // still break from the loop
-        return false;
-    }
-
-    return true;
-}
-
-int wxMSWEventLoopBase::GetNextMessageTimeout(WXMSG *msg, unsigned long timeout)
-{
-    // MsgWaitForMultipleObjects() won't notice any input which was already
-    // examined (e.g. using PeekMessage()) but not yet removed from the queue
-    // so we need to remove any immediately messages manually
-    //
-    // NB: using MsgWaitForMultipleObjectsEx() could simplify the code here but
-    //     it is not available in very old Windows versions
-    if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
-    {
-        // we use this function just in order to not block longer than the
-        // given timeout, so we don't pass any handles to it at all
-        DWORD rc = ::MsgWaitForMultipleObjects
-                     (
-                        0, NULL,
-                        FALSE,
-                        timeout,
-                        QS_ALLINPUT
-                     );
-
-        switch ( rc )
-        {
-            default:
-                wxLogDebug("unexpected MsgWaitForMultipleObjects() return "
-                           "value %lu", rc);
-                // fall through
-
-            case WAIT_TIMEOUT:
-                return -1;
-
-            case WAIT_OBJECT_0:
-                if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
-                {
-                    // somehow it may happen that MsgWaitForMultipleObjects()
-                    // returns true but there are no messages -- just treat it
-                    // the same as timeout then
-                    return -1;
-                }
-                break;
-        }
-    }
-
-    return msg->message != WM_QUIT;
-}
-
+#include "wx/tooltip.h"
+#if wxUSE_THREADS
+    // define the list of MSG strutures
+    WX_DECLARE_LIST(MSG, wxMsgList);
 
-#endif // wxUSE_BASE
+    #include "wx/listimpl.cpp"
 
-#if wxUSE_GUI
+    WX_DEFINE_LIST(wxMsgList)
+#endif // wxUSE_THREADS
 
 // ============================================================================
 // GUI wxEventLoop implementation
@@ -553,52 +451,3 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
 
     return true;
 }
-
-
-#else // !wxUSE_GUI
-
-
-// ============================================================================
-// wxConsoleEventLoop implementation
-// ============================================================================
-
-#if wxUSE_CONSOLE_EVENTLOOP
-
-void wxConsoleEventLoop::WakeUp()
-{
-#if wxUSE_THREADS
-    wxWakeUpMainThread();
-#endif
-}
-
-void wxConsoleEventLoop::ProcessMessage(WXMSG *msg)
-{
-    ::DispatchMessage(msg);
-}
-
-bool wxConsoleEventLoop::Dispatch()
-{
-    MSG msg;
-    if ( !GetNextMessage(&msg) )
-        return false;
-
-    ProcessMessage(&msg);
-
-    return !m_shouldExit;
-}
-
-int wxConsoleEventLoop::DispatchTimeout(unsigned long timeout)
-{
-    MSG msg;
-    int rc = GetNextMessageTimeout(&msg, timeout);
-    if ( rc != 1 )
-        return rc;
-
-    ProcessMessage(&msg);
-
-    return !m_shouldExit;
-}
-
-#endif // wxUSE_CONSOLE_EVENTLOOP
-
-#endif //wxUSE_GUI