wxMessageBox off the main thread lost result code.

[wxWidgets.git] / include / wx / osx / carbon / evtloop.h

diff --git a/include/wx/osx/carbon/evtloop.h b/include/wx/osx/carbon/evtloop.h
index d704a9c50ca4b284ede5c64e002fb41eddf9e49c..f18c7c949478460f1b557cdaa51fbc6a67f80498 100644 (file)
--- a/include/wx/osx/carbon/evtloop.h
+++ b/include/wx/osx/carbon/evtloop.h
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/evtloop.h
+// Name:        wx/osx/carbon/evtloop.h
 // Purpose:     declaration of wxEventLoop for wxMac
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-01-12
-// RCS-ID:      $Id$
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,27 +11,23 @@
 #ifndef _WX_MAC_CARBON_EVTLOOP_H_
 #define _WX_MAC_CARBON_EVTLOOP_H_
 
-class OpaqueEventRef;
+struct OpaqueEventRef;
 typedef OpaqueEventRef *EventRef;
 
-class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopManual
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop
 {
 public:
     wxGUIEventLoop();
 
-    // implement/override base class pure virtual
-    virtual bool Pending() const;
-    virtual bool Dispatch();
-    virtual int DispatchTimeout(unsigned long timeout);
-
     virtual void WakeUp();
-    virtual bool YieldFor(long eventsToProcess);
 
-private:
-    // dispatch an event and release it
-    void DispatchAndReleaseEvent(EventRef event);
+protected:
+    virtual int DoDispatchTimeout(unsigned long timeout);
+
+    virtual void OSXDoRun();
+    virtual void OSXDoStop();
 
-    double      m_sleepTime;
+    virtual CFRunLoopRef CFGetCurrentRunLoop() const;
 };
 
 #endif // _WX_MAC_CARBON_EVTLOOP_H_