cleanup for 10.5

[wxWidgets.git] / src / palmos / evtloop.cpp

diff --git a/src/palmos/evtloop.cpp b/src/palmos/evtloop.cpp
index 3de13673dc5898884774af3c27b79b1b155fd45e..ec93249cbcfb144c8507430fb0ad97f6cfb56c5d 100644 (file)
--- a/src/palmos/evtloop.cpp
+++ b/src/palmos/evtloop.cpp
@@ -51,40 +51,10 @@
 #include <Menu.h>
 #include <Form.h>
 
 #include <Menu.h>
 #include <Form.h>
 

-// ----------------------------------------------------------------------------
-// helper class
-// ----------------------------------------------------------------------------
-
-// this object sets the wxEventLoop given to the ctor as the currently active
-// one and unsets it in its dtor
-class wxEventLoopActivator
-{
-public:
-    wxEventLoopActivator(wxEventLoop **pActive,
-                         wxEventLoop *evtLoop)
-    {
-        m_pActive = pActive;
-        m_evtLoopOld = *pActive;
-        *pActive = evtLoop;
-    }
-
-    ~wxEventLoopActivator()
-    {
-        // restore the previously active event loop
-        *m_pActive = m_evtLoopOld;
-    }
-
-private:
-    wxEventLoop *m_evtLoopOld;
-    wxEventLoop **m_pActive;
-};
-

 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 
 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 

-wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
-

 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------


@@ -122,6 +92,8 @@ int wxEventLoop::Run()
     status_t    error;
     EventType    event;
 
     status_t    error;
     EventType    event;
 

+    wxEventLoopActivator activate(this);
+

     do {
         wxTheApp && wxTheApp->ProcessIdle();
 
     do {
         wxTheApp && wxTheApp->ProcessIdle();