From fb7f90626b5892857614702ccfb309935b49cd22 Mon Sep 17 00:00:00 2001
From: gephilipp <>
Date: Mon, 15 Oct 2007 18:09:27 +0000
Subject: [PATCH] *** empty log message ***

---
 panda/src/osxdisplay/osxGraphicsWindow.mm | 27 +++++++++--------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/panda/src/osxdisplay/osxGraphicsWindow.mm b/panda/src/osxdisplay/osxGraphicsWindow.mm
index 88e1cc37d7..0ef4d6569c 100644
--- a/panda/src/osxdisplay/osxGraphicsWindow.mm
+++ b/panda/src/osxdisplay/osxGraphicsWindow.mm
@@ -175,8 +175,8 @@ OSStatus osxGraphicsWindow::event_handler(EventHandlerCallRef myHandler, EventRe
 	UInt32 the_class = GetEventClass(event);
 	UInt32 kind = GetEventKind(event);
 
-	WindowRef window = _osx_window;	//	NULL;		
-//	GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, sizeof(WindowRef), NULL, &window);
+	WindowRef window = NULL;
+	GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, sizeof(WindowRef), NULL, &window);
 
 	if (osxdisplay_cat.is_spam())
 	{
@@ -186,7 +186,6 @@ OSStatus osxGraphicsWindow::event_handler(EventHandlerCallRef myHandler, EventRe
   switch (the_class)
   {
 	  case kEventClassMouse:
-            // osxdisplay_cat.info() << "Mouse movement handled by Window handler\n";
 		result  = handleWindowMouseEvents (myHandler, event);
 		break;
 		
@@ -291,21 +290,17 @@ void osxGraphicsWindow::SystemCloseWindow()
 
 static pascal OSStatus	windowEvtHndlr(EventHandlerCallRef myHandler, EventRef event, void *userData)
 {
-	osxGraphicsWindow*	osx_win = (osxGraphicsWindow *)userData;
-	if (osx_win != (osxGraphicsWindow *)NULL)
-		return osx_win->event_handler(myHandler, event);
-
-//#pragma unused (userData)
+#pragma unused (userData)
  
-//  WindowRef window = NULL;		
-//  GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, sizeof(WindowRef), NULL, &window);
+  WindowRef window = NULL;		
+  GetEventParameter(event, kEventParamDirectObject, typeWindowRef, NULL, sizeof(WindowRef), NULL, &window);
 
-//  if (window != NULL)
-//  {
-//    osxGraphicsWindow *osx_win = osxGraphicsWindow::GetCurrentOSxWindow(window);
-//    if (osx_win != (osxGraphicsWindow *)NULL)
-//      return osx_win->event_handler(myHandler, event);
-//  }
+  if (window != NULL)
+  {
+    osxGraphicsWindow *osx_win = osxGraphicsWindow::GetCurrentOSxWindow(window);
+    if (osx_win != (osxGraphicsWindow *)NULL)
+      return osx_win->event_handler(myHandler, event);
+  }
 
   return eventNotHandledErr;
 }