[Gtk-sharp-list] first pass at win32 patch
Vladimir Vukicevic
vladimir@pobox.com
08 Oct 2002 21:29:44 -0700
--=-UxtgJJ6Vg97ArXHB24Zg
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Ok, there's a bunch of little changes in this patch, some correct, some
not so correct. It builds, but executables still claim they can't find
gtksharpglue.dll.. i'm trying to figure that out now. Anyway, here's a
general list of patches:
- glib/LibraryNames.cs has a set of const strings that define the dlls.
Things like GLib.LibraryNames.GTK_LIB (Yes, this should be in the
GtkSharp namespace, but I chose it wrong the first time and I didn't
want to re-sed everything. Can easily be changed.)
- sources/gtk-sharp.sources lib names changed to these strings
- generator taught to not output ""s around "library" names that start
with GLib (should be GtkSharp).
- api/*.xml files are manually patched by this patch
- api/makefile.win32 added to generate code
- glue/makefile.win32 added to build a mingw32 DLL. this is MOSTLY
CORRECT, but it doesn't quite seem to work, or the dll's are not being
searched for correctly, or something.
- glue/win32dll.c - dll entry points. this is the most likely culprit
in the dll not working; i'm looking up docs in a sec on how to do this
right, just wanted to get this patch out.
- generator/Parameters.cs: don't claim that params that have "void" as
the cstype are Valid (*** necessary for mcs now as well, since the void
type fix went in toady)
- generator/SignalHandler.cs: signal handler marshallers
("voidPropertyBlahSignal") or whatever are now put in the
GtkSharp.<BaseNamespace>Signals namespace instead of
GtkSharp.<BaseNamespace>. This fixes the problem with csc of it
resolving namespaces against current ones (so you couldn't use
Gtk.Widget from GtkSharp.Gtk.xxx).
- generator/makefile.win32: removed codegen line, put it in the
api/makefile.win32
- various *.custom, glib/*.cs files: removed hard-coded library names
and changed to references of the const strings
- gtk/Table.custom: commented out the extra no-argument default
constructor, because one with the same signature but a different
protection level was being auto-generated. mcs does not complain about
this, csc does -- most likely a mcs bug. The default constructor here
is useful, but not horribly so.
That should be it. I'm building with mingw32 installed from cygwin with
a full cygwin/gnu toolchain (but using mingw32 for the actual build
tools). win32 libs of gtk+2 and related are from
http://www.gimp.org/~tml/gimp/win32/downloads.html .
- Vlad
--
Vladimir Vukicevic <vladimir@pobox.com>
--=-UxtgJJ6Vg97ArXHB24Zg
Content-Disposition: attachment; filename=win32.patch
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; name=win32.patch; charset=ANSI_X3.4-1968
--- /dev/null 2002-10-08 21:24:45.000000000 -0700
+++ glue/makefile.win32 2002-10-08 20:57:01.000000000 -0700
@@ -0,0 +1,33 @@
+
+GTK_CFLAGS=3D`pkg-config --cflags gtk+-win32-2.0`
+GTK_LIBS=3D`pkg-config --libs gtk+-win32-2.0`
+CC=3Dgcc -b i686-pc-mingw32
+DLLWRAP=3Ddllwrap --mno-cygwin --target i386-mingw32 --enable-stdcall-fixu=
p
+
+GLUE_OBJS =3D \
+ adjustment.o \
+ dialog.o \
+ error.o \
+ event.o \
+ fileselection.o \
+ list.o \
+ object.o \
+ paned.o \
+ slist.o \
+ style.o \
+ type.o \
+ value.o \
+ widget.o \
+ win32dll.o
+
+all: gtksharpglue.dll
+
+
+%.o: %.c
+ $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^=20
+
+
+gtksharpglue.dll: $(GLUE_OBJS)
+ $(DLLWRAP) --output-lib=3Dlibgtksharpglue.a --dllname=3Dgtksharpglue.dll =
--driver-name=3Dgcc $(GLUE_OBJS) $(GTK_LIBS)
+
+
--- /dev/null 2002-10-08 21:24:52.000000000 -0700
+++ glue/win32dll.c 2002-10-08 20:56:37.000000000 -0700
@@ -0,0 +1,8 @@
+
+int DllMain () {
+ return 1;
+}
+
+int DllMainCRTStartup () {
+ return 1;
+}
--- /dev/null 2002-10-08 21:27:47.000000000 -0700
+++ glib/LibraryNames.cs 2002-10-08 05:27:40.000000000 -0700
@@ -0,0 +1,38 @@
+
+namespace GLib {
+ public class LibraryNames {
+#if WIN32
+ public const string GTKSHARPGLUE_LIB =3D "gtksharpglue.dll";
+ public const string GLIB_LIB =3D "libglib-2.0-0.dll";
+ public const string GOBJECT_LIB =3D "libgobject-2.0-0.dll";
+ public const string ATK_LIB =3D "libatk-1.0-0.dll";
+ public const string PANGO_LIB =3D "libpango-1.0-0.dll";
+ public const string GDK_LIB =3D "libgdk-win32-2.0-0.dll";
+ public const string GDK_PIXBUF_LIB =3D "libgdk_pixbuf-2.0-0.dll";
+ public const string GTK_LIB =3D "libgtk-win32-2.0-0.dll";
+ public const string GNOME_LIB =3D "libgnome-2-0.dll";
+ public const string GNOMECANVAS_LIB =3D "libgnomecanvas-2-0.dll";
+ public const string GNOMEUI_LIB =3D "libgnomeui-2-0.dll";
+ public const string GTKHTML_LIB =3D "libgtkhtml-3.0-0.dll";
+ public const string GLADE_LIB =3D "libglade-2.0-0.dll";
+ public const string GDA_LIB =3D "libggda-2-0.dll";
+ public const string GNOMEDB_LIB =3D "libggnomedb-2-0.dll";
+#else
+ public const string GTKSHARPGLUE_LIB =3D "gtksharpglue";
+ public const string GLIB_LIB =3D "glib-2.0";
+ public const string GOBJECT_LIB =3D "gobject-2.0";
+ public const string ATK_LIB =3D "atk-1.0";
+ public const string PANGO_LIB =3D "pango-1.0";
+ public const string GDK_LIB =3D "gdk-x11-2.0";
+ public const string GDK_PIXBUF_LIB =3D "gdk-pixbuf-2.0";
+ public const string GTK_LIB =3D "gtk-x11-2.0";
+ public const string GNOME_LIB =3D "gnome-2";
+ public const string GNOMECANVAS_LIB =3D "gnomecanvas-2";
+ public const string GNOMEUI_LIB =3D "gnomeui-2";
+ public const string GTKHTML_LIB =3D "gtkhtml-3.0";
+ public const string GLADE_LIB =3D "glade-2.0";
+ public const string GDA_LIB =3D "gda-2";
+ public const string GNOMEDB_LIB =3D "gnomedb-2";
+#endif
+ }
+}
--- /dev/null 2002-10-08 21:27:53.000000000 -0700
+++ api/makefile.win32 2002-10-08 04:05:38.000000000 -0700
@@ -0,0 +1,7 @@
+
+all: generated-stamp
+
+generated-stamp: atk-api.xml gdk-api.xml gdk-symbols.xml gtk-api.xml gtk-s=
ymbols.xml pango-api.xml ../generator/codegen.exe
+ ../generator/codegen --generate atk-api.xml gdk-api.xml gdk-symbols.xml g=
tk-api.xml gtk-symbols.xml pango-api.xml
+ touch generated-stamp
+
Index: makefile.win32
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/makefile.win32,v
retrieving revision 1.5
diff -u -w -r1.5 makefile.win32
--- makefile.win32 24 Jun 2002 23:38:50 -0000 1.5
+++ makefile.win32 9 Oct 2002 04:22:37 -0000
@@ -1,16 +1,16 @@
-DIRS=3Dgenerator glib pango atk gdk gtk gnome sample
+DIRS=3Dgenerator api glib pango atk gdk gtk sample
ROOT=3D/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT)))
-CSC=3D$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe
+CSC=3D$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe /d:WIN32
=20
all: windows
=20
windows:
for i in $(DIRS); do \
- (cd $$i; CSC=3D$(CSC) make -f makefile.win32) || exit 1;\
+ (cd $$i; CSC=3D"$(CSC)" make -f makefile.win32) || exit 1;\
done;
=20
docs:
for i in $(DIRS); do \
- (cd $$i; CSC=3D$(CSC) make -f makefile.win32 docs) || exit 1;\
+ (cd $$i; CSC=3D"$(CSC)" make -f makefile.win32 docs) || exit 1;\
done;
=20
Index: api/atk-api.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/api/atk-api.xml,v
retrieving revision 1.1
diff -u -w -r1.1 atk-api.xml
--- api/atk-api.xml 20 Aug 2002 19:56:14 -0000 1.1
+++ api/atk-api.xml 9 Oct 2002 04:22:38 -0000
@@ -1,6 +1,6 @@
<?xml version=3D"1.0" encoding=3D"UTF-8"?>
<api>
- <namespace name=3D"Atk" library=3D"atk-1.0">
+ <namespace name=3D"Atk" library=3D"GLib.LibraryNames.ATK_LIB">
<enum name=3D"CoordType" cname=3D"AtkCoordType" type=3D"enum">
<member cname=3D"ATK_XY_SCREEN" name=3D"Screen"/>
<member cname=3D"ATK_XY_WINDOW" name=3D"Window"/>
Index: api/gdk-api.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/api/gdk-api.xml,v
retrieving revision 1.4
diff -u -w -r1.4 gdk-api.xml
--- api/gdk-api.xml 21 Sep 2002 14:21:15 -0000 1.4
+++ api/gdk-api.xml 9 Oct 2002 04:22:39 -0000
@@ -1,6 +1,6 @@
<?xml version=3D"1.0" encoding=3D"UTF-8"?>
<api>
- <namespace name=3D"Gdk" library=3D"gdk-x11-2.0">
+ <namespace name=3D"Gdk" library=3D"GLib.LibraryNames.GDK_LIB">
<enum name=3D"AxisUse" cname=3D"GdkAxisUse" type=3D"enum">
<member cname=3D"GDK_AXIS_IGNORE" name=3D"Ignore"/>
<member cname=3D"GDK_AXIS_X" name=3D"X"/>
@@ -2356,7 +2356,7 @@
</method>
</struct>
</namespace>
- <namespace name=3D"Gdk" library=3D"gdk_pixbuf-2.0">
+ <namespace name=3D"Gdk" library=3D"GLib.LibraryNames.GDK_PIXBUF_LIB">
<enum name=3D"Colorspace" cname=3D"GdkColorspace" type=3D"enum">
<member cname=3D"GDK_COLORSPACE_RGB" name=3D"Rgb"/>
</enum>
@@ -2513,7 +2513,7 @@
<method name=3D"GetColorspace" cname=3D"gdk_pixbuf_get_colorspace">
<return-type type=3D"GdkColorspace"/>
</method>
- <method name=3D"GetFromDrawable" cname=3D"gdk_pixbuf_get_from_drawab=
le" library=3D"gdk-x11-2.0">
+ <method name=3D"GetFromDrawable" cname=3D"gdk_pixbuf_get_from_drawab=
le" library=3D"GLib.LibraryNames.GDK_PIXBUF_LIB">
<return-type type=3D"GdkPixbuf*"/>
<parameters>
<parameter type=3D"GdkDrawable*" name=3D"src"/>
@@ -2526,7 +2526,7 @@
<parameter type=3D"int" name=3D"height"/>
</parameters>
</method>
- <method name=3D"GetFromImage" cname=3D"gdk_pixbuf_get_from_image" li=
brary=3D"gdk-x11-2.0">
+ <method name=3D"GetFromImage" cname=3D"gdk_pixbuf_get_from_image" li=
brary=3D"GLib.LibraryNames.GDK_LIB">
<return-type type=3D"GdkPixbuf*"/>
<parameters>
<parameter type=3D"GdkImage*" name=3D"src"/>
@@ -2616,7 +2616,7 @@
<parameter type=3D"int" name=3D"height"/>
</parameters>
</constructor>
- <method name=3D"RenderPixmapAndMask" cname=3D"gdk_pixbuf_render_pixm=
ap_and_mask" library=3D"gdk-x11-2.0">
+ <method name=3D"RenderPixmapAndMask" cname=3D"gdk_pixbuf_render_pixm=
ap_and_mask" library=3D"GLib.LibraryNames.GDK_LIB">
<return-type type=3D"void"/>
<parameters>
<parameter type=3D"GdkPixmap**" name=3D"pixmap_return"/>
@@ -2624,7 +2624,7 @@
<parameter type=3D"int" name=3D"alpha_threshold"/>
</parameters>
</method>
- <method name=3D"RenderPixmapAndMaskForColormap" cname=3D"gdk_pixbuf_=
render_pixmap_and_mask_for_colormap" library=3D"gdk-x11-2.0">
+ <method name=3D"RenderPixmapAndMaskForColormap" cname=3D"gdk_pixbuf_=
render_pixmap_and_mask_for_colormap" library=3D"GLib.LibraryNames.GDK_LIB">
<return-type type=3D"void"/>
<parameters>
<parameter type=3D"GdkColormap*" name=3D"colormap"/>
@@ -2633,7 +2633,7 @@
<parameter type=3D"int" name=3D"alpha_threshold"/>
</parameters>
</method>
- <method name=3D"RenderThresholdAlpha" cname=3D"gdk_pixbuf_render_thr=
eshold_alpha" library=3D"gdk-x11-2.0">
+ <method name=3D"RenderThresholdAlpha" cname=3D"gdk_pixbuf_render_thr=
eshold_alpha" library=3D"GLib.LibraryNames.GDK_LIB">
<return-type type=3D"void"/>
<parameters>
<parameter type=3D"GdkBitmap*" name=3D"bitmap"/>
@@ -2646,7 +2646,7 @@
<parameter type=3D"int" name=3D"alpha_threshold"/>
</parameters>
</method>
- <method name=3D"RenderToDrawable" cname=3D"gdk_pixbuf_render_to_draw=
able" library=3D"gdk-x11-2.0">
+ <method name=3D"RenderToDrawable" cname=3D"gdk_pixbuf_render_to_draw=
able" library=3D"GLib.LibraryNames.GDK_LIB">
<return-type type=3D"void"/>
<parameters>
<parameter type=3D"GdkDrawable*" name=3D"drawable"/>
@@ -2662,7 +2662,7 @@
<parameter type=3D"int" name=3D"y_dither"/>
</parameters>
</method>
- <method name=3D"RenderToDrawableAlpha" cname=3D"gdk_pixbuf_render_to=
_drawable_alpha" library=3D"gdk-x11-2.0">
+ <method name=3D"RenderToDrawableAlpha" cname=3D"gdk_pixbuf_render_to=
_drawable_alpha" library=3D"GLib.LibraryNames.GDK_LIB">
<return-type type=3D"void"/>
<parameters>
<parameter type=3D"GdkDrawable*" name=3D"drawable"/>
Index: api/gtk-api.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/api/gtk-api.xml,v
retrieving revision 1.8
diff -u -w -r1.8 gtk-api.xml
--- api/gtk-api.xml 21 Sep 2002 14:21:15 -0000 1.8
+++ api/gtk-api.xml 9 Oct 2002 04:22:45 -0000
@@ -1,6 +1,6 @@
<?xml version=3D"1.0" encoding=3D"UTF-8"?>
<api>
- <namespace name=3D"Gtk" library=3D"gtk-x11-2.0">
+ <namespace name=3D"Gtk" library=3D"GLib.LibraryNames.GTK_LIB">
<enum name=3D"AccelFlags" cname=3D"GtkAccelFlags" type=3D"flags">
<member cname=3D"GTK_ACCEL_VISIBLE" name=3D"Visible" value=3D"1 <=
< 0"/>
<member cname=3D"GTK_ACCEL_LOCKED" name=3D"Locked" value=3D"1 <&l=
t; 1"/>
@@ -11667,7 +11667,7 @@
<static-string cname=3D"GTK_STOCK_ZOOM_OUT" name=3D"ZoomOut" value=
=3D"gtk-zoom-out"/>
</object>
</namespace>
- <namespace name=3D"Gtk" library=3D"gtkhtml-3.0">
+ <namespace name=3D"Gtk" library=3D"GLib.LibraryNames.GTKHTML_LIB">
<enum name=3D"HTMLCommandType" cname=3D"GtkHTMLCommandType" type=3D"en=
um">
<member cname=3D"GTK_HTML_COMMAND_UNDO" name=3D"Undo"/>
<member cname=3D"GTK_HTML_COMMAND_REDO" name=3D"Redo"/>
Index: api/pango-api.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/api/pango-api.xml,v
retrieving revision 1.2
diff -u -w -r1.2 pango-api.xml
--- api/pango-api.xml 1 Sep 2002 04:46:37 -0000 1.2
+++ api/pango-api.xml 9 Oct 2002 04:22:45 -0000
@@ -1,6 +1,6 @@
<?xml version=3D"1.0" encoding=3D"UTF-8"?>
<api>
- <namespace name=3D"Pango" library=3D"pango-1.0">
+ <namespace name=3D"Pango" library=3D"GLib.LibraryNames.PANGO_LIB">
<enum name=3D"Alignment" cname=3D"PangoAlignment" type=3D"enum">
<member cname=3D"PANGO_ALIGN_LEFT" name=3D"Left"/>
<member cname=3D"PANGO_ALIGN_CENTER" name=3D"Center"/>
Index: generator/Ctor.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/generator/Ctor.cs,v
retrieving revision 1.9
diff -u -w -r1.9 Ctor.cs
--- generator/Ctor.cs 28 Aug 2002 20:58:01 -0000 1.9
+++ generator/Ctor.cs 9 Oct 2002 04:22:45 -0000
@@ -109,6 +109,9 @@
else
safety =3D "";
=20
+ if (libname.StartsWith ("GLib"))
+ sw.WriteLine("\t\t[DllImport(" + libname + ")]");
+ else
sw.WriteLine("\t\t[DllImport(\"" + libname + "\")]");
sw.WriteLine("\t\tstatic extern " + safety + "IntPtr " + cname + isig);
sw.WriteLine();
Index: generator/Method.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/generator/Method.cs,v
retrieving revision 1.25
diff -u -w -r1.25 Method.cs
--- generator/Method.cs 12 Sep 2002 05:21:15 -0000 1.25
+++ generator/Method.cs 9 Oct 2002 04:22:46 -0000
@@ -293,6 +293,9 @@
=20
public void GenerateImport (StreamWriter sw)
{
+ if (libname.StartsWith ("GLib"))
+ sw.WriteLine("\t\t[DllImport(" + libname + ")]");
+ else
sw.WriteLine("\t\t[DllImport(\"" + libname + "\")]");
sw.Write("\t\tstatic extern " + safety + m_ret + " " + cname + isig);
sw.WriteLine();
Index: generator/ObjectGen.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/generator/ObjectGen.cs,v
retrieving revision 1.38
diff -u -w -r1.38 ObjectGen.cs
--- generator/ObjectGen.cs 4 Sep 2002 05:25:57 -0000 1.38
+++ generator/ObjectGen.cs 9 Oct 2002 04:22:46 -0000
@@ -247,7 +247,7 @@
=20
sw.WriteLine ("namespace GtkSharp {");
sw.WriteLine ();
- sw.WriteLine ("\tnamespace " + ns + " {");
+ sw.WriteLine ("\tnamespace " + ns + "Helper {");
sw.WriteLine ();
sw.WriteLine ("\tpublic class ObjectManager {");
sw.WriteLine ();
Index: generator/Parameters.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/generator/Parameters.cs,v
retrieving revision 1.19
diff -u -w -r1.19 Parameters.cs
--- generator/Parameters.cs 12 Sep 2002 20:25:29 -0000 1.19
+++ generator/Parameters.cs 9 Oct 2002 04:22:46 -0000
@@ -152,6 +152,10 @@
Console.Write("Name: " + name + " Type: " + type + " ");
return false;
}
+ if (cs_type =3D=3D "void" || m_type =3D=3D "void") {
+ Console.Write("Void marshal: " + name + " type: " + type + " ");
+ return false;
+ }
}
=09
return true;
Index: generator/SignalHandler.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/generator/SignalHandler.cs,v
retrieving revision 1.16
diff -u -w -r1.16 SignalHandler.cs
--- generator/SignalHandler.cs 20 Aug 2002 19:56:14 -0000 1.16
+++ generator/SignalHandler.cs 9 Oct 2002 04:22:46 -0000
@@ -15,6 +15,9 @@
=09
public static String GetName(XmlElement sig, string ns, bool generate)
{
+ string base_ns =3D ns;
+ ns =3D ns + "Signals";
+
XmlElement ret_elem =3D sig["return-type"];
if (ret_elem =3D=3D null) {
Console.Write("Missing return-type ");
@@ -82,7 +85,7 @@
return ns + "." + sname;
=20
char sep =3D Path.DirectorySeparatorChar;
- String dir =3D ".." + sep + ns.ToLower() + sep + "generated";
+ String dir =3D ".." + sep + base_ns.ToLower() + sep + "generated";
=20
if (!Directory.Exists(dir)) {
Directory.CreateDirectory(dir);
@@ -165,7 +168,7 @@
sw.WriteLine("\t\t}");
sw.WriteLine();
}
- sw.Write("\t\t[DllImport(\"gobject-2.0\")]");
+ sw.Write("\t\t[DllImport(GLib.LibraryNames.GOBJECT_LIB)]");
sw.Write("\t\tstatic extern void g_signal_connect_data(");
sw.Write("IntPtr obj, String name, " + dname + " cb, int key, IntPtr p,=
");
sw.WriteLine(" int flags);");
Index: generator/makefile.win32
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/generator/makefile.win32,v
retrieving revision 1.2
diff -u -w -r1.2 makefile.win32
--- generator/makefile.win32 22 Jun 2002 22:12:50 -0000 1.2
+++ generator/makefile.win32 9 Oct 2002 04:22:46 -0000
@@ -2,7 +2,6 @@
=20
windows: *.cs
$(CSC) /unsafe /out:codegen.exe *.cs
- ./codegen gtkapi.xml
=20
docs: windows
=20
Index: glade/XML.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/glade/XML.custom,v
retrieving revision 1.3
diff -u -w -r1.3 XML.custom
--- glade/XML.custom 15 Sep 2002 19:40:45 -0000 1.3
+++ glade/XML.custom 9 Oct 2002 04:22:46 -0000
@@ -7,7 +7,7 @@
// This code is inserted after the automatically generated code.
=20
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern string gtksharp_glade_xml_get_filename (IntPtr raw);
=20
/// <summary>Filename Property</summary>
Index: glib/GException.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/glib/GException.cs,v
retrieving revision 1.3
diff -u -w -r1.3 GException.cs
--- glib/GException.cs 6 Oct 2002 02:12:04 -0000 1.3
+++ glib/GException.cs 9 Oct 2002 04:22:46 -0000
@@ -18,7 +18,7 @@
this.errptr =3D errptr;
}
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern string gtksharp_error_get_message (IntPtr errptr);
public override string Message {
get {
@@ -26,7 +26,7 @@
}
}
=20
- [DllImport("glib-2.0")]
+ [DllImport(GLib.LibraryNames.GLIB_LIB)]
static extern void g_clear_error (ref IntPtr errptr);
~GException ()
{
Index: glib/Idle.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/glib/Idle.cs,v
retrieving revision 1.1
diff -u -w -r1.1 Idle.cs
--- glib/Idle.cs 31 Aug 2002 20:37:51 -0000 1.1
+++ glib/Idle.cs 9 Oct 2002 04:22:46 -0000
@@ -33,7 +33,7 @@
=20
public class Idle {
=20
- [DllImport("glib-2.0")]
+ [DllImport(GLib.LibraryNames.GLIB_LIB)]
static extern uint g_idle_add (IdleHandler d, IntPtr data);
=20
public static uint Add (IdleHandler hndlr)
Index: glib/List.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/glib/List.cs,v
retrieving revision 1.1
diff -u -w -r1.1 List.cs
--- glib/List.cs 1 Sep 2002 04:46:38 -0000 1.1
+++ glib/List.cs 9 Oct 2002 04:22:46 -0000
@@ -19,7 +19,7 @@
=20
public class List : ListBase {
=20
- [DllImport("glib-2.0")]
+ [DllImport(GLib.LibraryNames.GLIB_LIB)]
static extern IntPtr g_list_copy (IntPtr l);
=09
public override object Clone ()
@@ -27,7 +27,7 @@
return new List (g_list_copy (Handle));
}
=09
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_list_get_data (IntPtr l);
=09
internal override IntPtr GetData (IntPtr current)
@@ -35,7 +35,7 @@
return gtksharp_list_get_data (current);
}
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_list_get_next (IntPtr l);
=09
internal override IntPtr Next (IntPtr current)
@@ -43,7 +43,7 @@
return gtksharp_list_get_next (current);
}
=20
- [DllImport("glib-2.0")]
+ [DllImport(GLib.LibraryNames.GLIB_LIB)]
static extern int g_list_length (IntPtr l);
=09
internal override int Length (IntPtr list)
@@ -51,7 +51,7 @@
return g_list_length (list);
}
=09
- [DllImport("glib-2.0")]
+ [DllImport(GLib.LibraryNames.GLIB_LIB)]
static extern void g_list_free(IntPtr l);
=20
internal override void Free (IntPtr list)
Index: glib/Object.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/glib/Object.cs,v
retrieving revision 1.29
diff -u -w -r1.29 Object.cs
--- glib/Object.cs 12 Sep 2002 19:21:46 -0000 1.29
+++ glib/Object.cs 9 Oct 2002 04:22:47 -0000
@@ -53,7 +53,7 @@
disposed =3D true;
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_object_unref (IntPtr raw);
=09
protected virtual void DisposeNative ()
@@ -66,7 +66,7 @@
_obj =3D IntPtr.Zero;
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_object_ref (IntPtr raw);
=20
/// <summary>
@@ -261,7 +261,7 @@
Data [key] =3D val;
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_object_get_property (
IntPtr obj, string name, IntPtr val);
=20
@@ -278,7 +278,7 @@
g_object_get_property (Raw, name, val.Handle);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_object_set_property (
IntPtr obj, string name, IntPtr val);
=20
@@ -295,7 +295,7 @@
g_object_set_property (Raw, name, val.Handle);
}
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern bool gtksharp_is_object (IntPtr obj);
=20
internal static bool IsObject (IntPtr obj)
Index: glib/ObjectManager.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/glib/ObjectManager.cs,v
retrieving revision 1.6
diff -u -w -r1.6 ObjectManager.cs
--- glib/ObjectManager.cs 5 Oct 2002 05:11:59 -0000 1.6
+++ glib/ObjectManager.cs 9 Oct 2002 04:22:47 -0000
@@ -12,7 +12,7 @@
=20
private static Hashtable types =3D new Hashtable ();
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern string gtksharp_get_type_name (IntPtr raw);
=20
public static GLib.Object CreateObject (IntPtr raw)
@@ -81,13 +81,13 @@
return expected_string;
}
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern int gtksharp_get_type_id (IntPtr raw);
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern int gtksharp_get_parent_type (int typ);
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern string gtksharp_get_type_name_for_id (int typ);
=20
static Type GetValidParentType (IntPtr raw)
Index: glib/SList.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/glib/SList.cs,v
retrieving revision 1.9
diff -u -w -r1.9 SList.cs
--- glib/SList.cs 1 Sep 2002 04:46:38 -0000 1.9
+++ glib/SList.cs 9 Oct 2002 04:22:47 -0000
@@ -19,7 +19,7 @@
=20
public class SList : ListBase {
=20
- [DllImport("glib-2.0")]
+ [DllImport(GLib.LibraryNames.GLIB_LIB)]
static extern IntPtr g_slist_copy (IntPtr l);
=09
public override object Clone ()
@@ -27,7 +27,7 @@
return new SList (g_slist_copy (Handle));
}
=09
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_slist_get_data (IntPtr l);
=09
internal override IntPtr GetData (IntPtr current)
@@ -35,7 +35,7 @@
return gtksharp_slist_get_data (current);
}
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_slist_get_next (IntPtr l);
=09
internal override IntPtr Next (IntPtr current)
@@ -43,7 +43,7 @@
return gtksharp_slist_get_next (current);
}
=20
- [DllImport("glib-2.0")]
+ [DllImport(GLib.LibraryNames.GLIB_LIB)]
static extern int g_slist_length (IntPtr l);
=09
internal override int Length (IntPtr list)
@@ -51,7 +51,7 @@
return g_slist_length (list);
}
=09
- [DllImport("glib-2.0")]
+ [DllImport(GLib.LibraryNames.GLIB_LIB)]
static extern void g_slist_free(IntPtr l);
=20
internal override void Free (IntPtr list)
Index: glib/Timeout.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/glib/Timeout.cs,v
retrieving revision 1.1
diff -u -w -r1.1 Timeout.cs
--- glib/Timeout.cs 6 Jun 2002 23:17:10 -0000 1.1
+++ glib/Timeout.cs 9 Oct 2002 04:22:47 -0000
@@ -32,7 +32,7 @@
=20
public class Timeout {
=20
- [DllImport("glib-2.0")]
+ [DllImport(GLib.LibraryNames.GLIB_LIB)]
static extern uint g_timeout_add (uint interval, TimeoutHandler d, IntPt=
r data);
=20
public static uint Add (uint interval, TimeoutHandler hndlr)
Index: glib/Value.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/glib/Value.cs,v
retrieving revision 1.18
diff -u -w -r1.18 Value.cs
--- glib/Value.cs 5 Oct 2002 05:11:59 -0000 1.18
+++ glib/Value.cs 9 Oct 2002 04:22:47 -0000
@@ -26,7 +26,7 @@
// Destructor is required since we are allocating unmanaged
// heap resources.
=20
- [DllImport("glib-2.0")]
+ [DllImport(GLib.LibraryNames.GLIB_LIB)]
static extern void g_free (IntPtr mem);
=20
~Value ()
@@ -37,10 +37,10 @@
=20
// import the glue function to allocate values on heap
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_value_create(TypeFundamentals type);
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_value_create_from_property(IntPtr obj, str=
ing name);
=20
// Constructor to wrap a raw GValue ref. We need the dummy param
@@ -78,7 +78,7 @@
_val =3D gtksharp_value_create_from_property (obj, prop_name);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_value_set_boolean (IntPtr val,
bool data);
=20
@@ -96,7 +96,7 @@
g_value_set_boolean (_val, val);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_value_set_boxed (IntPtr val, IntPtr data);
=20
/// <summary>
@@ -125,7 +125,7 @@
g_value_set_boxed (_val, val.Handle);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_value_set_double (IntPtr val, double data);
=20
/// <summary>
@@ -142,7 +142,7 @@
g_value_set_double (_val, val);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_value_set_float (IntPtr val, float data);
=20
/// <summary>
@@ -159,7 +159,7 @@
g_value_set_float (_val, val);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_value_set_int (IntPtr val, int data);
=20
/// <summary>
@@ -176,7 +176,7 @@
g_value_set_int (_val, val);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_value_set_object (IntPtr val, IntPtr data);
=20
/// <summary>
@@ -193,7 +193,7 @@
g_value_set_object (_val, val.Handle);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_value_set_pointer (IntPtr val, IntPtr data);
=20
/// <summary>
@@ -210,7 +210,7 @@
g_value_set_pointer (_val, val);=20
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_value_set_string (IntPtr val, string data);
=20
/// <summary>
@@ -227,7 +227,7 @@
g_value_set_string (_val, val);=20
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_value_set_uint (IntPtr val, uint data);
=20
/// <summary>
@@ -244,9 +244,9 @@
g_value_set_uint (_val, val);=20
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_value_set_enum (IntPtr val, int data);
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern void g_value_set_flags (IntPtr val, uint data);
=09
/// <summary>
@@ -266,7 +266,7 @@
g_value_set_enum (_val, (int) wrap);=20
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern bool g_value_get_boolean (IntPtr val);
=20
/// <summary>
@@ -286,7 +286,7 @@
return g_value_get_boolean (val._val);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern IntPtr g_value_get_boxed (IntPtr val);
=20
public static explicit operator GLib.Opaque (Value val)
@@ -309,7 +309,7 @@
return new GLib.Boxed (g_value_get_boxed (val._val));
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern double g_value_get_double (IntPtr val);
=20
/// <summary>
@@ -329,7 +329,7 @@
return g_value_get_double (val._val);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern float g_value_get_float (IntPtr val);
=20
/// <summary>
@@ -349,7 +349,7 @@
return g_value_get_float (val._val);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern int g_value_get_int (IntPtr val);
=20
/// <summary>
@@ -369,7 +369,7 @@
return g_value_get_int (val._val);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern IntPtr g_value_get_object (IntPtr val);
=20
/// <summary>
@@ -407,7 +407,7 @@
return new UnwrappedObject(g_value_get_object (val._val));
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern IntPtr g_value_get_pointer (IntPtr val);
=20
/// <summary>
@@ -427,7 +427,7 @@
return g_value_get_pointer (val._val);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern string g_value_get_string (IntPtr val);
=20
/// <summary>
@@ -447,7 +447,7 @@
return g_value_get_string (val._val);
}
=20
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern uint g_value_get_uint (IntPtr val);
=20
/// <summary>
@@ -467,9 +467,14 @@
return g_value_get_uint (val._val);
}
=20
- [DllImport("gobject-2.0")]
+ public static explicit operator ushort (Value val)
+ {
+ return (ushort) (uint) val;
+ }
+
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern int g_value_get_enum (IntPtr val);
- [DllImport("gobject-2.0")]
+ [DllImport(GLib.LibraryNames.GOBJECT_LIB)]
static extern uint g_value_get_flags (IntPtr val);
=20
/// <summary>
Index: gnome/CanvasItem.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gnome/CanvasItem.custom,v
retrieving revision 1.2
diff -u -w -r1.2 CanvasItem.custom
--- gnome/CanvasItem.custom 6 Aug 2002 15:52:32 -0000 1.2
+++ gnome/CanvasItem.custom 9 Oct 2002 04:22:47 -0000
@@ -17,7 +17,7 @@
Raw =3D gnome_canvas_item_new (group.Handle, type, IntPtr.Zero);
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_gnome_canvas_item_get_canvas (IntPtr i);
public Canvas Canvas {
get { return new Gnome.Canvas (gtksharp_gnome_canvas_item_get_canvas (thi=
s.Handle)); }
Index: gnome/CanvasPoints.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gnome/CanvasPoints.custom,v
retrieving revision 1.1
diff -u -w -r1.1 CanvasPoints.custom
--- gnome/CanvasPoints.custom 12 Aug 2002 19:14:43 -0000 1.1
+++ gnome/CanvasPoints.custom 9 Oct 2002 04:22:47 -0000
@@ -8,7 +8,7 @@
// This code is inserted after the automatically generated code.
//
=09
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern System.IntPtr
gtksharp_gnome_canvas_points_new_from_array (uint num_points, double[] coo=
rds);
=20
Index: gnome/Program.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gnome/Program.custom,v
retrieving revision 1.4
diff -u -w -r1.4 Program.custom
--- gnome/Program.custom 30 Jul 2002 23:02:11 -0000 1.4
+++ gnome/Program.custom 9 Oct 2002 04:22:47 -0000
@@ -17,7 +17,7 @@
public IntPtr value;
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern System.IntPtr
gtksharp_gnome_program_init (string app_id, string app_version, ref Module=
Info module, int argc, string[] argv, int nargs, PropertyArg[] args);
=20
Index: gtk/Adjustment.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/Adjustment.custom,v
retrieving revision 1.1
diff -u -w -r1.1 Adjustment.custom
--- gtk/Adjustment.custom 11 Aug 2002 22:48:00 -0000 1.1
+++ gtk/Adjustment.custom 9 Oct 2002 04:22:47 -0000
@@ -4,7 +4,7 @@
// This code is inserted after the automatically generated code.
//
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern void gtksharp_gtk_adjustment_set_bounds (IntPtr i, double lo=
wer, double upper, double step_increment, double page_increment, double pag=
e_size);
=20
/// <summary>Sets the Adjustment boundaries</summary>
Index: gtk/Application.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/Application.cs,v
retrieving revision 1.7
diff -u -w -r1.7 Application.cs
--- gtk/Application.cs 31 Aug 2002 20:37:52 -0000 1.7
+++ gtk/Application.cs 9 Oct 2002 04:22:47 -0000
@@ -23,7 +23,7 @@
=20
public class Application {
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern void gtk_init (int argc, IntPtr argv);
=20
public static void Init ()
@@ -31,7 +31,7 @@
gtk_init (0, new IntPtr(0));
}
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern void gtk_init (ref int argc, ref String[] argv);
=20
/// <summary>
@@ -48,7 +48,7 @@
gtk_init (ref argc, ref args);
}
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern void gtk_main ();
=20
/// <summary>
@@ -64,7 +64,7 @@
gtk_main ();
}
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern bool gtk_events_pending ();
=20
/// <summary>
@@ -80,7 +80,7 @@
return gtk_events_pending ();
}
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern void gtk_main_iteration ();
=20
/// <summary>
@@ -96,7 +96,7 @@
gtk_main_iteration ();
}
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern void gtk_main_quit ();
=20
/// <summary>
Index: gtk/ColorSelectionDialog.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/ColorSelectionDialog.custom,v
retrieving revision 1.2
diff -u -w -r1.2 ColorSelectionDialog.custom
--- gtk/ColorSelectionDialog.custom 13 Aug 2002 14:01:14 -0000 1.2
+++ gtk/ColorSelectionDialog.custom 9 Oct 2002 04:22:47 -0000
@@ -20,25 +20,25 @@
}
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_color_selection_dialog_get_colorsel (IntPtr =
i);
public Gtk.ColorSelection ColorSelection {
get { return new Gtk.ColorSelection (gtksharp_color_selection_dialo=
g_get_colorsel (this.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_color_selection_dialog_get_ok_button (IntPtr=
i);
public Gtk.Button OkButton {
get { return new Button (this, gtksharp_color_selection_dialog_get_=
ok_button (this.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_color_selection_dialog_get_cancel_button (In=
tPtr i);
public Gtk.Button CancelButton {
get { return new Button (this, gtksharp_color_selection_dialog_get_=
cancel_button (this.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_color_selection_dialog_get_help_button (IntP=
tr i);
public Gtk.Button HelpButton {
get { return new Button (this, gtksharp_color_selection_dialog_get_=
help_button (this.Handle)); }
Index: gtk/Dialog.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/Dialog.custom,v
retrieving revision 1.1
diff -u -w -r1.1 Dialog.custom
--- gtk/Dialog.custom 11 Jul 2002 13:18:36 -0000 1.1
+++ gtk/Dialog.custom 9 Oct 2002 04:22:47 -0000
@@ -8,13 +8,13 @@
// This code is inserted after the automatically generated code.
//
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_dialog_get_vbox (IntPtr i);
public Gtk.VBox VBox {
get { return new Gtk.VBox (gtksharp_dialog_get_vbox (this.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_dialog_get_action_area (IntPtr i);
public Gtk.VBox ActionArea {
get { return new Gtk.VBox (gtksharp_dialog_get_action_area (this.Handle))=
; }
Index: gtk/FileSelection.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/FileSelection.custom,v
retrieving revision 1.5
diff -u -w -r1.5 FileSelection.custom
--- gtk/FileSelection.custom 4 Oct 2002 18:52:03 -0000 1.5
+++ gtk/FileSelection.custom 9 Oct 2002 04:22:47 -0000
@@ -21,73 +21,73 @@
}
}
=09
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_dir_list (IntPtr i);
public Gtk.TreeView DirList {
get { return new Gtk.TreeView (gtksharp_file_selection_get_dir_list (this=
.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_file_list (IntPtr i);
public Gtk.TreeView FileList {
get { return new Gtk.TreeView (gtksharp_file_selection_get_file_list (thi=
s.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_selection_entry (IntPtr i=
);
public Gtk.Entry SelectionEntry {
get { return new Gtk.Entry (gtksharp_file_selection_get_selection_entry (=
this.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_selection_text (IntPtr i)=
;
public Gtk.Label SelectionText {
get { return new Gtk.Label (gtksharp_file_selection_get_selection_text (t=
his.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_ok_button (IntPtr i);
public Gtk.Button OkButton {
get { return new Button (this, gtksharp_file_selection_get_ok_button (thi=
s.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_cancel_button (IntPtr i);
public Gtk.Button CancelButton {
get { return new Button (this, gtksharp_file_selection_get_cancel_button =
(this.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_help_button (IntPtr i);
public Gtk.Button HelpButton {
get { return new Button (this, gtksharp_file_selection_get_help_button (t=
his.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_history_pulldown (IntPtr =
i);
public Gtk.OptionMenu HistoryPulldown {
get { return new Gtk.OptionMenu (gtksharp_file_selection_get_history_pull=
down (this.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_history_menu (IntPtr i);
public Gtk.Menu HistoryMenu {
get { return new Gtk.Menu (gtksharp_file_selection_get_history_menu (this=
.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_fileop_dialog (IntPtr i);
public Gtk.MessageDialog FileopDialog {
get { return new Gtk.MessageDialog (gtksharp_file_selection_get_fileop_di=
alog (this.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_fileop_entry (IntPtr i);
public Gtk.Entry FileopEntry {
get { return new Gtk.Entry (gtksharp_file_selection_get_fileop_entry (thi=
s.Handle)); }
}
=20
-[DllImport("gtksharpglue", CallingConvention=3DCallingConvention.Cdecl)]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB, CallingConvention=3DCalling=
Convention.Cdecl)]
static extern string gtksharp_file_selection_get_fileop_file (IntPtr i);
public string FileopFile {
get {
@@ -95,31 +95,31 @@
}
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_fileop_c_dir (IntPtr i);
public Gtk.Button FileopCDir {
get { return new Button (this, gtksharp_file_selection_get_fileop_c_dir(t=
his.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_fileop_del_file (IntPtr i=
);
public Gtk.Button FileopDelFile {
get { return new Button (this, gtksharp_file_selection_get_fileop_del_fil=
e (this.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_fileop_ren_file (IntPtr i=
);
public Gtk.Button FileopRenFile {
get { return new Button (this, gtksharp_file_selection_get_fileop_ren_fil=
e (this.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_button_area (IntPtr i);
public Gtk.HButtonBox ButtonArea {
get { return new Gtk.HButtonBox (gtksharp_file_selection_get_button_area =
(this.Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_file_selection_get_action_area (IntPtr i);
public new Gtk.HButtonBox ActionArea {
get { return new Gtk.HButtonBox (gtksharp_file_selection_get_action_area =
(this.Handle)); }
Index: gtk/ListStore.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/ListStore.custom,v
retrieving revision 1.1
diff -u -w -r1.1 ListStore.custom
--- gtk/ListStore.custom 10 Aug 2002 23:40:20 -0000 1.1
+++ gtk/ListStore.custom 9 Oct 2002 04:22:47 -0000
@@ -6,7 +6,7 @@
//
// This code is inserted after the automatically generated code.
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.Tre=
eIter iter, IntPtr parent);
public bool IterChildren (out Gtk.TreeIter iter) {
bool raw_ret =3D gtk_tree_model_iter_children (Handle, out iter, IntPtr=
.Zero);
@@ -14,7 +14,7 @@
return ret;
}
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern int gtk_tree_model_iter_n_children (IntPtr raw, IntPtr ite=
r);
public int IterNChildren () {
int raw_ret =3D gtk_tree_model_iter_n_children (Handle, IntPtr.Zero);
@@ -22,7 +22,7 @@
return ret;
}
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern bool gtk_tree_model_iter_nth_child (IntPtr raw, out Gtk.Tr=
eeIter iter, IntPtr parent, int n);
public bool IterNthChild (out Gtk.TreeIter iter, int n) {
bool raw_ret =3D gtk_tree_model_iter_nth_child (Handle, out iter, IntPt=
r.Zero, n);
Index: gtk/MessageDialog.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/MessageDialog.custom,v
retrieving revision 1.1
diff -u -w -r1.1 MessageDialog.custom
--- gtk/MessageDialog.custom 2 Oct 2002 19:38:43 -0000 1.1
+++ gtk/MessageDialog.custom 9 Oct 2002 04:22:47 -0000
@@ -1,4 +1,4 @@
-[DllImport ("gtk-x11-2.0")]
+[DllImport(GLib.LibraryNames.GTK_LIB)]
static extern IntPtr gtk_message_dialog_new (IntPtr parent_window, DialogF=
lags flags, MessageType type, ButtonsType bt, string msg, params object [] =
args);
=20
public MessageDialog (Gtk.Window parent_window, DialogFlags flags, Message=
Type type, ButtonsType bt, string msg)
Index: gtk/Object.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/Object.custom,v
retrieving revision 1.2
diff -u -w -r1.2 Object.custom
--- gtk/Object.custom 12 Sep 2002 05:21:16 -0000 1.2
+++ gtk/Object.custom 9 Oct 2002 04:22:47 -0000
@@ -7,7 +7,7 @@
// This code is inserted after the automatically generated code.
=20
=20
- [DllImport("gtksharpglue")]
+ [DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern void gtksharp_object_unref_if_floating (IntPtr raw);
=20
protected override void DisposeNative ()
Index: gtk/Paned.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/Paned.custom,v
retrieving revision 1.1
diff -u -w -r1.1 Paned.custom
--- gtk/Paned.custom 19 Jul 2002 07:54:33 -0000 1.1
+++ gtk/Paned.custom 9 Oct 2002 04:22:47 -0000
@@ -8,14 +8,14 @@
// This code is inserted after the automatically generated code.
//
=20
-[DllImport ("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_paned_get_child1 (IntPtr i);
=20
public Gtk.Widget Child1 {
get { return new Widget (gtksharp_paned_get_child1 (this.Handle)); =
}
}
=20
-[DllImport ("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_paned_get_child2 (IntPtr i);
=20
public Gtk.Widget Child2 {
Index: gtk/Style.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/Style.custom,v
retrieving revision 1.3
diff -u -w -r1.3 Style.custom
--- gtk/Style.custom 8 Oct 2002 07:48:43 -0000 1.3
+++ gtk/Style.custom 9 Oct 2002 04:22:47 -0000
@@ -17,21 +17,21 @@
return ret;
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_gtk_style_get_white_gc (IntPtr style);
=20
public Gdk.GC WhiteGC {
get { return EnsureGC (gtksharp_gtk_style_get_white_gc (Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_gtk_style_get_black_gc (IntPtr style);
=20
public Gdk.GC BlackGC {
get { return EnsureGC (gtksharp_gtk_style_get_black_gc (Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_gtk_style_get_fg_gc (IntPtr style, int i);
=20
public Gdk.GC ForegroundGC (StateType state)
@@ -51,7 +51,7 @@
}
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_gtk_style_get_bg_gc (IntPtr style, int i);
=20
public Gdk.GC BackgroundGC (StateType state)
@@ -71,21 +71,21 @@
}
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_gtk_style_get_white (IntPtr style);
=20
public Gdk.Color White {
get { return Gdk.Color.New (gtksharp_gtk_style_get_white (Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_gtk_style_get_black (IntPtr style);
=20
public Gdk.Color Black {
get { return Gdk.Color.New (gtksharp_gtk_style_get_black (Handle)); }
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_gtk_style_get_bg (IntPtr style, int i);
=20
public Gdk.Color Background (StateType state)
@@ -105,7 +105,7 @@
}
}
=20
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_gtk_style_get_fg (IntPtr style, int i);
=20
public Gdk.Color Foreground (StateType state)
@@ -125,9 +125,9 @@
}
}
=20
-[DllImport ("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern int gtksharp_gtk_style_get_thickness (IntPtr style, int x_ax=
is);
-[DllImport ("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern void gtksharp_gtk_style_set_thickness (IntPtr style, int val=
ue);
=20
public int XThickness {
Index: gtk/Table.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/Table.custom,v
retrieving revision 1.2
diff -u -w -r1.2 Table.custom
--- gtk/Table.custom 25 Aug 2002 05:51:21 -0000 1.2
+++ gtk/Table.custom 9 Oct 2002 04:22:47 -0000
@@ -1,4 +1,4 @@
-public Table()
-{
- Raw =3D gtk_table_new (0, 0, false);
-}
+//public Table()
+//{
+// Raw =3D gtk_table_new (0, 0, false);
+//}
Index: gtk/ThreadNotify.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/ThreadNotify.cs,v
retrieving revision 1.1
diff -u -w -r1.1 ThreadNotify.cs
--- gtk/ThreadNotify.cs 17 Aug 2002 19:53:51 -0000 1.1
+++ gtk/ThreadNotify.cs 9 Oct 2002 04:22:47 -0000
@@ -16,7 +16,7 @@
// <summary>
// This delegate will be invoked on the main Gtk thread.
// </summary>
- delegate void ReadyEvent ();
+ public delegate void ReadyEvent ();
=20
/// <summary>
/// Utility class to help writting multi-threaded Gtk applications
@@ -28,7 +28,7 @@
//
// DllImport functions from Gtk
//
- [DllImport ("gtk-x11-2.0")]
+ [DllImport (GLib.LibraryNames.GTK_LIB)]
public static extern int gdk_input_add (int s, int cond, GdkInputFunctio=
n f, IntPtr data);
public delegate void GdkInputFunction (IntPtr data, int source, int cond=
);
=20
Index: gtk/TreeModelSort.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/TreeModelSort.custom,v
retrieving revision 1.1
diff -u -w -r1.1 TreeModelSort.custom
--- gtk/TreeModelSort.custom 10 Aug 2002 23:40:20 -0000 1.1
+++ gtk/TreeModelSort.custom 9 Oct 2002 04:22:47 -0000
@@ -6,7 +6,7 @@
//
// This code is inserted after the automatically generated code.
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.Tre=
eIter iter, IntPtr parent);
public bool IterChildren (out Gtk.TreeIter iter) {
bool raw_ret =3D gtk_tree_model_iter_children (Handle, out iter, IntPtr=
.Zero);
@@ -14,7 +14,7 @@
return ret;
}
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern int gtk_tree_model_iter_n_children (IntPtr raw, IntPtr ite=
r);
public int IterNChildren () {
int raw_ret =3D gtk_tree_model_iter_n_children (Handle, IntPtr.Zero);
@@ -22,7 +22,7 @@
return ret;
}
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern bool gtk_tree_model_iter_nth_child (IntPtr raw, out Gtk.Tr=
eeIter iter, IntPtr parent, int n);
public bool IterNthChild (out Gtk.TreeIter iter, int n) {
bool raw_ret =3D gtk_tree_model_iter_nth_child (Handle, out iter, IntPt=
r.Zero, n);
Index: gtk/TreeStore.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/TreeStore.custom,v
retrieving revision 1.1
diff -u -w -r1.1 TreeStore.custom
--- gtk/TreeStore.custom 10 Aug 2002 23:40:20 -0000 1.1
+++ gtk/TreeStore.custom 9 Oct 2002 04:22:47 -0000
@@ -15,7 +15,7 @@
/// Appends a row to the root level of the TreeStore.
/// </remarks>
=20
- [DllImport ("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern void gtk_tree_store_append (IntPtr raw, out Gtk.TreeIter i=
ter, IntPtr parent);
=20
public void Append (out Gtk.TreeIter iter) {
@@ -31,7 +31,7 @@
/// the given position.
/// </remarks>
=20
- [DllImport ("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern void gtk_tree_store_insert (IntPtr raw, out Gtk.TreeIter i=
ter, IntPtr parent, int position);
=20
public void Insert (out Gtk.TreeIter iter, int position) {
@@ -46,7 +46,7 @@
/// Prepends a row to the root level of the TreeStore.
/// </remarks>
=20
- [DllImport ("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern void gtk_tree_store_prepend (IntPtr raw, out Gtk.TreeIter =
iter, IntPtr parent);
=20
public void Prepend (out Gtk.TreeIter iter) {
@@ -62,7 +62,7 @@
/// given sibling.
/// </remarks>
=20
- [DllImport ("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern void gtk_tree_store_insert_before (IntPtr raw, out Gtk.Tre=
eIter iter, IntPtr parent, ref Gtk.TreeIter sibling);
=20
public void InsertBefore (out Gtk.TreeIter iter, Gtk.TreeIter sibling) {
@@ -78,7 +78,7 @@
/// given sibling.
/// </remarks>
=20
- [DllImport ("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern void gtk_tree_store_insert_after (IntPtr raw, out Gtk.Tree=
Iter iter, IntPtr parent, ref Gtk.TreeIter sibling);
=20
public void InsertAfter (out Gtk.TreeIter iter, Gtk.TreeIter sibling) {
@@ -86,7 +86,7 @@
}
=20
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.Tre=
eIter iter, IntPtr parent);
public bool IterChildren (out Gtk.TreeIter iter) {
bool raw_ret =3D gtk_tree_model_iter_children (Handle, out iter, IntPtr=
.Zero);
@@ -94,7 +94,7 @@
return ret;
}
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern int gtk_tree_model_iter_n_children (IntPtr raw, IntPtr ite=
r);
public int IterNChildren () {
int raw_ret =3D gtk_tree_model_iter_n_children (Handle, IntPtr.Zero);
@@ -102,7 +102,7 @@
return ret;
}
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern bool gtk_tree_model_iter_nth_child (IntPtr raw, out Gtk.Tr=
eeIter iter, IntPtr parent, int n);
public bool IterNthChild (out Gtk.TreeIter iter, int n) {
bool raw_ret =3D gtk_tree_model_iter_nth_child (Handle, out iter, IntPt=
r.Zero, n);
Index: gtk/TreeView.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/TreeView.custom,v
retrieving revision 1.4
diff -u -w -r1.4 TreeView.custom
--- gtk/TreeView.custom 4 Oct 2002 16:38:47 -0000 1.4
+++ gtk/TreeView.custom 9 Oct 2002 04:22:47 -0000
@@ -7,10 +7,10 @@
// This code is inserted after the automatically generated code.
=20
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern IntPtr gtk_tree_view_get_model (IntPtr raw);
=20
- [DllImport("gtk-x11-2.0")]
+ [DllImport(GLib.LibraryNames.GTK_LIB)]
static extern IntPtr gtk_tree_view_set_model (IntPtr raw, IntPtr raw_mod=
el);
=20
/// <summary>Model Property</summary>
Index: gtk/Widget.custom
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/gtk/Widget.custom,v
retrieving revision 1.2
diff -u -w -r1.2 Widget.custom
--- gtk/Widget.custom 24 Sep 2002 03:21:37 -0000 1.2
+++ gtk/Widget.custom 9 Oct 2002 04:22:47 -0000
@@ -8,7 +8,7 @@
// This code is inserted after the automatically generated code.
//
=09
-[DllImport("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_gtk_widget_get_allocation (IntPtr style);
=20
public Gdk.Rectangle Allocation {
@@ -16,7 +16,7 @@
}
=20
=20
-[DllImport ("gtksharpglue")]
+[DllImport(GLib.LibraryNames.GTKSHARPGLUE_LIB)]
static extern IntPtr gtksharp_gtk_widget_get_window (IntPtr widget);
public Gdk.Window GdkWindow {
get {
Index: sources/gtk-sharp.sources
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/public/gtk-sharp/sources/gtk-sharp.sources,v
retrieving revision 1.3
diff -u -r1.3 gtk-sharp.sources
--- sources/gtk-sharp.sources 11 Sep 2002 09:43:17 -0000 1.3
+++ sources/gtk-sharp.sources 9 Oct 2002 04:32:48 -0000
@@ -1,13 +1,13 @@
-atk-1.0.2/atk Atk atk-1.0=20
-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
-libgnome-2.0.1/libgnome Gnome gnome-2
-libgnomecanvas-2.0.1/libgnomecanvas Gnome gnomecanvas-2
-libgnomeui-2.0.1/libgnomeui Gnome gnomeui-2
-gtkhtml/src Gtk gtkhtml-3.0
-libglade-2.0.0/glade Glade glade-2.0
-libart_lgpl-2.3.10 Art art_lgpl
-libgda-0.8.193/libgda Gda gda-2
-libgnomedb-0.8.193/libgnomedb GnomeDb gnomedb-2
+atk-1.0.2/atk Atk GLib.LibraryNames.ATK_LIB
+pango-1.0.3/pango Pango GLib.LibraryNames.PANGO_LIB
+gtk+-2.0.5/gdk Gdk GLib.LibraryNames.GDK_LIB
+gtk+-2.0.5/gdk-pixbuf Gdk GLib.LibraryNames.GDK_PIXBUF_LIB
+gtk+-2.0.5/gtk Gtk GLib.LibraryNames.GTK_LIB
+libgnome-2.0.1/libgnome Gnome GLib.LibraryNames.GNOME_LIB
+libgnomecanvas-2.0.1/libgnomecanvas Gnome GLib.LibraryNames.GNOME_CANVAS_L=
IB
+libgnomeui-2.0.1/libgnomeui Gnome GLib.LibraryNames.GNOMEUI_LIB
+gtkhtml/src Gtk GLib.LibraryNames.GTKHTML_LIB
+libglade-2.0.0/glade Glade GLib.LibraryNames.GLADE_LIB
+libart_lgpl-2.3.10 Art GLib.LibraryNames.ART_LIB
+libgda-0.8.193/libgda Gda GLib.LibraryNames.GDA_LIB
+libgnomedb-0.8.193/libgnomedb GnomeDb GLib.LibraryNames.GNOMEDB_LIB
--=-UxtgJJ6Vg97ArXHB24Zg--