Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged modified 46013 from svn trunk (NOTE: CVS).

Browse Source 
Rework idle handling so that NSApplication does not need to be subclassed or posed as.
Copyright Software 2000 Ltd.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2007-07-13 21:14:45 +00:00
parent f5d9bc0a49
commit 428424f525
3 changed files with 189 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/cocoa/app.h
View File

@@ -12,6 +12,11 @@
#ifndef _WX_COCOA_APP_H_
#define _WX_COCOA_APP_H_
typedef struct __CFRunLoopObserver * CFRunLoopObserverRef;
typedef const struct __CFString * CFStringRef;
#include "wx/mac/corefoundation/cfref.h"
// ========================================================================
// wxApp
// ========================================================================
@@ -26,7 +31,10 @@ class WXDLLEXPORT wxApp: public wxAppBase
// ------------------------------------------------------------------------
public:
wxApp();
virtual ~wxApp() {}
// ABI compatibility warning: This was implemented inline. wxCocoa apps
// compiled against < 2.8.5 won't call the new implementation which cleans up
// the CFRunLoop idle observer. Fortunately, Cleanup does that in 2.8.
virtual ~wxApp();
// ------------------------------------------------------------------------
// Cocoa specifics
@@ -37,6 +45,9 @@ public:
virtual void CocoaDelegate_applicationDidBecomeActive();
virtual void CocoaDelegate_applicationWillResignActive();
virtual void CocoaDelegate_applicationDidResignActive();
/* The following two cannot be virtual due to 2.8 ABI compatibility */
/*virtual*/ void CocoaDelegate_applicationWillUpdate();
/*virtual*/ void CF_ObserveMainRunLoopBeforeWaiting(CFRunLoopObserverRef observer, int activity);
protected:
WX_NSApplication m_cocoaApp;
struct objc_object *m_cocoaAppDelegate;