X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8519f6507f7b4389c0fe7dbae4ebd63120d5dd0..7ddb15416407390de67cc26b04e91ea99a521f57:/include/wx/msw/evtloop.h

diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index b45d932f65..e7afd91bab 100644
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/evtloop.h
-// Purpose:     wxEventLoop class for MSW
+// Purpose:     wxEventLoop class for wxMSW port
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-07-31
@@ -12,35 +12,16 @@
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_
 
-#if wxUSE_GUI
+#include "wx/dynarray.h"
+#include "wx/msw/wrapwin.h"
 #include "wx/window.h"
-#endif
+#include "wx/msw/evtloopconsole.h" // for wxMSWEventLoopBase
 
 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxMSWEventLoopBase : public wxEventLoopManual
-{
-public:
-    wxMSWEventLoopBase();
-
-    // implement base class pure virtuals
-    virtual bool Pending() const;
-
-protected:
-    // get the next message from queue and return true or return false if we
-    // got WM_QUIT or an error occurred
-    bool GetNextMessage(WXMSG *msg);
-
-    // same as above but with a timeout and return value can be -1 meaning that
-    // time out expired in addition to
-    int GetNextMessageTimeout(WXMSG *msg, unsigned long timeout);
-};
-
-#if wxUSE_GUI
-
-WX_DECLARE_OBJARRAY(MSG, wxMSGArray);
+WX_DECLARE_EXPORTED_OBJARRAY(MSG, wxMSGArray);
 
 class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxMSWEventLoopBase
 {
@@ -91,27 +72,4 @@ private:
     static wxWindowMSW *ms_winCritical;
 };
 
-#else // !wxUSE_GUI
-
-#if wxUSE_CONSOLE_EVENTLOOP
-
-class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase
-{
-public:
-    wxConsoleEventLoop() { }
-
-    // override/implement base class virtuals
-    virtual bool Dispatch();
-    virtual int DispatchTimeout(unsigned long timeout);
-    virtual void WakeUp();
-    virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }
-
-    // MSW-specific function to process a single message
-    virtual void ProcessMessage(WXMSG *msg);
-};
-
-#endif // wxUSE_CONSOLE_EVENTLOOP
-
-#endif // wxUSE_GUI/!wxUSE_GUI
-
 #endif // _WX_MSW_EVTLOOP_H_