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

Fl_get_key_mac.cxx: removed GetKeys Carbon call

Browse Source 
Tested OK with keyboard demo.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7615 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2010-05-26 21:25:11 +00:00
parent e2165ba028
commit 53d7a643f1
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Fl_cocoa.mm
View File

@ -43,7 +43,7 @@
really remove these as well, so we can stop linking to Carbon alltogether. really remove these as well, so we can stop linking to Carbon alltogether.
"_GetKeys", referenced from: "_GetKeys", referenced from:
Fl::get_key(int) in Fl_get_key.o Fl::get_key(int) in Fl_get_key.o (kept only for pre-10.4 runs)
"_GetEventParameter", referenced from: "_GetEventParameter", referenced from:
carbonTextHandler(OpaqueEventHandlerCallRef*, OpaqueEventRef*, void*) in Fl.o carbonTextHandler(OpaqueEventHandlerCallRef*, OpaqueEventRef*, void*) in Fl.o

8
src/Fl_get_key_mac.cxx
View File

@ -87,6 +87,13 @@ int Fl::event_key(int k) {
//: returns true, if that key is pressed right now //: returns true, if that key is pressed right now
int Fl::get_key(int k) { int Fl::get_key(int k) {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if(CGEventSourceKeyState != NULL) {
return (int)CGEventSourceKeyState(kCGEventSourceStateCombinedSessionState, fltk2mac(k) );
}
else
#endif
{
KeyMap foo; KeyMap foo;
GetKeys(foo); GetKeys(foo);
#ifdef MAC_TEST_FOR_KEYCODES #ifdef MAC_TEST_FOR_KEYCODES
@ -103,6 +110,7 @@ int Fl::get_key(int k) {
} }
int i = fltk2mac(k); int i = fltk2mac(k);
return (b[i>>3]>>(i&7))&1; return (b[i>>3]>>(i&7))&1;
}
} }
// //