mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refine the weak-binding solution...

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5637 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2007-01-23 21:48:17 +00:00
parent 28b3753946
commit f8d84949c4
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Fl_mac.cxx
View File

@ -3,7 +3,7 @@
//
// MacOS specific code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2006 by Bill Spitzak and others.
// Copyright 1998-2007 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@ -1270,16 +1270,7 @@ void fl_open_callback(void (*cb)(const char *)) {
extern "C" {
extern OSErr CPSEnableForegroundOperation(ProcessSerialNumber *psn, UInt32 _arg2,
UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
#ifndef MAC_OS_X_VERSION_10_3
enum {
kProcessTransformToForegroundApplication = 1L
};
typedef UInt32 ProcessApplicationTransformState;
extern OSStatus TransformProcessType(const ProcessSerialNumber *psn,
ProcessApplicationTransformState transformState);
#endif
}
//#endif
void fl_open_display() {
static char beenHereDoneThat = 0;
@ -1325,12 +1316,19 @@ void fl_open_display() {
if( !bundle )
{
OSErr err = 1;
// Earlier versions of this code tried to use weak linking, however it
// appears that this does not work on 10.2. Since 10.3 and higher provide
// both TransformProcessType and CPSEnableForegroundOperation, the following
// conditional code compiled on 10.2 will still work on newer releases...
OSErr err;
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
if (TransformProcessType != NULL) {
err = TransformProcessType(&cur_psn, kProcessTransformToForegroundApplication);
} else if (CPSEnableForegroundOperation != NULL) {
err = CPSEnableForegroundOperation(&cur_psn, 0x03, 0x3C, 0x2C, 0x1103);
}
err = TransformProcessType(&cur_psn, kProcessTransformToForegroundApplication);
} else
#endif // MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
err = CPSEnableForegroundOperation(&cur_psn, 0x03, 0x3C, 0x2C, 0x1103);
if (err == noErr) {
SetFrontProcess( &cur_psn );
}