Applied Peter Most's EVT_SPIN crash fix

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

diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index fd548b87f25aa3bf6fada941a6e954a182010e58..2869b07a92449a77532295830e0a4ec3ea83e468 100644 (file)
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -32,6 +32,10 @@ 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);
     // 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
 };
 
 #if wxUSE_GUI


@@ -66,6 +70,7 @@ public:
 
     // override/implement base class virtuals
     virtual bool Dispatch();
 
     // override/implement base class virtuals
     virtual bool Dispatch();

+    virtual int DispatchTimeout(unsigned long timeout);

     virtual void WakeUp();
 
 protected:
     virtual void WakeUp();
 
 protected:


@@ -92,10 +97,11 @@ public:
 
     // override/implement base class virtuals
     virtual bool Dispatch();
 
     // override/implement base class virtuals
     virtual bool Dispatch();

+    virtual int DispatchTimeout(unsigned long timeout);

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

-protected:
-    virtual void OnNextIteration();
+    // MSW-specific function to process a single message
+    virtual void ProcessMessage(WXMSG *msg);

 };
 
 #endif // wxUSE_CONSOLE_EVENTLOOP
 };
 
 #endif // wxUSE_CONSOLE_EVENTLOOP