webkit-gtk-1.6.1-darwin-quartz.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768
  1. Original from:
  2. http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
  3. http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
  4. Adapted for 1.6.1
  5. --- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
  6. +++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
  7. @@ -70,6 +70,8 @@
  8. #endif
  9. #include <gtk/gtk.h>
  10. +#undef XP_UNIX
  11. +
  12. #if defined(XP_UNIX)
  13. #include "RefPtrCairo.h"
  14. #include "gtk2xtbin.h"
  15. @@ -439,9 +441,9 @@
  16. event->setDefaultHandled();
  17. }
  18. -#if defined(XP_UNIX)
  19. void PluginView::handleFocusInEvent()
  20. {
  21. +#if defined(XP_UNIX)
  22. if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
  23. return;
  24. @@ -454,10 +456,12 @@
  25. event.detail = NotifyDetailNone;
  26. dispatchNPEvent(npEvent);
  27. +#endif
  28. }
  29. void PluginView::handleFocusOutEvent()
  30. {
  31. +#if defined(XP_UNIX)
  32. if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
  33. return;
  34. @@ -470,8 +474,8 @@
  35. event.detail = NotifyDetailNone;
  36. dispatchNPEvent(npEvent);
  37. -}
  38. #endif
  39. +}
  40. void PluginView::setParent(ScrollView* parent)
  41. {
  42. --- Source/WebCore/plugins/gtk/gtk2xtbin.c
  43. +++ Source/WebCore/plugins/gtk/gtk2xtbin.c
  44. @@ -41,7 +41,7 @@
  45. * The GtkXtBin widget allows for Xt toolkit code to be used
  46. * inside a GTK application.
  47. */
  48. -
  49. +#if 0
  50. #include "GtkVersioning.h"
  51. #include "xembed.h"
  52. #include "gtk2xtbin.h"
  53. @@ -966,3 +966,4 @@
  54. return;
  55. }
  56. +#endif