Merge wxUIActionSimulator fixes from SOC2010_GUI_TEST branch.

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

diff --git a/include/wx/osx/cocoa/evtloop.h b/include/wx/osx/cocoa/evtloop.h
index d0040bd92056039af2617257e4efd9c318ec6241..ed64e651ebdf6aa1afda234141509087a058b0e5 100644 (file)
--- a/include/wx/osx/cocoa/evtloop.h
+++ b/include/wx/osx/cocoa/evtloop.h
@@ -11,21 +11,19 @@
 #ifndef _WX_OSX_COCOA_EVTLOOP_H_
 #define _WX_OSX_COCOA_EVTLOOP_H_
 
 #ifndef _WX_OSX_COCOA_EVTLOOP_H_
 #define _WX_OSX_COCOA_EVTLOOP_H_
 

-class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopManual
+class WXDLLIMPEXP_BASE wxGUIEventLoop : public wxCFEventLoop

 {
 public:
     wxGUIEventLoop();
 {
 public:
     wxGUIEventLoop();

+    
+protected:
+    virtual int DoDispatchTimeout(unsigned long timeout);
+    
+    virtual void DoRun();

 
 

-    // 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:
-    double m_sleepTime;
+    virtual void DoStop();
+    
+    virtual CFRunLoopRef CFGetCurrentRunLoop() const;

 };
 
 #endif // _WX_OSX_COCOA_EVTLOOP_H_
 };
 
 #endif // _WX_OSX_COCOA_EVTLOOP_H_