2003-02-21 Mike Kestner <mkestner@speakeasy.net>

* 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
This commit is contained in:
Mike Kestner 2003-02-22 04:34:56 +00:00
parent 951d74accb
commit c0b574a686
35 changed files with 109 additions and 111 deletions

View file

@ -1,3 +1,12 @@
2003-02-21 Mike Kestner <mkestner@speakeasy.net>
* 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 <mkestner@speakeasy.net>
* api/*-api.xml : remove stray enum get_type methods.

View file

@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Atk" library="atk-1.0">
<namespace name="Atk" library="libatk-1.0-0.dll">
<enum name="CoordType" cname="AtkCoordType" type="enum">
<member cname="ATK_XY_SCREEN" name="Screen"/>
<member cname="ATK_XY_WINDOW" name="Window"/>

View file

@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Gdk" library="gdk-x11-2.0">
<namespace name="Gdk" library="libgdk-win32-2.0-0.dll">
<enum name="AxisUse" cname="GdkAxisUse" type="enum">
<member cname="GDK_AXIS_IGNORE" name="Ignore"/>
<member cname="GDK_AXIS_X" name="X"/>
@ -2329,7 +2329,7 @@
</method>
</struct>
</namespace>
<namespace name="Gdk" library="gdk_pixbuf-2.0">
<namespace name="Gdk" library="libgdk_pixbuf-2.0-0.dll">
<enum name="Colorspace" cname="GdkColorspace" type="enum">
<member cname="GDK_COLORSPACE_RGB" name="Rgb"/>
</enum>

View file

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

View file

@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Pango" library="pango-1.0">
<namespace name="Pango" library="libpango-1.0-0.dll">
<enum name="Alignment" cname="PangoAlignment" type="enum">
<member cname="PANGO_ALIGN_LEFT" name="Left"/>
<member cname="PANGO_ALIGN_CENTER" name="Center"/>

View file

@ -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:

View file

@ -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 ()

View file

@ -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

View file

@ -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)

View file

@ -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 ()
{

View file

@ -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)

View file

@ -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)

View file

@ -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)

View file

@ -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 ()

View file

@ -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);
/// <summary>
@ -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);

View file

@ -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)

View file

@ -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)

View file

@ -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)

View file

@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>
@ -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);
/// <summary>

View file

@ -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

View file

@ -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);
/// <summary>
@ -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 ();
/// <summary>
@ -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 ();
/// <summary>
@ -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 ();
/// <summary>
@ -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 ();
/// <summary>

View file

@ -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")]

View file

@ -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()
{

View file

@ -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);

View file

@ -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)

View file

@ -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 {

View file

@ -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);

View file

@ -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);

View file

@ -10,7 +10,7 @@
/// <summary> GetSelected Method </summary>
/// <remarks> To be completed </remarks>
[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) {

View file

@ -15,7 +15,7 @@
/// Appends a row to the root level of the TreeStore.
/// </remarks>
[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.
/// </remarks>
[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.
/// </remarks>
[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.
/// </remarks>
[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.
/// </remarks>
[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);

View file

@ -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);
/// <summary>Model Property</summary>

View file

@ -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

View file

@ -24,7 +24,7 @@ foreach $filename (@ARGV) {
open(OUTFILE, ">$filename.tmp") || die "Couldn't open $filename.tmp\n";
while ($line = <INFILE>) {
if ($line =~ /DllImport\(\"(.*)\"/ && exists($map{$1})) {
if ($line =~ /DllImport\s*\(\"(.*)\"/ && exists($map{$1})) {
$line =~ s/\"(.*)\"/\"$map{$1}\"/;
}

View file

@ -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:

View file

@ -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