summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-11-27 15:41:06 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-11-27 15:41:06 +0000
commit3f547aff6047d543e2a6364606b85f0eb8f52a06 (patch)
tree349d595106df4d084040e6dc3ab8b9a9fd6c7106
parenta137690f148150833b318aa56b12958189fed3ee (diff)
remove out-of-date GTK patches (now in gtk-2-24)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@13556 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--tools/current-gtk-patches/colorspace.patch11
-rw-r--r--tools/current-gtk-patches/gdk-quartz-keys.patch13
-rw-r--r--tools/current-gtk-patches/gdk-window-shown-under-mouse.patch51
3 files changed, 0 insertions, 75 deletions
diff --git a/tools/current-gtk-patches/colorspace.patch b/tools/current-gtk-patches/colorspace.patch
deleted file mode 100644
index ed5c37956d..0000000000
--- a/tools/current-gtk-patches/colorspace.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2.24.0/gdk/quartz/gdkcolor-quartz.c.orig 2012-08-13 22:23:03.000000000 +0400
-+++ gtk+-2.24.0/gdk/quartz/gdkcolor-quartz.c 2012-08-13 22:24:50.000000000 +0400
-@@ -237,7 +237,7 @@
- else
- components[3] = 1.0;
-
-- colorspace = CGColorSpaceCreateWithName (kCGColorSpaceGenericRGB);
-+ colorspace = CGColorSpaceCreateDeviceRGB();
- color = CGColorCreate (colorspace, components);
- CGColorSpaceRelease (colorspace);
- break;
diff --git a/tools/current-gtk-patches/gdk-quartz-keys.patch b/tools/current-gtk-patches/gdk-quartz-keys.patch
deleted file mode 100644
index 7c41807ff6..0000000000
--- a/tools/current-gtk-patches/gdk-quartz-keys.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gdk/quartz/gdkkeys-quartz.c b/gdk/quartz/gdkkeys-quartz.c
-index e4c1636..1cb7a3a 100644
---- a/gdk/quartz/gdkkeys-quartz.c
-+++ b/gdk/quartz/gdkkeys-quartz.c
-@@ -155,7 +155,7 @@ const static struct {
- { 67, GDK_asterisk, GDK_KP_Multiply },
- { 69, GDK_plus, GDK_KP_Add },
- { 75, GDK_slash, GDK_KP_Divide },
-- { 76, 0x01000003, GDK_KP_Enter },
-+ { 76, GDK_Return, GDK_KP_Enter },
- { 78, GDK_minus, GDK_KP_Subtract },
- { 81, GDK_equal, GDK_KP_Equal },
- { 82, GDK_0, GDK_KP_0 },
diff --git a/tools/current-gtk-patches/gdk-window-shown-under-mouse.patch b/tools/current-gtk-patches/gdk-window-shown-under-mouse.patch
deleted file mode 100644
index b545081b77..0000000000
--- a/tools/current-gtk-patches/gdk-window-shown-under-mouse.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a2b9d813967352bd2070e7c3a17834f1733921ac Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chris@dronelabs.com>
-Date: Wed, 26 Aug 2009 00:15:11 +0000
-Subject: Synthesize NSMouseEntered when the window is placed directly under mouse pointer.
-
-This fixes a bug where the window is not immediately changeable because it does
-not realize that the cursor is within it's bounds.
----
-diff --git a/gdk/quartz/GdkQuartzWindow.c b/gdk/quartz/GdkQuartzWindow.c
-index b0acbca..15623ab 100644
---- a/gdk/quartz/GdkQuartzWindow.c
-+++ b/gdk/quartz/GdkQuartzWindow.c
-@@ -271,6 +271,7 @@
- GdkWindow *window = [[self contentView] gdkWindow];
- GdkWindowObject *private = (GdkWindowObject *)window;
- GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
-+ NSPoint nspoint;
-
- inShowOrHide = YES;
-
-@@ -279,6 +280,28 @@
- else
- [impl->toplevel orderFront:nil];
-
-+ /* If the window is placed directly under the mouse pointer, then quartz
-+ * will not send a NSMouseEntered event. Therefore, we will go ahead and
-+ * synthesize the event ourselves.
-+ */
-+ nspoint = [impl->toplevel mouseLocationOutsideOfEventStream];
-+ if ([impl->view mouse:nspoint inRect:[impl->view frame]])
-+ {
-+ NSEvent *event;
-+
-+ event = [NSEvent enterExitEventWithType: NSMouseEntered
-+ location: NSMakePoint(0, 0)
-+ modifierFlags: 0
-+ timestamp: 0
-+ windowNumber: [impl->toplevel windowNumber]
-+ context: NULL
-+ eventNumber: 0
-+ trackingNumber: [impl->view trackingRect]
-+ userData: nil];
-+
-+ [NSApp postEvent:event atStart:NO];
-+ }
-+
- inShowOrHide = NO;
- }
-
---
-cgit v0.8.2.1-10-g45e7