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

gtk: Fix dll name and use a const for all DllImports in custom code

Browse source 
In Windows builds of GTK+ 3.x, the dll filename is libgtk-3-0.dll.

We use this opportunity to use a common const in the DllImport
statement for all custom code.
This commit is contained in:
Bertrand Lorentz 2014-02-23 15:12:20 +01:00
parent ee8499483e
commit 691de4e606
61 changed files with 157 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gtk/Accel.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class Accel {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_accel_map_save(IntPtr file_name);
[Obsolete("Moved to AccelMap class. Use AccelMap.Save instead")]
@ -35,7 +35,7 @@ namespace Gtk {
GLib.Marshaller.Free (native);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_accel_map_add_filter(IntPtr filter_pattern);
[Obsolete("Moved to AccelMap class. Use AccelMap.AddFilter instead")]
@ -45,7 +45,7 @@ namespace Gtk {
GLib.Marshaller.Free (native);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_accel_map_foreach_unfiltered(IntPtr data, GtkSharp.AccelMapForeachNative foreach_func);
[Obsolete("Moved to AccelMap class. Use AccelMap.ForeachUnfiltered instead")]
@ -54,7 +54,7 @@ namespace Gtk {
gtk_accel_map_foreach_unfiltered(data, foreach_func_wrapper.NativeDelegate);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_accel_map_save_fd(int fd);
[Obsolete("Moved to AccelMap class. Use AccelMap.SaveFd instead")]
@ -62,7 +62,7 @@ namespace Gtk {
gtk_accel_map_save_fd(fd);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_accel_map_add_entry(IntPtr accel_path, uint accel_key, int accel_mods);
[Obsolete("Moved to AccelMap class. Use AccelMap.AddEntry instead")]
@ -72,7 +72,7 @@ namespace Gtk {
GLib.Marshaller.Free (native);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_accel_map_load_fd(int fd);
[Obsolete("Moved to AccelMap class. Use AccelMap.LoadFd instead")]
@ -80,7 +80,7 @@ namespace Gtk {
gtk_accel_map_load_fd(fd);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_accel_map_lookup_entry(IntPtr accel_path, ref Gtk.AccelKey key);
[Obsolete("Moved to AccelMap class. Use AccelMap.LookupEntry instead")]
@ -91,7 +91,7 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_accel_map_change_entry(IntPtr accel_path, uint accel_key, int accel_mods, bool replace);
[Obsolete("Moved to AccelMap class. Use AccelMap.ChangeEntry instead")]
@ -102,7 +102,7 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_accel_map_load (IntPtr file_name);
[Obsolete("Moved to AccelMap class. Use AccelMap.Load instead")]
@ -112,7 +112,7 @@ namespace Gtk {
GLib.Marshaller.Free (native);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_accel_map_foreach(IntPtr data, GtkSharp.AccelMapForeachNative foreach_func);
[Obsolete("Moved to AccelMap class. Use AccelMap.Foreach instead")]
@ -121,7 +121,7 @@ namespace Gtk {
gtk_accel_map_foreach(data, foreach_func_wrapper.NativeDelegate);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_accel_groups_from_object (IntPtr obj);
public static AccelGroup[] GroupsFromObject (GLib.Object obj)

2
gtk/Action.cs
View file

@ -28,7 +28,7 @@ namespace Gtk {
public Action (string name, string label) : this (name, label, null, null)
{}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_action_get_proxies (IntPtr raw);
public Gtk.Widget[] Proxies {

2
gtk/ActionGroup.cs
View file

@ -80,7 +80,7 @@ namespace Gtk {
actions[0].Changed += changed;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_action_group_list_actions (IntPtr raw);
public Gtk.Action[] ListActions() {

2
gtk/Adjustment.cs
View file

@ -23,7 +23,7 @@ namespace Gtk {
public partial class Adjustment {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);
public Adjustment (double value, double lower, double upper, double step_increment, double page_increment, double page_size) : base (IntPtr.Zero)

16
gtk/Application.cs
View file

@ -56,10 +56,10 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_init (ref int argc, ref IntPtr argv);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_init_check (ref int argc, ref IntPtr argv);
static void SetPrgname ()
@ -125,7 +125,7 @@ namespace Gtk {
return do_init (progname, ref args, true);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_main ();
public static void Run ()
@ -133,7 +133,7 @@ namespace Gtk {
gtk_main ();
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_events_pending ();
@ -142,10 +142,10 @@ namespace Gtk {
return gtk_events_pending ();
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_main_iteration ();
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_main_iteration_do (bool blocking);
public static void RunIteration ()
@ -158,7 +158,7 @@ namespace Gtk {
return gtk_main_iteration_do (blocking);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_main_quit ();
public static void Quit ()
@ -167,7 +167,7 @@ namespace Gtk {
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_get_current_event ();
public static Gdk.Event CurrentEvent {

2
gtk/Bin.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class Bin {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_bin_get_child(IntPtr raw);
public new Gtk.Widget Child {

2
gtk/Builder.cs
View file

@ -231,7 +231,7 @@ namespace Gtk {
this.handler_type = handler_type;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_builder_connect_signals_full(IntPtr raw, GtkSharp.BuilderConnectFuncNative func, IntPtr user_data);
public void ConnectSignals() {

2
gtk/Button.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class Button {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_button_new_from_stock(IntPtr stock_id);
public Button (string stock_id) : base (IntPtr.Zero)

4
gtk/CellRenderer.cs
View file

@ -28,7 +28,7 @@ namespace Gtk {
public partial class CellRenderer {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_cell_renderer_start_editing (IntPtr handle, IntPtr evnt, IntPtr widget, IntPtr path, ref Gdk.Rectangle bg_area, ref Gdk.Rectangle cell_area, int flags);
public ICellEditable StartEditing (Widget widget, Gdk.Event evnt, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, CellRendererState flags)
@ -40,7 +40,7 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_cell_renderer_render (IntPtr handle, IntPtr drawable, IntPtr widget, ref Gdk.Rectangle bg_area, ref Gdk.Rectangle cell_area, ref Gdk.Rectangle expose_area, int flags);
public void Render (Cairo.Context context, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)

2
gtk/CheckMenuItem.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class CheckMenuItem {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_check_menu_item_new_with_mnemonic (IntPtr label);
public CheckMenuItem (string label) : base (IntPtr.Zero)

8
gtk/Clipboard.cs
View file

@ -25,10 +25,10 @@ namespace Gtk {
public partial class Clipboard {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_clipboard_set_with_data(IntPtr raw, TargetEntry[] targets, int n_targets, GtkSharp.ClipboardGetFuncNative get_func, GtkSharp.ClipboardClearFuncNative clear_func, IntPtr data);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_clipboard_set_with_owner(IntPtr raw, TargetEntry[] targets, int n_targets, GtkSharp.ClipboardGetFuncNative get_func, GtkSharp.ClipboardClearFuncNative clear_func, IntPtr owner);
void ClearProxy (Clipboard clipboard)
@ -73,7 +73,7 @@ namespace Gtk {
Text = text;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_clipboard_wait_for_rich_text (IntPtr raw, IntPtr buffer, out IntPtr format, out UIntPtr length);
public byte[] WaitForRichText(Gtk.TextBuffer buffer, out Gdk.Atom format)
@ -115,7 +115,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_clipboard_request_rich_text(IntPtr raw, IntPtr buffer, RichTextReceivedFuncNative cb, IntPtr user_data);
public void RequestRichText (Gtk.TextBuffer buffer, RichTextReceivedFunc cb)

8
gtk/ColorSelection.cs
View file

@ -23,7 +23,7 @@ namespace Gtk {
public partial class ColorSelection {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_color_selection_palette_to_string(Gdk.Color[] colors, int n_colors);
/// <summary> PaletteToString Method </summary>
@ -34,7 +34,7 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_color_selection_palette_from_string(IntPtr str, out IntPtr colors, out int n_colors);
public static Gdk.Color[] PaletteFromString(string str) {
@ -59,10 +59,10 @@ namespace Gtk {
return colors;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_color_selection_set_previous_color(IntPtr raw, ref Gdk.Color color);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_color_selection_get_previous_color(IntPtr raw, out Gdk.Color color);
// Create Gtk# property to replace two Gtk+ functions

4
gtk/Container.cs
View file

@ -60,10 +60,10 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_container_get_focus_chain (IntPtr raw, out IntPtr list_ptr);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_container_set_focus_chain (IntPtr raw, IntPtr list_ptr);
public Widget[] FocusChain {

2
gtk/Dialog.cs
View file

@ -26,7 +26,7 @@ namespace Gtk {
using System.Runtime.InteropServices;
public partial class Dialog {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_dialog_new_with_buttons (IntPtr title, IntPtr i, int flags, IntPtr dummy);
public Dialog (string title, Gtk.Window parent, Gtk.DialogFlags flags, params object[] button_data) : base(IntPtr.Zero)
{

2
gtk/Drag.cs
View file

@ -23,7 +23,7 @@ namespace Gtk {
public partial class Drag {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_drag_set_icon_default(IntPtr context);
public static void SetIconDefault(Gdk.DragContext context)

2
gtk/FileChooserDialog.cs
View file

@ -28,7 +28,7 @@ namespace Gtk {
public partial class FileChooserDialog {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_file_chooser_dialog_new(IntPtr title, IntPtr parent, int action, IntPtr nil);
public FileChooserDialog (string title, Window parent, FileChooserAction action, params object[] button_data) : base (IntPtr.Zero)

2
gtk/Global.cs
View file

@ -20,6 +20,8 @@ namespace Gtk {
public partial class Global {
internal const string GtkNativeDll = "libgtk-3-0.dll";
public static bool ShowUri (string uri)
{
return ShowUri (null, uri);

2
gtk/HScale.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class HScale {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_hscale_new_with_range (double min, double max, double step);
public HScale (double min, double max, double step) : base (IntPtr.Zero)

2
gtk/IconFactory.cs
View file

@ -20,7 +20,7 @@ namespace Gtk {
public partial class IconFactory {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
extern static void gtk_icon_size_lookup (IconSize size, out int width, out int height);
/// <summary> Query icon dimensions </summary>

2
gtk/IconSet.cs
View file

@ -20,7 +20,7 @@ namespace Gtk {
public partial class IconSet {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
unsafe static extern void gtk_icon_set_get_sizes (
IntPtr raw, out int *pointer_to_enum, out int n_sizes);

12
gtk/IconTheme.cs
View file

@ -28,7 +28,7 @@ namespace Gtk {
public partial class IconTheme {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_icon_theme_list_icons (IntPtr raw, IntPtr context);
public string[] ListIcons (string context)
@ -47,16 +47,16 @@ namespace Gtk {
return result;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_icon_theme_get_search_path(IntPtr raw, out IntPtr path, out int n_elements);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_icon_theme_set_search_path(IntPtr raw, IntPtr[] path, int n_elements);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_icon_theme_get_search_path_utf8(IntPtr raw, out IntPtr path, out int n_elements);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_icon_theme_set_search_path_utf8(IntPtr raw, IntPtr[] path, int n_elements);
bool IsWindowsPlatform {
@ -107,7 +107,7 @@ namespace Gtk {
SearchPath = path;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_icon_theme_get_icon_sizes (IntPtr raw, IntPtr icon_name);
public int[] GetIconSizes (string icon_name)

2
gtk/IconView.cs
View file

@ -36,7 +36,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_icon_view_scroll_to_path(IntPtr raw, IntPtr path, bool use_align, float row_align, float col_align);
public void ScrollToPath (Gtk.TreePath path)

4
gtk/Image.cs
View file

@ -27,7 +27,7 @@ namespace Gtk {
public partial class Image {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_image_new_from_icon_set(IntPtr icon_set, int size);
public Image (Gtk.IconSet icon_set, Gtk.IconSize size) : base (IntPtr.Zero)
@ -45,7 +45,7 @@ namespace Gtk {
Raw = gtk_image_new_from_icon_set(icon_set.Handle, (int) size);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_image_new_from_stock(IntPtr stock_id, int size);
public Image (string stock_id, Gtk.IconSize size) : base (IntPtr.Zero)

2
gtk/ImageMenuItem.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class ImageMenuItem {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_image_menu_item_new_with_mnemonic (IntPtr label);
public ImageMenuItem (string label) : base (IntPtr.Zero)

4
gtk/Key.cs
View file

@ -28,7 +28,7 @@ namespace Gtk {
static Hashtable wrappers = new Hashtable ();
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern uint gtk_key_snooper_install (GtkSharp.KeySnoopFuncNative snooper, IntPtr func_data);
public static uint SnooperInstall (Gtk.KeySnoopFunc snooper)
@ -39,7 +39,7 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_key_snooper_remove (uint snooper_handler_id);
public static void SnooperRemove (uint snooper_handler_id)

8
gtk/ListStore.cs
View file

@ -26,7 +26,7 @@ namespace Gtk {
public partial class ListStore : IEnumerable {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent);
public bool IterChildren (out Gtk.TreeIter iter)
{
@ -42,7 +42,7 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_iter_nth_child (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent, int n);
public bool IterNthChild (out Gtk.TreeIter iter, int n)
{
@ -122,7 +122,7 @@ namespace Gtk {
return AppendValues ((Array) values);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_list_store_insert_with_valuesv(IntPtr raw, out TreeIter iter, int position, int[] columns, GLib.Value[] values, int n_values);
public TreeIter InsertWithValues (int position, params object[] values)
@ -148,7 +148,7 @@ namespace Gtk {
return iter;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_list_store_set_valuesv(IntPtr raw, ref TreeIter iter, int[] columns, GLib.Value[] values, int n_values);
public void SetValues (TreeIter iter, params object[] values)

4
gtk/Menu.cs
View file

@ -35,7 +35,7 @@ namespace Gtk {
Popup (null, null, null, 3, Global.CurrentEventTime);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_menu_set_screen (IntPtr raw, IntPtr screen);
public new Gdk.Screen Screen {
@ -47,7 +47,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_menu_set_active (IntPtr raw, uint index_);
public void SetActive (uint index_)

2
gtk/MenuItem.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class MenuItem {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_menu_item_new_with_mnemonic (IntPtr label);
public MenuItem (string label) : base (IntPtr.Zero)

4
gtk/MessageDialog.cs
View file

@ -20,10 +20,10 @@ namespace Gtk {
public partial class MessageDialog {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_message_dialog_new (IntPtr parent_window, DialogFlags flags, MessageType type, ButtonsType bt, IntPtr msg, IntPtr args);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_message_dialog_new_with_markup (IntPtr parent_window, DialogFlags flags, MessageType type, ButtonsType bt, IntPtr msg, IntPtr args);
public MessageDialog (Gtk.Window parent_window, DialogFlags flags, MessageType type, ButtonsType bt, bool use_markup, string format, params object[] args)

2
gtk/Notebook.cs
View file

@ -32,7 +32,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern int gtk_notebook_page_num (IntPtr handle, IntPtr child);
public int PageNum (Widget child)

4
gtk/Plug.cs
View file

@ -26,7 +26,7 @@ namespace Gtk {
public partial class Plug {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_plug_new(UIntPtr socket_id);
public Plug (ulong socket_id) : base (IntPtr.Zero)
@ -39,7 +39,7 @@ namespace Gtk {
Raw = gtk_plug_new (new UIntPtr (socket_id));
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_plug_new_for_display(IntPtr display, UIntPtr socket_id);
public Plug (Gdk.Display display, ulong socket_id) : base (IntPtr.Zero)

2
gtk/Printer.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class Printer {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_enumerate_printers (GtkSharp.PrinterFuncNative func, IntPtr func_data, GLib.DestroyNotify destroy, bool wait);
public static void EnumeratePrinters (Gtk.PrinterFunc func, bool wait)

4
gtk/RadioAction.cs
View file

@ -25,10 +25,10 @@ namespace Gtk
public partial class RadioAction
{
[DllImport("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport(Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_radio_action_get_group(IntPtr raw);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_radio_action_set_group(IntPtr raw, IntPtr list);
[GLib.Property ("group")]

6
gtk/RadioButton.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class RadioButton {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_radio_button_new_with_mnemonic (IntPtr group, IntPtr label);
// creates a new group for this RadioButton
@ -36,10 +36,10 @@ namespace Gtk {
GLib.Marshaller.Free (native);
}
[DllImport("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport(Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_radio_button_get_group(IntPtr raw);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_radio_button_set_group(IntPtr raw, IntPtr list);
[GLib.Property ("group")]

6
gtk/RadioMenuItem.cs
View file

@ -43,7 +43,7 @@ namespace Gtk {
GLib.Marshaller.Free (label_as_native);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_radio_menu_item_new_with_mnemonic(IntPtr group, IntPtr label);
public RadioMenuItem (RadioMenuItem[] group, string label) : base (IntPtr.Zero)
@ -71,10 +71,10 @@ namespace Gtk {
GLib.Marshaller.Free (native_label);
}
[DllImport("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport(Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_radio_menu_item_get_group(IntPtr raw);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_radio_menu_item_set_group(IntPtr raw, IntPtr list);
[GLib.Property ("group")]

8
gtk/RadioToolButton.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class RadioToolButton {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_radio_tool_button_new (IntPtr group);
public RadioToolButton (RadioToolButton[] group) : base (IntPtr.Zero)
@ -46,7 +46,7 @@ namespace Gtk {
Raw = gtk_radio_tool_button_new(native_group);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_radio_tool_button_new_from_stock (IntPtr group, IntPtr stock_id);
public RadioToolButton (RadioToolButton[] group, string stock_id) : base (IntPtr.Zero)
@ -72,10 +72,10 @@ namespace Gtk {
GLib.Marshaller.Free (stock_id_as_native);
}
[DllImport("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport(Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_radio_tool_button_get_group(IntPtr raw);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_radio_tool_button_set_group(IntPtr raw, IntPtr list);
[GLib.Property ("group")]

8
gtk/SelectionData.cs
View file

@ -25,10 +25,10 @@ namespace Gtk {
public partial class SelectionData {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
private static extern IntPtr gtk_selection_data_get_text (IntPtr selection_data);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
private static extern void gtk_selection_data_set_text (IntPtr selection_data, IntPtr str, int len);
public string Text {
@ -45,7 +45,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
private static extern IntPtr gtk_selection_data_get_data (IntPtr selection_data);
public byte[] Data {
@ -61,7 +61,7 @@ namespace Gtk {
Set(type, format, data, data.Length);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_selection_data_get_targets(IntPtr raw, out IntPtr targets, out int n_atoms);
public Gdk.Atom [] Targets {

2
gtk/SpinButton.cs
View file

@ -26,7 +26,7 @@ namespace Gtk {
public partial class SpinButton {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_spin_button_new_with_range (double min, double max, double step);
public SpinButton (double min, double max, double step) : base (IntPtr.Zero)

4
gtk/StatusIcon.cs
View file

@ -38,7 +38,7 @@ namespace Gtk {
static MenuPositionFuncNative StatusIconPositionMenuFunc = null;
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_menu_popup (IntPtr menu, IntPtr parent_menu_shell, IntPtr parent_menu_item, MenuPositionFuncNative func, IntPtr data, uint button, uint activate_time);
public void PresentMenu (Menu menu, uint button, uint activate_time)
@ -84,7 +84,7 @@ namespace Gtk {
}
}
[DllImport("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport(Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_status_icon_get_geometry(IntPtr raw, out IntPtr screen, IntPtr area, out int orientation);
public bool GetGeometry(out Gdk.Screen screen, out Gdk.Rectangle area, out Gtk.Orientation orientation)

4
gtk/Stock.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class Stock {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_stock_list_ids ();
public static string[] ListIds ()
@ -49,7 +49,7 @@ namespace Gtk {
public IntPtr TranslationDomain;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_stock_lookup (IntPtr stock_id, out ConstStockItem item);
public static Gtk.StockItem Lookup (string stock_id) {

8
gtk/StockManager.cs
View file

@ -26,7 +26,7 @@ namespace Gtk {
public class StockManager {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_stock_add_static(ref Gtk.StockItem items, uint n_items);
[Obsolete ("Use StockManager.Add instead")]
@ -55,7 +55,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_stock_lookup (IntPtr stock_id, out ConstStockItem item);
public static bool Lookup (string stock_id, ref Gtk.StockItem item)
@ -76,10 +76,10 @@ namespace Gtk {
return Lookup (stock_id, ref item);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_stock_add(ref Gtk.StockItem item, uint n_items);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_stock_add(Gtk.StockItem[] items, uint n_items);
[Obsolete ("Use the StockItem or StockItem[] overload instead.")]

2
gtk/Target.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class Target {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_target_table_new_from_list(IntPtr list, out int n_targets);
public static Gtk.TargetEntry[] TableNewFromList(Gtk.TargetList list) {

2
gtk/TargetList.cs
View file

@ -23,7 +23,7 @@ namespace Gtk {
public partial class TargetList {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_target_list_new(Gtk.TargetEntry[] targets, uint n_targets);
public TargetList() : base(gtk_target_list_new(null, 0)) {}

16
gtk/TextBuffer.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class TextBuffer {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_text_buffer_set_text (IntPtr raw, IntPtr text, int len);
public void Clear ()
@ -46,7 +46,7 @@ namespace Gtk {
gtk_text_buffer_paste_clipboard(Handle, clipboard.Handle, IntPtr.Zero, true);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_text_buffer_insert (IntPtr raw, ref Gtk.TextIter iter, IntPtr text, int len);
[Obsolete ("Replaced by 'ref TextIter iter' overload")]
@ -109,7 +109,7 @@ namespace Gtk {
Text = text;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_text_buffer_insert_interactive(IntPtr raw, ref Gtk.TextIter iter, IntPtr text, int len, bool default_editable);
public bool InsertInteractive(ref Gtk.TextIter iter, string text, bool default_editable)
@ -120,7 +120,7 @@ namespace Gtk {
return result;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_text_buffer_insert_interactive_at_cursor(IntPtr raw, IntPtr text, int len, bool default_editable);
public bool InsertInteractiveAtCursor(string text, bool default_editable)
@ -131,7 +131,7 @@ namespace Gtk {
return result;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_text_buffer_insert_at_cursor(IntPtr raw, IntPtr text, int len);
public void InsertAtCursor(string text)
@ -141,7 +141,7 @@ namespace Gtk {
GLib.Marshaller.Free (native);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_text_buffer_serialize (IntPtr raw, IntPtr content_buffer, IntPtr format, ref Gtk.TextIter start, ref Gtk.TextIter end, out UIntPtr length);
public byte[] Serialize(Gtk.TextBuffer content_buffer, Gdk.Atom format, Gtk.TextIter start, Gtk.TextIter end)
@ -156,10 +156,10 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_text_buffer_get_serialize_formats(IntPtr raw, out int n_formats);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_text_buffer_get_deserialize_formats(IntPtr raw, out int n_formats);
public Gdk.Atom[] DeserializeFormats {

2
gtk/TextChildAnchor.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class TextChildAnchor {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_text_child_anchor_get_widgets (IntPtr raw);
public Widget[] Widgets {

8
gtk/TextIter.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial struct TextIter {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern uint gtk_text_iter_get_char(ref Gtk.TextIter raw);
public string Char {
@ -34,7 +34,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_text_iter_get_marks (ref TextIter iter);
public TextMark[] Marks {
@ -50,7 +50,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_text_iter_get_tags (ref TextIter iter);
public TextTag[] Tags {
@ -66,7 +66,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_text_iter_get_toggled_tags (ref TextIter iter, bool toggled_on);
public TextTag[] GetToggledTags (bool toggled_on)

2
gtk/TextView.cs
View file

@ -26,7 +26,7 @@ namespace Gtk {
public partial class TextView {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_text_view_new_with_buffer (IntPtr buffer);
public TextView (TextBuffer buffer) : base (IntPtr.Zero)

4
gtk/TreeModelAdapter.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class TreeModelAdapter {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent);
public bool IterChildren (out Gtk.TreeIter iter) {
bool raw_ret = gtk_tree_model_iter_children (Handle, out iter, IntPtr.Zero);
@ -39,7 +39,7 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_iter_nth_child (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent, int n);
public bool IterNthChild (out Gtk.TreeIter iter, int n) {
bool raw_ret = gtk_tree_model_iter_nth_child (Handle, out iter, IntPtr.Zero, n);

8
gtk/TreeModelFilter.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class TreeModelFilter {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent);
public bool IterChildren (out Gtk.TreeIter iter) {
bool raw_ret = gtk_tree_model_iter_children (Handle, out iter, IntPtr.Zero);
@ -39,7 +39,7 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_iter_nth_child (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent, int n);
public bool IterNthChild (out Gtk.TreeIter iter, int n) {
bool raw_ret = gtk_tree_model_iter_nth_child (Handle, out iter, IntPtr.Zero, n);
@ -83,7 +83,7 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_model_filter_set_modify_func(IntPtr raw, int n_columns, IntPtr[] types, GtkSharp.TreeModelFilterModifyFuncNative func, IntPtr data, GLib.DestroyNotify destroy);
public void SetModifyFunc (int n_columns, GLib.GType[] types, TreeModelFilterModifyFunc func)
@ -96,7 +96,7 @@ namespace Gtk {
gtk_tree_model_filter_set_modify_func (Handle, n_columns, native_types, func_wrapper.NativeDelegate, (IntPtr) gch, GLib.DestroyHelper.NotifyHandler);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_filter_convert_child_iter_to_iter (IntPtr raw, out Gtk.TreeIter filter_iter, ref Gtk.TreeIter child_iter);
public TreeIter ConvertChildIterToIter (Gtk.TreeIter child_iter)

4
gtk/TreeModelSort.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class TreeModelSort {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent);
public bool IterChildren (out Gtk.TreeIter iter) {
bool raw_ret = gtk_tree_model_iter_children (Handle, out iter, IntPtr.Zero);
@ -39,7 +39,7 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_iter_nth_child (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent, int n);
public bool IterNthChild (out Gtk.TreeIter iter, int n) {
bool raw_ret = gtk_tree_model_iter_nth_child (Handle, out iter, IntPtr.Zero, n);

2
gtk/TreePath.cs
View file

@ -21,7 +21,7 @@ namespace Gtk {
public partial class TreePath {
// Patch submitted by malte on bug #49518
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_tree_path_get_indices(IntPtr raw);
public int [] Indices {

4
gtk/TreeSelection.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class TreeSelection {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_tree_selection_get_selected_rows (IntPtr raw, IntPtr model);
public TreePath[] GetSelectedRows ()
@ -38,7 +38,7 @@ namespace Gtk {
return (TreePath[]) GLib.Marshaller.ListToArray (list, typeof (Gtk.TreePath));
}
[DllImport ("libgtk-win32-3.0-0.dll", EntryPoint="gtk_tree_selection_get_selected", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, EntryPoint="gtk_tree_selection_get_selected", CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_selection_get_selected_without_model (IntPtr raw, IntPtr model, out Gtk.TreeIter iter);
public bool GetSelected (out Gtk.TreeIter iter)

30
gtk/TreeStore.cs
View file

@ -27,10 +27,10 @@ namespace Gtk {
public partial class TreeStore {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_append (IntPtr raw, out TreeIter iter, ref TreeIter parent);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_append (IntPtr raw, out TreeIter iter, IntPtr parent);
public TreeIter AppendNode ()
@ -47,10 +47,10 @@ namespace Gtk {
return iter;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_insert (IntPtr raw, out TreeIter iter, ref TreeIter parent, int position);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_insert (IntPtr raw, out TreeIter iter, IntPtr parent, int position);
public TreeIter InsertNode (TreeIter parent, int position)
@ -67,10 +67,10 @@ namespace Gtk {
return iter;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_prepend (IntPtr raw, out TreeIter iter, ref TreeIter parent);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_prepend (IntPtr raw, out TreeIter iter, IntPtr parent);
public TreeIter PrependNode (TreeIter parent)
@ -87,10 +87,10 @@ namespace Gtk {
return iter;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_insert_before (IntPtr raw, out TreeIter iter, ref TreeIter parent, ref TreeIter sibling);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_insert_before (IntPtr raw, out TreeIter iter, IntPtr parent, ref TreeIter sibling);
public TreeIter InsertNodeBefore (TreeIter sibling)
@ -107,10 +107,10 @@ namespace Gtk {
return iter;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_insert_after (IntPtr raw, out TreeIter iter, ref TreeIter parent, ref TreeIter sibling);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_insert_after (IntPtr raw, out TreeIter iter, IntPtr parent, ref TreeIter sibling);
public TreeIter InsertNodeAfter (TreeIter sibling)
@ -127,7 +127,7 @@ namespace Gtk {
return iter;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent);
public bool IterChildren (out Gtk.TreeIter iter) {
bool raw_ret = gtk_tree_model_iter_children (Handle, out iter, IntPtr.Zero);
@ -141,7 +141,7 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_model_iter_nth_child (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent, int n);
public bool IterNthChild (out Gtk.TreeIter iter, int n) {
bool raw_ret = gtk_tree_model_iter_nth_child (Handle, out iter, IntPtr.Zero, n);
@ -227,10 +227,10 @@ namespace Gtk {
return AppendValues ((Array) values);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_insert_with_valuesv(IntPtr raw, out TreeIter iter, IntPtr parent, int position, int[] columns, GLib.Value[] values, int n_values);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_insert_with_valuesv(IntPtr raw, out TreeIter iter, ref TreeIter parent, int position, int[] columns, GLib.Value[] values, int n_values);
public TreeIter InsertWithValues (int position, params object[] values)
@ -269,7 +269,7 @@ namespace Gtk {
return iter;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_tree_store_set_valuesv(IntPtr raw, ref TreeIter iter, int[] columns, GLib.Value[] values, int n_values);
public void SetValues (TreeIter iter, params object[] values)

4
gtk/TreeView.cs
View file

@ -46,7 +46,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_view_get_path_at_pos (IntPtr raw,
int x,
int y,
@ -55,7 +55,7 @@ namespace Gtk {
out int cell_x,
out int cell_y);
[DllImport ("libgtk-win32-3.0-0.dll", EntryPoint="gtk_tree_view_get_path_at_pos", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, EntryPoint="gtk_tree_view_get_path_at_pos", CallingConvention = CallingConvention.Cdecl)]
static extern bool gtk_tree_view_get_path_at_pos_intptr (IntPtr raw,
int x,
int y,

6
gtk/UIManager.cs
View file

@ -37,7 +37,7 @@ namespace Gtk {
return AddUiFromString (new System.IO.StreamReader (s).ReadToEnd ());
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern uint gtk_ui_manager_new_merge_id (IntPtr raw);
public uint NewMergeId ()
@ -45,7 +45,7 @@ namespace Gtk {
return gtk_ui_manager_new_merge_id (Handle);
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_ui_manager_get_toplevels (IntPtr raw, int types);
public Widget[] GetToplevels (Gtk.UIManagerItemType types) {
@ -58,7 +58,7 @@ namespace Gtk {
return result;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_ui_manager_get_action_groups (IntPtr raw);
public ActionGroup[] ActionGroups {

2
gtk/VScale.cs
View file

@ -25,7 +25,7 @@ namespace Gtk {
public partial class VScale {
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_vscale_new_with_range (double min, double max, double step);
public VScale (double min, double max, double step) : base (IntPtr.Zero)

12
gtk/Widget.cs
View file

@ -165,10 +165,10 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_binding_set_by_class (IntPtr class_ptr);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_binding_entry_add_signall (IntPtr binding_set, uint keyval, Gdk.ModifierType modifiers, IntPtr signal_name, IntPtr binding_args);
[StructLayout(LayoutKind.Sequential)]
@ -237,10 +237,10 @@ namespace Gtk {
return ret;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_widget_class_find_style_property (IntPtr class_ptr, IntPtr property_name);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_widget_style_get_property (IntPtr inst, IntPtr property_name, ref GLib.Value value);
internal GLib.Value StyleGetPropertyValue (string property_name)
@ -259,7 +259,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_widget_list_mnemonic_labels (IntPtr raw);
public Widget[] ListMnemonicLabels ()
@ -397,7 +397,7 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
private static extern void gtk_widget_destroy (IntPtr raw);
public virtual void Destroy ()

8
gtk/Window.cs
View file

@ -31,10 +31,10 @@ namespace Gtk {
this.Title = title;
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_window_get_default_icon_list();
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_window_set_default_icon_list(IntPtr list);
public static Gdk.Pixbuf[] DefaultIconList {
@ -56,10 +56,10 @@ namespace Gtk {
}
}
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gtk_window_get_icon_list(IntPtr raw);
[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
[DllImport (Global.GtkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void gtk_window_set_icon_list(IntPtr raw, IntPtr list);
public Gdk.Pixbuf[] IconList {

2
gtk/gtk-api.raw
View file

@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Gtk" library="libgtk-win32-3.0-0.dll">
<namespace name="Gtk" library="libgtk-3-0.dll">
<enum name="AccelFlags" cname="GtkAccelFlags" gtype="gtk_accel_flags_get_type" type="flags">
<member cname="GTK_ACCEL_VISIBLE" name="Visible" value="1 &lt;&lt; 0" />
<member cname="GTK_ACCEL_LOCKED" name="Locked" value="1 &lt;&lt; 1" />

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

@ -2,5 +2,5 @@
<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="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgtk-win32-3.0-0.dll" target="libgtk-3@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libgtk-3-0.dll" target="libgtk-3@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</configuration>

2
sources/sources.xml
View file

@ -113,7 +113,7 @@
</library>
</api>
<api filename="../gtk/gtk-api.raw">
<library name="libgtk-win32-3.0-0.dll">
<library name="libgtk-3-0.dll">
<namespace name="Gtk">
<directory path="gtk+-3.0.0/gtk">
<!-- Internal stuff -->