From bc2a18749af39941dcc44b17153329217dca71b9 Mon Sep 17 00:00:00 2001
From: Mirco Bauer <meebey@meebey.net>
Date: Tue, 2 Oct 2012 17:17:44 +0200
Subject: [PATCH] gtkdotnet: Fixed P/Invokes and Dllmap to use GDK 3.0 instead
of 2.0
---
gtkdotnet/Graphics.cs | 10 +++++-----
gtkdotnet/gtk-dotnet.dll.config.in | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gtkdotnet/Graphics.cs b/gtkdotnet/Graphics.cs
index 84634e230..933138120 100644
--- a/gtkdotnet/Graphics.cs
+++ b/gtkdotnet/Graphics.cs
@@ -33,19 +33,19 @@ namespace Gtk.DotNet {
private Graphics () {}
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
internal static extern IntPtr gdk_win32_drawable_get_handle(IntPtr raw);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
internal static extern IntPtr gdk_win32_hdc_get(IntPtr drawable, IntPtr gc, int usage);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
internal static extern void gdk_win32_hdc_release(IntPtr drawable,IntPtr gc,int usage);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
internal static extern IntPtr gdk_x11_drawable_get_xdisplay (IntPtr raw);
- [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+ [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
internal static extern IntPtr gdk_x11_drawable_get_xid (IntPtr raw);
public static System.Drawing.Graphics FromDrawable (Gdk.Window drawable)
diff --git a/gtkdotnet/gtk-dotnet.dll.config.in b/gtkdotnet/gtk-dotnet.dll.config.in
index 8f2e60d91..f4c0c10cc 100644
--- a/gtkdotnet/gtk-dotnet.dll.config.in
+++ b/gtkdotnet/gtk-dotnet.dll.config.in
@@ -1,3 +1,3 @@
<configuration>
- <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-@GDK_BACKEND@-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
+ <dllmap dll="libgdk-win32-3.0-0.dll" target="libgdk-3@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</configuration>