From 8c0e123418d475aa1fee3e58165c428d206b7e5f Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Wed, 9 Feb 2011 16:54:12 -0600 Subject: [PATCH] dllimport libname updates for Gtk. * *: s/win32-2.0-0/win32-3.0-0/ I suspect this will need to change again when I see some win32 binaries. I think the win32 goes away. Killing a few dead customs in the list as well. --- gtk/Accel.custom | 22 ++--- gtk/Action.custom | 2 +- gtk/ActionGroup.custom | 2 +- gtk/Adjustment.custom | 2 +- gtk/Application.cs | 16 ++-- gtk/Bin.custom | 2 +- gtk/Builder.custom | 2 +- gtk/Button.custom | 2 +- gtk/CellRenderer.custom | 4 +- gtk/CheckMenuItem.custom | 2 +- gtk/Clipboard.custom | 8 +- gtk/ColorSelection.custom | 8 +- gtk/Combo.custom | 27 ------ gtk/Container.custom | 4 +- gtk/Dialog.custom | 2 +- gtk/Drag.custom | 2 +- gtk/FileChooserDialog.custom | 4 +- gtk/FileSelection.custom | 78 ----------------- gtk/HScale.custom | 2 +- gtk/IconFactory.custom | 2 +- gtk/IconSet.custom | 2 +- gtk/IconTheme.custom | 12 +-- gtk/IconView.custom | 2 +- gtk/Image.custom | 4 +- gtk/ImageMenuItem.custom | 2 +- gtk/Input.custom | 2 +- gtk/ItemFactory.custom | 2 +- gtk/Key.cs | 4 +- gtk/ListStore.custom | 8 +- gtk/Makefile.am | 3 - gtk/Menu.custom | 4 +- gtk/MenuItem.custom | 2 +- gtk/MessageDialog.custom | 4 +- gtk/Notebook.custom | 2 +- gtk/Object.custom | 157 ----------------------------------- gtk/Plug.custom | 4 +- gtk/PrintContext.custom | 2 +- gtk/Printer.custom | 2 +- gtk/Quit.custom | 74 ----------------- gtk/RadioButton.custom | 2 +- gtk/RadioMenuItem.custom | 2 +- gtk/RadioToolButton.custom | 4 +- gtk/SelectionData.custom | 8 +- gtk/SpinButton.custom | 2 +- gtk/StatusIcon.custom | 4 +- gtk/Stock.custom | 4 +- gtk/StockManager.cs | 8 +- gtk/Target.custom | 2 +- gtk/TargetList.custom | 2 +- gtk/TextBuffer.custom | 16 ++-- gtk/TextChildAnchor.custom | 2 +- gtk/TextIter.custom | 8 +- gtk/TextView.custom | 2 +- gtk/TreeModelAdapter.custom | 4 +- gtk/TreeModelFilter.custom | 8 +- gtk/TreeModelSort.custom | 4 +- gtk/TreePath.custom | 2 +- gtk/TreeSelection.custom | 4 +- gtk/TreeStore.custom | 30 +++---- gtk/TreeView.custom | 4 +- gtk/TreeViewColumn.custom | 2 +- gtk/UIManager.custom | 6 +- gtk/VScale.custom | 2 +- gtk/Widget.custom | 10 +-- gtk/Window.custom | 8 +- gtk/gtk-sharp.dll.config.in | 2 +- 66 files changed, 149 insertions(+), 488 deletions(-) delete mode 100644 gtk/Combo.custom delete mode 100644 gtk/FileSelection.custom delete mode 100755 gtk/Object.custom delete mode 100644 gtk/Quit.custom diff --git a/gtk/Accel.custom b/gtk/Accel.custom index ca08851f7..cb667cd64 100644 --- a/gtk/Accel.custom +++ b/gtk/Accel.custom @@ -18,7 +18,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_accel_map_save(IntPtr file_name); [Obsolete("Moved to AccelMap class. Use AccelMap.Save instead")] @@ -28,7 +28,7 @@ GLib.Marshaller.Free (native); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_accel_map_add_filter(IntPtr filter_pattern); [Obsolete("Moved to AccelMap class. Use AccelMap.AddFilter instead")] @@ -38,7 +38,7 @@ GLib.Marshaller.Free (native); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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")] @@ -47,7 +47,7 @@ gtk_accel_map_foreach_unfiltered(data, foreach_func_wrapper.NativeDelegate); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_accel_map_save_fd(int fd); [Obsolete("Moved to AccelMap class. Use AccelMap.SaveFd instead")] @@ -55,7 +55,7 @@ gtk_accel_map_save_fd(fd); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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")] @@ -65,7 +65,7 @@ GLib.Marshaller.Free (native); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_accel_map_load_fd(int fd); [Obsolete("Moved to AccelMap class. Use AccelMap.LoadFd instead")] @@ -73,7 +73,7 @@ gtk_accel_map_load_fd(fd); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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")] @@ -84,7 +84,7 @@ return ret; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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")] @@ -95,7 +95,7 @@ return ret; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_accel_map_load (IntPtr file_name); [Obsolete("Moved to AccelMap class. Use AccelMap.Load instead")] @@ -105,7 +105,7 @@ GLib.Marshaller.Free (native); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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")] @@ -114,7 +114,7 @@ gtk_accel_map_foreach(data, foreach_func_wrapper.NativeDelegate); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_accel_groups_from_object (IntPtr obj); public static AccelGroup[] GroupsFromObject (GLib.Object obj) diff --git a/gtk/Action.custom b/gtk/Action.custom index 227e5eb4a..a92ceef34 100644 --- a/gtk/Action.custom +++ b/gtk/Action.custom @@ -24,7 +24,7 @@ { } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_action_get_proxies (IntPtr raw); public Gtk.Widget[] Proxies { diff --git a/gtk/ActionGroup.custom b/gtk/ActionGroup.custom index 680ac10ed..485fa7846 100644 --- a/gtk/ActionGroup.custom +++ b/gtk/ActionGroup.custom @@ -73,7 +73,7 @@ actions[0].Changed += changed; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_action_group_list_actions (IntPtr raw); public Gtk.Action[] ListActions() { diff --git a/gtk/Adjustment.custom b/gtk/Adjustment.custom index 21517f194..bdf7c64b4 100644 --- a/gtk/Adjustment.custom +++ b/gtk/Adjustment.custom @@ -18,7 +18,7 @@ // Boston, MA 02111-1307, USA. // -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/Application.cs b/gtk/Application.cs index a73abf44c..b54187b40 100755 --- a/gtk/Application.cs +++ b/gtk/Application.cs @@ -55,10 +55,10 @@ namespace Gtk { } } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_init (ref int argc, ref IntPtr argv); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gtk_init_check (ref int argc, ref IntPtr argv); static void SetPrgname () @@ -120,7 +120,7 @@ namespace Gtk { return do_init (progname, ref args, true); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_main (); public static void Run () @@ -128,7 +128,7 @@ namespace Gtk { gtk_main (); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gtk_events_pending (); @@ -137,10 +137,10 @@ namespace Gtk { return gtk_events_pending (); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_main_iteration (); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gtk_main_iteration_do (bool blocking); public static void RunIteration () @@ -153,7 +153,7 @@ namespace Gtk { return gtk_main_iteration_do (blocking); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_main_quit (); public static void Quit () @@ -162,7 +162,7 @@ namespace Gtk { } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_get_current_event (); public static Gdk.Event CurrentEvent { diff --git a/gtk/Bin.custom b/gtk/Bin.custom index bd2ee22b3..4502d87d5 100644 --- a/gtk/Bin.custom +++ b/gtk/Bin.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_bin_get_child(IntPtr raw); public new Gtk.Widget Child { diff --git a/gtk/Builder.custom b/gtk/Builder.custom index caf45d0d9..7a9fc2d5d 100644 --- a/gtk/Builder.custom +++ b/gtk/Builder.custom @@ -225,7 +225,7 @@ class SignalConnector this.handler_type = handler_type; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_builder_connect_signals_full(IntPtr raw, GtkSharp.BuilderConnectFuncNative func, IntPtr user_data); public void ConnectSignals() { diff --git a/gtk/Button.custom b/gtk/Button.custom index 9e27ca1b4..f11c6bca2 100644 --- a/gtk/Button.custom +++ b/gtk/Button.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_button_new_from_stock(IntPtr stock_id); public Button (string stock_id) : base (IntPtr.Zero) diff --git a/gtk/CellRenderer.custom b/gtk/CellRenderer.custom index 2837b4960..6a6b20b63 100644 --- a/gtk/CellRenderer.custom +++ b/gtk/CellRenderer.custom @@ -24,7 +24,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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 CellEditable StartEditing (Widget widget, Gdk.Event evnt, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, CellRendererState flags) @@ -36,7 +36,7 @@ return ret; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/CheckMenuItem.custom b/gtk/CheckMenuItem.custom index 53b37ab48..0a76050fb 100644 --- a/gtk/CheckMenuItem.custom +++ b/gtk/CheckMenuItem.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_check_menu_item_new_with_mnemonic (IntPtr label); public CheckMenuItem (string label) : base (IntPtr.Zero) diff --git a/gtk/Clipboard.custom b/gtk/Clipboard.custom index ad2833416..4c90f9ad7 100644 --- a/gtk/Clipboard.custom +++ b/gtk/Clipboard.custom @@ -19,10 +19,10 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -67,7 +67,7 @@ Text = text; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -109,7 +109,7 @@ } } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/ColorSelection.custom b/gtk/ColorSelection.custom index ab286b396..2466a644e 100644 --- a/gtk/ColorSelection.custom +++ b/gtk/ColorSelection.custom @@ -17,7 +17,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_color_selection_palette_to_string(Gdk.Color[] colors, int n_colors); /// PaletteToString Method @@ -28,7 +28,7 @@ return ret; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) { @@ -53,10 +53,10 @@ return colors; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_color_selection_set_previous_color(IntPtr raw, ref Gdk.Color color); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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 diff --git a/gtk/Combo.custom b/gtk/Combo.custom deleted file mode 100644 index aee07f1e2..000000000 --- a/gtk/Combo.custom +++ /dev/null @@ -1,27 +0,0 @@ -// -// 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. - - -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] -static extern void gtk_combo_set_popdown_strings(IntPtr raw, IntPtr strings); - -public string[] PopdownStrings { - set { - GLib.List list = new GLib.List (IntPtr.Zero, typeof (string)); - foreach (string val in value) - list.Append (val); - gtk_combo_set_popdown_strings(Handle, list.Handle); - } -} diff --git a/gtk/Container.custom b/gtk/Container.custom index a4fe1ddba..b0eae90da 100644 --- a/gtk/Container.custom +++ b/gtk/Container.custom @@ -53,10 +53,10 @@ public IEnumerable AllChildren { } } -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gtk_container_get_focus_chain (IntPtr raw, out IntPtr list_ptr); -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_container_set_focus_chain (IntPtr raw, IntPtr list_ptr); public Widget[] FocusChain { diff --git a/gtk/Dialog.custom b/gtk/Dialog.custom index 9400c2cc7..13a76fe95 100644 --- a/gtk/Dialog.custom +++ b/gtk/Dialog.custom @@ -24,7 +24,7 @@ // Boston, MA 02111-1307, USA. -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", 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) { diff --git a/gtk/Drag.custom b/gtk/Drag.custom index 7e6daf375..724a594d4 100644 --- a/gtk/Drag.custom +++ b/gtk/Drag.custom @@ -18,7 +18,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_drag_set_icon_default(IntPtr context); public static void SetIconDefault(Gdk.DragContext context) diff --git a/gtk/FileChooserDialog.custom b/gtk/FileChooserDialog.custom index d034405e6..d0600ddfc 100644 --- a/gtk/FileChooserDialog.custom +++ b/gtk/FileChooserDialog.custom @@ -22,7 +22,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -43,7 +43,7 @@ AddButton ((string) button_data [i], (int) button_data [i + 1]); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_file_chooser_dialog_new_with_backend(IntPtr title, IntPtr parent, int action, IntPtr backend, IntPtr nil); public FileChooserDialog (string backend, string title, Window parent, FileChooserAction action, params object[] button_data) : base (IntPtr.Zero) diff --git a/gtk/FileSelection.custom b/gtk/FileSelection.custom deleted file mode 100644 index 2f301c3d3..000000000 --- a/gtk/FileSelection.custom +++ /dev/null @@ -1,78 +0,0 @@ -// -// Gtk.FileSelection.custom - Gtk FileSelection class customizations -// -// Author: Duncan Mak (duncan@ximian.com) -// Joe Shaw (joe@ximian.com) -// -// Copyright (C) 2002 Ximian, Inc. -// -// 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 class FSButton : Gtk.Button { - FileSelection file_sel; - - public FileSelection FileSelection { - get { return file_sel; } - } - - internal FSButton (FileSelection fs, IntPtr raw) : base (raw) { - file_sel = fs; - } -} - -[DllImport("libgtk-win32-2.0-0.dll")] -static extern IntPtr gtk_file_selection_get_selections (IntPtr handle); - -[DllImport("libgtk-win32-2.0-0.dll")] -static extern IntPtr gtk_file_selection_get_selections_utf8 (IntPtr handle); - -[DllImport("libglib-2.0-0.dll")] -static extern void g_strfreev (IntPtr handle); - -public string[] Selections { - get { - IntPtr strv; - - switch (Environment.OSVersion.Platform) { - case PlatformID.Win32NT: - case PlatformID.Win32S: - case PlatformID.Win32Windows: - case PlatformID.WinCE: - strv = gtk_file_selection_get_selections_utf8 (Handle); - break; - default: - strv = gtk_file_selection_get_selections (Handle); - break; - } - - System.Collections.ArrayList result = new System.Collections.ArrayList (); - - int i = 0; - IntPtr strptr = Marshal.ReadIntPtr (strv, IntPtr.Size * i++); - while (strptr != IntPtr.Zero) { - result.Add (GLib.Marshaller.FilenamePtrToString (strptr)); - strptr = Marshal.ReadIntPtr (strv, IntPtr.Size * i++); - } - - g_strfreev (strv); - - return result.ToArray (typeof (string)) as string[]; - } -} - diff --git a/gtk/HScale.custom b/gtk/HScale.custom index 9523648f7..90d5de73a 100644 --- a/gtk/HScale.custom +++ b/gtk/HScale.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/IconFactory.custom b/gtk/IconFactory.custom index eca075d33..4668ea0b2 100644 --- a/gtk/IconFactory.custom +++ b/gtk/IconFactory.custom @@ -13,7 +13,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] extern static void gtk_icon_size_lookup (IconSize size, out int width, out int height); /// Query icon dimensions diff --git a/gtk/IconSet.custom b/gtk/IconSet.custom index 1d87473ef..89891505f 100644 --- a/gtk/IconSet.custom +++ b/gtk/IconSet.custom @@ -13,7 +13,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] unsafe static extern void gtk_icon_set_get_sizes ( IntPtr raw, out int *pointer_to_enum, out int n_sizes); diff --git a/gtk/IconTheme.custom b/gtk/IconTheme.custom index 79440ec72..918ede616 100644 --- a/gtk/IconTheme.custom +++ b/gtk/IconTheme.custom @@ -21,7 +21,7 @@ - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_icon_theme_list_icons (IntPtr raw, IntPtr context); public string[] ListIcons (string context) @@ -40,16 +40,16 @@ return result; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_icon_theme_get_search_path(IntPtr raw, out IntPtr path, out int n_elements); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_icon_theme_set_search_path(IntPtr raw, IntPtr[] path, int n_elements); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_icon_theme_set_search_path_utf8(IntPtr raw, IntPtr[] path, int n_elements); [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] @@ -115,7 +115,7 @@ SearchPath = path; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_icon_theme_get_icon_sizes (IntPtr raw, IntPtr icon_name); public int[] GetIconSizes (string icon_name) diff --git a/gtk/IconView.custom b/gtk/IconView.custom index 2e4f7c4e9..78debeeb1 100644 --- a/gtk/IconView.custom +++ b/gtk/IconView.custom @@ -29,7 +29,7 @@ } } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/Image.custom b/gtk/Image.custom index 19b92e585..febf326bc 100644 --- a/gtk/Image.custom +++ b/gtk/Image.custom @@ -19,7 +19,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -37,7 +37,7 @@ Raw = gtk_image_new_from_icon_set(icon_set.Handle, (int) size); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/ImageMenuItem.custom b/gtk/ImageMenuItem.custom index ef72d82b0..edee97058 100644 --- a/gtk/ImageMenuItem.custom +++ b/gtk/ImageMenuItem.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_image_menu_item_new_with_mnemonic (IntPtr label); public ImageMenuItem (string label) : base (IntPtr.Zero) diff --git a/gtk/Input.custom b/gtk/Input.custom index bbfdfd06c..8ff51b6a6 100644 --- a/gtk/Input.custom +++ b/gtk/Input.custom @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint gtk_input_add_full(int source, int condition, InputFunctionNative function, GtkSharp.CallbackMarshalNative marshal, IntPtr data, GLib.DestroyNotify destroy); [UnmanagedFunctionPointer (CallingConvention.Cdecl)] diff --git a/gtk/ItemFactory.custom b/gtk/ItemFactory.custom index 78061b8e5..4ab3b8446 100644 --- a/gtk/ItemFactory.custom +++ b/gtk/ItemFactory.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_item_factory_new(IntPtr container_type, IntPtr path, IntPtr accel_group); public ItemFactory (GLib.GType container_type, string path, Gtk.AccelGroup accel_group) : base (IntPtr.Zero) diff --git a/gtk/Key.cs b/gtk/Key.cs index d4684abc6..90f5e5cba 100644 --- a/gtk/Key.cs +++ b/gtk/Key.cs @@ -28,7 +28,7 @@ namespace Gtk { static Hashtable wrappers = new Hashtable (); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_key_snooper_remove (uint snooper_handler_id); public static void SnooperRemove (uint snooper_handler_id) diff --git a/gtk/ListStore.custom b/gtk/ListStore.custom index 67c7220cd..6f7d08792 100644 --- a/gtk/ListStore.custom +++ b/gtk/ListStore.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) { @@ -37,7 +37,7 @@ return ret; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) { @@ -117,7 +117,7 @@ return AppendValues ((Array) values); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -143,7 +143,7 @@ return iter; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index a70e06159..445f04bad 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -51,7 +51,6 @@ customs = \ Clipboard.custom \ ColorSelection.custom \ ColorSelectionDialog.custom \ - Combo.custom \ ComboBox.custom \ ComboBoxEntry.custom \ Container.custom \ @@ -60,7 +59,6 @@ customs = \ Entry.custom \ EntryCompletion.custom \ FileChooserDialog.custom \ - FileSelection.custom \ Frame.custom \ HBox.custom \ HScale.custom \ @@ -79,7 +77,6 @@ customs = \ Menu.custom \ MenuItem.custom \ Notebook.custom \ - Object.custom \ PaperSize.custom \ Plug.custom \ PrintContext.custom \ diff --git a/gtk/Menu.custom b/gtk/Menu.custom index 4e7e8a6ee..dcd6017e6 100644 --- a/gtk/Menu.custom +++ b/gtk/Menu.custom @@ -30,7 +30,7 @@ Popup (null, null, null, 3, Global.CurrentEventTime); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_menu_set_screen (IntPtr raw, IntPtr screen); public new Gdk.Screen Screen { @@ -42,7 +42,7 @@ } } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_menu_set_active (IntPtr raw, uint index_); public void SetActive (uint index_) diff --git a/gtk/MenuItem.custom b/gtk/MenuItem.custom index d8c55e3a6..86411356c 100644 --- a/gtk/MenuItem.custom +++ b/gtk/MenuItem.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_menu_item_new_with_mnemonic (IntPtr label); public MenuItem (string label) : base (IntPtr.Zero) diff --git a/gtk/MessageDialog.custom b/gtk/MessageDialog.custom index e68505e44..6cdc1d7a9 100644 --- a/gtk/MessageDialog.custom +++ b/gtk/MessageDialog.custom @@ -13,10 +13,10 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", 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-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/Notebook.custom b/gtk/Notebook.custom index c80b3e1b5..c0b5df57f 100644 --- a/gtk/Notebook.custom +++ b/gtk/Notebook.custom @@ -26,7 +26,7 @@ public Widget CurrentPageWidget { } } -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int gtk_notebook_page_num (IntPtr handle, IntPtr child); public int PageNum (Widget child) diff --git a/gtk/Object.custom b/gtk/Object.custom deleted file mode 100755 index f76304cc5..000000000 --- a/gtk/Object.custom +++ /dev/null @@ -1,157 +0,0 @@ -// Gtk.Object.custom - Gtk Object class customizations -// -// Author: Mike Kestner -// -// Copyright (c) 2002-2003 Mike Kestner -// Copyright (c) 2007 Novell, Inc. -// -// 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. - - static Hashtable destroy_handlers; - static Hashtable DestroyHandlers { - get { - if (destroy_handlers == null) - destroy_handlers = new Hashtable (); - return destroy_handlers; - } - } - - private static void OverrideDestroyed (GLib.GType gtype) - { - // Do Nothing. We don't want to hook into the native vtable. - // We will manually invoke the VM on signal invocation. The signal - // always raises before the default handler because this signal - // is RUN_CLEANUP. - } - - [GLib.DefaultSignalHandler(Type=typeof(Gtk.Object), ConnectionMethod="OverrideDestroyed")] - protected virtual void OnDestroyed () - { - if (DestroyHandlers.Contains (Handle)) { - EventHandler handler = (EventHandler) DestroyHandlers [Handle]; - handler (this, EventArgs.Empty); - DestroyHandlers.Remove (Handle); - } - } - - [GLib.Signal("destroy")] - public event EventHandler Destroyed { - add { - EventHandler handler = (EventHandler) DestroyHandlers [Handle]; - DestroyHandlers [Handle] = Delegate.Combine (handler, value); - } - remove { - EventHandler handler = (EventHandler) DestroyHandlers [Handle]; - handler = (EventHandler) Delegate.Remove (handler, value); - if (handler != null) - DestroyHandlers [Handle] = handler; - else - DestroyHandlers.Remove (Handle); - } - } - - event EventHandler InternalDestroyed { - add { - GLib.Signal sig = GLib.Signal.Lookup (this, "destroy"); - sig.AddDelegate (value); - } - remove { - GLib.Signal sig = GLib.Signal.Lookup (this, "destroy"); - sig.RemoveDelegate (value); - } - } - - static void NativeDestroy (object o, EventArgs args) - { - Gtk.Object obj = o as Gtk.Object; - if (obj == null) - return; - obj.OnDestroyed (); - } - - static EventHandler native_destroy_handler; - static EventHandler NativeDestroyHandler { - get { - if (native_destroy_handler == null) - native_destroy_handler = new EventHandler (NativeDestroy); - return native_destroy_handler; - } - } - - protected override void CreateNativeObject (string[] names, GLib.Value[] vals) - { - base.CreateNativeObject (names, vals); - } - - public override void Dispose () - { - if (Handle == IntPtr.Zero) - return; - InternalDestroyed -= NativeDestroyHandler; - base.Dispose (); - } - - [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - private static extern void g_object_ref_sink (IntPtr raw); - - protected override IntPtr Raw { - get { - return base.Raw; - } - set { - if (value != IntPtr.Zero) - g_object_ref_sink (value); - base.Raw = value; - if (value != IntPtr.Zero) - InternalDestroyed += NativeDestroyHandler; - } - } - - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - private static extern void gtk_object_destroy (IntPtr raw); - - public virtual void Destroy () - { - if (Handle == IntPtr.Zero) - return; - gtk_object_destroy (Handle); - InternalDestroyed -= NativeDestroyHandler; - } - - [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern bool g_object_is_floating (IntPtr raw); - - [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void g_object_force_floating (IntPtr raw); - - [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern void g_object_unref (IntPtr raw); - - public bool IsFloating { - get { - return g_object_is_floating (Handle); - } - set { - if (value == true) { - if (!IsFloating) - g_object_force_floating (Handle); - } else { - g_object_ref_sink (Handle); - g_object_unref (Handle); - } - } - } diff --git a/gtk/Plug.custom b/gtk/Plug.custom index a83ffaf06..117d26622 100644 --- a/gtk/Plug.custom +++ b/gtk/Plug.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_plug_new(uint socket_id); public Plug (uint socket_id) : base (IntPtr.Zero) @@ -34,7 +34,7 @@ Raw = gtk_plug_new(socket_id); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_plug_new_for_display(IntPtr display, uint socket_id); public Plug (Gdk.Display display, uint socket_id) : base (IntPtr.Zero) diff --git a/gtk/PrintContext.custom b/gtk/PrintContext.custom index 5c07c825e..173e1c5f4 100644 --- a/gtk/PrintContext.custom +++ b/gtk/PrintContext.custom @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_print_context_get_cairo_context(IntPtr raw); [DllImport ("libcairo-2.dll", CallingConvention = CallingConvention.Cdecl)] diff --git a/gtk/Printer.custom b/gtk/Printer.custom index f21e01a1f..89953bde0 100644 --- a/gtk/Printer.custom +++ b/gtk/Printer.custom @@ -18,7 +18,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/Quit.custom b/gtk/Quit.custom deleted file mode 100644 index 7751bcd84..000000000 --- a/gtk/Quit.custom +++ /dev/null @@ -1,74 +0,0 @@ -// Gtk.Quit.custom - Gtk Quit class customizations -// -// Author: Mike Kestner -// -// Copyright (c) 2005 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. - - - class QuitProxy { - - GtkSharp.FunctionWrapper function; - GtkSharp.CallbackMarshalWrapper marshal; - IntPtr data; - DestroyNotify destroy; - GLib.DestroyNotify handler; - - public QuitProxy (GtkSharp.FunctionWrapper function, GtkSharp.CallbackMarshalWrapper marshal, IntPtr data, DestroyNotify destroy) - { - this.marshal = marshal; - this.function = function; - this.destroy = destroy; - this.data = data; - handler = new GLib.DestroyNotify (OnDestroy); - } - - void OnDestroy (IntPtr data) - { - if (destroy != null) - destroy (); - - GCHandle gch = (GCHandle) data; - gch.Free (); - } - - public GLib.DestroyNotify Handler { - get { - return handler; - } - } - } - - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern uint gtk_quit_add_full(uint main_level, GtkSharp.FunctionNative function, GtkSharp.CallbackMarshalNative marshal, IntPtr data, GLib.DestroyNotify destroy); - - [Obsolete ("Replaced by Add method")] - public static uint AddFull (uint main_level, Function function, CallbackMarshal marshal, IntPtr data, DestroyNotify destroy) - { - GtkSharp.FunctionWrapper function_wrapper = new GtkSharp.FunctionWrapper (function); - GtkSharp.CallbackMarshalWrapper marshal_wrapper = new GtkSharp.CallbackMarshalWrapper (marshal); - QuitProxy proxy = new QuitProxy (function_wrapper, marshal_wrapper, data, destroy); - GCHandle gch = GCHandle.Alloc (proxy); - return gtk_quit_add_full (main_level, function_wrapper.NativeDelegate, marshal_wrapper.NativeDelegate, (IntPtr) gch, proxy.Handler); - } - - public static uint Add (uint main_level, Function function) - { - GtkSharp.FunctionWrapper function_wrapper = new GtkSharp.FunctionWrapper (function); - GCHandle gch = GCHandle.Alloc (function_wrapper); - return gtk_quit_add_full (main_level, function_wrapper.NativeDelegate, null, (IntPtr) gch, GLib.DestroyHelper.NotifyHandler); - } - diff --git a/gtk/RadioButton.custom b/gtk/RadioButton.custom index 73359f845..af563b7c4 100644 --- a/gtk/RadioButton.custom +++ b/gtk/RadioButton.custom @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_radio_button_new_with_mnemonic (IntPtr group, IntPtr label); // creates a new group for this RadioButton diff --git a/gtk/RadioMenuItem.custom b/gtk/RadioMenuItem.custom index ad8f86f99..58be5aa1e 100644 --- a/gtk/RadioMenuItem.custom +++ b/gtk/RadioMenuItem.custom @@ -38,7 +38,7 @@ } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_radio_menu_item_new_with_mnemonic(IntPtr group, IntPtr label); public RadioMenuItem (GLib.SList group, string label) : base (IntPtr.Zero) diff --git a/gtk/RadioToolButton.custom b/gtk/RadioToolButton.custom index edb1c9140..3b1250d46 100644 --- a/gtk/RadioToolButton.custom +++ b/gtk/RadioToolButton.custom @@ -21,7 +21,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_radio_tool_button_new (IntPtr group); public RadioToolButton (GLib.SList group) : base (IntPtr.Zero) @@ -34,7 +34,7 @@ Raw = gtk_radio_tool_button_new(group == null ? IntPtr.Zero : group.Handle); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_radio_tool_button_new_from_stock (IntPtr group, IntPtr stock_id); public RadioToolButton (GLib.SList group, string stock_id) : base (IntPtr.Zero) diff --git a/gtk/SelectionData.custom b/gtk/SelectionData.custom index e78325be7..7e45367d4 100644 --- a/gtk/SelectionData.custom +++ b/gtk/SelectionData.custom @@ -18,10 +18,10 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] private static extern IntPtr gtk_selection_data_get_text (IntPtr selection_data); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] private static extern void gtk_selection_data_set_text (IntPtr selection_data, IntPtr str, int len); public string Text { @@ -38,7 +38,7 @@ } } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] private static extern IntPtr gtk_selection_data_get_data (IntPtr selection_data); public byte[] Data { @@ -57,7 +57,7 @@ [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_free (IntPtr ptr); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gtk_selection_data_get_targets(IntPtr raw, out IntPtr targets, out int n_atoms); public Gdk.Atom [] Targets { diff --git a/gtk/SpinButton.custom b/gtk/SpinButton.custom index 0e6ebb2bc..05019674d 100644 --- a/gtk/SpinButton.custom +++ b/gtk/SpinButton.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/StatusIcon.custom b/gtk/StatusIcon.custom index bd0a103d4..1d930c7e8 100644 --- a/gtk/StatusIcon.custom +++ b/gtk/StatusIcon.custom @@ -31,7 +31,7 @@ static MenuPositionFuncNative StatusIconPositionMenuFunc = null; - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -77,7 +77,7 @@ } } - [DllImport("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/Stock.custom b/gtk/Stock.custom index 0f21b16d4..70b36ae37 100644 --- a/gtk/Stock.custom +++ b/gtk/Stock.custom @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_stock_list_ids (); public static string[] ListIds () @@ -43,7 +43,7 @@ public IntPtr TranslationDomain; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gtk_stock_lookup (IntPtr stock_id, out ConstStockItem item); public static Gtk.StockItem Lookup (string stock_id) { diff --git a/gtk/StockManager.cs b/gtk/StockManager.cs index 4d50b9815..096a380dc 100644 --- a/gtk/StockManager.cs +++ b/gtk/StockManager.cs @@ -26,7 +26,7 @@ namespace Gtk { public class StockManager { - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_stock_add(ref Gtk.StockItem item, uint n_items); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_stock_add(Gtk.StockItem[] items, uint n_items); [Obsolete ("Use the StockItem or StockItem[] overload instead.")] diff --git a/gtk/Target.custom b/gtk/Target.custom index 838d17c8c..472e234d5 100644 --- a/gtk/Target.custom +++ b/gtk/Target.custom @@ -20,7 +20,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) { diff --git a/gtk/TargetList.custom b/gtk/TargetList.custom index 3ed220566..b96157764 100644 --- a/gtk/TargetList.custom +++ b/gtk/TargetList.custom @@ -16,7 +16,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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)) {} diff --git a/gtk/TextBuffer.custom b/gtk/TextBuffer.custom index 67f981bca..78762e506 100644 --- a/gtk/TextBuffer.custom +++ b/gtk/TextBuffer.custom @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_text_buffer_set_text (IntPtr raw, IntPtr text, int len); public void Clear () @@ -40,7 +40,7 @@ public void PasteClipboard (Gtk.Clipboard clipboard) gtk_text_buffer_paste_clipboard(Handle, clipboard.Handle, IntPtr.Zero, true); } -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", 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")] @@ -103,7 +103,7 @@ public void SetText (string text) Text = text; } -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -114,7 +114,7 @@ public bool InsertInteractive(ref Gtk.TextIter iter, string text, bool default_e return result; } -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -125,7 +125,7 @@ public bool InsertInteractiveAtCursor(string text, bool default_editable) return result; } -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_text_buffer_insert_at_cursor(IntPtr raw, IntPtr text, int len); public void InsertAtCursor(string text) @@ -135,7 +135,7 @@ public void InsertAtCursor(string text) GLib.Marshaller.Free (native); } -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -150,10 +150,10 @@ public byte[] Serialize(Gtk.TextBuffer content_buffer, Gdk.Atom format, Gtk.Text return ret; } -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_text_buffer_get_serialize_formats(IntPtr raw, out int n_formats); -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_text_buffer_get_deserialize_formats(IntPtr raw, out int n_formats); public Gdk.Atom[] DeserializeFormats { diff --git a/gtk/TextChildAnchor.custom b/gtk/TextChildAnchor.custom index 56988de55..70a6fd273 100644 --- a/gtk/TextChildAnchor.custom +++ b/gtk/TextChildAnchor.custom @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_text_child_anchor_get_widgets (IntPtr raw); public Widget[] Widgets { diff --git a/gtk/TextIter.custom b/gtk/TextIter.custom index cff299543..ce11a8997 100755 --- a/gtk/TextIter.custom +++ b/gtk/TextIter.custom @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint gtk_text_iter_get_char(ref Gtk.TextIter raw); public string Char { @@ -28,7 +28,7 @@ } } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_text_iter_get_marks (ref TextIter iter); public TextMark[] Marks { @@ -44,7 +44,7 @@ } } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_text_iter_get_tags (ref TextIter iter); public TextTag[] Tags { @@ -60,7 +60,7 @@ } } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_text_iter_get_toggled_tags (ref TextIter iter, bool toggled_on); public TextTag[] GetToggledTags (bool toggled_on) diff --git a/gtk/TextView.custom b/gtk/TextView.custom index 5ae4e3a07..03b43f5f7 100644 --- a/gtk/TextView.custom +++ b/gtk/TextView.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_text_view_new_with_buffer (IntPtr buffer); public TextView (TextBuffer buffer) : base (IntPtr.Zero) diff --git a/gtk/TreeModelAdapter.custom b/gtk/TreeModelAdapter.custom index 7ef2d5b2b..6a0829659 100644 --- a/gtk/TreeModelAdapter.custom +++ b/gtk/TreeModelAdapter.custom @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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); @@ -33,7 +33,7 @@ return ret; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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); diff --git a/gtk/TreeModelFilter.custom b/gtk/TreeModelFilter.custom index 404c52d37..8af5f2c33 100644 --- a/gtk/TreeModelFilter.custom +++ b/gtk/TreeModelFilter.custom @@ -1,4 +1,4 @@ - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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); @@ -12,7 +12,7 @@ return ret; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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); @@ -56,7 +56,7 @@ return ret; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -69,7 +69,7 @@ gtk_tree_model_filter_set_modify_func (Handle, n_columns, native_types, func_wrapper.NativeDelegate, (IntPtr) gch, GLib.DestroyHelper.NotifyHandler); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/TreeModelSort.custom b/gtk/TreeModelSort.custom index d66755b16..6c5449f86 100644 --- a/gtk/TreeModelSort.custom +++ b/gtk/TreeModelSort.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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); @@ -35,7 +35,7 @@ return ret; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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); diff --git a/gtk/TreePath.custom b/gtk/TreePath.custom index 50de67225..146791a94 100644 --- a/gtk/TreePath.custom +++ b/gtk/TreePath.custom @@ -14,7 +14,7 @@ // Boston, MA 02111-1307, USA. // Patch submitted by malte on bug #49518 - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_tree_path_get_indices(IntPtr raw); public int [] Indices { diff --git a/gtk/TreeSelection.custom b/gtk/TreeSelection.custom index eb23beba4..e90e98a36 100644 --- a/gtk/TreeSelection.custom +++ b/gtk/TreeSelection.custom @@ -19,7 +19,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_tree_selection_get_selected_rows (IntPtr raw, IntPtr model); public TreePath[] GetSelectedRows () @@ -32,7 +32,7 @@ return (TreePath[]) GLib.Marshaller.ListToArray (list, typeof (Gtk.TreePath)); } - [DllImport ("libgtk-win32-2.0-0.dll", EntryPoint="gtk_tree_selection_get_selected", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/TreeStore.custom b/gtk/TreeStore.custom index 57d4cfb64..dfb4b5cae 100644 --- a/gtk/TreeStore.custom +++ b/gtk/TreeStore.custom @@ -23,10 +23,10 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_tree_store_append (IntPtr raw, out TreeIter iter, ref TreeIter parent); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_tree_store_append (IntPtr raw, out TreeIter iter, IntPtr parent); public TreeIter AppendNode () @@ -43,10 +43,10 @@ return iter; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_tree_store_insert (IntPtr raw, out TreeIter iter, ref TreeIter parent, int position); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -63,10 +63,10 @@ return iter; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_tree_store_prepend (IntPtr raw, out TreeIter iter, ref TreeIter parent); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_tree_store_prepend (IntPtr raw, out TreeIter iter, IntPtr parent); public TreeIter PrependNode (TreeIter parent) @@ -83,10 +83,10 @@ return iter; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -103,10 +103,10 @@ return iter; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -123,7 +123,7 @@ return iter; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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); @@ -137,7 +137,7 @@ return ret; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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); @@ -223,10 +223,10 @@ return AppendValues ((Array) values); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -265,7 +265,7 @@ return iter; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/TreeView.custom b/gtk/TreeView.custom index a57774fa4..ac5743398 100644 --- a/gtk/TreeView.custom +++ b/gtk/TreeView.custom @@ -42,7 +42,7 @@ } } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gtk_tree_view_get_path_at_pos (IntPtr raw, int x, int y, @@ -51,7 +51,7 @@ out int cell_x, out int cell_y); - [DllImport ("libgtk-win32-2.0-0.dll", EntryPoint="gtk_tree_view_get_path_at_pos", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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, diff --git a/gtk/TreeViewColumn.custom b/gtk/TreeViewColumn.custom index 990246e2c..7e4689bf3 100644 --- a/gtk/TreeViewColumn.custom +++ b/gtk/TreeViewColumn.custom @@ -50,7 +50,7 @@ _NewWithAttributes (title, cell, attrs); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_tree_view_column_get_cell_renderers (IntPtr raw); public CellRenderer[] CellRenderers { diff --git a/gtk/UIManager.custom b/gtk/UIManager.custom index 801ef32a0..cf56bb5f9 100644 --- a/gtk/UIManager.custom +++ b/gtk/UIManager.custom @@ -32,7 +32,7 @@ return AddUiFromString (new System.IO.StreamReader (s).ReadToEnd ()); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint gtk_ui_manager_new_merge_id (IntPtr raw); public uint NewMergeId () @@ -40,7 +40,7 @@ return gtk_ui_manager_new_merge_id (Handle); } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_ui_manager_get_toplevels (IntPtr raw, int types); public Widget[] GetToplevels (Gtk.UIManagerItemType types) { @@ -52,7 +52,7 @@ return result; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_ui_manager_get_action_groups (IntPtr raw); public ActionGroup[] ActionGroups { diff --git a/gtk/VScale.custom b/gtk/VScale.custom index 3a33f1fc0..e0abfd3e2 100644 --- a/gtk/VScale.custom +++ b/gtk/VScale.custom @@ -21,7 +21,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", 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) diff --git a/gtk/Widget.custom b/gtk/Widget.custom index 6f23fce90..0e7c65837 100644 --- a/gtk/Widget.custom +++ b/gtk/Widget.custom @@ -166,10 +166,10 @@ static ClosureMarshal BindingDelegate { } } -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_binding_set_by_class (IntPtr class_ptr); -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", 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)] @@ -235,10 +235,10 @@ public object StyleGetProperty (string property_name) return ret; } -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_widget_class_find_style_property (IntPtr class_ptr, IntPtr property_name); -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", 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) @@ -257,7 +257,7 @@ internal GLib.Value StyleGetPropertyValue (string property_name) } } -[DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_widget_list_mnemonic_labels (IntPtr raw); public Widget[] ListMnemonicLabels () diff --git a/gtk/Window.custom b/gtk/Window.custom index 113610ebd..4be9d75d1 100755 --- a/gtk/Window.custom +++ b/gtk/Window.custom @@ -26,10 +26,10 @@ this.Title = title; } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_window_get_default_icon_list(); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_window_set_default_icon_list(IntPtr list); public static Gdk.Pixbuf[] DefaultIconList { @@ -51,10 +51,10 @@ } } - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gtk_window_get_icon_list(IntPtr raw); - [DllImport ("libgtk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gtk_window_set_icon_list(IntPtr raw, IntPtr list); public Gdk.Pixbuf[] IconList { diff --git a/gtk/gtk-sharp.dll.config.in b/gtk/gtk-sharp.dll.config.in index e540dbe7c..a81347478 100644 --- a/gtk/gtk-sharp.dll.config.in +++ b/gtk/gtk-sharp.dll.config.in @@ -2,5 +2,5 @@ - +