Add "OSX" prefix to wxCFEventLoop::DoRun() and DoStop() methods.

[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 63c565721c9a0d7f00327a737ac8067b2267d76d..c388d32ce65e6f857949fedc7a6d7e15ef2922eb 100644 (file)
--- a/include/wx/osx/cocoa/evtloop.h
+++ b/include/wx/osx/cocoa/evtloop.h
@@ -11,48 +11,38 @@
 #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_BASE wxGUIEventLoop : public wxEventLoopManual
+class WXDLLIMPEXP_BASE wxGUIEventLoop : public wxCFEventLoop

 {
 public:
 {
 public:

-    typedef wxMacEventLoopSource Source;
-

     wxGUIEventLoop();
     wxGUIEventLoop();

-
-    // implement/override base class pure virtual
-    virtual bool Pending() const;
-    virtual bool Dispatch();
-    virtual int DispatchTimeout(unsigned long timeout);
+    ~wxGUIEventLoop();
+    
+    void BeginModalSession( wxWindow* modalWindow );
+    
+    void EndModalSession();

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

-    virtual bool YieldFor(long eventsToProcess);
-
-#if wxUSE_EVENTLOOP_SOURCE
-    virtual wxMacEventLoopSource* CreateSource() const
-    {
-        return new wxMacEventLoopSource();
-    }
-
-    virtual wxMacEventLoopSource* CreateSource(int res,
-                                           wxEventLoopSourceHandler* handler,
-                                           int flags) const;
-
-    virtual wxMacEventLoopSource* CreateSource(CFRunLoopSourceRef res,
-                                           wxEventLoopSourceHandler* handler,
-                                           int flags) const
-    {
-        return new wxMacEventLoopSource(res, handler, flags);
-    }
-#endif

 
 

+    void OSXUseLowLevelWakeup(bool useIt)
+        { m_osxLowLevelWakeUp = useIt ; }
+    

 protected:
 protected:

-#if wxUSE_EVENTLOOP_SOURCE
-    // adding/removing sources
-    virtual bool DoAddSource(wxAbstractEventLoopSource* source);
-    virtual bool DoRemoveSource(wxAbstractEventLoopSource* source);
-#endif
-
-private:
-    double m_sleepTime;
+    virtual int DoDispatchTimeout(unsigned long timeout);
+
+    virtual void OSXDoRun();
+    virtual void OSXDoStop();
+
+    virtual CFRunLoopRef CFGetCurrentRunLoop() const;
+    
+    void* m_modalSession;
+    
+    wxWindow* m_modalWindow;
+    
+    WXWindow m_dummyWindow;
+    
+    int m_modalNestedLevel;
+    
+    bool m_osxLowLevelWakeUp;

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