summaryrefslogtreecommitdiffstats
path: root/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
blob: 5ad357e9eeed26e9c05b08e9b6bdcb2d597e6e1c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
Original from:
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt

Adapted for 1.6.1

--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
@@ -70,6 +70,8 @@
 #endif
 #include <gtk/gtk.h>
 
+#undef XP_UNIX
+
 #if defined(XP_UNIX)
 #include "RefPtrCairo.h"
 #include "gtk2xtbin.h"
@@ -439,9 +441,9 @@
         event->setDefaultHandled();
 }
 
-#if defined(XP_UNIX)
 void PluginView::handleFocusInEvent()
 {
+#if defined(XP_UNIX)
     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
         return;
 
@@ -454,10 +456,12 @@
     event.detail = NotifyDetailNone;
 
     dispatchNPEvent(npEvent);
+#endif
 }
 
 void PluginView::handleFocusOutEvent()
 {
+#if defined(XP_UNIX)
     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
         return;
 
@@ -470,8 +474,8 @@
     event.detail = NotifyDetailNone;
 
     dispatchNPEvent(npEvent);
-}
 #endif
+}
 
 void PluginView::setParent(ScrollView* parent)
 {
--- Source/WebCore/plugins/gtk/gtk2xtbin.c
+++ Source/WebCore/plugins/gtk/gtk2xtbin.c
@@ -41,7 +41,7 @@
  * The GtkXtBin widget allows for Xt toolkit code to be used
  * inside a GTK application.  
  */
-
+#if 0
 #include "GtkVersioning.h"
 #include "xembed.h"
 #include "gtk2xtbin.h"
@@ -966,3 +966,4 @@
 
   return;
 }
+#endif