head	1.2;
access;
symbols;
locks; strict;
comment	@// @;


1.2
date	2014.05.30.10.22.05;	author pho;	state dead;
branches;
next	1.1;
commitid	pujOAy5YvcBW3yCx;

1.1
date	2014.05.30.03.03.36;	author pho;	state Exp;
branches;
next	;
commitid	SyhQGFZ06rmWDvCx;


desc
@@


1.2
log
@PR pkg/48840: Remove most patches that I have recently added

The preprocessor macro XP_MACOSX is misused everywhere. They tend to
say "#if defined(XP_MACOSX)" to actually mean
"#if defined(MOZ_WIDGET_COCOA)". It's okay to equate XP_MACOSX with
XP_DARWIN but equating it with MOZ_WIDGET_COCOA is just wrong. As a
result, cairo-gtk2 build on Darwin is completely broken and needs
heavy patching. Ideally they should be fixed individually but that
will be an extremely hard work, so don't define XP_MACOSX for now.
@
text
@$NetBSD: patch-dom_events_nsEventStateManager.cpp,v 1.1 2014/05/30 03:03:36 pho Exp $

Don't assume cocoa toolkit just because OS_ARCH is Darwin.

--- dom/events/nsEventStateManager.cpp.orig	2014-05-06 22:55:23.000000000 +0000
+++ dom/events/nsEventStateManager.cpp
@@@@ -85,7 +85,7 @@@@
 #include "GeckoProfiler.h"
 #include "Units.h"
 
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
 #import <ApplicationServices/ApplicationServices.h>
 #endif
 
@@@@ -1865,7 +1865,7 @@@@ nsEventStateManager::FireContextClick()
     return;
   }
 
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
   // Hack to ensure that we don't show a context menu when the user
   // let go of the mouse after a long cpu-hogging operation prevented
   // us from handling any OS events. See bug 117589.
@@@@ -3137,7 +3137,7 @@@@ nsEventStateManager::DecideGestureEvent(
   aEvent->panDirection = panDirection;
 }
 
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
 static bool
 NodeAllowsClickThrough(nsINode* aNode)
 {
@@@@ -3314,7 +3314,7 @@@@ nsEventStateManager::PostHandleEvent(nsP
             // focused frame
             EnsureDocument(mPresContext);
             if (mDocument) {
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
               if (!activeContent || !activeContent->IsXUL())
 #endif
                 fm->ClearFocus(mDocument->GetWindow());
@@@@ -3689,7 +3689,7 @@@@ nsEventStateManager::PostHandleEvent(nsP
     }
     break;
 
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
   case NS_MOUSE_ACTIVATE:
     if (mCurrentTarget) {
       nsCOMPtr<nsIContent> targetContent;
@


1.1
log
@PR pkg/48840: Don't assume cocoa toolkit just because OS_ARCH is Darwin
@
text
@d1 1
a1 1
$NetBSD$
@