Define wxUSE_CAIRO in wx/chkconf.h to ensure that it's always defined.

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

diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index 01c9d934d10d1ad83a7adc4c99e1f46969141a67..5c89e304bd80b29f3a44677d73b71b2b5ec2ca21 100644 (file)
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -13,6 +13,8 @@
 #define _WX_MSW_EVTLOOP_H_
 
 #if wxUSE_GUI
+#include "wx/dynarray.h"
+#include "wx/msw/wrapwin.h"
 #include "wx/window.h"
 #endif
 
@@ -32,10 +34,16 @@ 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
 {
 public:
@@ -66,7 +74,9 @@ public:
 
     // override/implement base class virtuals
     virtual bool Dispatch();
+    virtual int DispatchTimeout(unsigned long timeout);
     virtual void WakeUp();
+    virtual bool YieldFor(long eventsToProcess);
 
 protected:
     virtual void OnNextIteration();
@@ -76,6 +86,8 @@ private:
     // 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;
@@ -83,6 +95,8 @@ private:
 
 #else // !wxUSE_GUI
 
+#if wxUSE_CONSOLE_EVENTLOOP
+
 class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase
 {
 public:
@@ -90,12 +104,16 @@ public:
 
     // 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; }
 
-protected:
-    virtual void OnNextIteration();
+    // 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_