X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b46f221ff3a68c8f3a14ac6a67eb4923c266faf8..b02dd12239c8a59b9a545d9fcb04974f8ad02c6b:/include/wx/osx/carbon/evtloop.h

diff --git a/include/wx/osx/carbon/evtloop.h b/include/wx/osx/carbon/evtloop.h
index dd8a6b448a..8a80fef3fa 100644
--- a/include/wx/osx/carbon/evtloop.h
+++ b/include/wx/osx/carbon/evtloop.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/evtloop.h
+// Name:        wx/osx/carbon/evtloop.h
 // Purpose:     declaration of wxEventLoop for wxMac
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -12,53 +12,25 @@
 #ifndef _WX_MAC_CARBON_EVTLOOP_H_
 #define _WX_MAC_CARBON_EVTLOOP_H_
 
-// set wxOSX_USE_RUN_APP_EVENT_LOOP to 1 if the standard
-// RunApplicationEventLoop function should be used, otherwise
-// the lower level CarbonEventLoop will be used
-//
-// in the long run we should make this 1 by default but we will have to clean
-// up event handling to make sure we don't miss handling of things like pending
-// events etc and perhaps we will also have to pipe events through an
-// ueber-event-handler to make sure we have one place to do all these
-// house-keeping functions
-#define wxOSX_USE_RUN_APP_EVENT_LOOP 0
+struct OpaqueEventRef;
+typedef OpaqueEventRef *EventRef;
 
-// ----------------------------------------------------------------------------
-// wxEventLoop
-// ----------------------------------------------------------------------------
-
-#if wxOSX_USE_RUN_APP_EVENT_LOOP
-
-class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop
 {
 public:
-    wxGUIEventLoop() { m_exitcode = 0; }
+    wxGUIEventLoop();
 
-    // implement base class pure virtuals
-    virtual int Run();
-    virtual void Exit(int rc = 0);
-    virtual bool Pending() const;
-    virtual bool Dispatch();
+    virtual void WakeUp();
 
-private:
-    int m_exitcode;
-};
+protected:
+    virtual int DoDispatchTimeout(unsigned long timeout);
 
-#else // manual event loop
+    virtual void DoRun();
 
-class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopManual
-{
-public:
-    wxGUIEventLoop() { }
-
-    virtual bool Pending() const;
-    virtual bool Dispatch();
+    virtual void DoStop();
 
-    // implement base class pure virtual
-    virtual void WakeUp();
+    virtual CFRunLoopRef CFGetCurrentRunLoop() const;
 };
 
-#endif // auto/manual event loop
-
 #endif // _WX_MAC_CARBON_EVTLOOP_H_