using newer API

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

diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index eec606477b2f195ea2d17dcf9487c4417f110305..cd4e02041bc8d88476a5299bb85ff6cbf18506be 100644 (file)
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -12,21 +12,20 @@
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_
 
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_
 

+#include "wx/window.h"
+

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

-class WXDLLEXPORT wxEventLoop : public wxEventLoopBase
+class WXDLLEXPORT wxEventLoop : public wxEventLoopManual

 {
 public:
     wxEventLoop();
 
     // implement base class pure virtuals
 {
 public:
     wxEventLoop();
 
     // implement base class pure virtuals

-    virtual int Run();
-    virtual void Exit(int rc = 0);

     virtual bool Pending() const;
     virtual bool Dispatch();
     virtual bool Pending() const;
     virtual bool Dispatch();

-    virtual bool IsRunning() const;

 
     // MSW-specific methods
     // --------------------
 
     // MSW-specific methods
     // --------------------


@@ -44,30 +43,27 @@ public:
     //
     // calling this function with NULL argument restores the normal event
     // handling
     //
     // calling this function with NULL argument restores the normal event
     // handling

-    static void SetCriticalWindow(wxWindow *win) { ms_winCritical = win; }
+    static void SetCriticalWindow(wxWindowMSW *win) { ms_winCritical = win; }

 
     // return true if there is no critical window or if this window is [a child
     // of] the critical one
 
     // return true if there is no critical window or if this window is [a child
     // of] the critical one

-    static bool AllowProcessing(wxWindow *win)
+    static bool AllowProcessing(wxWindowMSW *win)

     {
         return !ms_winCritical || IsChildOfCriticalWindow(win);
     }
 
 protected:
     {
         return !ms_winCritical || IsChildOfCriticalWindow(win);
     }
 
 protected:

+    // override/implement base class virtuals
+    virtual void WakeUp();
+    virtual void OnNextIteration();
+

     // check if the given window is a child of ms_winCritical (which must be
     // non NULL)
     // check if the given window is a child of ms_winCritical (which must be
     // non NULL)

-    static bool IsChildOfCriticalWindow(wxWindow *win);
+    static bool IsChildOfCriticalWindow(wxWindowMSW *win);

 
 
     // critical window or NULL
 
 
     // critical window or NULL

-    static wxWindow *ms_winCritical;
-
-    // the loop exit code
-    int m_exitcode;
-
-    // should we exit the loop?
-    bool m_shouldExit;
+    static wxWindowMSW *ms_winCritical;

 };
 
 #endif // _WX_MSW_EVTLOOP_H_
 };
 
 #endif // _WX_MSW_EVTLOOP_H_

-