ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DllImport updates for gdk.

Browse source
This commit is contained in:
Mike Kestner 2011-02-09 23:39:39 -06:00
parent 1f7f2b45b9
commit 70d1b232f2
17 changed files with 38 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gdk/Color.custom
View file

@ -30,7 +30,7 @@ public Color (byte r, byte g, byte b)
Pixel = 0; Pixel = 0;
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern uint gdk_color_hash(ref Gdk.Color raw); static extern uint gdk_color_hash(ref Gdk.Color raw);
public override int GetHashCode() { public override int GetHashCode() {

6
gdk/Device.custom
View file

@ -22,7 +22,7 @@
[DllImport("gdksharpglue-3")] [DllImport("gdksharpglue-3")]
static extern DeviceKey gtksharp_gdk_device_get_device_key (IntPtr device, uint axis); static extern DeviceKey gtksharp_gdk_device_get_device_key (IntPtr device, uint axis);
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_device_get_state(IntPtr device, IntPtr window, double [] axes, out int maskAsInt); static extern void gdk_device_get_state(IntPtr device, IntPtr window, double [] axes, out int maskAsInt);
@ -39,10 +39,10 @@
return gtksharp_gdk_device_get_device_key (Handle, axis); return gtksharp_gdk_device_get_device_key (Handle, axis);
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_device_free_history(IntPtr events, int n_events); static extern void gdk_device_free_history(IntPtr events, int n_events);
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern bool gdk_device_get_history(IntPtr device, IntPtr window, uint start, uint stop, out IntPtr events, out int n_events); static extern bool gdk_device_get_history(IntPtr device, IntPtr window, uint start, uint stop, out IntPtr events, out int n_events);
public TimeCoord[] GetHistory (Gdk.Window window, uint start, uint stop) public TimeCoord[] GetHistory (Gdk.Window window, uint start, uint stop)

8
gdk/Display.custom
View file

@ -18,7 +18,7 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_display_get_pointer(IntPtr raw, IntPtr screen, out int x, out int y, out int mask); static extern void gdk_display_get_pointer(IntPtr raw, IntPtr screen, out int x, out int y, out int mask);
[Obsolete] [Obsolete]
@ -28,7 +28,7 @@
mask = (Gdk.ModifierType) mask_as_int; mask = (Gdk.ModifierType) mask_as_int;
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_display_get_pointer(IntPtr raw, out IntPtr screen, out int x, out int y, out int mask); static extern void gdk_display_get_pointer(IntPtr raw, out IntPtr screen, out int x, out int y, out int mask);
public void GetPointer(out Gdk.Screen screen, out int x, out int y, out Gdk.ModifierType mask) { public void GetPointer(out Gdk.Screen screen, out int x, out int y, out Gdk.ModifierType mask) {
@ -58,7 +58,7 @@
GetPointer (out screen, out x, out y, out mod); GetPointer (out screen, out x, out y, out mod);
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_display_list_devices (IntPtr raw); static extern IntPtr gdk_display_list_devices (IntPtr raw);
public Device[] ListDevices () public Device[] ListDevices ()
@ -73,7 +73,7 @@
return result; return result;
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_display_add_client_message_filter (IntPtr raw, IntPtr message_type, GdkSharp.FilterFuncNative func, IntPtr data); static extern void gdk_display_add_client_message_filter (IntPtr raw, IntPtr message_type, GdkSharp.FilterFuncNative func, IntPtr data);
public void AddClientMessageFilter (Gdk.Atom message_type, Gdk.FilterFunc func) public void AddClientMessageFilter (Gdk.Atom message_type, Gdk.FilterFunc func)

2
gdk/DisplayManager.custom
View file

@ -18,7 +18,7 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_display_manager_list_displays (IntPtr raw); static extern IntPtr gdk_display_manager_list_displays (IntPtr raw);
public Display[] ListDisplays () public Display[] ListDisplays ()

65
gdk/Drawable.custom
View file

@ -1,65 +0,0 @@
// Gdk.Drawble.custom - Gdk Drawble class customizations
//
// Author: Pedro Abelleira Seco <pedroabelleira@yahoo.es>
//
// This code is inserted after the automatically generated code.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
public void DrawRectangle(Gdk.GC gc, bool filled, Gdk.Rectangle area)
{
gdk_draw_rectangle(Handle, gc.Handle, filled, area.X, area.Y, area.Width, area.Height);
}
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_draw_polygon(IntPtr raw, IntPtr gc, int filled, Gdk.Point[] points, int npoints);
[Obsolete]
public void DrawPolygon(Gdk.GC gc, int filled, Gdk.Point[] points)
{
gdk_draw_polygon(Handle, gc.Handle, filled, points, points.Length);
}
public void DrawPolygon(Gdk.GC gc, bool filled, Gdk.Point[] points)
{
gdk_draw_polygon(Handle, gc.Handle, filled ? 1 : 0, points, points.Length);
}
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_draw_lines(IntPtr raw, IntPtr gc, Gdk.Point[] points, int npoints);
public void DrawLines(Gdk.GC gc, Gdk.Point[] points)
{
gdk_draw_lines(Handle, gc.Handle, points, points.Length);
}
[DllImport ("libgdk-win32-2.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)]
internal static extern IntPtr gdk_x11_drawable_get_xid (IntPtr raw);
#if MANLY_ENOUGH_TO_INCLUDE
public virtual Cairo.Graphics CairoGraphics ()
{
Cairo.Graphics o = new Cairo.Graphics ();
IntPtr display = gdk_x11_drawable_get_xdisplay (Handle);
o.SetTargetDrawable (display, gdk_x11_drawable_get_xid (Handle));
return o;
}
#endif

2
gdk/Event.cs
View file

@ -39,7 +39,7 @@ namespace Gdk {
get { return raw; } get { return raw; }
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_event_get_type (); static extern IntPtr gdk_event_get_type ();
public static GLib.GType GType { public static GLib.GType GType {

12
gdk/Global.custom
View file

@ -19,7 +19,7 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_devices_list (); static extern IntPtr gdk_devices_list ();
public static Device[] DevicesList () public static Device[] DevicesList ()
@ -34,7 +34,7 @@
return result; return result;
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_list_visuals (); static extern IntPtr gdk_list_visuals ();
public static Visual[] ListVisuals () public static Visual[] ListVisuals ()
@ -113,7 +113,7 @@
} }
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern bool gdk_init_check(ref int argc, ref IntPtr argv); static extern bool gdk_init_check(ref int argc, ref IntPtr argv);
public static bool InitCheck (ref string[] argv) public static bool InitCheck (ref string[] argv)
@ -127,7 +127,7 @@
return result; return result;
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_parse_args(ref int argc, ref IntPtr argv); static extern void gdk_parse_args(ref int argc, ref IntPtr argv);
public static void ParseArgs (ref string[] argv) public static void ParseArgs (ref string[] argv)
@ -140,7 +140,7 @@
argv = a.GetArgs (argc); argv = a.GetArgs (argc);
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_query_depths (out IntPtr depths, out int n_depths); static extern void gdk_query_depths (out IntPtr depths, out int n_depths);
public static int[] QueryDepths () public static int[] QueryDepths ()
@ -152,7 +152,7 @@
Marshal.Copy (ptr, result, 0, count); Marshal.Copy (ptr, result, 0, count);
return result; return result;
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_query_visual_types (out IntPtr types, out int n_types); static extern void gdk_query_visual_types (out IntPtr types, out int n_types);
public static VisualType[] QueryVisualTypes () public static VisualType[] QueryVisualTypes ()

2
gdk/Input.custom
View file

@ -20,7 +20,7 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern int gdk_input_add_full (int source, int condition, GdkSharp.InputFunctionNative function, IntPtr data, GLib.DestroyNotify destroy); static extern int gdk_input_add_full (int source, int condition, GdkSharp.InputFunctionNative function, IntPtr data, GLib.DestroyNotify destroy);
[Obsolete] [Obsolete]

4
gdk/Keymap.custom
View file

@ -22,7 +22,7 @@
[DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void g_free(IntPtr ptr); static extern void g_free(IntPtr ptr);
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern bool gdk_keymap_get_entries_for_keycode(IntPtr raw, uint hardware_keycode, out IntPtr keys, out IntPtr keyvals, out int n_entries); static extern bool gdk_keymap_get_entries_for_keycode(IntPtr raw, uint hardware_keycode, out IntPtr keys, out IntPtr keyvals, out int n_entries);
public void GetEntriesForKeycode(uint hardware_keycode, out Gdk.KeymapKey[] keys, out uint[] keyvals) public void GetEntriesForKeycode(uint hardware_keycode, out Gdk.KeymapKey[] keys, out uint[] keyvals)
@ -47,7 +47,7 @@
} }
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern bool gdk_keymap_get_entries_for_keyval(IntPtr raw, uint keyval, out IntPtr keys, out int n_keys); static extern bool gdk_keymap_get_entries_for_keyval(IntPtr raw, uint keyval, out IntPtr keys, out int n_keys);
public KeymapKey[] GetEntriesForKeyval (uint keyval) public KeymapKey[] GetEntriesForKeyval (uint keyval)

2
gdk/Makefile.am
View file

@ -38,7 +38,6 @@ customs = \
DeviceAxis.custom \ DeviceAxis.custom \
Display.custom \ Display.custom \
DisplayManager.custom \ DisplayManager.custom \
Drawable.custom \
EdgeTable.custom \ EdgeTable.custom \
GCValues.custom \ GCValues.custom \
Global.custom \ Global.custom \
@ -47,7 +46,6 @@ customs = \
PangoAttrEmbossed.custom\ PangoAttrEmbossed.custom\
PangoAttrEmbossColor.custom \ PangoAttrEmbossColor.custom \
PangoAttrStipple.custom \ PangoAttrStipple.custom \
Pixmap.custom \
Pixbuf.custom \ Pixbuf.custom \
PixbufAnimation.custom \ PixbufAnimation.custom \
PixbufFrame.custom \ PixbufFrame.custom \

66
gdk/Pixmap.custom
View file

@ -1,66 +0,0 @@
// Gdk.Pixmap.custom - Pixmap extensions
//
// Authors: Mike Kestner <mkestner@ximian.com>
//
// Copyright (c) 2004 Novell, Inc.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
public Pixmap (Gdk.Drawable drawable, int width, int height) : this (drawable, width, height, -1) {}
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_pixmap_colormap_create_from_xpm (IntPtr drawable, IntPtr colormap, IntPtr mask, IntPtr transparent_color, IntPtr filename);
public static Gdk.Pixmap ColormapCreateFromXpm(Gdk.Drawable drawable, Gdk.Colormap colormap, string filename)
{
IntPtr native = GLib.Marshaller.StringToPtrGStrdup (filename);
IntPtr raw_ret = gdk_pixmap_colormap_create_from_xpm (drawable.Handle, colormap.Handle, IntPtr.Zero, IntPtr.Zero, native);
GLib.Marshaller.Free (native);
return GLib.Object.GetObject (raw_ret) as Gdk.Pixmap;
}
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_pixmap_colormap_create_from_xpm_d (IntPtr drawable, IntPtr colormap, IntPtr mask, IntPtr transparent_color, IntPtr data);
public static Gdk.Pixmap ColormapCreateFromXpmD(Gdk.Drawable drawable, Gdk.Colormap colormap, string data)
{
IntPtr native = GLib.Marshaller.StringToPtrGStrdup (data);
IntPtr raw_ret = gdk_pixmap_colormap_create_from_xpm_d (drawable.Handle, colormap.Handle, IntPtr.Zero, IntPtr.Zero, native);
GLib.Marshaller.Free (native);
return GLib.Object.GetObject (raw_ret) as Gdk.Pixmap;
}
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_pixmap_create_from_xpm (IntPtr drawable, IntPtr mask, IntPtr transparent_color, IntPtr filename);
public static Gdk.Pixmap CreateFromXpm(Gdk.Drawable drawable, string filename)
{
IntPtr native = GLib.Marshaller.StringToPtrGStrdup (filename);
IntPtr raw_ret = gdk_pixmap_create_from_xpm (drawable.Handle, IntPtr.Zero, IntPtr.Zero, native);
GLib.Marshaller.Free (native);
return GLib.Object.GetObject (raw_ret) as Gdk.Pixmap;
}
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_pixmap_create_from_xpm_d (IntPtr drawable, IntPtr mask, IntPtr transparent_color, IntPtr data);
public static Gdk.Pixmap CreateFromXpmD(Gdk.Drawable drawable, string data)
{
IntPtr native = GLib.Marshaller.StringToPtrGStrdup (data);
IntPtr raw_ret = gdk_pixmap_create_from_xpm_d (drawable.Handle, IntPtr.Zero, IntPtr.Zero, native);
GLib.Marshaller.Free (native);
return GLib.Object.GetObject (raw_ret) as Gdk.Pixmap;
}

4
gdk/Property.custom
View file

@ -20,7 +20,7 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_property_change(IntPtr window, IntPtr property, IntPtr type, int format, int mode, out byte data, int nelements); static extern void gdk_property_change(IntPtr window, IntPtr property, IntPtr type, int format, int mode, out byte data, int nelements);
[Obsolete ("Replaced by corrected overload with data parameter")] [Obsolete ("Replaced by corrected overload with data parameter")]
@ -30,7 +30,7 @@
return data; return data;
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern bool gdk_property_get(IntPtr window, IntPtr property, IntPtr type, UIntPtr offset, UIntPtr length, bool pdelete, out IntPtr actual_property_type, out int actual_format, out int actual_length, out IntPtr data); static extern bool gdk_property_get(IntPtr window, IntPtr property, IntPtr type, UIntPtr offset, UIntPtr length, bool pdelete, out IntPtr actual_property_type, out int actual_format, out int actual_length, out IntPtr data);
public static bool Get(Gdk.Window window, Gdk.Atom property, Gdk.Atom type, ulong offset, ulong length, int pdelete, out Gdk.Atom actual_property_type, out int actual_format, out int actual_length, out byte[] data) { public static bool Get(Gdk.Window window, Gdk.Atom property, Gdk.Atom type, ulong offset, ulong length, int pdelete, out Gdk.Atom actual_property_type, out int actual_format, out int actual_length, out byte[] data) {

2
gdk/Region.custom
View file

@ -23,7 +23,7 @@
[DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void g_free (IntPtr mem); static extern void g_free (IntPtr mem);
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_region_get_rectangles(IntPtr raw, out IntPtr rectangles, out int n_rectangles); static extern void gdk_region_get_rectangles(IntPtr raw, out IntPtr rectangles, out int n_rectangles);
public Rectangle[] GetRectangles () public Rectangle[] GetRectangles ()

8
gdk/Screen.custom
View file

@ -18,7 +18,7 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_screen_get_toplevel_windows (IntPtr raw); static extern IntPtr gdk_screen_get_toplevel_windows (IntPtr raw);
public Window[] ToplevelWindows public Window[] ToplevelWindows
@ -35,7 +35,7 @@
} }
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_screen_list_visuals (IntPtr raw); static extern IntPtr gdk_screen_list_visuals (IntPtr raw);
public Visual[] ListVisuals () public Visual[] ListVisuals ()
@ -50,10 +50,10 @@
return result; return result;
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_screen_get_font_options(IntPtr raw); static extern IntPtr gdk_screen_get_font_options(IntPtr raw);
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_screen_set_font_options(IntPtr raw, IntPtr options); static extern void gdk_screen_set_font_options(IntPtr raw, IntPtr options);
[GLib.Property ("font-options")] [GLib.Property ("font-options")]

6
gdk/TextProperty.cs
View file

@ -26,10 +26,10 @@ namespace Gdk {
public class TextProperty { public class TextProperty {
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_free_text_list(IntPtr ptr); static extern void gdk_free_text_list(IntPtr ptr);
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern int gdk_text_property_to_utf8_list(IntPtr encoding, int format, byte[] text, int length, out IntPtr list); static extern int gdk_text_property_to_utf8_list(IntPtr encoding, int format, byte[] text, int length, out IntPtr list);
public static string[] ToStringList (Gdk.Atom encoding, int format, byte[] text, int length) public static string[] ToStringList (Gdk.Atom encoding, int format, byte[] text, int length)
@ -49,7 +49,7 @@ namespace Gdk {
return result; return result;
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern int gdk_text_property_to_utf8_list_for_display(IntPtr display, IntPtr encoding, int format, byte[] text, int length, out IntPtr list); static extern int gdk_text_property_to_utf8_list_for_display(IntPtr display, IntPtr encoding, int format, byte[] text, int length, out IntPtr list);
public static string[] ToStringListForDisplay (Gdk.Display display, Gdk.Atom encoding, int format, byte[] text, int length) public static string[] ToStringListForDisplay (Gdk.Display display, Gdk.Atom encoding, int format, byte[] text, int length)

16
gdk/Window.custom
View file

@ -24,7 +24,7 @@
public Window (Gdk.Window parent, Gdk.WindowAttr attributes, Gdk.WindowAttributesType attributes_mask) : this (parent, attributes, (int)attributes_mask) {} public Window (Gdk.Window parent, Gdk.WindowAttr attributes, Gdk.WindowAttributesType attributes_mask) : this (parent, attributes, (int)attributes_mask) {}
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_window_get_children(IntPtr raw); static extern IntPtr gdk_window_get_children(IntPtr raw);
public Window[] Children { public Window[] Children {
@ -40,7 +40,7 @@
} }
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_window_set_icon_list(IntPtr raw, IntPtr pixbufs); static extern void gdk_window_set_icon_list(IntPtr raw, IntPtr pixbufs);
public Pixbuf[] IconList { public Pixbuf[] IconList {
@ -52,7 +52,7 @@
} }
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_window_get_toplevels(); static extern IntPtr gdk_window_get_toplevels();
public static Window[] Toplevels { public static Window[] Toplevels {
@ -71,7 +71,7 @@
[DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_object_ref (IntPtr raw); static extern IntPtr g_object_ref (IntPtr raw);
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_window_destroy(IntPtr raw); static extern void gdk_window_destroy(IntPtr raw);
public void Destroy () public void Destroy ()
@ -97,10 +97,10 @@
} }
#endif #endif
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_window_get_user_data (IntPtr raw, out IntPtr data); static extern void gdk_window_get_user_data (IntPtr raw, out IntPtr data);
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_window_set_user_data(IntPtr raw, IntPtr user_data); static extern void gdk_window_set_user_data(IntPtr raw, IntPtr user_data);
public IntPtr UserData { public IntPtr UserData {
get { get {
@ -113,10 +113,10 @@
} }
} }
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_window_add_filter (IntPtr handle, GdkSharp.FilterFuncNative wrapper, IntPtr data); static extern void gdk_window_add_filter (IntPtr handle, GdkSharp.FilterFuncNative wrapper, IntPtr data);
[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern void gdk_window_remove_filter (IntPtr handle, GdkSharp.FilterFuncNative wrapper, IntPtr data); static extern void gdk_window_remove_filter (IntPtr handle, GdkSharp.FilterFuncNative wrapper, IntPtr data);
static Hashtable filter_all_hash; static Hashtable filter_all_hash;

2
gdk/gdk-sharp.dll.config.in
View file

@ -1,6 +1,6 @@
<configuration> <configuration>
<dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<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.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</configuration> </configuration>