overriding the cfrunloop accessor, during booting cocoa has to create a NSRunLoop earlier
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -22,6 +22,8 @@ protected:
|
||||
virtual void DoRun();
|
||||
|
||||
virtual void DoStop();
|
||||
|
||||
virtual CFRunLoopRef CFGetCurrentRunLoop() const;
|
||||
};
|
||||
|
||||
#endif // _WX_OSX_COCOA_EVTLOOP_H_
|
||||
|
@@ -94,6 +94,11 @@ void wxGUIEventLoop::DoStop()
|
||||
QuitApplicationEventLoop();
|
||||
}
|
||||
|
||||
CFRunLoopRef wxGUIEventLoop::CFGetCurrentRunLoop() const
|
||||
{
|
||||
return wxCFEventLoop::CFGetCurrentRunLoop();
|
||||
}
|
||||
|
||||
// TODO move into a evtloop_osx.cpp
|
||||
|
||||
wxModalEventLoop::wxModalEventLoop(wxWindow *modalWindow)
|
||||
@@ -114,6 +119,7 @@ wxModalEventLoop::wxModalEventLoop(WXWindow modalNativeWindow)
|
||||
|
||||
void wxModalEventLoop::DoRun()
|
||||
{
|
||||
wxWindowDisabler disabler(m_modalWindow);
|
||||
wxMacAutoreleasePool autoreleasepool;
|
||||
|
||||
bool resetGroupParent = false;
|
||||
|
@@ -175,6 +175,13 @@ void wxGUIEventLoop::DoStop()
|
||||
[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)
|
||||
|
Reference in New Issue
Block a user