diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-03-29 10:35:00 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-03-29 10:35:00 +0000 |
| commit | 941901e273319ce152523af7fa079a6f5cf89d68 (patch) | |
| tree | 9d70b82fa54d81607a0022f14a0518c47805a796 /src/Fl_grab.cxx | |
| parent | b77071a3de3593ea482aa7ea0a442c7fc888a2e2 (diff) | |
OS X: removed all Carbon and Quickdraw references. Starting with 1.3, we only support Cocoa and Quartz.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7351 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_grab.cxx')
| -rw-r--r-- | src/Fl_grab.cxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/Fl_grab.cxx b/src/Fl_grab.cxx index b6d49f8a5..2164d8cf6 100644 --- a/src/Fl_grab.cxx +++ b/src/Fl_grab.cxx @@ -47,13 +47,8 @@ extern HWND fl_capture; #endif #ifdef __APPLE__ -// MacOS Carbon does not seem to have a mechanism to grab the mouse pointer -#ifdef __APPLE_COCOA__ extern void MACsetkeywindow(void *nsw); extern void *fl_capture; -#else -extern Window fl_capture; -#endif #endif void Fl::grab(Fl_Window* win) { @@ -63,13 +58,8 @@ void Fl::grab(Fl_Window* win) { SetActiveWindow(fl_capture = fl_xid(first_window())); SetCapture(fl_capture); #elif defined(__APPLE__) -#ifdef __APPLE_COCOA__ - fl_capture = Fl_X::i(first_window())->xid; - MACsetkeywindow(fl_capture); -#else - fl_capture = fl_xid( first_window() ); - SetUserFocusWindow( fl_capture ); -#endif + fl_capture = Fl_X::i(first_window())->xid; + MACsetkeywindow(fl_capture); #else XGrabPointer(fl_display, fl_xid(first_window()), @@ -97,9 +87,6 @@ void Fl::grab(Fl_Window* win) { ReleaseCapture(); #elif defined(__APPLE__) fl_capture = 0; -#ifndef __APPLE_COCOA__ - SetUserFocusWindow( (WindowRef)kUserFocusAuto ); -#endif #else XUngrabKeyboard(fl_display, fl_event_time); XUngrabPointer(fl_display, fl_event_time); |