Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index 88ab13492bfe1d0b71b0560908344534ca8a359e..dee2c03db367264443d6ef163b645aa6288a81d4 100644 (file)
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/evtloop.h
 ///////////////////////////////////////////////////////////////////////////////
 // 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
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-07-31

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003-2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003-2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -12,33 +11,16 @@
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_
 
 #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"
 #include "wx/window.h"

-#endif
+#include "wx/msw/evtloopconsole.h" // for wxMSWEventLoopBase

 
 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // 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_EXPORTED_OBJARRAY(MSG, wxMSGArray);

 
 class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxMSWEventLoopBase
 {
 
 class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxMSWEventLoopBase
 {


@@ -72,6 +54,7 @@ public:
     virtual bool Dispatch();
     virtual int DispatchTimeout(unsigned long timeout);
     virtual void WakeUp();
     virtual bool Dispatch();
     virtual int DispatchTimeout(unsigned long timeout);
     virtual void WakeUp();

+    virtual bool YieldFor(long eventsToProcess);

 
 protected:
     virtual void OnNextIteration();
 
 protected:
     virtual void OnNextIteration();


@@ -81,34 +64,11 @@ private:
     // non NULL)
     static bool IsChildOfCriticalWindow(wxWindowMSW *win);
 
     // non NULL)
     static bool IsChildOfCriticalWindow(wxWindowMSW *win);
 

+    // array of messages used for temporary storage by YieldFor()
+    wxMSGArray m_arrMSG;

 
     // critical window or NULL
     static wxWindowMSW *ms_winCritical;
 };
 
 
     // critical window or NULL
     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();
-
-    // MSW-specific function to process a single message
-    virtual void ProcessMessage(WXMSG *msg);
-
-protected:
-    virtual void OnNextIteration();
-};
-
-#endif // wxUSE_CONSOLE_EVENTLOOP
-
-#endif // wxUSE_GUI/!wxUSE_GUI
-

 #endif // _WX_MSW_EVTLOOP_H_
 #endif // _WX_MSW_EVTLOOP_H_