routing native events first to the wx class and only if skipped call native handler

[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 dd8a6b448aac0d4f517410c079985fd2c22a7331..b55112994f35784a4d4a09d85033b8d6b6bc3e8c 100644 (file)
--- a/include/wx/osx/carbon/evtloop.h
+++ b/include/wx/osx/carbon/evtloop.h
@@ -12,53 +12,27 @@
 #ifndef _WX_MAC_CARBON_EVTLOOP_H_
 #define _WX_MAC_CARBON_EVTLOOP_H_
 
 #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
-
-// ----------------------------------------------------------------------------
-// wxEventLoop
-// ----------------------------------------------------------------------------
-
-#if wxOSX_USE_RUN_APP_EVENT_LOOP
-
-class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase
-{
-public:
-    wxGUIEventLoop() { m_exitcode = 0; }
-
-    // implement base class pure virtuals
-    virtual int Run();
-    virtual void Exit(int rc = 0);
-    virtual bool Pending() const;
-    virtual bool Dispatch();
-
-private:
-    int m_exitcode;
-};
-
-#else // manual event loop
+class OpaqueEventRef;
+typedef OpaqueEventRef *EventRef;

 
 class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopManual
 {
 public:
 
 class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopManual
 {
 public:

-    wxGUIEventLoop() { }
+    wxGUIEventLoop();

 
 

+    // implement/override base class pure virtual

     virtual bool Pending() const;
     virtual bool Dispatch();
     virtual bool Pending() const;
     virtual bool Dispatch();

+    virtual int DispatchTimeout(unsigned long timeout);

 
 

-    // implement base class pure virtual

     virtual void WakeUp();
     virtual void WakeUp();

-};

 
 

-#endif // auto/manual event loop
+private:
+    // dispatch an event and release it
+    void DispatchAndReleaseEvent(EventRef event);
+
+    double      m_sleepTime;
+};

 
 #endif // _WX_MAC_CARBON_EVTLOOP_H_
 
 
 #endif // _WX_MAC_CARBON_EVTLOOP_H_