added carbonaccessors.o

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

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index 9f8161da68575029bc9c75f9fd4ba2131a550a0f..effad7cb10c1f9c31e5fe8e34e47a51c32c44828 100644 (file)
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -46,11 +46,11 @@ public:
             SetKeepLooping(TRUE);
         }
 
             SetKeepLooping(TRUE);
         }
 

-    // process a message
-    void ProcessEvent(event_t *evt);
+    // process an event
+    void Dispatch();

 
 

-    // generate an idle message, return TRUE if more idle time requested
-    bool SendIdleMessage();
+    // generate an idle event, return TRUE if more idle time requested
+    bool SendIdleEvent();

 
     // set/get the exit code
     void SetExitCode(int exitcode) { m_exitcode = exitcode; }
 
     // set/get the exit code
     void SetExitCode(int exitcode) { m_exitcode = exitcode; }


@@ -71,12 +71,18 @@ private:
 // wxEventLoopImpl implementation
 // ============================================================================
 
 // wxEventLoopImpl implementation
 // ============================================================================
 

-void wxEventLoopImpl::ProcessEvent(event_t *evt)
+void wxEventLoopImpl::Dispatch()

 {
 {

-    MGL_wmProcessEvent(g_winMng, evt);
+    event_t evt;
+    ibool rc;
+
+    MGL_wmUpdateDC(g_winMng);
+    
+    EVT_halt(&evt, EVT_EVERYEVT);
+    MGL_wmProcessEvent(g_winMng, &evt);

 }
 
 }
 

-bool wxEventLoopImpl::SendIdleMessage()
+bool wxEventLoopImpl::SendIdleEvent()

 {
     wxIdleEvent event;
 
 {
     wxIdleEvent event;
 


@@ -91,6 +97,8 @@ bool wxEventLoopImpl::SendIdleMessage()
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 

+wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
+

 wxEventLoop::~wxEventLoop()
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 wxEventLoop::~wxEventLoop()
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );


@@ -107,6 +115,9 @@ int wxEventLoop::Run()
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     m_impl = new wxEventLoopImpl;
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     m_impl = new wxEventLoopImpl;

+    
+    wxEventLoop *oldLoop = ms_activeLoop;
+    ms_activeLoop = this;

 
     for ( ;; )
     {
 
     for ( ;; )
     {


@@ -116,7 +127,7 @@ int wxEventLoop::Run()
 
         // generate and process idle events for as long as we don't have
         // anything else to do
 
         // generate and process idle events for as long as we don't have
         // anything else to do

-        while ( !Pending() && m_impl->SendIdleMessage() ) {}
+        while ( !Pending() && m_impl->SendIdleEvent() ) {}

 
         // a message came or no more idle processing to do, sit in Dispatch()
         // waiting for the next message
 
         // a message came or no more idle processing to do, sit in Dispatch()
         // waiting for the next message


@@ -131,6 +142,8 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
     delete m_impl;
     m_impl = NULL;
 

+    ms_activeLoop = oldLoop;
+

     return exitcode;
 }
 
     return exitcode;
 }
 


@@ -156,21 +169,6 @@ bool wxEventLoop::Dispatch()
 {
     wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
 
 {
     wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
 

-    event_t evt;
-    ibool rc = EVT_getNext(&evt, EVT_EVERYEVT);
-
-    if ( !rc )
-    {
-        wxLogError(_T("events queue empty even though Pending() returned true"));
-        return FALSE;
-    }
-    
-    // FIXME_MGL -- there must be some way to programatically exit
-    // the loop, like WM_QUIT under Windows -- perhaps we need custom
-    // event to indicate this??
-
-    m_impl->ProcessEvent(&evt);
-
+    m_impl->Dispatch();

     return m_impl->GetKeepLooping();
 }
     return m_impl->GetKeepLooping();
 }

-