gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17712) -Codechange [FS#1411]: [OSX] Replace undocumented process manager API calls with a documented alternative. (pyth)

Browse Source
This commit is contained in:
michi_cc 2009-10-04 21:33:36 +00:00
parent 8484e08ee0
commit ec90a8778f
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/video/cocoa/cocoa_v.mm
View File

@ -44,17 +44,6 @@
* Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information. * Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information.
*/ */
/* Portions of CPS.h */
struct CPSProcessSerNum {
UInt32 lo;
UInt32 hi;
};
extern "C" OSErr CPSGetCurrentProcess(CPSProcessSerNum *psn);
extern "C" OSErr CPSEnableForegroundOperation(CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
extern "C" OSErr CPSSetFrontProcess(CPSProcessSerNum *psn);
/* Disables a warning. This is needed since the method exists but has been dropped from the header, supposedly as of 10.4. */ /* Disables a warning. This is needed since the method exists but has been dropped from the header, supposedly as of 10.4. */
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4) #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
@interface NSApplication(NSAppleMenu) @interface NSApplication(NSAppleMenu)
@ -171,17 +160,22 @@ static void setupWindowMenu()
static void setupApplication() static void setupApplication()
{ {
CPSProcessSerNum PSN; ProcessSerialNumber psn = { 0, kCurrentProcess };
/* Ensure the application object is initialised */ /* Ensure the application object is initialised */
[NSApplication sharedApplication]; [NSApplication sharedApplication];
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
/* Tell the dock about us */ /* Tell the dock about us */
if (!CPSGetCurrentProcess(&PSN) && if (MacOSVersionIsAtLeast(10, 3, 0)) {
!CPSEnableForegroundOperation(&PSN, 0x03, 0x3C, 0x2C, 0x1103) && OSStatus returnCode = TransformProcessType(&psn, kProcessTransformToForegroundApplication);
!CPSSetFrontProcess(&PSN)) { if (returnCode != 0) DEBUG(driver, 0, "Could not change to foreground application. Error %d", (int)returnCode);
[NSApplication sharedApplication];
} }
#endif
/* Become the front process, important when start from the command line. */
OSErr err = SetFrontProcess(&psn);
if (err != 0) DEBUG(driver, 0, "Could not bring the application to front. Error %d", (int)err);
/* Set up the menubar */ /* Set up the menubar */
[NSApp setMainMenu:[[NSMenu alloc] init]]; [NSApp setMainMenu:[[NSMenu alloc] init]];