3 files changed, 4 insertions, 3 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
index 8c3f47d47..d4054affc 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
@@ -19,6 +19,7 @@
 
 #include "../../config_lib.h"
 #include "Fl_Cocoa_Screen_Driver.H"
+#include "Fl_Cocoa_Window_Driver.H"
 #include "../Quartz/Fl_Font.H"
 #include <FL/Fl.H>
 #include <FL/x.H>
@@ -167,7 +168,7 @@ void Fl_Cocoa_Screen_Driver::grab(Fl_Window* win)
   if (win) {
     if (!Fl::grab_) {
       fl_capture = Fl_X::i(Fl::first_window())->xid;
-      Fl_X::i(Fl::first_window())->set_key_window();
+      ((Fl_Cocoa_Window_Driver*)Fl::first_window()->driver())->set_key_window();
     }
     Fl::grab_ = win;
   } else {
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
index 5b0bba2f9..caf705cbe 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
@@ -73,6 +73,7 @@ public:
   CGContextRef gc;                 // graphics context
   NSCursor *cursor;
   static void q_release_context(Fl_Cocoa_Window_Driver *x = 0); // free all resources associated with gc
+  void set_key_window();
 
   // --- window data
   virtual int decorated_w();
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
index 68389bae9..df1bb114e 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
@@ -53,8 +53,7 @@ Fl_Cocoa_Window_Driver::~Fl_Cocoa_Window_Driver()
 
 void Fl_Cocoa_Window_Driver::take_focus()
 {
-  Fl_X *x = Fl_X::i(pWindow);
-  if (x) x->set_key_window();
+  set_key_window();
 }