diff --git a/ChangeLog b/ChangeLog index 105d0b4bf..92bee7b2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-04-21 Dan Winship + + * gdk/EventClient.cs (gtksharp_gdk_event_client_get_time): + * glib/Object.cs (gtksharp_get_type_id): + * glib/Value.cs (gtksharp_object_get_ref_count, + g_value_take_boxed): + * gnome/PrintContext.custom (gnome_print_concat, + gnome_print_glyphlist, gnome_print_setdash): + * gtk/NodeStore.cs (gtksharp_node_store_new, stamp): + * gtk/NodeView.cs (gtk_tree_view_new_with_model): + * gtk/Widget.custom (gtksharp_gtk_widget_set_allocation): + * pango/LayoutLine.custom (g_free): Remove unused + prototypes/fields + 2005-04-21 Mike Kestner * Makefile.include : make mcs shaddup about 169. diff --git a/gdk/EventClient.cs b/gdk/EventClient.cs index c388aed93..3cea53766 100644 --- a/gdk/EventClient.cs +++ b/gdk/EventClient.cs @@ -26,9 +26,6 @@ namespace Gdk { public class EventClient : Event { - [DllImport("gdksharpglue-2")] - static extern uint gtksharp_gdk_event_client_get_time (IntPtr evt); - [DllImport("gdksharpglue-2")] static extern IntPtr gtksharp_gdk_event_client_get_message_type (IntPtr evt); diff --git a/glib/Object.cs b/glib/Object.cs index abfe9fabb..02d793485 100644 --- a/glib/Object.cs +++ b/glib/Object.cs @@ -224,9 +224,6 @@ namespace GLib { } } - [DllImport("glibsharpglue-2")] - private static extern IntPtr gtksharp_get_type_id (IntPtr obj); - public static GLib.GType GType { get { return GType.Object; diff --git a/glib/Value.cs b/glib/Value.cs index 76cc0fb70..d69251a6b 100755 --- a/glib/Value.cs +++ b/glib/Value.cs @@ -149,9 +149,6 @@ namespace GLib { } - [DllImport("glibsharpglue")] - static extern int gtksharp_object_get_ref_count (IntPtr obj); - [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_object (ref Value val, IntPtr data); @@ -366,9 +363,6 @@ namespace GLib { [DllImport("libgobject-2.0-0.dll")] static extern bool g_type_is_a (IntPtr type, IntPtr is_a_type); - [DllImport("libgobject-2.0-0.dll")] - static extern void g_value_take_boxed (ref Value val, IntPtr data); - public object Val { get { diff --git a/gnome/PrintContext.custom b/gnome/PrintContext.custom index a5035680c..ed693c953 100644 --- a/gnome/PrintContext.custom +++ b/gnome/PrintContext.custom @@ -141,11 +141,11 @@ return (PrintReturnCode)gnome_print_setlinecap (Handle, captype); } - [DllImport("gnomeprint-2-2")] + // FIXME! + /*[DllImport("gnomeprint-2-2")] static extern int gnome_print_setdash (IntPtr raw, int n_values, IntPtr value, double offset); - // FIXME! - /*public PrintReturnCode SetDash (double values[], double offset) { + public PrintReturnCode SetDash (double values[], double offset) { return (PrintReturnCode)gnome_print_setdash (Handle, values.Length, values, offset); }*/ @@ -170,9 +170,6 @@ return (PrintReturnCode)gnome_print_eoclip (Handle); } - [DllImport("gnomeprint-2-2")] - static extern int gnome_print_concat (IntPtr raw, IntPtr matrix); - [DllImport("gnomeprint-2-2")] static extern int gnome_print_scale (IntPtr raw, double sx, double sy); @@ -235,9 +232,6 @@ return (PrintReturnCode) result; } - [DllImport("gnomeprint-2-2")] - static extern int gnome_print_glyphlist (IntPtr raw, IntPtr glyphlist); - [DllImport("gnomeprint-2-2")] static extern int gnome_print_grayimage (IntPtr raw, IntPtr data, int width, int height, int rowstride); diff --git a/gtk/NodeStore.cs b/gtk/NodeStore.cs index ee159507d..60c6f9403 100644 --- a/gtk/NodeStore.cs +++ b/gtk/NodeStore.cs @@ -90,7 +90,6 @@ namespace Gtk { public ParentDelegate parent; } - int stamp; Hashtable node_hash = new IDHashtable (); GLib.GType[] ctypes; PropertyInfo[] getters; @@ -285,9 +284,6 @@ namespace Gtk { gtksharp_node_store_set_tree_model_callbacks (Handle, ref tree_model_iface); } - [DllImport("gtksharpglue-2")] - static extern IntPtr gtksharp_node_store_new (); - public NodeStore (Type node_type) : base (IntPtr.Zero) { CreateNativeObject (new string [0], new GLib.Value [0]); diff --git a/gtk/NodeView.cs b/gtk/NodeView.cs index 4451633ed..3c5981a65 100644 --- a/gtk/NodeView.cs +++ b/gtk/NodeView.cs @@ -30,9 +30,6 @@ namespace Gtk { public class NodeView : TreeView { - [DllImport("libgtk-win32-2.0-0.dll")] - static extern IntPtr gtk_tree_view_new_with_model(IntPtr model); - NodeStore store; public NodeView (NodeStore store) : base (IntPtr.Zero) diff --git a/gtk/Widget.custom b/gtk/Widget.custom index 1f384eb1c..fc98e953a 100644 --- a/gtk/Widget.custom +++ b/gtk/Widget.custom @@ -56,9 +56,6 @@ private static void Widget_ParentSet (object o, ParentSetArgs args) [DllImport("gtksharpglue-2")] static extern IntPtr gtksharp_gtk_widget_get_allocation (IntPtr style); -[DllImport("gtksharpglue-2")] -static extern void gtksharp_gtk_widget_set_allocation (IntPtr raw, Gdk.Rectangle rect); - public Gdk.Rectangle Allocation { get { return Gdk.Rectangle.New (gtksharp_gtk_widget_get_allocation (Handle)); } set { SizeAllocate (value); } diff --git a/pango/LayoutLine.custom b/pango/LayoutLine.custom index f1d54ceda..5e6bc9f91 100644 --- a/pango/LayoutLine.custom +++ b/pango/LayoutLine.custom @@ -55,17 +55,16 @@ public int Length { } -[DllImport("libglib-2.0-0.dll")] -static extern void g_free (IntPtr raw); - +#if NOT_BROKEN [DllImport("libpango-1.0-0.dll")] static extern void pango_layout_line_get_x_ranges(IntPtr raw, int start_index, int end_index, out IntPtr ranges_handle, out int n_ranges); +#endif public void GetXRanges(int start_index, int end_index, out int[][] ranges) { - // FIXME: this is broke + // FIXME: this is broken throw new NotImplementedException (); - /* +#if NOT_BROKEN int count; IntPtr array_ptr; pango_layout_line_get_x_ranges(Handle, start_index, end_index, out array_ptr, out count); @@ -78,6 +77,6 @@ public void GetXRanges(int start_index, int end_index, out int[][] ranges) } Marshal.Copy (array_ptr, ranges, 0, count); g_free (array_ptr); - */ +#endif }