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 2187942a73c40f29de990de0242a52cad4dda229..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,29 +11,30 @@
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_
 
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_
 

+#include "wx/dynarray.h"
+#include "wx/msw/wrapwin.h"
+#include "wx/window.h"
+#include "wx/msw/evtloopconsole.h" // for wxMSWEventLoopBase
+

 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxEventLoop : public wxEventLoopManual
+WX_DECLARE_EXPORTED_OBJARRAY(MSG, wxMSGArray);
+
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxMSWEventLoopBase

 {
 public:
 {
 public:

-    wxEventLoop();
-
-    // implement base class pure virtuals
-    virtual bool Pending() const;
-    virtual bool Dispatch();
+    wxGUIEventLoop() { }

 
 

-    // MSW-specific methods
-    // --------------------
+    // process a single message: calls PreProcessMessage() before dispatching
+    // it
+    virtual void ProcessMessage(WXMSG *msg);

 
     // preprocess a message, return true if processed (i.e. no further
     // dispatching required)
     virtual bool PreProcessMessage(WXMSG *msg);
 
 
     // preprocess a message, return true if processed (i.e. no further
     // dispatching required)
     virtual bool PreProcessMessage(WXMSG *msg);
 

-    // process a single message
-    virtual void ProcessMessage(WXMSG *msg);
-

     // set the critical window: this is the window such that all the events
     // except those to this window (and its children) stop to be processed
     // (typical examples: assert or crash report dialog)
     // set the critical window: this is the window such that all the events
     // except those to this window (and its children) stop to be processed
     // (typical examples: assert or crash report dialog)


@@ -50,19 +50,25 @@ public:
         return !ms_winCritical || IsChildOfCriticalWindow(win);
     }
 
         return !ms_winCritical || IsChildOfCriticalWindow(win);
     }
 

-protected:

     // override/implement base class virtuals
     // override/implement base class virtuals

+    virtual bool Dispatch();
+    virtual int DispatchTimeout(unsigned long timeout);

     virtual void WakeUp();
     virtual void WakeUp();

+    virtual bool YieldFor(long eventsToProcess);
+
+protected:

     virtual void OnNextIteration();
 
     virtual void OnNextIteration();
 

+private:

     // check if the given window is a child of ms_winCritical (which must be
     // non NULL)
     static bool IsChildOfCriticalWindow(wxWindowMSW *win);
 
     // check if the given window is a child of ms_winCritical (which must be
     // 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;
 };
 
 #endif // _WX_MSW_EVTLOOP_H_
 
     // critical window or NULL
     static wxWindowMSW *ms_winCritical;
 };
 
 #endif // _WX_MSW_EVTLOOP_H_

-