From c0b574a68604b5921936ccfbf89edd1b212fc75a Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Sat, 22 Feb 2003 04:34:56 +0000 Subject: [PATCH] 2003-02-21 Mike Kestner * mapdllnames.pl : a little whitespace action * api/*-api.xml : move to win32 dllnames * */makefile.win32 : remove the mapdllnames step * */*.cs : move to win32 dllnames * */*.custom : move to win32 dllnames * sources/gtk-sharp.sources : move to win32 dllnames svn path=/trunk/gtk-sharp/; revision=11823 --- ChangeLog | 9 ++++++++ api/atk-api.xml | 2 +- api/gdk-api.xml | 4 ++-- api/gtk-api.xml | 2 +- api/pango-api.xml | 2 +- atk/makefile.win32 | 1 - gdk/Threads.cs | 6 ++--- gdk/makefile.win32 | 5 +---- glib/FileUtils.cs | 2 +- glib/GException.cs | 2 +- glib/Idle.cs | 2 +- glib/List.cs | 10 ++++----- glib/Log.cs | 16 +++++++------- glib/MainContext.cs | 4 ++-- glib/Object.cs | 10 ++++----- glib/SList.cs | 10 ++++----- glib/Source.cs | 2 +- glib/Timeout.cs | 2 +- glib/Value.cs | 46 +++++++++++++++++++-------------------- glib/makefile.win32 | 5 +---- gtk/Application.cs | 12 +++++----- gtk/Clipboard.custom | 2 +- gtk/Dialog.custom | 2 +- gtk/ListStore.custom | 6 ++--- gtk/MessageDialog.custom | 2 +- gtk/SelectionData.custom | 6 ++--- gtk/ThreadNotify.cs | 2 +- gtk/TreeModelSort.custom | 6 ++--- gtk/TreeSelection.custom | 2 +- gtk/TreeStore.custom | 16 +++++++------- gtk/TreeView.custom | 4 ++-- gtk/makefile.win32 | 5 +---- mapdllnames.pl | 2 +- pango/makefile.win32 | 1 - sources/gtk-sharp.sources | 10 ++++----- 35 files changed, 109 insertions(+), 111 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2864cb247..ddd066210 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-02-21 Mike Kestner + + * mapdllnames.pl : a little whitespace action + * api/*-api.xml : move to win32 dllnames + * */makefile.win32 : remove the mapdllnames step + * */*.cs : move to win32 dllnames + * */*.custom : move to win32 dllnames + * sources/gtk-sharp.sources : move to win32 dllnames + 2003-02-21 Mike Kestner * api/*-api.xml : remove stray enum get_type methods. diff --git a/api/atk-api.xml b/api/atk-api.xml index 6ebcde455..fa187ed29 100644 --- a/api/atk-api.xml +++ b/api/atk-api.xml @@ -6,7 +6,7 @@ Please DO NOT MODIFY THIS FILE, modify .metadata files instead. --> - + diff --git a/api/gdk-api.xml b/api/gdk-api.xml index 12987eab2..1611ccb92 100644 --- a/api/gdk-api.xml +++ b/api/gdk-api.xml @@ -6,7 +6,7 @@ Please DO NOT MODIFY THIS FILE, modify .metadata files instead. --> - + @@ -2329,7 +2329,7 @@ - + diff --git a/api/gtk-api.xml b/api/gtk-api.xml index 5732efb0c..22acba81b 100644 --- a/api/gtk-api.xml +++ b/api/gtk-api.xml @@ -6,7 +6,7 @@ Please DO NOT MODIFY THIS FILE, modify .metadata files instead. --> - + diff --git a/api/pango-api.xml b/api/pango-api.xml index 1411c574e..ce3fb468c 100644 --- a/api/pango-api.xml +++ b/api/pango-api.xml @@ -6,7 +6,7 @@ Please DO NOT MODIFY THIS FILE, modify .metadata files instead. --> - + diff --git a/atk/makefile.win32 b/atk/makefile.win32 index bfa646551..9e9ec49c4 100644 --- a/atk/makefile.win32 +++ b/atk/makefile.win32 @@ -1,7 +1,6 @@ all: windows windows: - ../mapdllnames.pl generated/*.cs $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /out:atk-sharp.dll /recurse:*.cs docs: diff --git a/gdk/Threads.cs b/gdk/Threads.cs index 4bed82af4..4b5db0b61 100644 --- a/gdk/Threads.cs +++ b/gdk/Threads.cs @@ -11,7 +11,7 @@ namespace Gdk public class Threads { - [DllImport("gdk-x11-2.0")] + [DllImport("libgdk-win32-2.0-0.dll")] static extern void gdk_threads_init (); public static void Init () @@ -19,7 +19,7 @@ namespace Gdk gdk_threads_init (); } - [DllImport("gdk-x11-2.0")] + [DllImport("libgdk-win32-2.0-0.dll")] static extern void gdk_threads_enter (); public static void Enter () @@ -27,7 +27,7 @@ namespace Gdk gdk_threads_enter (); } - [DllImport("gdk-x11-2.0")] + [DllImport("libgdk-win32-2.0-0.dll")] static extern void gdk_threads_leave (); public static void Leave () diff --git a/gdk/makefile.win32 b/gdk/makefile.win32 index 4d901d422..36520bff1 100644 --- a/gdk/makefile.win32 +++ b/gdk/makefile.win32 @@ -1,10 +1,7 @@ all: windows windows: - cat *.cs generated/*.cs > allthesource.cs - ../mapdllnames.pl allthesource.cs - $(CSC) /unsafe /target:library /r:System.Drawing.dll /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:gdk-sharp.dll allthesource.cs - rm allthesource.cs + $(CSC) /unsafe /target:library /r:System.Drawing.dll /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:gdk-sharp.dll /recurse:*.cs docs: $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /doc:gdk-sharp-docs.xml /out:gdk-sharp.dll /recurse:*.cs diff --git a/glib/FileUtils.cs b/glib/FileUtils.cs index 85901525c..0a96a6e34 100644 --- a/glib/FileUtils.cs +++ b/glib/FileUtils.cs @@ -12,7 +12,7 @@ namespace GLib { public class FileUtils { - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] extern static bool g_file_get_contents (string filename, out IntPtr contents, out int length, out IntPtr error); public static string GetFileContents (string filename) diff --git a/glib/GException.cs b/glib/GException.cs index 65173e822..9ce96468f 100644 --- a/glib/GException.cs +++ b/glib/GException.cs @@ -26,7 +26,7 @@ namespace GLib { } } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern void g_clear_error (ref IntPtr errptr); ~GException () { diff --git a/glib/Idle.cs b/glib/Idle.cs index f5a1412d4..cf764715f 100755 --- a/glib/Idle.cs +++ b/glib/Idle.cs @@ -33,7 +33,7 @@ namespace GLib { public class Idle { - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern uint g_idle_add (IdleHandler d, IntPtr data); public static uint Add (IdleHandler hndlr) diff --git a/glib/List.cs b/glib/List.cs index 4eebb0baf..b6d3a018b 100644 --- a/glib/List.cs +++ b/glib/List.cs @@ -19,7 +19,7 @@ namespace GLib { public class List : ListBase { - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern IntPtr g_list_copy (IntPtr l); public override object Clone () @@ -43,7 +43,7 @@ namespace GLib { return gtksharp_list_get_next (current); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern int g_list_length (IntPtr l); internal override int Length (IntPtr list) @@ -51,7 +51,7 @@ namespace GLib { return g_list_length (list); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern void g_list_free(IntPtr l); internal override void Free (IntPtr list) @@ -60,7 +60,7 @@ namespace GLib { g_list_free (list); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern IntPtr g_list_append (IntPtr l, IntPtr raw); internal override IntPtr Append (IntPtr list, IntPtr raw) @@ -68,7 +68,7 @@ namespace GLib { return g_list_append (list, raw); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern IntPtr g_list_prepend (IntPtr l, IntPtr raw); internal override IntPtr Prepend (IntPtr list, IntPtr raw) diff --git a/glib/Log.cs b/glib/Log.cs index 817205a92..d7c253479 100644 --- a/glib/Log.cs +++ b/glib/Log.cs @@ -53,7 +53,7 @@ namespace GLib { handlers = new Hashtable (); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern void g_logv (string log_domain, LogLevelFlags flags, string message); public void WriteLog (string logDomain, LogLevelFlags flags, string format, params object [] args) @@ -61,7 +61,7 @@ namespace GLib { g_logv (logDomain, flags, String.Format (format, args)); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern uint g_log_set_handler (string log_domain, LogLevelFlags flags, LogFunc log_func, @@ -79,7 +79,7 @@ namespace GLib { return result; } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern uint g_log_remove_handler (string log_domain, uint handler_id); public static void RemoveLogHandler (string logDomain, uint handlerID) @@ -91,7 +91,7 @@ namespace GLib { } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern PrintFunc g_set_print_handler (PrintFunc handler); public static PrintFunc SetPrintHandler (PrintFunc handler) @@ -102,7 +102,7 @@ namespace GLib { return g_set_print_handler (handler); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern PrintFunc g_set_printerr_handler (PrintFunc handler); public static PrintFunc SetPrintErrorHandler (PrintFunc handler) @@ -113,7 +113,7 @@ namespace GLib { return g_set_printerr_handler (handler); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern void g_log_default_handler (string log_domain, LogLevelFlags log_level, string message, @@ -127,7 +127,7 @@ namespace GLib { g_log_default_handler (logDomain, logLevel, message, IntPtr.Zero); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] extern static LogLevelFlags g_log_set_always_fatal (LogLevelFlags fatal_mask); public static LogLevelFlags SetAlwaysFatal (LogLevelFlags fatalMask) @@ -135,7 +135,7 @@ namespace GLib { return g_log_set_always_fatal (fatalMask); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] extern static LogLevelFlags g_log_set_fatal_mask (string log_domain, LogLevelFlags fatal_mask); public static LogLevelFlags SetAlwaysFatal (string logDomain, LogLevelFlags fatalMask) diff --git a/glib/MainContext.cs b/glib/MainContext.cs index 41c116c67..44a6e67d2 100644 --- a/glib/MainContext.cs +++ b/glib/MainContext.cs @@ -11,7 +11,7 @@ namespace GLib { public class MainContext { - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern bool g_main_context_iteration (IntPtr Raw, bool MayBlock); public static bool Iteration () @@ -24,7 +24,7 @@ namespace GLib { return g_main_context_iteration (IntPtr.Zero, MayBlock); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern bool g_main_context_pending (IntPtr Raw); public static bool Pending () diff --git a/glib/Object.cs b/glib/Object.cs index 0deac9158..0bd4b3287 100644 --- a/glib/Object.cs +++ b/glib/Object.cs @@ -61,7 +61,7 @@ namespace GLib { disposed = true; } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_object_unref (IntPtr raw); protected virtual void DisposeNative () @@ -76,7 +76,7 @@ namespace GLib { _obj = IntPtr.Zero; } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_object_ref (IntPtr raw); /// @@ -180,7 +180,7 @@ namespace GLib { Raw = raw; } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern IntPtr g_object_new (uint gtype, IntPtr dummy); public Object (uint gtype) @@ -324,7 +324,7 @@ namespace GLib { Data [key] = val; } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_object_get_property ( IntPtr obj, string name, IntPtr val); @@ -341,7 +341,7 @@ namespace GLib { g_object_get_property (Raw, name, val.Handle); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_object_set_property ( IntPtr obj, string name, IntPtr val); diff --git a/glib/SList.cs b/glib/SList.cs index e467dbed2..f1d4d8c76 100644 --- a/glib/SList.cs +++ b/glib/SList.cs @@ -19,7 +19,7 @@ namespace GLib { public class SList : ListBase { - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern IntPtr g_slist_copy (IntPtr l); public override object Clone () @@ -43,7 +43,7 @@ namespace GLib { return gtksharp_slist_get_next (current); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern int g_slist_length (IntPtr l); internal override int Length (IntPtr list) @@ -51,7 +51,7 @@ namespace GLib { return g_slist_length (list); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern void g_slist_free(IntPtr l); internal override void Free (IntPtr list) @@ -60,7 +60,7 @@ namespace GLib { g_slist_free (list); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern IntPtr g_slist_append (IntPtr l, IntPtr raw); internal override IntPtr Append (IntPtr list, IntPtr raw) @@ -68,7 +68,7 @@ namespace GLib { return g_slist_append (list, raw); } - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern IntPtr g_slist_prepend (IntPtr l, IntPtr raw); internal override IntPtr Prepend (IntPtr list, IntPtr raw) diff --git a/glib/Source.cs b/glib/Source.cs index bc86a32a3..9431cfea2 100644 --- a/glib/Source.cs +++ b/glib/Source.cs @@ -11,7 +11,7 @@ namespace GLib { public class Source { - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern bool g_source_remove (uint tag); public static bool Remove (uint tag) diff --git a/glib/Timeout.cs b/glib/Timeout.cs index 1548a8b0b..514740e6c 100755 --- a/glib/Timeout.cs +++ b/glib/Timeout.cs @@ -32,7 +32,7 @@ namespace GLib { public class Timeout { - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern uint g_timeout_add (uint interval, TimeoutHandler d, IntPtr data); public static uint Add (uint interval, TimeoutHandler hndlr) diff --git a/glib/Value.cs b/glib/Value.cs index c7bc62d99..fa7578641 100755 --- a/glib/Value.cs +++ b/glib/Value.cs @@ -26,7 +26,7 @@ namespace GLib { // Destructor is required since we are allocating unmanaged // heap resources. - [DllImport("glib-2.0")] + [DllImport("libglib-2.0-0.dll")] static extern void g_free (IntPtr mem); ~Value () @@ -78,7 +78,7 @@ namespace GLib { _val = gtksharp_value_create_from_property (obj, prop_name); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_boolean (IntPtr val, bool data); @@ -96,7 +96,7 @@ namespace GLib { g_value_set_boolean (_val, val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_boxed (IntPtr val, IntPtr data); /// @@ -125,7 +125,7 @@ namespace GLib { g_value_set_boxed (_val, val.Handle); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_double (IntPtr val, double data); /// @@ -142,7 +142,7 @@ namespace GLib { g_value_set_double (_val, val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_float (IntPtr val, float data); /// @@ -159,7 +159,7 @@ namespace GLib { g_value_set_float (_val, val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_int (IntPtr val, int data); /// @@ -176,7 +176,7 @@ namespace GLib { g_value_set_int (_val, val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_object (IntPtr val, IntPtr data); /// @@ -193,7 +193,7 @@ namespace GLib { g_value_set_object (_val, val.Handle); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_pointer (IntPtr val, IntPtr data); /// @@ -210,7 +210,7 @@ namespace GLib { g_value_set_pointer (_val, val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_string (IntPtr val, string data); /// @@ -227,7 +227,7 @@ namespace GLib { g_value_set_string (_val, val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_uint (IntPtr val, uint data); /// @@ -258,9 +258,9 @@ namespace GLib { g_value_set_uint (_val, val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_enum (IntPtr val, int data); - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern void g_value_set_flags (IntPtr val, uint data); /// @@ -280,7 +280,7 @@ namespace GLib { g_value_set_enum (_val, (int) wrap); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern bool g_value_get_boolean (IntPtr val); /// @@ -300,7 +300,7 @@ namespace GLib { return g_value_get_boolean (val._val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern IntPtr g_value_get_boxed (IntPtr val); public static explicit operator GLib.Opaque (Value val) @@ -323,7 +323,7 @@ namespace GLib { return new GLib.Boxed (g_value_get_boxed (val._val)); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern double g_value_get_double (IntPtr val); /// @@ -343,7 +343,7 @@ namespace GLib { return g_value_get_double (val._val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern float g_value_get_float (IntPtr val); /// @@ -363,7 +363,7 @@ namespace GLib { return g_value_get_float (val._val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern int g_value_get_int (IntPtr val); /// @@ -383,7 +383,7 @@ namespace GLib { return g_value_get_int (val._val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern IntPtr g_value_get_object (IntPtr val); /// @@ -421,7 +421,7 @@ namespace GLib { return new UnwrappedObject(g_value_get_object (val._val)); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern IntPtr g_value_get_pointer (IntPtr val); /// @@ -441,7 +441,7 @@ namespace GLib { return g_value_get_pointer (val._val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern string g_value_get_string (IntPtr val); /// @@ -461,7 +461,7 @@ namespace GLib { return g_value_get_string (val._val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern uint g_value_get_uint (IntPtr val); /// @@ -498,9 +498,9 @@ namespace GLib { return (ushort) g_value_get_uint (val._val); } - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern int g_value_get_enum (IntPtr val); - [DllImport("gobject-2.0")] + [DllImport("libgobject-2.0-0.dll")] static extern uint g_value_get_flags (IntPtr val); /// diff --git a/glib/makefile.win32 b/glib/makefile.win32 index dc420f8ff..6e63149fd 100644 --- a/glib/makefile.win32 +++ b/glib/makefile.win32 @@ -1,10 +1,7 @@ all: windows windows: - cat *.cs > allthesource.cs - ../mapdllnames.pl allthesource.cs - $(CSC) /unsafe /target:library /out:glib-sharp.dll allthesource.cs - rm allthesource.cs + $(CSC) /unsafe /target:library /out:glib-sharp.dll /recurse:*.cs docs: $(CSC) /unsafe /target:library /doc:glib-sharp-docs.xml /out:glib-sharp.dll /recurse:*.cs diff --git a/gtk/Application.cs b/gtk/Application.cs index d2c226b15..5204e1657 100755 --- a/gtk/Application.cs +++ b/gtk/Application.cs @@ -23,7 +23,7 @@ namespace Gtk { public class Application { - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern void gtk_init (int argc, IntPtr argv); public static void Init () @@ -31,7 +31,7 @@ namespace Gtk { gtk_init (0, new IntPtr(0)); } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern void gtk_init (ref int argc, ref String[] argv); /// @@ -48,7 +48,7 @@ namespace Gtk { gtk_init (ref argc, ref args); } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern void gtk_main (); /// @@ -64,7 +64,7 @@ namespace Gtk { gtk_main (); } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern bool gtk_events_pending (); /// @@ -80,7 +80,7 @@ namespace Gtk { return gtk_events_pending (); } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern void gtk_main_iteration (); /// @@ -96,7 +96,7 @@ namespace Gtk { gtk_main_iteration (); } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern void gtk_main_quit (); /// diff --git a/gtk/Clipboard.custom b/gtk/Clipboard.custom index 6ee925ab6..afb1162f9 100644 --- a/gtk/Clipboard.custom +++ b/gtk/Clipboard.custom @@ -2,7 +2,7 @@ public static Hashtable clipboard_objects = new Hashtable (); private static uint clipboard_object_next_id = 0; - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern bool gtk_clipboard_set_with_data(IntPtr raw, IntPtr targets, int n_targets, GtkSharp.GtkClipboardGetFuncNative get_func, GtkSharp.GtkClipboardClearFuncNative clear_func, uint id); [DllImport("gtksharpglue")] diff --git a/gtk/Dialog.custom b/gtk/Dialog.custom index d879e07e6..0258565ac 100644 --- a/gtk/Dialog.custom +++ b/gtk/Dialog.custom @@ -10,7 +10,7 @@ // // Manually wrap until we figure out how to gen ellipses. -[DllImport("gtk-x11-2.0")] +[DllImport("libgtk-win32-2.0-0.dll")] static extern IntPtr gtk_dialog_new_with_buttons (string title, IntPtr i, int flags, IntPtr dummy); public Dialog (string title, Gtk.Window parent, Gtk.DialogFlags flags) : base() { diff --git a/gtk/ListStore.custom b/gtk/ListStore.custom index 1c6adc25d..065d727aa 100644 --- a/gtk/ListStore.custom +++ b/gtk/ListStore.custom @@ -6,7 +6,7 @@ // // This code is inserted after the automatically generated code. - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] 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); @@ -14,7 +14,7 @@ return ret; } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern int gtk_tree_model_iter_n_children (IntPtr raw, IntPtr iter); public int IterNChildren () { int raw_ret = gtk_tree_model_iter_n_children (Handle, IntPtr.Zero); @@ -22,7 +22,7 @@ return ret; } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] 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/MessageDialog.custom b/gtk/MessageDialog.custom index a9db820bd..d2c254458 100644 --- a/gtk/MessageDialog.custom +++ b/gtk/MessageDialog.custom @@ -1,4 +1,4 @@ -[DllImport ("gtk-x11-2.0")] +[DllImport ("libgtk-win32-2.0-0.dll")] static extern IntPtr gtk_message_dialog_new (IntPtr parent_window, DialogFlags flags, MessageType type, ButtonsType bt, string msg, params object [] args); public MessageDialog (Gtk.Window parent_window, DialogFlags flags, MessageType type, ButtonsType bt, string msg) diff --git a/gtk/SelectionData.custom b/gtk/SelectionData.custom index 86fa69574..e5af01710 100644 --- a/gtk/SelectionData.custom +++ b/gtk/SelectionData.custom @@ -1,8 +1,8 @@ - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] private static extern string gtk_selection_data_get_text (ref Gtk.SelectionData selection_data); - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] private static extern void gtk_selection_data_set_text (ref Gtk.SelectionData selection_data, string str, int len); public string Text { @@ -14,7 +14,7 @@ } } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern void gtk_selection_data_set (ref Gtk.SelectionData raw, IntPtr type, int format, byte[] data, int length); public byte[] Data { diff --git a/gtk/ThreadNotify.cs b/gtk/ThreadNotify.cs index d939cc66c..ebfb72a37 100644 --- a/gtk/ThreadNotify.cs +++ b/gtk/ThreadNotify.cs @@ -28,7 +28,7 @@ namespace Gtk { // // DllImport functions from Gtk // - [DllImport ("gtk-x11-2.0")] + [DllImport ("libgtk-win32-2.0-0.dll")] public static extern int gdk_input_add (int s, int cond, GdkInputFunction f, IntPtr data); public delegate void GdkInputFunction (IntPtr data, int source, int cond); diff --git a/gtk/TreeModelSort.custom b/gtk/TreeModelSort.custom index 5a6f01b8a..28e9fb9d4 100644 --- a/gtk/TreeModelSort.custom +++ b/gtk/TreeModelSort.custom @@ -6,7 +6,7 @@ // // This code is inserted after the automatically generated code. - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] 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); @@ -14,7 +14,7 @@ return ret; } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern int gtk_tree_model_iter_n_children (IntPtr raw, IntPtr iter); public int IterNChildren () { int raw_ret = gtk_tree_model_iter_n_children (Handle, IntPtr.Zero); @@ -22,7 +22,7 @@ return ret; } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] 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/TreeSelection.custom b/gtk/TreeSelection.custom index 1e74b50c8..d0b32e6cb 100644 --- a/gtk/TreeSelection.custom +++ b/gtk/TreeSelection.custom @@ -10,7 +10,7 @@ /// GetSelected Method /// To be completed - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern bool gtk_tree_selection_get_selected(IntPtr raw, out IntPtr model, ref Gtk.TreeIter iter); public bool GetSelected(out Gtk.TreeModel model, ref Gtk.TreeIter iter) { diff --git a/gtk/TreeStore.custom b/gtk/TreeStore.custom index 8b1672157..aa7da12b0 100644 --- a/gtk/TreeStore.custom +++ b/gtk/TreeStore.custom @@ -15,7 +15,7 @@ /// Appends a row to the root level of the TreeStore. /// - [DllImport ("gtk-x11-2.0")] + [DllImport ("libgtk-win32-2.0-0.dll")] static extern void gtk_tree_store_append (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent); public void Append (out Gtk.TreeIter iter) { @@ -31,7 +31,7 @@ /// the given position. /// - [DllImport ("gtk-x11-2.0")] + [DllImport ("libgtk-win32-2.0-0.dll")] static extern void gtk_tree_store_insert (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent, int position); public void Insert (out Gtk.TreeIter iter, int position) { @@ -46,7 +46,7 @@ /// Prepends a row to the root level of the TreeStore. /// - [DllImport ("gtk-x11-2.0")] + [DllImport ("libgtk-win32-2.0-0.dll")] static extern void gtk_tree_store_prepend (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent); public void Prepend (out Gtk.TreeIter iter) { @@ -62,7 +62,7 @@ /// given sibling. /// - [DllImport ("gtk-x11-2.0")] + [DllImport ("libgtk-win32-2.0-0.dll")] static extern void gtk_tree_store_insert_before (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent, ref Gtk.TreeIter sibling); public void InsertBefore (out Gtk.TreeIter iter, Gtk.TreeIter sibling) { @@ -78,7 +78,7 @@ /// given sibling. /// - [DllImport ("gtk-x11-2.0")] + [DllImport ("libgtk-win32-2.0-0.dll")] static extern void gtk_tree_store_insert_after (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent, ref Gtk.TreeIter sibling); public void InsertAfter (out Gtk.TreeIter iter, Gtk.TreeIter sibling) { @@ -86,7 +86,7 @@ } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] 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); @@ -94,7 +94,7 @@ return ret; } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern int gtk_tree_model_iter_n_children (IntPtr raw, IntPtr iter); public int IterNChildren () { int raw_ret = gtk_tree_model_iter_n_children (Handle, IntPtr.Zero); @@ -102,7 +102,7 @@ return ret; } - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] 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/TreeView.custom b/gtk/TreeView.custom index 73f73a33e..4aca41c92 100644 --- a/gtk/TreeView.custom +++ b/gtk/TreeView.custom @@ -7,10 +7,10 @@ // This code is inserted after the automatically generated code. - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern IntPtr gtk_tree_view_get_model (IntPtr raw); - [DllImport("gtk-x11-2.0")] + [DllImport("libgtk-win32-2.0-0.dll")] static extern IntPtr gtk_tree_view_set_model (IntPtr raw, IntPtr raw_model); /// Model Property diff --git a/gtk/makefile.win32 b/gtk/makefile.win32 index 2ab7e09dd..829d6fcc7 100644 --- a/gtk/makefile.win32 +++ b/gtk/makefile.win32 @@ -1,10 +1,7 @@ all: windows windows: - cat *.cs generated/*.cs > allthesource.cs - ../mapdllnames.pl allthesource.cs - $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /out:gtk-sharp.dll allthesource.cs - rm allthesource.cs + $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /out:gtk-sharp.dll /recurse:*.cs docs: $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /doc:gtk-sharp-docs.xml /out:gtk-sharp.dll /recurse:*.cs diff --git a/mapdllnames.pl b/mapdllnames.pl index d3e1dd20d..3747556fa 100755 --- a/mapdllnames.pl +++ b/mapdllnames.pl @@ -24,7 +24,7 @@ foreach $filename (@ARGV) { open(OUTFILE, ">$filename.tmp") || die "Couldn't open $filename.tmp\n"; while ($line = ) { - if ($line =~ /DllImport\(\"(.*)\"/ && exists($map{$1})) { + if ($line =~ /DllImport\s*\(\"(.*)\"/ && exists($map{$1})) { $line =~ s/\"(.*)\"/\"$map{$1}\"/; } diff --git a/pango/makefile.win32 b/pango/makefile.win32 index 36d50b090..b61daca39 100644 --- a/pango/makefile.win32 +++ b/pango/makefile.win32 @@ -1,7 +1,6 @@ all: windows windows: - ../mapdllnames.pl generated/*.cs $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /out:pango-sharp.dll /recurse:*.cs docs: diff --git a/sources/gtk-sharp.sources b/sources/gtk-sharp.sources index d6e167582..d8a2c22d6 100644 --- a/sources/gtk-sharp.sources +++ b/sources/gtk-sharp.sources @@ -1,8 +1,8 @@ -atk-1.0.2/atk Atk atk-1.0 -pango-1.0.3/pango Pango pango-1.0 -gtk+-2.0.5/gdk Gdk gdk-x11-2.0 -gtk+-2.0.5/gdk-pixbuf Gdk gdk_pixbuf-2.0 -gtk+-2.0.5/gtk Gtk gtk-x11-2.0 +atk-1.0.2/atk Atk libatk-1.0-0.dll +pango-1.0.3/pango Pango libpango-1.0-0.dll +gtk+-2.0.5/gdk Gdk libgdk-win32-2.0-0.dll +gtk+-2.0.5/gdk-pixbuf Gdk libgdk_pixbuf-2.0-0.dll +gtk+-2.0.5/gtk Gtk libgtk-win32-2.0-0.dll libgnome-2.0.1/libgnome Gnome gnome-2 libgnomecanvas-2.0.1/libgnomecanvas Gnome gnomecanvas-2 libgnomeui-2.0.1/libgnomeui Gnome gnomeui-2