overriding the cfrunloop accessor, during booting cocoa has to create a NSRunLoop...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/cocoa/evtloop.h b/include/wx/osx/cocoa/evtloop.h
index 79c25c2b00f9494583d0160f859c11c6bdb75905..ed64e651ebdf6aa1afda234141509087a058b0e5 100644 (file)
--- a/include/wx/osx/cocoa/evtloop.h
+++ b/include/wx/osx/cocoa/evtloop.h
@@ -22,6 +22,8 @@ protected:
     virtual void DoRun();
 
     virtual void DoStop();
     virtual void DoRun();
 
     virtual void DoStop();

+    
+    virtual CFRunLoopRef CFGetCurrentRunLoop() const;

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

diff --git a/src/osx/carbon/evtloop.cpp b/src/osx/carbon/evtloop.cpp
index 4ca136ca90ad9eb21eba418d409cd60f6a99c24c..6ea3f85fac468748d45862f529de8107d20d91fa 100644 (file)
--- a/src/osx/carbon/evtloop.cpp
+++ b/src/osx/carbon/evtloop.cpp
@@ -94,6 +94,11 @@ void wxGUIEventLoop::DoStop()
     QuitApplicationEventLoop();
 }
 
     QuitApplicationEventLoop();
 }
 

+CFRunLoopRef wxGUIEventLoop::CFGetCurrentRunLoop() const
+{
+    return wxCFEventLoop::CFGetCurrentRunLoop();
+}
+

 // TODO move into a evtloop_osx.cpp
 
 wxModalEventLoop::wxModalEventLoop(wxWindow *modalWindow)
 // TODO move into a evtloop_osx.cpp
 
 wxModalEventLoop::wxModalEventLoop(wxWindow *modalWindow)


@@ -114,6 +119,7 @@ wxModalEventLoop::wxModalEventLoop(WXWindow modalNativeWindow)
 
 void wxModalEventLoop::DoRun()
 {
 
 void wxModalEventLoop::DoRun()
 {

+    wxWindowDisabler disabler(m_modalWindow);

     wxMacAutoreleasePool autoreleasepool;
 
     bool resetGroupParent = false;
     wxMacAutoreleasePool autoreleasepool;
 
     bool resetGroupParent = false;

diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm
index bcd24e8405fd41e84156e860d81b92046094a5ae..ed35319658eb8af7a1682a4b722ba92c49bd641a 100644 (file)
--- a/src/osx/cocoa/evtloop.mm
+++ b/src/osx/cocoa/evtloop.mm
@@ -175,6 +175,13 @@ void wxGUIEventLoop::DoStop()
     [NSApp stop:0];
 }
 
     [NSApp stop:0];
 }
 

+CFRunLoopRef wxGUIEventLoop::CFGetCurrentRunLoop() const
+{
+    NSRunLoop* nsloop = [NSRunLoop currentRunLoop];
+    return [nsloop getCFRunLoop];
+}
+
+

 // TODO move into a evtloop_osx.cpp
 
 wxModalEventLoop::wxModalEventLoop(wxWindow *modalWindow)
 // TODO move into a evtloop_osx.cpp
 
 wxModalEventLoop::wxModalEventLoop(wxWindow *modalWindow)