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 fe75758c14bd0975d04f3ba1a4a5785ff954dd63..cd4e02041bc8d88476a5299bb85ff6cbf18506be 100644 (file)
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -12,18 +12,18 @@
 #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();
 


@@ -53,6 +53,10 @@ public:
     }
 
 protected:
     }
 
 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)
     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);


@@ -60,13 +64,6 @@ protected:
 
     // critical window or NULL
     static wxWindowMSW *ms_winCritical;
 
     // critical window or NULL
     static wxWindowMSW *ms_winCritical;

-
-    // the loop exit code
-    int m_exitcode;
-
-    // should we exit the loop?
-    bool m_shouldExit;

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

-