ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-01-10 22:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge to HEAD of jeroen and friends' work on the 2-4 branch. HEAD

Browse source 
is now tracking Gnome 2.6.

svn path=/trunk/gtk-sharp/; revision=35479
This commit is contained in:
Mike Kestner 2004-10-29 20:33:07 +00:00
parent 764b8ac5d8
commit 7f3171c814
239 changed files with 14573 additions and 1410 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

558
ChangeLog
View file

@ -48,6 +48,27 @@
* gdk/Pixmap.custom : add overloads for *CreateFromXPM* methods which * gdk/Pixmap.custom : add overloads for *CreateFromXPM* methods which
default transparency mask and color. default transparency mask and color.
2004-10-07 Todd Berman <tberman@off.net>
* gtk/Gtk.metadata: Mark ComboBox.GetActiveIter as an out param.
2004-10-06 John Luke <john.luke@gmail.com>
* gtk/Action.custom: add overload for string, string, null, null
* gtk/UIManager.custom: add overload to get the UI from a resource
* gtk/Makefile.am: add the 2 new custom files
* sample/Action.cs: remove using GtkSharp, make ui_info const, quit on Quit
2004-10-05 Todd Berman <tberman@off.net>
* gtk/ComboBox.custom: Add SetCellDataFunc to allow you to set a
CellLayoutDataFunc on a ComboBox.
2004-10-05 Todd Berman <tberman@off.net>
* gtk/ComboBox.custom: new file, to allow get/set access to 'model'.
* gtk/Makefile.am: add ComboBox.custom.
2004-10-05 Mike Kestner <mkestner@ximian.com> 2004-10-05 Mike Kestner <mkestner@ximian.com>
* gtk/Gtk.metadata : hide Selection.GetTargets. * gtk/Gtk.metadata : hide Selection.GetTargets.
@ -55,6 +76,15 @@
Target, and Type field accessors. Target, and Type field accessors.
* gtk/glue/selectiondata.c : field accessor glue. * gtk/glue/selectiondata.c : field accessor glue.
2004-10-04 Todd Berman <tberman@off.net>
* Merge forward patch from Miguel to fix delegate marshalling in
1.1.1. Original Changelog follows
2004-10-04 Todd Berman <tberman@off.net>
* */*.pc.in: Fix the Requires to use -2.0
2004-09-29 Mike Kestner <mkestner@ximian.com> 2004-09-29 Mike Kestner <mkestner@ximian.com>
* gtk/Gtk.metadata : hide some ellipsis methods, add pass_as attrs. * gtk/Gtk.metadata : hide some ellipsis methods, add pass_as attrs.
@ -101,18 +131,13 @@
* glib/Source.cs: Add new base class to hold the method to be * glib/Source.cs: Add new base class to hold the method to be
called, and the proxy handler we use to keep references to them called, and the proxy handler we use to keep references to them
and avoid a collection. and avoid a collection.
Exposes a new variables that references all the active Timeouts Exposes a new variables that references all the active Timeouts
and Idle handlers to avoid collection/ and Idle handlers to avoid collection/
* glib/Timeout.cs: Implement TimeoutProxy that acts as a filter to * glib/Timeout.cs: Implement TimeoutProxy that acts as a filter to
remove the proxy when the timeout is removed. remove the proxy when the timeout is removed.
Register a TimeoutProxy when we create a timeout. Register a TimeoutProxy when we create a timeout.
* glib/Idle.cs: Implement IdleProxy that acts as a filter to * glib/Idle.cs: Implement IdleProxy that acts as a filter to
remove the proxy when the idle handler is removed. remove the proxy when the idle handler is removed.
Register an IdleProxy when we create a timeout. Register an IdleProxy when we create a timeout.
2004-09-17 Mike Kestner <mkestner@ximian.com> 2004-09-17 Mike Kestner <mkestner@ximian.com>
@ -171,6 +196,22 @@
gchar* to const-gchar*, so we do not try to modify it (call gfree). gchar* to const-gchar*, so we do not try to modify it (call gfree).
[Fixes #64421] [Fixes #64421]
2004-08-27 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gnomevfs/Async.cs: Add Priority enum. Add methods which take an Uri
object (similar to Sync methods).
* gnomevfs/Vfs.cs: Add Truncate bindings.
* gnomevfs/VfsStream.cs: Major fixes. Don't use the AsyncWaitHandle for
blocking until an operation has finished. Fix (a)sync reading & writing.
You either use sync/async throughout the code. Can't mix sync and async
gnome-vfs method calls (different Handle objects).
* gnomevfs/VfsStreamAsyncResult.cs: Throw NotSupportedException when
AsyncWaitHandle property is accessed.
* sample/gnomevfs/Makefile.am: New test programs.
* sample/gnomevfs/TestAsync.cs:
* sample/gnomevfs/TestAsyncStream.cs:
* sample/gnomevfs/TestSyncStream.cs:
2004-08-26 Manuel V. Santos <mvsl@telefonica.net> 2004-08-26 Manuel V. Santos <mvsl@telefonica.net>
* gdk/Device.custom : glue to expose object fields. * gdk/Device.custom : glue to expose object fields.
@ -225,7 +266,6 @@
* gdk/PixbufLoader.custom: add Write () overload * gdk/PixbufLoader.custom: add Write () overload
[Fixes #62681] [Fixes #62681]
2004-08-24 Larry Ewing <lewing@ximian.com> 2004-08-24 Larry Ewing <lewing@ximian.com>
* gdk/Pixbuf.custom : add RenderThresholdAlpha overload which defaults * gdk/Pixbuf.custom : add RenderThresholdAlpha overload which defaults
@ -238,6 +278,22 @@
and mark the old int filled overload Obsolete. and mark the old int filled overload Obsolete.
[Fixes #60702] [Fixes #60702]
2004-08-23 Todd Berman <tberman@off.net>
* panelapplet/BonoboUIVerb.cs:
* panelapplet/ContextMenuItem.cs:
* panelapplet/Makefile.am:
* panelapplet/PanelApplet.custom: Remove the ContextMenuItem and the
need for the glue. Add BonoboUIVerb to directly call the setup_menu
function. Leave the glue library for now, as I think getting the
proper orientation stuff setup will require some glue work.
* sample/panelapplet/testapplet.cs: Update sample to reflect new
api. Need to make this installable.
2004-08-22 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gnomevfs/Makefile.am: Remove ADDITIONAL_API variable.
2004-08-20 Mike Kestner <mkestner@ximian.com> 2004-08-20 Mike Kestner <mkestner@ximian.com>
* atk/Atk.metadata : mark an array param on Relation ctor. * atk/Atk.metadata : mark an array param on Relation ctor.
@ -248,6 +304,15 @@
* gtk/TextBuffer.custom : pass -1 for the text length to some * gtk/TextBuffer.custom : pass -1 for the text length to some
more methods. more methods.
2004-08-19 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gnomevfs/Makefile.am: Add Monitor.cs.
* gnomevfs/Monitor.cs: New custom class wrapping the gnome_vfs_monitor_*
methods.
* sample/gnomevfs/Makefile.am: Added TestMonitor.cs.
* sample/gnomevfs/TestMonitor.cs: Test case for using the new Monitor
class.
2004-08-18 John Luke <john.luke@gmail.com> 2004-08-18 John Luke <john.luke@gmail.com>
* AUTHORS: fix my name * AUTHORS: fix my name
@ -276,6 +341,11 @@
* glib/Marshaller.cs : some gunichar marshal-fu. * glib/Marshaller.cs : some gunichar marshal-fu.
* glib/glue/unichar.c : a new glue method. * glib/glue/unichar.c : a new glue method.
2004-08-14 Todd Berman <tberman@off.net>
* gnomevfs/VfsStream.cs: if ErrorEof is returned in Read, return 0
instead of throwing an exception.
2004-08-13 John Luke <john.luke@gmail.com> 2004-08-13 John Luke <john.luke@gmail.com>
* gtk/Gtk.metadata: mark Gtk.StockManager.Lookup param as ref * gtk/Gtk.metadata: mark Gtk.StockManager.Lookup param as ref
@ -289,6 +359,44 @@
Adapted from a patch by borsanza@yahoo.es (Borja Sanchez Zamorano). Adapted from a patch by borsanza@yahoo.es (Borja Sanchez Zamorano).
[Fixes #62985] [Fixes #62985]
2004-08-10 Todd Berman <tberman@off.net>
* gnomevfs/AssemblyInfo.cs.in: use the .snk, not the .pub.
2004-08-10 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* glib/MainLoop.cs:
* gnomevfs/.cvsignore:
* gnomevfs/Async.cs:
* gnomevfs/FileInfo.cs:
* gnomevfs/Gnomevfs.metadata:
* gnomevfs/Makefile.am:
* gnomevfs/MimeType.cs:
* gnomevfs/Sync.cs:
* gnomevfs/Uri.custom:
* gnomevfs/VfsStream.cs:
* gnomevfs/VfsStreamAsyncResult.cs:
* gnomevfs/VolumeMonitor.custom:
* gnomevfs/Xfer.cs:
* gnomevfs/XferProgressCallback.cs:
* gnomevfs/XferProgressCallbackNative.cs:
* gnomevfs/filesize.diff:
* gnomevfs/gnomevfs-api.raw:
* sample/gnomevfs/.cvsignore:
* sample/gnomevfs/Makefile.am:
* sample/gnomevfs/TestInfo.cs:
* sample/gnomevfs/TestMime.cs:
* sample/gnomevfs/TestSync.cs:
* sample/gnomevfs/TestSyncCreate.cs:
* sample/gnomevfs/TestSyncWrite.cs:
* sample/gnomevfs/TestUnlink.cs:
* sample/gnomevfs/TestVolumes.cs:
* sample/gnomevfs/TestXfer.cs:
Commit new gnomevfs files and samples. Also the GLib.MainLoop addition
for programs which don't want to use Gtk.Application.Run (), but still
use the GLib main loop.
2004-08-04 Raja R Harinath <rharinath@novell.com> 2004-08-04 Raja R Harinath <rharinath@novell.com>
* configure.in (GTKHTML): Use SOVERSION=11 for GtkHTML 3.1.18. * configure.in (GTKHTML): Use SOVERSION=11 for GtkHTML 3.1.18.
@ -298,6 +406,10 @@
* parser/gapi2xml.pl : char const * fixes for clahey's gsf binding. * parser/gapi2xml.pl : char const * fixes for clahey's gsf binding.
2004-07-28 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* */*: merge from HEAD again.
2004-07-24 Mike Kestner <mkestner@ximian.com> 2004-07-24 Mike Kestner <mkestner@ximian.com>
* gdk/Gdk.metadata : hide Window.Destroy. * gdk/Gdk.metadata : hide Window.Destroy.
@ -308,6 +420,11 @@
* glib/Value.cs : allow null for ctor(GLib.Object). * glib/Value.cs : allow null for ctor(GLib.Object).
2004-07-18 Todd Berman <tberman@off.net>
* panelapplet/Makefile.am: We dont actually use gnome-sharp.dll, remove
it.
2004-07-16 John Luke <jluke@cfl.rr.com> 2004-07-16 John Luke <jluke@cfl.rr.com>
* gtk/Gtk.metadata: * gtk/Gtk.metadata:
@ -323,10 +440,133 @@
Remove unnessesary disabledefaultconstructor Remove unnessesary disabledefaultconstructor
* gnome/PrintJob.custom: Change ctor to an overload ctor * gnome/PrintJob.custom: Change ctor to an overload ctor
2004-07-11 Todd Berman <tberman@off.net>
* panelapplet/ContextMenuItem.cs: New struct to hold context menu
item information.
* panelapplet/Makefile.am: added new file.
* panelapplet/PanelApplet.custom: add glue accessor to set the context
menu.
* panelapplet/glue/panelapplet.c: new glue functionality to setup a
context menu.
* sample/panelapplet/testapplet.cs: expand sample to show context menu
code.
2004-07-10 Todd Berman <tberman@off.net>
* panelapplet/panelapplet-sharp-2.0.pc.in: fix path.
2004-07-09 Mike Kestner <mkestner@ximian.com> 2004-07-09 Mike Kestner <mkestner@ximian.com>
* gdk/Gdk.metadata : mark gc param of Drawable.DrawPixbuf null_ok. * gdk/Gdk.metadata : mark gc param of Drawable.DrawPixbuf null_ok.
2004-07-09 Todd Berman <tberman@off.net>
* Makefile.am:
* configure.in:
Add panelapplet stuff to configure.in and the subdirs.
* generator/ClassBase.cs:
* generator/ObjectGen.cs:
Add a new attribute 'abstract' to allow a class to be defined to be
abstract. PanelApplet.PanelApplet uses this.
* panelapplet/.cvsignore:
* panelapplet/AppletFactory.cs:
* panelapplet/AssemblyInfo.cs.in:
* panelapplet/Makefile.am:
* panelapplet/PanelApplet.cs:
* panelapplet/PanelApplet.custom:
* panelapplet/PanelApplet.metadata:
* panelapplet/panelapplet-api.raw:
* panelapplet/panelapplet-sharp-2.0.pc.in:
* panelapplet/panelapplet-sharp.dll.config.in:
* panelapplet/glue/.cvsignore:
* panelapplet/glue/Makefile.am:
* panelapplet/glue/panelapplet.c:
Initial import of the panelapplet code. This code is largely
untested, and will need a good amount of glue. For sure glue code is
needed for the context menu items.
* sample/panelapplet/CSharpTestApplet_Factory.server:
* sample/panelapplet/monodoc.png:
* sample/panelapplet/testapplet.cs:
A small testcase for the panelapplet. There is no makefile yet, and
the server needs some help as it uses an absolute path that will only
work on my box. When I get back to Toronto (so some point this weekend)
I will fix this code to build/install properly and add a README file
to help with any potential issues.
* sources/Makefile.am:
* sources/gtk-sharp-sources.xml:
Add the panelapplet-sharp stuff to the build here.
2004-07-06 Todd Berman <tberman@off.net>
* sources/gtk_tree_model_signal_fix.patch: duh, this is the real patch.
2004-07-06 Todd Berman <tberman@off.net>
* sources/Makefile.am:
* sources/gtk_tree_model_signal_fix.patch: a new hacky patch to fix
the signal generation on the tree model structs.
* */*-api.raw: regen.
* glib/Object.cs: merge forward a small patch.
2004-07-06 Todd Berman <tberman@off.net>
* Makefile.am:
* configure.in:
* gtk-sharp-2.0.pc.in:
* gtk-sharp.pc.in:
* art/.cvsignore:
* art/Makefile.am:
* art/art-sharp-2.0.pc.in:
* art/art-sharp.pc.in:
* gconf/GConf/.cvsignore:
* gconf/GConf/Makefile.am:
* gconf/GConf/gconf-sharp-2.0.pc.in:
* gconf/GConf/gconf-sharp.pc.in:
* gda/.cvsignore:
* gda/Makefile.am:
* gda/gda-sharp-2.0.pc.in:
* gda/gda-sharp.pc.in:
* glade/.cvsignore:
* glade/Makefile.am:
* glade/glade-sharp-2.0.pc.in:
* glade/glade-sharp.pc.in:
* gnome/.cvsignore:
* gnome/Makefile.am:
* gnome/gnome-sharp-2.0.pc.in:
* gnome/gnome-sharp.pc.in:
* gnomedb/.cvsignore:
* gnomedb/Makefile.am:
* gnomedb/gnomedb-sharp-2.0.pc.in:
* gnomedb/gnomedb-sharp.pc.in:
* gnomevfs/.cvsignore:
* gnomevfs/gnome-vfs-sharp-2.0.pc.in:
* gnomevfs/gnome-vfs-sharp.pc.in:
* gtkhtml/.cvsignore:
* gtkhtml/Makefile.am:
* gtkhtml/gtkhtml-sharp-2.0.pc.in:
* gtkhtml/gtkhtml-sharp.pc.in:
* rsvg/.cvsignore:
* rsvg/Makefile.am:
* rsvg/rsvg-sharp-2.0.pc.in:
* rsvg/rsvg-sharp.pc.in:
* sample/rsvg/Makefile.am:
* vte/.cvsignore:
* vte/Makefile.am:
* vte/vte-sharp-2.0.pc.in:
* vte/vte-sharp.pc.in:
Make gtk-sharp-2.0 parallel installable with gtk-sharp. Now you can
install both and do -pkg:gtk-sharp-2.0 or similar to compile against
the gtk-sharp-2.0 assemblies.
Basically this change comprised some small configure.in changes to
change the $(PACKAGE) to gtk-sharp-2.0, and check for the appropriate
versions of the gnome 2.6 based libraries.
Also, every .pc file was renamed -2.0.pc to allow for the parallel
install, and the .cvsignore and Makefile.am rules were updated to
reflect this change.
2004-07-05 John Luke <jluke@cfl.rr.com> 2004-07-05 John Luke <jluke@cfl.rr.com>
* sample/VteTest.cs: improve the scrolling in the sample * sample/VteTest.cs: improve the scrolling in the sample
@ -366,26 +606,32 @@
* configure.in : tag and bump version to 0.99. * configure.in : tag and bump version to 0.99.
2004-06-22 Mike Kestner <mkestner@ximian.com>
* configure.in : GLIB check for gobject, not glib.
2004-06-23 Todd Berman <tberman@off.net> 2004-06-23 Todd Berman <tberman@off.net>
* doc/*/*.xml: s/GtkSharp.SignalArgs/GLib.SignalArgs/; * doc/*/*.xml: s/GtkSharp.SignalArgs/GLib.SignalArgs/;
2004-06-22 Mike Kestner <mkestner@ximian.com>
* configure.in : GLIB check for gobject, not glib.
2004-06-20 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gdk/Gdk.metadata: Fix merging errors.
* gnome/CanvasItem.custom: Idem.
* gtk/Widget.custom: Idem.
2004-06-20 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* *: Merge with HEAD.
2004-06-17 Larry Ewing <lewing@ximian.com> 2004-06-17 Larry Ewing <lewing@ximian.com>
* gdk/Makefile.am (sources): add Pixdata.custom * gdk/Makefile.am (sources): add Pixdata.custom
* gdk/Pixdata.custom: add new file to fix Serialize. * gdk/Pixdata.custom: add new file to fix Serialize.
* gnome/CanvasItem.custom: remove the incorrect custom bindings. * gnome/CanvasItem.custom: remove the incorrect custom bindings.
* gnome/Gnome.metadata: stop hiding the AffineRelative and * gnome/Gnome.metadata: stop hiding the AffineRelative and
AffineAbsolute the generator gets them right they are not out AffineAbsolute the generator gets them right they are not out
params. params.
* gdk/Gdk.metadata: mark the Pixdata byte stream as and array hide * gdk/Gdk.metadata: mark the Pixdata byte stream as and array hide
the broken serialize method. the broken serialize method.
@ -531,6 +777,16 @@
* configure.in (MONODOC_REQUIRED_VERSION): Fix missing 'test' in * configure.in (MONODOC_REQUIRED_VERSION): Fix missing 'test' in
shell if statement. shell if statement.
2004-06-07 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gtk/Widget.custom: Add the AddAccelerator method back which got
removed by accident during the last merge.
* sample/CustomNotebook.cs: New sample showing of a custom Notebook.
2004-06-07 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* *: Merge with HEAD.
2004-06-04 Todd Berman <tberman@sevenl.net> 2004-06-04 Todd Berman <tberman@sevenl.net>
* glib/Object.cs: ConnectDefaultHandlers needs to look at public api * glib/Object.cs: ConnectDefaultHandlers needs to look at public api
@ -568,10 +824,9 @@
* generator/Field.cs : add field hiding, for manual impl. * generator/Field.cs : add field hiding, for manual impl.
* generator/StructBase.cs : support disable_new, for manual impl. * generator/StructBase.cs : support disable_new, for manual impl.
2004-06-01 Jeroen Zwartepoorte <jeroen@xs4all.nl> 2004-06-01 Jeroen Zwartepoorte <jerone@xs4all.nl>
* sample/CustomWidget.cs: Add custom widget sample. * sample/CustomWidget.cs: remove custom GType stuff.
* sample/Makefile.am: Idem.
2004-06-01 Mike Kestner <mkestner@ximian.com> 2004-06-01 Mike Kestner <mkestner@ximian.com>
@ -580,11 +835,26 @@
* gtk/CellRenderer.custom : remove ctor (). * gtk/CellRenderer.custom : remove ctor ().
* gtkhtml/Gtk.metadata : add a disable_void_ctor rule for HTML. * gtkhtml/Gtk.metadata : add a disable_void_ctor rule for HTML.
2004-06-01 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* configure.in: Merge with HEAD again.
* gdk/Gdk.metadata:
* gnome/CanvasItem.custom:
* gtk/Gtk.metadata:
* sample/.cvsignore:
* sample/CustomWidget.cs: Inherit from Gtk.Bin and make it a better
suited sample.
2004-06-01 Mike Kestner <mkestner@ximian.com> 2004-06-01 Mike Kestner <mkestner@ximian.com>
* gtk/Gtk.metadata : mark SizeRequest requisition as out, not ref. * gtk/Gtk.metadata : mark SizeRequest requisition as out, not ref.
[Fixes #59388] [Fixes #59388]
2004-06-01 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* sample/CustomWidget.cs: Fixed Widget.SizeRequest usage. Works properly
now.
2004-05-31 Mike Kestner <mkestner@ximian.com> 2004-05-31 Mike Kestner <mkestner@ximian.com>
* configure.in : Bump version to 0.93 and tag. * configure.in : Bump version to 0.93 and tag.
@ -598,14 +868,45 @@
2004-05-31 Jeroen Zwartepoorte <jeroen@xs4all.nl> 2004-05-31 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gdk/Gdk.metadata: fix membler names in WindowClass. * gdk/Gdk.metadata: fix member names in WindowClass.
[Fixes #59336] [Fixes #59336]
2004-05-31 Jeroen Zwartepoorte <jeroen@xs4all.nl> 2004-05-31 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gdk/Gdk.metadata: mark dest rects as out for Isect and Union. * gdk/Gdk.metadata: mark dest rects as out for Intersect and Union.
[Fixes #59341] [Fixes #59341]
2004-05-31 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gtk/Gtk.metadata: Unhide the GtkWidgetFlags enum.
* gtk/Makefile.am: Remove WidgetFlags.cs.
* gtk/WidgetFlags.cs: Obsolete.
2004-05-31 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* sample/CustomWidget.cs: The Gtk.Requisition is passed by reference in
the OnSizeRequested handler.
2004-05-31 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* *: Merge changes from HEAD again.
2004-05-31 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gtk/Container.custom: Merged fix for Container.Forall handler.
* gtk/Makefile.am: Added WidgetFlags.cs.
* gtk/Widget.custom: Added Flags property and setter to GdkWindow.
* gtk/WidgetFlags.cs: Enumeration of widget flags (from widget.h).
* gtk/glue/container.c: (gtksharp_container_invoke_gtk_callback): Fixes
for Container.Forall handler.
* gtk/glue/widget.c: (gtksharp_gtk_widget_set_window),
(gtksharp_gtk_widget_get_state), (gtksharp_gtk_widget_get_flags),
(gtksharp_gtk_widget_set_flags): Added new API which is needed to write
custom gtk widgets.
* parser/gapi_pp.pl: Match #if !defined (*_DISABLE_DEPRECATED) properly.
* sample/CustomWidget.cs: new sample for creating a custom Gtk widget.
* sample/Makefile.am: Added CustomWidget.cs sample.
2004-05-29 Mike Kestner <mkestner@ximian.com> 2004-05-29 Mike Kestner <mkestner@ximian.com>
* gnome/CanvasItem.custom : for OnUpdate, Art.SVP can be NULL * gnome/CanvasItem.custom : for OnUpdate, Art.SVP can be NULL
@ -657,10 +958,13 @@
* gtkhtml/Gtk.metadata : hide Gtk.HTML the ctors. * gtkhtml/Gtk.metadata : hide Gtk.HTML the ctors.
* gtkhtml/HTML.custom : new manual impl for ctors. * gtkhtml/HTML.custom : new manual impl for ctors.
* gtkhtml/Makefile.am : add new custom [Fixes #59148] * gtkhtml/Makefile.am : add new custom [Fixes #59148]
2004-05-26 Mike Kestner <mkestner@ximian.com>
* */Makefile.am : rm -f generated/* in case it doesn't exist yet. 2004-05-25 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gnome/Gnome.metadata: Don't hide the GtkEntry and GnomeEntry
properties.
* gtk/Accel.custom: Add custom methods for backwards compatibility of
the gtk_accel_map_* methods. [Fixes #58954]
2004-05-25 Dan Winship <danw@ximian.com> 2004-05-25 Dan Winship <danw@ximian.com>
@ -688,6 +992,22 @@
* generator/SignalHandler.cs : put back the ObjectGen hack * generator/SignalHandler.cs : put back the ObjectGen hack
for param wrapping. [Fixes #58876] for param wrapping. [Fixes #58876]
2004-05-23 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* atk/atk-api.xml: Removed.
* gdk/gdk-api.xml: Idem.
* glade/glade-api.xml: Idem.
* gnome/IconTheme.cs: s/GLibSharp/GLib/
* gnome/gnome-api.xml: Removed.
* gtk/Adjustment.custom: Obsolete custom property code.
* gtk/glue/adjustment.c: (gtksharp_gtk_adjustment_set_bounds): Idem.
* gtk/gtk-api.xml: Removed.
* pango/pango-api.xml: Idem.
2004-05-23 Jeroen Zwartepoorte <jeroen@xs4all.nl>
Merge changes from HEAD since yesterday.
2004-05-22 Mike Kestner <mkestner@ximian.com> 2004-05-22 Mike Kestner <mkestner@ximian.com>
* configure.in : require mono-0.91.99. Sorry, but we need to * configure.in : require mono-0.91.99. Sorry, but we need to
@ -700,6 +1020,10 @@
its new internal nature. This fixes MD, gnunit, and all gnome# its new internal nature. This fixes MD, gnunit, and all gnome#
programs that were blowing up for no reason. programs that were blowing up for no reason.
2004-05-23 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* *: Merge changes from HEAD again.
2004-05-22 Radek Doulik <rodo@ximian.com> 2004-05-22 Radek Doulik <rodo@ximian.com>
* gtk/TreeView.custom(GetPathAtPos): change Gtk.TreeViewColumn * gtk/TreeView.custom(GetPathAtPos): change Gtk.TreeViewColumn
@ -829,6 +1153,60 @@
* gtk/ItemFactory.custom : implement ctor for subclassing. * gtk/ItemFactory.custom : implement ctor for subclassing.
* gtk/Plug.custom : implement ctors for subclassing. * gtk/Plug.custom : implement ctors for subclassing.
2004-05-09 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gdk/Gdk.metadata: Misc fixes for getting Muine to build & run.
* gtk/FileSelection.custom: Add this back.
* gtk/Gtk.metadata: Misc fixes for getting Muine to build & run.
2004-05-08 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gconf/GConf.PropertyEditors/Makefile.am: Reinclude the OptionMenu
property editor.
* gdk/Gdk.metadata:
* gdk/Pixbuf.custom: Add backwards compatible implementations of
GetFromDrawable, RenderPixmapAndMask and a couple of others which are
now static in gtk+ 2.4. These methods have the same API as the ones
generate for gtk+ 2.2.
* gdk/gdk-api.raw:
* generator/ClassBase.cs: Generate an [Obsolete] tag for deprecated
code.
* generator/ClassGen.cs: Idem.
* generator/Method.cs: Idem.
* generator/ObjectGen.cs: Idem.
* gnome/Gnome.metadata:
* gnome/IconData.cs:
* gnome/IconTheme.cs: GnomeIconTheme inherits directly from GtkIconTheme
in libgnomeui-2.6. This breaks the parser, so it won't generate the
proper code. This is a manual class implementation for backward
compatibility with gtk+ 2.2 version of gtk#.
* gnome/IconTheme.custom: Removed
* gnome/Makefile.am:
* gnome/gnome-api.raw:
* gtk/Gtk.metadata:
* gtk/IconTheme.custom: Added custom methods previously found in
../gnome/IconTheme.custom.
* gtk/gtk-api.raw:
* pango/pango-api.raw:
* parser/gapi2xml.pl: Check for "deprecated" prefixes and add a
deprecated attribute to the appropriate elements when found.
* parser/gapi_pp.pl: Prefix everything that's in a #ifndef
*_DISABLE_DEPRECATED block with "deprecated".
* sample/GtkDemo/DemoMain.cs: s/File/System.IO.File/ since there's now
also a Gtk.File class.
* sample/GtkDemo/DemoSizeGroup.cs: Use the original OptioMenu code.
* sample/GtkDemo/DemoTextView.cs: s/File/System.IO.File/.
* sample/Makefile.am:
* sources/gtk-sharp-sources.xml: Add a bunch of <exclude>s to the Gtk
namespace so it won't generate API for _really_ old deprecated widgets
like GtkCList, GtkCTree etc.
This commit adds support for deprecated widgets to gtk#. This is
necessary since some widgets have been deprecated from gtk+ 2.2->2.4,
but are still in use (any program that uses Gtk.OptionMenu, Gtk.Combo
and methods in Gtk.Toolbar to name a few). This is done in C# by using
the [Obsolete] metadata tag.
2004-05-07 Todd Berman <tberman@sevenl.net> 2004-05-07 Todd Berman <tberman@sevenl.net>
* gnome/Makefile.am: add DruidPageEdge.custom * gnome/Makefile.am: add DruidPageEdge.custom
@ -989,6 +1367,32 @@
* configure.in : bump version for cvs. * configure.in : bump version for cvs.
2004-05-06 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* Makefile.in:
* configure.in:
* gconf/GConf.PropertyEditors/Makefile.in:
* glade/Makefile.in:
* gnomevfs/.cvsignore:
* gnomevfs/AssemblyInfo.cs.in:
* gnomevfs/Makefile.am:
* gnomevfs/Makefile.in:
* gnomevfs/gnome-vfs-sharp.dll.config.in:
* gnomevfs/gnome-vfs-sharp.pc.in:
* sample/Actions.cs: Remove System.Drawing.Size usage.
* sample/Makefile.am: Added actions.exe.
* sample/Makefile.in:
Remove obsolete Makefile.in files from the repository. Auto*ify the
gnomevfs assembly.
2004-05-06 Jeroen Zwartepoorte <jeroen@xs4all.nl>
Merge changes from HEAD to the jeroen-gtk-2-4 branch. The correct
gnome 2.6.0 & gtk+-2.4.1 sources are now also downloaded when you run
"make get-source-code". Some samples are disabled for now since they
use deprecated API and fail to build.
2004-05-05 Mike Kestner <mkestner@ximian.com> 2004-05-05 Mike Kestner <mkestner@ximian.com>
* generator/BoxedGen.cs : remove g_value_init DllImport and change * generator/BoxedGen.cs : remove g_value_init DllImport and change
@ -1018,11 +1422,11 @@
gnome/CanvasProxy.cs : ditto gnome/CanvasProxy.cs : ditto
gnome/void*Signal.cs : ditto gnome/void*Signal.cs : ditto
2004-05-04 Mike Kestner <mkestner@ximian.com> 2004-05-05 Mike Kestner <mkestner@ximian.com>
* sample/gconf/Makefile.am : fix some whitespace. I love you, auto*. * sample/gconf/Makefile.am : fix some whitespace. I love you, auto*.
2004-05-04 Mike Kestner <mkestner@ximian.com> 2004-05-05 Mike Kestner <mkestner@ximian.com>
* configure.in : fix gtkhtml versioning *again*. * configure.in : fix gtkhtml versioning *again*.
* sample/gconf/Makefile.am : conditional build on ENABLE_GNOME. * sample/gconf/Makefile.am : conditional build on ENABLE_GNOME.
@ -1386,6 +1790,14 @@
* sample/Makefile.am: small resource build fix for glade-test.exe * sample/Makefile.am: small resource build fix for glade-test.exe
2004-03-27 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gnomevfs/Mime.cs:
* gnomevfs/MimeActionType.cs:
* gnomevfs/Vfs.cs:
Implemented more gnome-vfs methods.
2004-03-25 Mike Kestner <mkestner@ximian.com> 2004-03-25 Mike Kestner <mkestner@ximian.com>
* gtk/Gtk.metadata : Widget.Events is a Gdk.EventMask, not int * gtk/Gtk.metadata : Widget.Events is a Gdk.EventMask, not int
@ -1479,6 +1891,28 @@
* parser/gapi-fixup.in: * parser/gapi-fixup.in:
* generator/gapi-codegen.in: s/@MONO@/@RUNTIME@ * generator/gapi-codegen.in: s/@MONO@/@RUNTIME@
2004-03-14 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* Makefile.in:
* configure.in:
* gnomevfs/AsyncCallback.cs:
* gnomevfs/AsyncCallbackNative.cs:
* gnomevfs/AsyncReadCallback.cs:
* gnomevfs/AsyncReadCallbackNative.cs:
* gnomevfs/AsyncWriteCallback.cs:
* gnomevfs/AsyncWriteCallbackNative.cs:
* gnomevfs/Handle.cs:
* gnomevfs/Makefile.in:
* gnomevfs/OpenMode.cs:
* gnomevfs/Result.cs:
* gnomevfs/SeekPosition.cs:
* gnomevfs/Vfs.cs:
* sample/Makefile.in:
* sample/TestVfs.cs:
Added partial gnome-vfs bindings. Necessary now that can Gtk.FileChooser
return gnome-vfs uris.
2004-03-12 Mike Kestner <mkestner@ximian.com> 2004-03-12 Mike Kestner <mkestner@ximian.com>
* */Makefile.am : automakify the build * */Makefile.am : automakify the build
@ -1503,7 +1937,6 @@
* glue/Makefile.am: * glue/Makefile.am:
* glue/makefile.win32: * glue/makefile.win32:
* glue/thread-notify.c: dropped. * glue/thread-notify.c: dropped.
* gtk/ThreadNotify.cs: use just Idle.Add, which is what the deprecated * gtk/ThreadNotify.cs: use just Idle.Add, which is what the deprecated
gda_input_add does. No more P/Invoke here. gda_input_add does. No more P/Invoke here.
@ -1511,13 +1944,43 @@
* glue/Makefile.am: * glue/Makefile.am:
* glue/makefile.win32: added thread-notify.o * glue/makefile.win32: added thread-notify.o
* glue/thread-notify.c: handles pipe creation/read/write/close for * glue/thread-notify.c: handles pipe creation/read/write/close for
ThreadNotify. ThreadNotify.
* gtk/ThreadNotify.cs: P/Invoke the thread-notify code instead of libc * gtk/ThreadNotify.cs: P/Invoke the thread-notify code instead of libc
functions. functions.
2004-02-29 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gtk/FileChooserDialog.custom: Implement the
gtk_file_chooser_dialog_new constructor by hand.
2004-02-28 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gtk/Gtk.metadata: Rename some AddAction* methods to just Add*.
2004-02-28 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* glib/Value.cs: Work around a GLib.Value having a null string (#54979).
* sample/Actions.cs: Updated.
* sample/Makefile.in: Added the action sample.
2004-02-28 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gdk/gdk-api.xml: Updated to latest CVS.
* gnome/gnome-api.xml: Idem.
* gtk/gtk-api.xml: Idem.
* pango/pango-api.xml: Idem.
* sample/Makefile.in: Don't build the gconf sample for now.
2004-02-28 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gnome/PrintContext.custom: Added gnome_print_context_* methods.
* gtk/gtk-api.xml: Hide GtkActionEntry C-specific struct and methods.
* sample/Actions.cs: Updated.
* sample/Makefile.in: Reinclude print sample.
* sample/PrintSample.cs: Updated.
* sample/TestDnd.cs: Updated.
2004-02-26 Mike Kestner <mkestner@ximian.com> 2004-02-26 Mike Kestner <mkestner@ximian.com>
* configure.in : tagged 0.17 and bumped cvs version. * configure.in : tagged 0.17 and bumped cvs version.
@ -1747,12 +2210,6 @@
* gdk/*.custom : manually wrap GList api using typed arrays * gdk/*.custom : manually wrap GList api using typed arrays
* gdk/gdk-api.xml : regen. * gdk/gdk-api.xml : regen.
2004-02-12 Mike Kestner <mkestner@ximian.com>
* gdk/Gdk.metadata : hide the GSList API
* gdk/*.custom : manually wrap GSList api using typed arrays
* gdk/gdk-api.xml : regen.
2004-02-12 Mike Kestner <mkestner@ximian.com> 2004-02-12 Mike Kestner <mkestner@ximian.com>
* gtk/Accel.custom : s/List/SList * gtk/Accel.custom : s/List/SList
@ -1764,6 +2221,35 @@
* glib/time_t_CustomMarshaler.cs: Update after custom marshaling * glib/time_t_CustomMarshaler.cs: Update after custom marshaling
changes. changes.
2004-02-12 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* gtk/Gtk.metadata: Hide the various *ActionEntry classes since
they're only meant to be used in C code.
2004-02-11 Jeroen Zwartepoorte <jeroen@xs4all.nl>
* atk/atk-api.xml:
* gconf/GConf.PropertyEditors/Makefile.in:
* gdk/Gdk.metadata:
* gdk/gdk-api.xml:
* generator/CallbackGen.cs: Set a GError pointer to IntPtr.Zero.
* gnome/Gnome.metadata:
* gnome/gnome-api.xml:
* gtk/Adjustment.custom:
* gtk/FileSelection.custom: Deprecated, removed.
* gtk/FileSystemModel.custom:
* gtk/Gtk.metadata:
* gtk/IconTheme.custom: Custom SearchPath property (fixes #51599).
* gtk/Paned.custom: Deprecated, removed.
* gtk/TreeModelFilter.custom: New class in 2.4.
* gtk/gtk-api.xml:
* pango/pango-api.xml:
* sample/Actions.cs: Added new Action API sample.
* sample/Makefile.in: Don't build some samples for now.
Updated everything to use gtk 2.3/2.4. Some samples commented out
because they use deprecated/changed API. More work to follow.
2004-02-11 Mike Kestner <mkestner@ximian.com> 2004-02-11 Mike Kestner <mkestner@ximian.com>
* gtk/Gtk.metadata : hide the GSList API * gtk/Gtk.metadata : hide the GSList API
@ -1778,12 +2264,6 @@
* gtk/*.custom : return 0 length arrays, not null. * gtk/*.custom : return 0 length arrays, not null.
2004-02-11 Mike Kestner <mkestner@ximian.com>
* gtk/Gtk.metadata : hide the GList API
* gtk/*.custom : manually wrap GList api using typed arrays
* gtk/gtk-api.xml : regen.
2004-02-10 Mike Kestner <mkestner@ximian.com> 2004-02-10 Mike Kestner <mkestner@ximian.com>
* gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs : * gconf/GConf.PropertyEditors/PropertyEditorColorPicker.cs :

8
Makefile.am
View file

@ -1,10 +1,10 @@
SUBDIRS = sources generator parser glib pango atk gdk gtk glade art gnome gda gnomedb gtkhtml gconf rsvg vte sample doc SUBDIRS = sources generator parser glib pango atk gdk gtk glade art gnomevfs gnome gda gnomedb gtkhtml gconf rsvg vte panelapplet sample doc
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gtk-sharp.pc pkgconfig_DATA = gtk-sharp-2.0.pc
EXTRA_DIST = \ EXTRA_DIST = \
gtk-sharp.pc.in \ gtk-sharp-2.0.pc.in \
gtk-sharp.snk \ gtk-sharp.snk \
makefile.win32 \ makefile.win32 \
ChangeLog \ ChangeLog \
@ -12,5 +12,5 @@ EXTRA_DIST = \
README \ README \
README.generator README.generator
DISTCLEANFILES = gtk-sharp.pc DISTCLEANFILES = gtk-sharp-2.0.pc

2
art/.cvsignore
View file

@ -1,4 +1,4 @@
art-sharp.pc *.pc
AssemblyInfo.cs AssemblyInfo.cs
*.dll *.dll
*.dll.config *.dll.config

8
art/Makefile.am
View file

@ -2,7 +2,7 @@ if ENABLE_LIBART
TARGET = $(ASSEMBLY) $(ASSEMBLY).config TARGET = $(ASSEMBLY) $(ASSEMBLY).config
APIS = $(API) $(ADDITIONAL_API) APIS = $(API) $(ADDITIONAL_API)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = art-sharp.pc pkgconfig_DATA = art-sharp-2.0.pc
else else
TARGET = TARGET =
APIS = APIS =
@ -16,12 +16,12 @@ ASSEMBLY_NAME = art-sharp
references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll
ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY = $(ASSEMBLY_NAME).dll
apidir = $(datadir)/gapi apidir = $(datadir)/gapi-2.0
noinst_DATA = $(TARGET) noinst_DATA = $(TARGET)
api_DATA = $(APIS) api_DATA = $(APIS)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk
DISTCLEANFILES = art-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs DISTCLEANFILES = art-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs
sources = sources =
@ -41,7 +41,7 @@ EXTRA_DIST = \
$(METADATA) \ $(METADATA) \
$(dist_customs) \ $(dist_customs) \
$(dist_sources) \ $(dist_sources) \
art-sharp.pc.in art-sharp-2.0.pc.in
$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
cp $(srcdir)/$(RAW_API) $(API) cp $(srcdir)/$(RAW_API) $(API)

2
art/art-sharp-2.0.pc.in
View file

@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib
Name: Art# Name: Art#
Description: Art# - libart .NET Binding Description: Art# - libart .NET Binding
Version: @VERSION@ Version: @VERSION@
Libs: -r:${libdir}/mono/@PACKAGE@/art-sharp.dll Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/art-sharp.dll

9
art/art-sharp.pc.in
View file

@ -1,9 +0,0 @@
prefix=@prefix@
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
Name: Art#
Description: Art# - libart .NET Binding
Version: @VERSION@
Libs: -r:${libdir}/mono/@PACKAGE@/art-sharp.dll

2
atk/Makefile.am
View file

@ -8,7 +8,7 @@ references = /r:../glib/glib-sharp.dll
TARGET = $(ASSEMBLY) TARGET = $(ASSEMBLY)
ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY = $(ASSEMBLY_NAME).dll
gapidir = $(datadir)/gapi gapidir = $(datadir)/gapi-2.0
noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config
gapi_DATA = $(API) gapi_DATA = $(API)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.snk CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.snk

74
atk/atk-api.raw
View file

@ -42,6 +42,7 @@
<member cname="ATK_RELATION_SUBWINDOW_OF" name="SubwindowOf"/> <member cname="ATK_RELATION_SUBWINDOW_OF" name="SubwindowOf"/>
<member cname="ATK_RELATION_EMBEDS" name="Embeds"/> <member cname="ATK_RELATION_EMBEDS" name="Embeds"/>
<member cname="ATK_RELATION_EMBEDDED_BY" name="EmbeddedBy"/> <member cname="ATK_RELATION_EMBEDDED_BY" name="EmbeddedBy"/>
<member cname="ATK_RELATION_POPUP_FOR" name="PopupFor"/>
<member cname="ATK_RELATION_LAST_DEFINED" name="LastDefined"/> <member cname="ATK_RELATION_LAST_DEFINED" name="LastDefined"/>
</enum> </enum>
<enum name="Role" cname="AtkRole" type="enum"> <enum name="Role" cname="AtkRole" type="enum">
@ -119,6 +120,8 @@
<member cname="ATK_ROLE_PARAGRAPH" name="Paragraph"/> <member cname="ATK_ROLE_PARAGRAPH" name="Paragraph"/>
<member cname="ATK_ROLE_RULER" name="Ruler"/> <member cname="ATK_ROLE_RULER" name="Ruler"/>
<member cname="ATK_ROLE_APPLICATION" name="Application"/> <member cname="ATK_ROLE_APPLICATION" name="Application"/>
<member cname="ATK_ROLE_AUTOCOMPLETE" name="Autocomplete"/>
<member cname="ATK_ROLE_EDITBAR" name="Editbar"/>
<member cname="ATK_ROLE_LAST_DEFINED" name="LastDefined"/> <member cname="ATK_ROLE_LAST_DEFINED" name="LastDefined"/>
</enum> </enum>
<enum name="StateType" cname="AtkStateType" type="enum"> <enum name="StateType" cname="AtkStateType" type="enum">
@ -152,6 +155,7 @@
<member cname="ATK_STATE_VERTICAL" name="Vertical"/> <member cname="ATK_STATE_VERTICAL" name="Vertical"/>
<member cname="ATK_STATE_VISIBLE" name="Visible"/> <member cname="ATK_STATE_VISIBLE" name="Visible"/>
<member cname="ATK_STATE_MANAGES_DESCENDANTS" name="ManagesDescendants"/> <member cname="ATK_STATE_MANAGES_DESCENDANTS" name="ManagesDescendants"/>
<member cname="ATK_STATE_INDETERMINATE" name="Indeterminate"/>
<member cname="ATK_STATE_LAST_DEFINED" name="LastDefined"/> <member cname="ATK_STATE_LAST_DEFINED" name="LastDefined"/>
</enum> </enum>
<enum name="TextAttribute" cname="AtkTextAttribute" type="enum"> <enum name="TextAttribute" cname="AtkTextAttribute" type="enum">
@ -194,6 +198,12 @@
<member cname="ATK_TEXT_BOUNDARY_LINE_START" name="LineStart"/> <member cname="ATK_TEXT_BOUNDARY_LINE_START" name="LineStart"/>
<member cname="ATK_TEXT_BOUNDARY_LINE_END" name="LineEnd"/> <member cname="ATK_TEXT_BOUNDARY_LINE_END" name="LineEnd"/>
</enum> </enum>
<enum name="TextClipType" cname="AtkTextClipType" type="enum">
<member cname="ATK_TEXT_CLIP_NONE" name="None"/>
<member cname="ATK_TEXT_CLIP_MIN" name="Min"/>
<member cname="ATK_TEXT_CLIP_MAX" name="Max"/>
<member cname="ATK_TEXT_CLIP_BOTH" name="Both"/>
</enum>
<callback name="EventListener" cname="AtkEventListener"> <callback name="EventListener" cname="AtkEventListener">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -433,6 +443,13 @@
</method> </method>
</interface> </interface>
<interface name="Hypertext" cname="AtkHypertext"> <interface name="Hypertext" cname="AtkHypertext">
<signal name="LinkSelected" cname="link_selected" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="AtkHypertext*" name="hypertext"/>
<parameter type="gint" name="link_index"/>
</parameters>
</signal>
<method name="GetLink" cname="atk_hypertext_get_link"> <method name="GetLink" cname="atk_hypertext_get_link">
<return-type type="AtkHyperlink*"/> <return-type type="AtkHyperlink*"/>
<parameters> <parameters>
@ -839,6 +856,21 @@
<parameter type="const-gchar*" name="name"/> <parameter type="const-gchar*" name="name"/>
</parameters> </parameters>
</method> </method>
<method name="FreeRanges" cname="atk_text_free_ranges" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="AtkTextRange**" name="ranges"/>
</parameters>
</method>
<method name="GetBoundedRanges" cname="atk_text_get_bounded_ranges">
<return-type type="AtkTextRange**"/>
<parameters>
<parameter type="AtkTextRectangle*" name="rect"/>
<parameter type="AtkCoordType" name="coord_type"/>
<parameter type="AtkTextClipType" name="x_clip_type"/>
<parameter type="AtkTextClipType" name="y_clip_type"/>
</parameters>
</method>
<method name="GetCaretOffset" cname="atk_text_get_caret_offset"> <method name="GetCaretOffset" cname="atk_text_get_caret_offset">
<return-type type="gint"/> <return-type type="gint"/>
</method> </method>
@ -876,6 +908,15 @@
<parameter type="AtkCoordType" name="coords"/> <parameter type="AtkCoordType" name="coords"/>
</parameters> </parameters>
</method> </method>
<method name="GetRangeExtents" cname="atk_text_get_range_extents">
<return-type type="void"/>
<parameters>
<parameter type="gint" name="start_offset"/>
<parameter type="gint" name="end_offset"/>
<parameter type="AtkCoordType" name="coord_type"/>
<parameter type="AtkTextRectangle*" name="rect"/>
</parameters>
</method>
<method name="GetRunAttributes" cname="atk_text_get_run_attributes"> <method name="GetRunAttributes" cname="atk_text_get_run_attributes">
<return-type type="AtkAttributeSet*"/> <return-type type="AtkAttributeSet*"/>
<parameters> <parameters>
@ -994,6 +1035,16 @@
</method> </method>
</object> </object>
<object name="Hyperlink" cname="AtkHyperlink" parent="GObject"> <object name="Hyperlink" cname="AtkHyperlink" parent="GObject">
<property name="SelectedLink" cname="selected-link" type="gboolean" readable="true"/>
<property name="NumberOfAnchors" cname="number-of-anchors" type="gint" readable="true"/>
<property name="EndIndex" cname="end-index" type="gint" readable="true"/>
<property name="StartIndex" cname="start-index" type="gint" readable="true"/>
<signal name="LinkActivated" cname="link_activated" when="LAST">
<return-type type="void"/>
<parameters>
<parameter type="AtkHyperlink*" name="link_"/>
</parameters>
</signal>
<virtual_method name="GetUri" cname="get_uri"> <virtual_method name="GetUri" cname="get_uri">
<return-type type="gchar*"/> <return-type type="gchar*"/>
<parameters> <parameters>
@ -1049,6 +1100,9 @@
<method name="IsInline" cname="atk_hyperlink_is_inline"> <method name="IsInline" cname="atk_hyperlink_is_inline">
<return-type type="gboolean"/> <return-type type="gboolean"/>
</method> </method>
<method name="IsSelectedLink" cname="atk_hyperlink_is_selected_link">
<return-type type="gboolean"/>
</method>
<method name="IsValid" cname="atk_hyperlink_is_valid"> <method name="IsValid" cname="atk_hyperlink_is_valid">
<return-type type="gboolean"/> <return-type type="gboolean"/>
</method> </method>
@ -1062,6 +1116,7 @@
<interface cname="AtkSelection"/> <interface cname="AtkSelection"/>
<interface cname="AtkTable"/> <interface cname="AtkTable"/>
<interface cname="AtkText"/> <interface cname="AtkText"/>
<interface cname="AtkHypertext"/>
<interface cname="AtkValue"/> <interface cname="AtkValue"/>
</implements> </implements>
<method name="GetType" cname="atk_no_op_object_get_type" shared="true"> <method name="GetType" cname="atk_no_op_object_get_type" shared="true">
@ -1099,6 +1154,8 @@
<property name="AtkObjectNamePropertyTableRowHeader" cname="atk_object_name_property_table_row_header" type="AtkObject" readable="true" writeable="true"/> <property name="AtkObjectNamePropertyTableRowHeader" cname="atk_object_name_property_table_row_header" type="AtkObject" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyTableRowDescription" cname="atk_object_name_property_table_row_description" type="gchar*" readable="true" writeable="true"/> <property name="AtkObjectNamePropertyTableRowDescription" cname="atk_object_name_property_table_row_description" type="gchar*" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyTableSummary" cname="atk_object_name_property_table_summary" type="AtkObject" readable="true" writeable="true"/> <property name="AtkObjectNamePropertyTableSummary" cname="atk_object_name_property_table_summary" type="AtkObject" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyTableCaptionObject" cname="atk_object_name_property_table_caption_object" type="AtkObject" readable="true" writeable="true"/>
<property name="AtkObjectNamePropertyHypertextNumLinks" cname="atk_object_name_property_hypertext_num_links" type="gint" readable="true"/>
<signal name="ChildrenChanged" cname="children_changed" when="LAST"> <signal name="ChildrenChanged" cname="children_changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
@ -1351,6 +1408,8 @@
<object name="Relation" cname="AtkRelation" parent="GObject"> <object name="Relation" cname="AtkRelation" parent="GObject">
<field cname="target" type="GPtrArray*"/> <field cname="target" type="GPtrArray*"/>
<field cname="relationship" type="AtkRelationType"/> <field cname="relationship" type="AtkRelationType"/>
<property name="RelationType" cname="relation_type" type="AtkRelationType" readable="true" writeable="true"/>
<property name="Target" cname="target" type="value_array" readable="true" writeable="true"/>
<method name="GetRelationType" cname="atk_relation_get_relation_type"> <method name="GetRelationType" cname="atk_relation_get_relation_type">
<return-type type="AtkRelationType"/> <return-type type="AtkRelationType"/>
</method> </method>
@ -1536,6 +1595,18 @@
<field cname="new_value" type="GValue"/> <field cname="new_value" type="GValue"/>
</struct> </struct>
<alias name="State" cname="AtkState" type="guint64"/> <alias name="State" cname="AtkState" type="guint64"/>
<struct name="TextRange" cname="AtkTextRange">
<field cname="bounds" type="AtkTextRectangle"/>
<field cname="start_offset" type="gint"/>
<field cname="end_offset" type="gint"/>
<field cname="content" type="gchar*"/>
</struct>
<struct name="TextRectangle" cname="AtkTextRectangle">
<field cname="x" type="gint"/>
<field cname="y" type="gint"/>
<field cname="width" type="gint"/>
<field cname="height" type="gint"/>
</struct>
<class name="Global" cname="AtkGlobal"> <class name="Global" cname="AtkGlobal">
<method name="AddFocusTracker" cname="atk_add_focus_tracker" shared="true"> <method name="AddFocusTracker" cname="atk_add_focus_tracker" shared="true">
<return-type type="guint"/> <return-type type="guint"/>
@ -1560,6 +1631,9 @@
<method name="GetDefaultRegistry" cname="atk_get_default_registry" shared="true"> <method name="GetDefaultRegistry" cname="atk_get_default_registry" shared="true">
<return-type type="AtkRegistry*"/> <return-type type="AtkRegistry*"/>
</method> </method>
<method name="GetFocusObject" cname="atk_get_focus_object" shared="true">
<return-type type="AtkObject*"/>
</method>
<method name="GetRoot" cname="atk_get_root" shared="true"> <method name="GetRoot" cname="atk_get_root" shared="true">
<return-type type="AtkObject*"/> <return-type type="AtkObject*"/>
</method> </method>

1
atk/atk-sharp.dll.config.in
View file

@ -1,3 +1,4 @@
<configuration> <configuration>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
</configuration> </configuration>

12
atk/glue/Makefile.am
View file

@ -1,20 +1,20 @@
lib_LTLIBRARIES = libatksharpglue.la lib_LTLIBRARIES = libatksharpglue-2.0.la
libatksharpglue_la_LDFLAGS = -module -avoid-version -no-undefined libatksharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
libatksharpglue_la_SOURCES = \ libatksharpglue_2_0_la_SOURCES = \
generated.c \ generated.c \
vmglueheaders.h vmglueheaders.h
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32
libatksharpglue_la_LIBADD = $(BASE_DEPENDENCIES_LIBS) libatksharpglue_2_0_la_LIBADD = $(BASE_DEPENDENCIES_LIBS)
INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir) INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir)
libatksharpglue.dll: $(libatksharpglue_la_OBJECTS) libatksharpglue.rc libatksharpglue.def libatksharpglue.dll: $(libatksharpglue_2_0_la_OBJECTS) libatksharpglue.rc libatksharpglue.def
./build-dll libatksharpglue $(VERSION) ./build-dll libatksharpglue-2.0 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

8
atk/glue/makefile.win32
View file

@ -7,16 +7,16 @@ GLUE_OBJS = \
generated.o \ generated.o \
win32dll.o win32dll.o
all: atksharpglue.dll all: atksharpglue-2.0.dll
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
atksharpglue.dll: $(GLUE_OBJS) atksharpglue-2.0.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libatksharpglue.a --dllname=atksharpglue.dll --driver-name=gcc --output-def=atksharpglue.def $(GLUE_OBJS) $(GTK_LIBS) $(DLLWRAP) --output-lib=libatksharpglue-2.0.a --dllname=atksharpglue-2.0.dll --driver-name=gcc --output-def=atksharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
clean: clean:
rm -f atksharpglue.dll *.o libatksharpglue.a rm -f atksharpglue-2.0.dll *.o libatksharpglue-2.0.a

73
configure.in
View file

@ -2,12 +2,15 @@
AC_INIT(README) AC_INIT(README)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(gtk-sharp, 1.0.2) AM_INIT_AUTOMAKE(gtk-sharp, 1.9.0)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
API_VERSION=1.0.0.0 API_VERSION=2.0.0.0
AC_SUBST(API_VERSION) AC_SUBST(API_VERSION)
PACKAGE_VERSION=gtk-sharp-2.0
AC_SUBST(PACKAGE_VERSION)
AC_CHECK_TOOL(CC, gcc, gcc) AC_CHECK_TOOL(CC, gcc, gcc)
AC_PROG_CC AC_PROG_CC
AM_PROG_CC_STDC AM_PROG_CC_STDC
@ -60,11 +63,11 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir],
fi fi
) )
MONO_REQUIRED_VERSION=0.96 MONO_REQUIRED_VERSION=1.0
PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
if test "x$has_mono" = "xtrue"; then if test "x$has_mono" = "xtrue"; then
GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(libdir)' GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(libdir)'
GENERATED_SOURCES=generated/*.cs GENERATED_SOURCES=generated/*.cs
AC_PATH_PROG(RUNTIME, mono, no) AC_PATH_PROG(RUNTIME, mono, no)
AC_PATH_PROG(CSC, mcs, no) AC_PATH_PROG(CSC, mcs, no)
@ -107,15 +110,15 @@ AC_SUBST(LIB_PREFIX)
AC_SUBST(LIB_SUFFIX) AC_SUBST(LIB_SUFFIX)
AC_SUBST(GENERATED_SOURCES) AC_SUBST(GENERATED_SOURCES)
PKG_CHECK_MODULES(GLIB, gobject-2.0) PKG_CHECK_MODULES(GLIB, gobject-2.0 >= 2.4)
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_LIBS)
PKG_CHECK_MODULES(PANGO, pango) PKG_CHECK_MODULES(PANGO, pango >= 1.4)
AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_CFLAGS)
AC_SUBST(PANGO_LIBS) AC_SUBST(PANGO_LIBS)
PKG_CHECK_MODULES(GTK, gtk+-2.0) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4)
AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS) AC_SUBST(GTK_LIBS)
@ -124,10 +127,11 @@ AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS) AC_SUBST(XML_LIBS)
## Versions of dependencies ## Versions of dependencies
GNOME_REQUIRED_VERSION=2.2.0 GNOME_REQUIRED_VERSION=2.6.0
GTK_REQUIRED_VERSION=2.2.0 GTK_REQUIRED_VERSION=2.4.0
ART_REQUIRED_VERSION=2.3.16
PKG_CHECK_MODULES(LIBART, libart-2.0 >= $GNOME_REQUIRED_VERSION, enable_libart=yes, enable_libart=no) PKG_CHECK_MODULES(LIBART, libart-2.0 >= $ART_REQUIRED_VERSION, enable_libart=yes, enable_libart=no)
AC_SUBST(LIBART_CFLAGS) AC_SUBST(LIBART_CFLAGS)
AC_SUBST(LIBART_LIBS) AC_SUBST(LIBART_LIBS)
@ -135,7 +139,7 @@ PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOME_REQUIRED_VERSION libgnomeu
AC_SUBST(GNOME_CFLAGS) AC_SUBST(GNOME_CFLAGS)
AC_SUBST(GNOME_LIBS) AC_SUBST(GNOME_LIBS)
GLADE_REQUIRED_VERSION=2.0.0 GLADE_REQUIRED_VERSION=2.3.6
PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no) PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no)
AC_SUBST(GLADE_CFLAGS) AC_SUBST(GLADE_CFLAGS)
AC_SUBST(GLADE_LIBS) AC_SUBST(GLADE_LIBS)
@ -175,6 +179,11 @@ AC_SUBST(GTKHTML_SOVERSION)
VTE_REQUIRED_VERSION=0.11.10 VTE_REQUIRED_VERSION=0.11.10
PKG_CHECK_MODULES(VTE_DEPENDENCIES, vte >= $VTE_REQUIRED_VERSION, enable_vte=yes, enable_vte=no) PKG_CHECK_MODULES(VTE_DEPENDENCIES, vte >= $VTE_REQUIRED_VERSION, enable_vte=yes, enable_vte=no)
LIBPANEL_REQUIRED_VERSION=2.6
PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-2.0 >= $LIBPANEL_REQUIRED_VERSION, enable_panel=yes, enable_panel=no)
AC_SUBST(LIBPANEL_CFLAGS)
AC_SUBST(LIBPANEL_LIBS)
AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes") AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes")
AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes") AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes")
AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes") AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes")
@ -183,6 +192,8 @@ AM_CONDITIONAL(ENABLE_GNOMEDB, test "x$enable_gnomedb" = "xyes")
AM_CONDITIONAL(ENABLE_RSVG, test "x$enable_rsvg" = "xyes") AM_CONDITIONAL(ENABLE_RSVG, test "x$enable_rsvg" = "xyes")
AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
AM_CONDITIONAL(ENABLE_VTE, test "x$enable_vte" = "xyes") AM_CONDITIONAL(ENABLE_VTE, test "x$enable_vte" = "xyes")
AM_CONDITIONAL(ENABLE_PANEL, test "x$enable_panel" = "xyes")
AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
@ -190,8 +201,11 @@ AC_SUBST(CFLAGS)
AC_OUTPUT([ AC_OUTPUT([
sources/Makefile sources/Makefile
parser/Makefile parser/Makefile
parser/gapi-2.0.pc
parser/gapi2-fixup
parser/gapi2-parser
generator/Makefile generator/Makefile
generator/gapi-codegen generator/gapi2-codegen
glib/Makefile glib/Makefile
glib/AssemblyInfo.cs glib/AssemblyInfo.cs
glib/glib-sharp.dll.config glib/glib-sharp.dll.config
@ -206,7 +220,7 @@ atk/atk-sharp.dll.config
art/Makefile art/Makefile
art/AssemblyInfo.cs art/AssemblyInfo.cs
art/art-sharp.dll.config art/art-sharp.dll.config
art/art-sharp.pc art/art-sharp-2.0.pc
gdk/Makefile gdk/Makefile
gdk/AssemblyInfo.cs gdk/AssemblyInfo.cs
gdk/gdk-sharp.dll.config gdk/gdk-sharp.dll.config
@ -218,56 +232,64 @@ gtk/glue/Makefile
glade/Makefile glade/Makefile
glade/AssemblyInfo.cs glade/AssemblyInfo.cs
glade/glade-sharp.dll.config glade/glade-sharp.dll.config
glade/glade-sharp.pc glade/glade-sharp-2.0.pc
glade/glue/Makefile glade/glue/Makefile
gnome/Makefile gnome/Makefile
gnome/AssemblyInfo.cs gnome/AssemblyInfo.cs
gnome/gnome-sharp.dll.config gnome/gnome-sharp.dll.config
gnome/gnome-sharp.pc gnome/gnome-sharp-2.0.pc
gnome/glue/Makefile gnome/glue/Makefile
gnomevfs/Makefile
gnomevfs/AssemblyInfo.cs
gnomevfs/gnome-vfs-sharp.dll.config
gnomevfs/gnome-vfs-sharp-2.0.pc
gda/Makefile gda/Makefile
gda/AssemblyInfo.cs gda/AssemblyInfo.cs
gda/gda-sharp.dll.config gda/gda-sharp.dll.config
gda/gda-sharp.pc gda/gda-sharp-2.0.pc
gnomedb/Makefile gnomedb/Makefile
gnomedb/AssemblyInfo.cs gnomedb/AssemblyInfo.cs
gnomedb/gnomedb-sharp.dll.config gnomedb/gnomedb-sharp.dll.config
gnomedb/gnomedb-sharp.pc gnomedb/gnomedb-sharp-2.0.pc
gconf/Makefile gconf/Makefile
gconf/doc/Makefile gconf/doc/Makefile
gconf/GConf/Makefile gconf/GConf/Makefile
gconf/GConf/AssemblyInfo.cs gconf/GConf/AssemblyInfo.cs
gconf/GConf/gconf-sharp.dll.config gconf/GConf/gconf-sharp.dll.config
gconf/GConf/gconf-sharp.pc gconf/GConf/gconf-sharp-2.0.pc
gconf/GConf.PropertyEditors/Makefile gconf/GConf.PropertyEditors/Makefile
gconf/GConf.PropertyEditors/AssemblyInfo.cs gconf/GConf.PropertyEditors/AssemblyInfo.cs
gconf/tools/Makefile gconf/tools/Makefile
gconf/tools/gconfsharp-schemagen gconf/tools/gconfsharp2-schemagen
gtkhtml/Makefile gtkhtml/Makefile
gtkhtml/AssemblyInfo.cs gtkhtml/AssemblyInfo.cs
gtkhtml/gtkhtml-sharp.dll.config gtkhtml/gtkhtml-sharp.dll.config
gtkhtml/gtkhtml-sharp.pc gtkhtml/gtkhtml-sharp-2.0.pc
rsvg/Makefile rsvg/Makefile
rsvg/AssemblyInfo.cs rsvg/AssemblyInfo.cs
rsvg/rsvg-sharp.dll.config rsvg/rsvg-sharp.dll.config
rsvg/rsvg-sharp.pc rsvg/rsvg-sharp-2.0.pc
vte/Makefile vte/Makefile
vte/AssemblyInfo.cs vte/AssemblyInfo.cs
vte/vte-sharp.dll.config vte/vte-sharp.dll.config
vte/vte-sharp.pc vte/vte-sharp-2.0.pc
panelapplet/Makefile
panelapplet/AssemblyInfo.cs
panelapplet/panelapplet-sharp.dll.config
panelapplet/panelapplet-sharp-2.0.pc
panelapplet/glue/Makefile
doc/Makefile doc/Makefile
doc/updater/Makefile doc/updater/Makefile
sample/GtkDemo/Makefile sample/GtkDemo/Makefile
sample/Makefile sample/Makefile
sample/gconf/Makefile sample/gconf/Makefile
sample/gnomevfs/Makefile
sample/pixmaps/Makefile sample/pixmaps/Makefile
sample/rsvg/Makefile sample/rsvg/Makefile
sample/test/Makefile sample/test/Makefile
sample/drawing-sample.exe.config sample/drawing-sample.exe.config
sample/cairo-sample.exe.config sample/cairo-sample.exe.config
gtk-sharp.pc gtk-sharp-2.0.pc
parser/gapi.pc
parser/gapi-fixup
Makefile Makefile
]) ])
@ -287,6 +309,7 @@ echo " * gnomedb-sharp.dll: $enable_gnomedb"
echo " * rsvg-sharp.dll: $enable_rsvg " echo " * rsvg-sharp.dll: $enable_rsvg "
echo " * gtkhtml-sharp.dll: $enable_gtkhtml " echo " * gtkhtml-sharp.dll: $enable_gtkhtml "
echo " * vte-sharp.dll: $enable_vte " echo " * vte-sharp.dll: $enable_vte "
echo " * panelapplet-sharp.dll: $enable_panel "
echo "" echo ""
echo " NOTE: if any of the above say 'no' you may install the" echo " NOTE: if any of the above say 'no' you may install the"
echo " corresponding development packages for them, rerun" echo " corresponding development packages for them, rerun"

4
gconf/GConf.PropertyEditors/EditorShell.cs
View file

@ -84,8 +84,8 @@ namespace GConf.PropertyEditors
editor = new PropertyEditorToggleButton (key, (Gtk.ToggleButton) control); editor = new PropertyEditorToggleButton (key, (Gtk.ToggleButton) control);
else if (control is Gtk.Entry) else if (control is Gtk.Entry)
editor = new PropertyEditorEntry (key, (Gtk.Entry) control); editor = new PropertyEditorEntry (key, (Gtk.Entry) control);
else if (control is Gtk.OptionMenu) /*else if (control is Gtk.OptionMenu)
editor = new PropertyEditorOptionMenu (key, (Gtk.OptionMenu) control, enum_type, enum_values); editor = new PropertyEditorOptionMenu (key, (Gtk.OptionMenu) control, enum_type, enum_values);*/
else else
throw new EditorNotSupportedException (); throw new EditorNotSupportedException ();

2
gconf/GConf.PropertyEditors/Makefile.am
View file

@ -24,7 +24,7 @@ sources = \
PropertyEditorEnum.cs \ PropertyEditorEnum.cs \
PropertyEditorEntry.cs \ PropertyEditorEntry.cs \
PropertyEditorFileEntry.cs \ PropertyEditorFileEntry.cs \
PropertyEditorOptionMenu.cs \ PropertyEditorOptionMenu.cs \
PropertyEditorRadioButton.cs \ PropertyEditorRadioButton.cs \
PropertyEditorSpinButton.cs \ PropertyEditorSpinButton.cs \
PropertyEditorToggleButton.cs \ PropertyEditorToggleButton.cs \

2
gconf/GConf/.cvsignore
View file

@ -1,4 +1,4 @@
gconf-sharp.pc *.pc
AssemblyInfo.cs AssemblyInfo.cs
Makefile Makefile
Makefile.in Makefile.in

6
gconf/GConf/Makefile.am
View file

@ -1,13 +1,13 @@
if ENABLE_GNOME if ENABLE_GNOME
TARGET = $(ASSEMBLY) $(ASSEMBLY).config TARGET = $(ASSEMBLY) $(ASSEMBLY).config
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gconf-sharp.pc pkgconfig_DATA = gconf-sharp-2.0.pc
else else
TARGET = TARGET =
endif endif
noinst_DATA = $(TARGET) noinst_DATA = $(TARGET)
CLEANFILES = $(ASSEMBLY) gtk-sharp.snk CLEANFILES = $(ASSEMBLY) gtk-sharp.snk
DISTCLEANFILES = gconf-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs DISTCLEANFILES = gconf-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs
ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY = $(ASSEMBLY_NAME).dll
ASSEMBLY_NAME = gconf-sharp ASSEMBLY_NAME = gconf-sharp
@ -16,7 +16,7 @@ EXTRA_DIST = \
$(sources) \ $(sources) \
$(ASSEMBLY).config.in \ $(ASSEMBLY).config.in \
AssemblyInfo.cs.in \ AssemblyInfo.cs.in \
gconf-sharp.pc.in gconf-sharp-2.0.pc.in
references = \ references = \
/r:../../glib/glib-sharp.dll /r:../../glib/glib-sharp.dll

2
gconf/GConf/gconf-sharp.pc.in → gconf/GConf/gconf-sharp-2.0.pc.in
View file

@ -6,5 +6,5 @@ libdir=${exec_prefix}/lib
Name: GConf# Name: GConf#
Description: GConf# - GConf .NET Binding Description: GConf# - GConf .NET Binding
Version: @VERSION@ Version: @VERSION@
Requires: gnome-sharp Requires: gnome-sharp-2.0
Libs: -r:${libdir}/mono/@PACKAGE@/gconf-sharp.dll -r:${libdir}/mono/@PACKAGE@/gconf-sharp-peditors.dll Libs: -r:${libdir}/mono/@PACKAGE@/gconf-sharp.dll -r:${libdir}/mono/@PACKAGE@/gconf-sharp-peditors.dll

2
gconf/tools/.cvsignore
View file

@ -1,4 +1,4 @@
Makefile Makefile
Makefile.in Makefile.in
gconfsharp-schemagen gconfsharp2-schemagen
*.exe *.exe

8
gconf/tools/Makefile.am
View file

@ -1,12 +1,12 @@
assemblydir = $(bindir) assemblydir = $(libdir)/gtk-sharp-2.0
assembly_DATA = gconfsharp-schemagen.exe assembly_DATA = gconfsharp-schemagen.exe
bin_SCRIPTS = gconfsharp-schemagen bin_SCRIPTS = gconfsharp2-schemagen
CLEANFILES = gconfsharp-schemagen.exe CLEANFILES = gconfsharp-schemagen.exe
DISTCLEANFILES = gconfsharp-schemagen DISTCLEANFILES = gconfsharp2-schemagen
EXTRA_DIST = \ EXTRA_DIST = \
schemagen.cs \ schemagen.cs \
gconfsharp-schemagen.in gconfsharp2-schemagen.in
gconfsharp-schemagen.exe: $(srcdir)/schemagen.cs gconfsharp-schemagen.exe: $(srcdir)/schemagen.cs
$(CSC) /out:gconfsharp-schemagen.exe $(srcdir)/schemagen.cs $(CSC) /out:gconfsharp-schemagen.exe $(srcdir)/schemagen.cs

2
gconf/tools/gconfsharp-schemagen.in
View file

@ -1,2 +0,0 @@
#!/bin/sh
@RUNTIME@ @prefix@/bin/gconfsharp-schemagen.exe "$@"

2
gconf/tools/gconfsharp2-schemagen.in Normal file
View file

@ -0,0 +1,2 @@
#!/bin/sh
@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe "$@"

2
gda/.cvsignore
View file

@ -1,4 +1,4 @@
gda-sharp.pc *.pc
AssemblyInfo.cs AssemblyInfo.cs
*.dll *.dll
*.dll.config *.dll.config

8
gda/Makefile.am
View file

@ -2,7 +2,7 @@ if ENABLE_GDA
TARGET = $(ASSEMBLY) $(ASSEMBLY).config TARGET = $(ASSEMBLY) $(ASSEMBLY).config
APIS = $(API) APIS = $(API)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gda-sharp.pc pkgconfig_DATA = gda-sharp-2.0.pc
else else
TARGET = TARGET =
APIS = APIS =
@ -15,12 +15,12 @@ ASSEMBLY_NAME = gda-sharp
references = /r:../glib/glib-sharp.dll references = /r:../glib/glib-sharp.dll
ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY = $(ASSEMBLY_NAME).dll
gapidir = $(datadir)/gapi gapidir = $(datadir)/gapi-2.0
noinst_DATA = $(TARGET) noinst_DATA = $(TARGET)
gapi_DATA = $(APIS) gapi_DATA = $(APIS)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk
DISTCLEANFILES = gda-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs DISTCLEANFILES = gda-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs
sources = \ sources = \
Application.cs Application.cs
@ -38,7 +38,7 @@ EXTRA_DIST = \
$(METADATA) \ $(METADATA) \
$(customs) \ $(customs) \
$(sources) \ $(sources) \
gda-sharp.pc.in gda-sharp-2.0.pc.in
$(API): $(srcdir)/$(METADATA) $(API): $(srcdir)/$(METADATA)
cp $(srcdir)/$(RAW_API) $(API) cp $(srcdir)/$(RAW_API) $(API)

2
gda/gda-sharp.pc.in → gda/gda-sharp-2.0.pc.in
View file

@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib
Name: Gda# Name: Gda#
Description: Gda# - Gda .NET Binding Description: Gda# - Gda .NET Binding
Version: @VERSION@ Version: @VERSION@
Libs: -r:${libdir}/mono/@PACKAGE@/gda-sharp.dll Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gda-sharp.dll

1
gda/gda-sharp.dll.config.in
View file

@ -1,3 +1,4 @@
<configuration> <configuration>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/> <dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
</configuration> </configuration>

18
gdk/Device.custom
View file

@ -1,4 +1,4 @@
// Display.custom - customizations to Gdk.Display // Device.custom - customizations to Gdk.Device
// //
// Authors: Manuel V. Santos <mvsl@telefonica.net> // Authors: Manuel V. Santos <mvsl@telefonica.net>
// //
@ -19,28 +19,28 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_device_get_name (IntPtr device); static extern IntPtr gtksharp_gdk_device_get_name (IntPtr device);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern InputSource gtksharp_gdk_device_get_source (IntPtr device); static extern InputSource gtksharp_gdk_device_get_source (IntPtr device);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern InputMode gtksharp_gdk_device_get_mode (IntPtr device); static extern InputMode gtksharp_gdk_device_get_mode (IntPtr device);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern bool gtksharp_gdk_device_has_cursor (IntPtr device); static extern bool gtksharp_gdk_device_has_cursor (IntPtr device);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern int gtksharp_gdk_device_get_num_axes (IntPtr device); static extern int gtksharp_gdk_device_get_num_axes (IntPtr device);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern int gtksharp_gdk_device_get_num_keys (IntPtr device); static extern int gtksharp_gdk_device_get_num_keys (IntPtr device);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern DeviceAxis gtksharp_gdk_device_get_device_axis (IntPtr device, uint axis); static extern DeviceAxis gtksharp_gdk_device_get_device_axis (IntPtr device, uint axis);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern DeviceKey gtksharp_gdk_device_get_device_key (IntPtr device, uint axis); static extern DeviceKey gtksharp_gdk_device_get_device_key (IntPtr device, uint axis);
[DllImport("libgdk-win32-2.0-0.dll")] [DllImport("libgdk-win32-2.0-0.dll")]

18
gdk/DragContext.custom
View file

@ -20,7 +20,7 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern DragProtocol gtksharp_drag_context_get_protocol (IntPtr ptr); static extern DragProtocol gtksharp_drag_context_get_protocol (IntPtr ptr);
public unsafe DragProtocol DragProtocol { public unsafe DragProtocol DragProtocol {
@ -30,7 +30,7 @@ public unsafe DragProtocol DragProtocol {
} }
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern bool gtksharp_drag_context_get_is_source (IntPtr ptr); static extern bool gtksharp_drag_context_get_is_source (IntPtr ptr);
public bool IsSource { public bool IsSource {
@ -40,7 +40,7 @@ public bool IsSource {
} }
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_drag_context_get_source_window (IntPtr ptr); static extern IntPtr gtksharp_drag_context_get_source_window (IntPtr ptr);
public Gdk.Window SourceWindow { public Gdk.Window SourceWindow {
@ -50,7 +50,7 @@ public Gdk.Window SourceWindow {
} }
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_drag_context_get_dest_window (IntPtr ptr); static extern IntPtr gtksharp_drag_context_get_dest_window (IntPtr ptr);
public Gdk.Window DestWindow { public Gdk.Window DestWindow {
@ -60,7 +60,7 @@ public Gdk.Window DestWindow {
} }
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_drag_context_get_targets (IntPtr ptr); static extern IntPtr gtksharp_drag_context_get_targets (IntPtr ptr);
public Atom [] Targets { public Atom [] Targets {
@ -78,7 +78,7 @@ public Atom [] Targets {
} }
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern DragAction gtksharp_drag_context_get_actions (IntPtr ptr); static extern DragAction gtksharp_drag_context_get_actions (IntPtr ptr);
public DragAction Actions { public DragAction Actions {
@ -87,7 +87,7 @@ public DragAction Actions {
} }
} }
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern DragAction gtksharp_drag_context_get_suggested_action (IntPtr ptr); static extern DragAction gtksharp_drag_context_get_suggested_action (IntPtr ptr);
public DragAction SuggestedAction { public DragAction SuggestedAction {
@ -97,7 +97,7 @@ public DragAction SuggestedAction {
} }
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern DragAction gtksharp_drag_context_get_action (IntPtr ptr); static extern DragAction gtksharp_drag_context_get_action (IntPtr ptr);
public DragAction Action { public DragAction Action {
@ -107,7 +107,7 @@ public DragAction Action {
} }
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_drag_context_get_start_time (IntPtr ptr); static extern uint gtksharp_drag_context_get_start_time (IntPtr ptr);
public uint StartTime { public uint StartTime {

6
gdk/Event.cs
View file

@ -28,13 +28,13 @@ namespace Gdk {
public class Event : GLib.IWrapper { public class Event : GLib.IWrapper {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern EventType gtksharp_gdk_event_get_event_type (IntPtr evt); static extern EventType gtksharp_gdk_event_get_event_type (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_get_window (IntPtr evt); static extern IntPtr gtksharp_gdk_event_get_window (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern sbyte gtksharp_gdk_event_get_send_event (IntPtr evt); static extern sbyte gtksharp_gdk_event_get_send_event (IntPtr evt);
[DllImport("libgdk-win32-2.0-0.dll")] [DllImport("libgdk-win32-2.0-0.dll")]

18
gdk/EventButton.cs
View file

@ -25,31 +25,31 @@ namespace Gdk {
public class EventButton : Event { public class EventButton : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_button_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_button_get_time (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_button_get_x (IntPtr evt); static extern double gtksharp_gdk_event_button_get_x (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_button_get_y (IntPtr evt); static extern double gtksharp_gdk_event_button_get_y (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_button_get_x_root (IntPtr evt); static extern double gtksharp_gdk_event_button_get_x_root (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_button_get_y_root (IntPtr evt); static extern double gtksharp_gdk_event_button_get_y_root (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_button_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_button_get_state (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_button_get_button (IntPtr evt); static extern uint gtksharp_gdk_event_button_get_button (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_button_get_device (IntPtr evt); static extern IntPtr gtksharp_gdk_event_button_get_device (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_button_get_axes (IntPtr evt); static extern IntPtr gtksharp_gdk_event_button_get_axes (IntPtr evt);
public EventButton (IntPtr raw) : base (raw) {} public EventButton (IntPtr raw) : base (raw) {}

8
gdk/EventClient.cs
View file

@ -26,16 +26,16 @@ namespace Gdk {
public class EventClient : Event { public class EventClient : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_client_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_client_get_time (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_client_get_message_type (IntPtr evt); static extern IntPtr gtksharp_gdk_event_client_get_message_type (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern ushort gtksharp_gdk_event_client_get_data_format (IntPtr evt); static extern ushort gtksharp_gdk_event_client_get_data_format (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_client_get_data (IntPtr evt); static extern IntPtr gtksharp_gdk_event_client_get_data (IntPtr evt);
public EventClient (IntPtr raw) : base (raw) {} public EventClient (IntPtr raw) : base (raw) {}

8
gdk/EventConfigure.cs
View file

@ -26,16 +26,16 @@ namespace Gdk {
public class EventConfigure : Event { public class EventConfigure : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern int gtksharp_gdk_event_configure_get_x (IntPtr evt); static extern int gtksharp_gdk_event_configure_get_x (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern int gtksharp_gdk_event_configure_get_y (IntPtr evt); static extern int gtksharp_gdk_event_configure_get_y (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern int gtksharp_gdk_event_configure_get_width (IntPtr evt); static extern int gtksharp_gdk_event_configure_get_width (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern int gtksharp_gdk_event_configure_get_height (IntPtr evt); static extern int gtksharp_gdk_event_configure_get_height (IntPtr evt);
public EventConfigure (IntPtr raw) : base (raw) {} public EventConfigure (IntPtr raw) : base (raw) {}

20
gdk/EventCrossing.cs
View file

@ -26,34 +26,34 @@ namespace Gdk {
public class EventCrossing : Event { public class EventCrossing : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_crossing_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_crossing_get_time (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_crossing_get_x (IntPtr evt); static extern double gtksharp_gdk_event_crossing_get_x (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_crossing_get_y (IntPtr evt); static extern double gtksharp_gdk_event_crossing_get_y (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_crossing_get_x_root (IntPtr evt); static extern double gtksharp_gdk_event_crossing_get_x_root (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_crossing_get_y_root (IntPtr evt); static extern double gtksharp_gdk_event_crossing_get_y_root (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_crossing_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_crossing_get_state (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_crossing_get_subwindow (IntPtr evt); static extern IntPtr gtksharp_gdk_event_crossing_get_subwindow (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern CrossingMode gtksharp_gdk_event_crossing_get_mode (IntPtr evt); static extern CrossingMode gtksharp_gdk_event_crossing_get_mode (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern NotifyType gtksharp_gdk_event_crossing_get_detail (IntPtr evt); static extern NotifyType gtksharp_gdk_event_crossing_get_detail (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern bool gtksharp_gdk_event_crossing_get_focus (IntPtr evt); static extern bool gtksharp_gdk_event_crossing_get_focus (IntPtr evt);
public EventCrossing (IntPtr raw) : base (raw) {} public EventCrossing (IntPtr raw) : base (raw) {}

8
gdk/EventDND.cs
View file

@ -26,16 +26,16 @@ namespace Gdk {
public class EventDND : Event { public class EventDND : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_dnd_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_dnd_get_time (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_dnd_get_context (IntPtr evt); static extern IntPtr gtksharp_gdk_event_dnd_get_context (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern short gtksharp_gdk_event_dnd_get_x_root (IntPtr evt); static extern short gtksharp_gdk_event_dnd_get_x_root (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern short gtksharp_gdk_event_dnd_get_y_root (IntPtr evt); static extern short gtksharp_gdk_event_dnd_get_y_root (IntPtr evt);
public EventDND (IntPtr raw) : base (raw) {} public EventDND (IntPtr raw) : base (raw) {}

6
gdk/EventExpose.cs
View file

@ -26,13 +26,13 @@ namespace Gdk {
public class EventExpose : Event { public class EventExpose : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern Rectangle gtksharp_gdk_event_expose_get_area (IntPtr evt); static extern Rectangle gtksharp_gdk_event_expose_get_area (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_expose_get_region (IntPtr evt); static extern IntPtr gtksharp_gdk_event_expose_get_region (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern int gtksharp_gdk_event_expose_get_count (IntPtr evt); static extern int gtksharp_gdk_event_expose_get_count (IntPtr evt);
public EventExpose (IntPtr raw) : base (raw) {} public EventExpose (IntPtr raw) : base (raw) {}

2
gdk/EventFocus.cs
View file

@ -26,7 +26,7 @@ namespace Gdk {
public class EventFocus : Event { public class EventFocus : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern short gtksharp_gdk_event_focus_get_in (IntPtr evt); static extern short gtksharp_gdk_event_focus_get_in (IntPtr evt);
public EventFocus (IntPtr raw) : base (raw) {} public EventFocus (IntPtr raw) : base (raw) {}

10
gdk/EventKey.cs
View file

@ -26,19 +26,19 @@ namespace Gdk {
public class EventKey : Event { public class EventKey : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_key_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_key_get_time (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_key_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_key_get_state (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_key_get_keyval (IntPtr evt); static extern uint gtksharp_gdk_event_key_get_keyval (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern ushort gtksharp_gdk_event_key_get_hardware_keycode (IntPtr evt); static extern ushort gtksharp_gdk_event_key_get_hardware_keycode (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern byte gtksharp_gdk_event_key_get_group (IntPtr evt); static extern byte gtksharp_gdk_event_key_get_group (IntPtr evt);
public EventKey (IntPtr raw) : base (raw) {} public EventKey (IntPtr raw) : base (raw) {}

18
gdk/EventMotion.cs
View file

@ -26,31 +26,31 @@ namespace Gdk {
public class EventMotion : Event { public class EventMotion : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_motion_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_motion_get_time (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_motion_get_x (IntPtr evt); static extern double gtksharp_gdk_event_motion_get_x (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_motion_get_y (IntPtr evt); static extern double gtksharp_gdk_event_motion_get_y (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_motion_get_x_root (IntPtr evt); static extern double gtksharp_gdk_event_motion_get_x_root (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_motion_get_y_root (IntPtr evt); static extern double gtksharp_gdk_event_motion_get_y_root (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_motion_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_motion_get_state (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern ushort gtksharp_gdk_event_motion_get_is_hint (IntPtr evt); static extern ushort gtksharp_gdk_event_motion_get_is_hint (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_motion_get_device (IntPtr evt); static extern IntPtr gtksharp_gdk_event_motion_get_device (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_motion_get_axes (IntPtr evt); static extern IntPtr gtksharp_gdk_event_motion_get_axes (IntPtr evt);
public EventMotion (IntPtr raw) : base (raw) {} public EventMotion (IntPtr raw) : base (raw) {}

6
gdk/EventProperty.cs
View file

@ -26,13 +26,13 @@ namespace Gdk {
public class EventProperty : Event { public class EventProperty : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_property_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_property_get_time (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_property_get_atom (IntPtr evt); static extern IntPtr gtksharp_gdk_event_property_get_atom (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern PropertyState gtksharp_gdk_event_property_get_state (IntPtr evt); static extern PropertyState gtksharp_gdk_event_property_get_state (IntPtr evt);
public EventProperty (IntPtr raw) : base (raw) {} public EventProperty (IntPtr raw) : base (raw) {}

4
gdk/EventProximity.cs
View file

@ -26,10 +26,10 @@ namespace Gdk {
public class EventProximity : Event { public class EventProximity : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_proximity_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_proximity_get_time (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_proximity_get_device (IntPtr evt); static extern IntPtr gtksharp_gdk_event_proximity_get_device (IntPtr evt);
public EventProximity (IntPtr raw) : base (raw) {} public EventProximity (IntPtr raw) : base (raw) {}

16
gdk/EventScroll.cs
View file

@ -26,28 +26,28 @@ namespace Gdk {
public class EventScroll : Event { public class EventScroll : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_scroll_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_scroll_get_time (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_scroll_get_x (IntPtr evt); static extern double gtksharp_gdk_event_scroll_get_x (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_scroll_get_y (IntPtr evt); static extern double gtksharp_gdk_event_scroll_get_y (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_scroll_get_x_root (IntPtr evt); static extern double gtksharp_gdk_event_scroll_get_x_root (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern double gtksharp_gdk_event_scroll_get_y_root (IntPtr evt); static extern double gtksharp_gdk_event_scroll_get_y_root (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_scroll_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_scroll_get_state (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern ScrollDirection gtksharp_gdk_event_scroll_get_direction (IntPtr evt); static extern ScrollDirection gtksharp_gdk_event_scroll_get_direction (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_scroll_get_device (IntPtr evt); static extern IntPtr gtksharp_gdk_event_scroll_get_device (IntPtr evt);
public EventScroll (IntPtr raw) : base (raw) {} public EventScroll (IntPtr raw) : base (raw) {}

10
gdk/EventSelection.cs
View file

@ -26,19 +26,19 @@ namespace Gdk {
public class EventSelection : Event { public class EventSelection : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_selection_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_selection_get_time (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_selection_get_selection (IntPtr evt); static extern IntPtr gtksharp_gdk_event_selection_get_selection (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_selection_get_target (IntPtr evt); static extern IntPtr gtksharp_gdk_event_selection_get_target (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_selection_get_property (IntPtr evt); static extern IntPtr gtksharp_gdk_event_selection_get_property (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern uint gtksharp_gdk_event_selection_get_requestor (IntPtr evt); static extern uint gtksharp_gdk_event_selection_get_requestor (IntPtr evt);
public EventSelection (IntPtr raw) : base (raw) {} public EventSelection (IntPtr raw) : base (raw) {}

4
gdk/EventSetting.cs
View file

@ -26,10 +26,10 @@ namespace Gdk {
public class EventSetting : Event { public class EventSetting : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern SettingAction gtksharp_gdk_event_setting_get_action (IntPtr evt); static extern SettingAction gtksharp_gdk_event_setting_get_action (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_gdk_event_setting_get_name (IntPtr evt); static extern IntPtr gtksharp_gdk_event_setting_get_name (IntPtr evt);
public EventSetting (IntPtr raw) : base (raw) {} public EventSetting (IntPtr raw) : base (raw) {}

2
gdk/EventVisibility.cs
View file

@ -26,7 +26,7 @@ namespace Gdk {
public class EventVisibility : Event { public class EventVisibility : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern VisibilityState gtksharp_gdk_event_visibility_get_state (IntPtr evt); static extern VisibilityState gtksharp_gdk_event_visibility_get_state (IntPtr evt);
public EventVisibility (IntPtr raw) : base (raw) {} public EventVisibility (IntPtr raw) : base (raw) {}

4
gdk/EventWindowState.cs
View file

@ -26,10 +26,10 @@ namespace Gdk {
public class EventWindowState : Event { public class EventWindowState : Event {
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern WindowState gtksharp_gdk_event_window_state_get_changed_mask (IntPtr evt); static extern WindowState gtksharp_gdk_event_window_state_get_changed_mask (IntPtr evt);
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern WindowState gtksharp_gdk_event_window_state_get_new_window_state (IntPtr evt); static extern WindowState gtksharp_gdk_event_window_state_get_new_window_state (IntPtr evt);
public EventWindowState (IntPtr raw) : base (raw) {} public EventWindowState (IntPtr raw) : base (raw) {}

3
gdk/Gdk.metadata
View file

@ -83,6 +83,7 @@
<attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='Save']" name="hidden">1</attr> <attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='Save']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='Savev']/*/*[@type='char**']" name="array">1</attr> <attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='Savev']/*/*[@type='char**']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='ScaleSimple']" name="hidden">1</attr> <attr path="/api/namespace/object[@cname='GdkPixbuf']/method[@name='ScaleSimple']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkPixbuf']/property[@name='Pixels']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkPixbufLoader']/method[@name='GetPixbuf']" name="needs_ref">1</attr> <attr path="/api/namespace/object[@cname='GdkPixbufLoader']/method[@name='GetPixbuf']" name="needs_ref">1</attr>
<attr path="/api/namespace/object[@cname='GdkPixbufLoader']/method[@name='Write']/*/*[@name='buf']" name="array">1</attr> <attr path="/api/namespace/object[@cname='GdkPixbufLoader']/method[@name='Write']/*/*[@name='buf']" name="array">1</attr>
<attr path="/api/namespace/object[@cname='GdkPixmap']" name="parent">GdkDrawable</attr> <attr path="/api/namespace/object[@cname='GdkPixmap']" name="parent">GdkDrawable</attr>
@ -115,6 +116,7 @@
<attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetUserData']" name="hidden">1</attr> <attr path="/api/namespace/object[@cname='GdkWindow']/method[@name='GetUserData']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkWindow']/method[@cname='gdk_window_set_user_data']" name="hidden">1</attr> <attr path="/api/namespace/object[@cname='GdkWindow']/method[@cname='gdk_window_set_user_data']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GdkWindow']/method[@cname='gdk_window_set_back_pixmap']/*/*[@name='pixmap']" name="null_ok">1</attr> <attr path="/api/namespace/object[@cname='GdkWindow']/method[@cname='gdk_window_set_back_pixmap']/*/*[@name='pixmap']" name="null_ok">1</attr>
<attr path="/api/namespace/struct[@cname='GdkAtom']/method[@name='Name']" name="name">GetName</attr>
<attr path="/api/namespace/struct[@cname='GdkEventAny']" name="hidden">1</attr> <attr path="/api/namespace/struct[@cname='GdkEventAny']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GdkEventButton']" name="hidden">1</attr> <attr path="/api/namespace/struct[@cname='GdkEventButton']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GdkEventClient']" name="hidden">1</attr> <attr path="/api/namespace/struct[@cname='GdkEventClient']" name="hidden">1</attr>
@ -144,6 +146,5 @@
<attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='Polygon']/*/*[@name='npoints']" name="name">n_points</attr> <attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='Polygon']/*/*[@name='npoints']" name="name">n_points</attr>
<attr path="/api/namespace/struct[@cname='GdkTimeCoord']/field[@cname='axes']" name="array_len">128</attr> <attr path="/api/namespace/struct[@cname='GdkTimeCoord']/field[@cname='axes']" name="array_len">128</attr>
<attr path="/api/namespace/struct[@cname='GdkWindowObject']" name="hidden">1</attr> <attr path="/api/namespace/struct[@cname='GdkWindowObject']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GdkAtom']/method[@name='Name']" name="name">GetName</attr>
</metadata> </metadata>

12
gdk/Global.custom
View file

@ -49,7 +49,7 @@
return result; return result;
} }
[DllImport ("gdksharpglue")] [DllImport ("gdksharpglue-2.0")]
static extern IntPtr gtksharp_get_gdk_net_supported (); static extern IntPtr gtksharp_get_gdk_net_supported ();
public static Gdk.Atom[] SupportedWindowManagerHints { public static Gdk.Atom[] SupportedWindowManagerHints {
@ -66,7 +66,7 @@
} }
} }
[DllImport ("gdksharpglue")] [DllImport ("gdksharpglue-2.0")]
static extern IntPtr gtksharp_get_gdk_net_client_list (out int count); static extern IntPtr gtksharp_get_gdk_net_client_list (out int count);
public static Gdk.Window[] WindowManagerClientWindows { public static Gdk.Window[] WindowManagerClientWindows {
@ -87,7 +87,7 @@
} }
} }
[DllImport ("gdksharpglue")] [DllImport ("gdksharpglue-2.0")]
static extern int gtksharp_get_gdk_net_number_of_desktops (); static extern int gtksharp_get_gdk_net_number_of_desktops ();
public static int NumberOfDesktops { public static int NumberOfDesktops {
@ -96,7 +96,7 @@
} }
} }
[DllImport ("gdksharpglue")] [DllImport ("gdksharpglue-2.0")]
static extern int gtksharp_get_gdk_net_current_desktop (); static extern int gtksharp_get_gdk_net_current_desktop ();
public static int CurrentDesktop { public static int CurrentDesktop {
@ -105,7 +105,7 @@
} }
} }
[DllImport ("gdksharpglue")] [DllImport ("gdksharpglue-2.0")]
static extern uint gtksharp_get_gdk_net_active_window (); static extern uint gtksharp_get_gdk_net_active_window ();
public static Gdk.Window ActiveWindow { public static Gdk.Window ActiveWindow {
@ -119,7 +119,7 @@
} }
} }
[DllImport ("gdksharpglue")] [DllImport ("gdksharpglue-2.0")]
static extern IntPtr gtksharp_get_gdk_net_workarea (); static extern IntPtr gtksharp_get_gdk_net_workarea ();
public static Gdk.Rectangle[] DesktopWorkareas { public static Gdk.Rectangle[] DesktopWorkareas {

2
gdk/Makefile.am
View file

@ -10,7 +10,7 @@ references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll
TARGET = $(ASSEMBLY) TARGET = $(ASSEMBLY)
ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY = $(ASSEMBLY_NAME).dll
gapidir = $(datadir)/gapi gapidir = $(datadir)/gapi-2.0
noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config
gapi_DATA = $(API) $(ADDITIONAL_API) gapi_DATA = $(API) $(ADDITIONAL_API)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.snk CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.snk

65
gdk/Pixbuf.custom
View file

@ -31,6 +31,67 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("libgdk-win32-2.0-0.dll")]
static extern IntPtr gdk_pixbuf_get_from_drawable(IntPtr raw, IntPtr src, IntPtr cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
public Gdk.Pixbuf GetFromDrawable(Gdk.Drawable src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height) {
IntPtr raw_ret = gdk_pixbuf_get_from_drawable(Handle, src.Handle, cmap.Handle, src_x, src_y, dest_x, dest_y, width, height);
Gdk.Pixbuf ret;
if (raw_ret == IntPtr.Zero)
ret = null;
else
ret = (Gdk.Pixbuf) GLib.Object.GetObject(raw_ret);
return ret;
}
[DllImport("libgdk-win32-2.0-0.dll")]
static extern IntPtr gdk_pixbuf_get_from_image(IntPtr raw, IntPtr src, IntPtr cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
public Gdk.Pixbuf GetFromImage(Gdk.Image src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height) {
IntPtr raw_ret = gdk_pixbuf_get_from_image(Handle, src.Handle, cmap.Handle, src_x, src_y, dest_x, dest_y, width, height);
Gdk.Pixbuf ret;
if (raw_ret == IntPtr.Zero)
ret = null;
else
ret = (Gdk.Pixbuf) GLib.Object.GetObject(raw_ret);
return ret;
}
[DllImport("libgdk-win32-2.0-0.dll")]
static extern void gdk_pixbuf_render_pixmap_and_mask(IntPtr raw, IntPtr pixmap_return, IntPtr mask_return, int alpha_threshold);
public void RenderPixmapAndMask(Gdk.Pixmap pixmap_return, Gdk.Bitmap mask_return, int alpha_threshold) {
gdk_pixbuf_render_pixmap_and_mask(Handle, pixmap_return.Handle, mask_return.Handle, alpha_threshold);
}
[DllImport("libgdk-win32-2.0-0.dll")]
static extern void gdk_pixbuf_render_pixmap_and_mask_for_colormap(IntPtr raw, IntPtr colormap, IntPtr pixmap_return, IntPtr mask_return, int alpha_threshold);
public void RenderPixmapAndMaskForColormap(Gdk.Colormap colormap, Gdk.Pixmap pixmap_return, Gdk.Bitmap mask_return, int alpha_threshold) {
gdk_pixbuf_render_pixmap_and_mask_for_colormap(Handle, colormap.Handle, pixmap_return.Handle, mask_return.Handle, alpha_threshold);
}
[DllImport("libgdk-win32-2.0-0.dll")]
static extern void gdk_pixbuf_render_threshold_alpha(IntPtr raw, IntPtr bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold);
public void RenderThresholdAlpha(Gdk.Bitmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold) {
gdk_pixbuf_render_threshold_alpha(Handle, bitmap.Handle, src_x, src_y, dest_x, dest_y, width, height, alpha_threshold);
}
[DllImport("libgdk-win32-2.0-0.dll")]
static extern void gdk_pixbuf_render_to_drawable(IntPtr raw, IntPtr drawable, IntPtr gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int dither, int x_dither, int y_dither);
public void RenderToDrawable(Gdk.Drawable drawable, Gdk.GC gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither) {
gdk_pixbuf_render_to_drawable(Handle, drawable.Handle, gc.Handle, src_x, src_y, dest_x, dest_y, width, height, (int) dither, x_dither, y_dither);
}
[DllImport("libgdk-win32-2.0-0.dll")]
static extern void gdk_pixbuf_render_to_drawable_alpha(IntPtr raw, IntPtr drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_mode, int alpha_threshold, int dither, int x_dither, int y_dither);
public void RenderToDrawableAlpha(Gdk.Drawable drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.PixbufAlphaMode alpha_mode, int alpha_threshold, Gdk.RgbDither dither, int x_dither, int y_dither) {
gdk_pixbuf_render_to_drawable_alpha(Handle, drawable.Handle, src_x, src_y, dest_x, dest_y, width, height, (int) alpha_mode, alpha_threshold, (int) dither, x_dither, y_dither);
}
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]
static extern void g_object_ref (IntPtr handle); static extern void g_object_ref (IntPtr handle);
@ -191,7 +252,3 @@
return ret; return ret;
} }
public void RenderThresholdAlpha (Bitmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int alpha_threshold)
{
RenderThresholdAlpha (bitmap, src_x, src_y, dest_x, dest_y, -1, -1, alpha_threshold);
}

6
gdk/Selection.custom
View file

@ -20,17 +20,17 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_get_gdk_selection_primary (); static extern IntPtr gtksharp_get_gdk_selection_primary ();
public static Gdk.Atom Primary = new Gdk.Atom (gtksharp_get_gdk_selection_primary()); public static Gdk.Atom Primary = new Gdk.Atom (gtksharp_get_gdk_selection_primary());
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_get_gdk_selection_secondary (); static extern IntPtr gtksharp_get_gdk_selection_secondary ();
public static Gdk.Atom Secondary = new Gdk.Atom (gtksharp_get_gdk_selection_secondary()); public static Gdk.Atom Secondary = new Gdk.Atom (gtksharp_get_gdk_selection_secondary());
[DllImport("gdksharpglue")] [DllImport("gdksharpglue-2.0")]
static extern IntPtr gtksharp_get_gdk_selection_clipboard (); static extern IntPtr gtksharp_get_gdk_selection_clipboard ();
public static Gdk.Atom Clipboard = new Gdk.Atom (gtksharp_get_gdk_selection_clipboard()); public static Gdk.Atom Clipboard = new Gdk.Atom (gtksharp_get_gdk_selection_clipboard());

790
gdk/gdk-api.raw
View file

File diff suppressed because it is too large Load diff

12
gdk/glue/Makefile.am
View file

@ -1,6 +1,6 @@
lib_LTLIBRARIES = libgdksharpglue.la lib_LTLIBRARIES = libgdksharpglue-2.0.la
libgdksharpglue_la_SOURCES = \ libgdksharpglue_2_0_la_SOURCES = \
dragcontext.c \ dragcontext.c \
device.c \ device.c \
event.c \ event.c \
@ -11,14 +11,14 @@ libgdksharpglue_la_SOURCES = \
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32
libgdksharpglue_la_LDFLAGS = -module -avoid-version -no-undefined libgdksharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
libgdksharpglue_la_LIBADD = $(GTK_LIBS) libgdksharpglue_2_0_la_LIBADD = $(GTK_LIBS)
INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir) INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir)
libgdksharpglue.dll: $(libgdksharpglue_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def libgdksharpglue.dll: $(libgdksharpglue_2_0_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def
./build-dll libgdksharpglue $(VERSION) ./build-dll libgdksharpglue-2.0 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

8
gdk/glue/makefile.win32
View file

@ -10,16 +10,16 @@ GLUE_OBJS = \
selection.o \ selection.o \
win32dll.o win32dll.o
all: gdksharpglue.dll all: gdksharpglue-2.0.dll
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
gdksharpglue.dll: $(GLUE_OBJS) gdksharpglue-2.0.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libgdksharpglue.a --dllname=gdksharpglue.dll --driver-name=gcc --output-def=gdksharpglue.def $(GLUE_OBJS) $(GTK_LIBS) $(DLLWRAP) --output-lib=libgdksharpglue-2.0.a --dllname=gdksharpglue-2.0.dll --driver-name=gcc --output-def=gdksharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
clean: clean:
rm -f gdksharpglue.dll *.o libgdksharpglue.a rm -f gdksharpglue-2.0.dll *.o libgdksharpglue-2.0.a

2
generator/.cvsignore
View file

@ -2,7 +2,7 @@
*.exe *.exe
*.xml *.xml
generated-stamp generated-stamp
gapi-codegen gapi2-codegen
Makefile Makefile
Makefile.in Makefile.in

4
generator/BoxedGen.cs
View file

@ -39,10 +39,10 @@ namespace GtkSharp.Generation {
{ {
StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name); StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
base.Generate (gen_info); base.Generate (gen_info);
sw.WriteLine ("\t\t[DllImport(\"glibsharpglue\")]"); sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2.0\")]");
sw.WriteLine ("\t\tstatic extern IntPtr glibsharp_value_get_boxed (ref GLib.Value val);"); sw.WriteLine ("\t\tstatic extern IntPtr glibsharp_value_get_boxed (ref GLib.Value val);");
sw.WriteLine (); sw.WriteLine ();
sw.WriteLine ("\t\t[DllImport(\"glibsharpglue\")]"); sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2.0\")]");
sw.WriteLine ("\t\tstatic extern void glibsharp_value_set_boxed (ref GLib.Value val, ref " + QualifiedName + " boxed);"); sw.WriteLine ("\t\tstatic extern void glibsharp_value_set_boxed (ref GLib.Value val, ref " + QualifiedName + " boxed);");
sw.WriteLine (); sw.WriteLine ();
sw.WriteLine ("\t\tpublic static explicit operator GLib.Value (" + QualifiedName + " boxed)"); sw.WriteLine ("\t\tpublic static explicit operator GLib.Value (" + QualifiedName + " boxed)");

21
generator/ClassBase.cs
View file

@ -38,6 +38,8 @@ namespace GtkSharp.Generation {
private bool ctors_initted = false; private bool ctors_initted = false;
private Hashtable clash_map; private Hashtable clash_map;
private bool deprecated = false;
private bool isabstract = false;
public Hashtable Methods { public Hashtable Methods {
get { get {
@ -64,12 +66,17 @@ namespace GtkSharp.Generation {
protected ClassBase (XmlElement ns, XmlElement elem) : base (ns, elem) { protected ClassBase (XmlElement ns, XmlElement elem) : base (ns, elem) {
if (elem.HasAttribute ("deprecated"))
deprecated = elem.GetAttribute ("deprecated") == "1";
if (elem.HasAttribute ("abstract"))
isabstract = elem.GetAttribute ("abstract") == "1";
foreach (XmlNode node in elem.ChildNodes) { foreach (XmlNode node in elem.ChildNodes) {
if (!(node is XmlElement)) continue; if (!(node is XmlElement)) continue;
XmlElement member = (XmlElement) node; XmlElement member = (XmlElement) node;
if (member.HasAttribute ("hidden")) if (member.HasAttribute ("hidden"))
continue; continue;
string name; string name;
switch (node.Name) { switch (node.Name) {
case "method": case "method":
@ -107,6 +114,18 @@ namespace GtkSharp.Generation {
} }
} }
public bool IsDeprecated {
get {
return deprecated;
}
}
public bool IsAbstract {
get {
return isabstract;
}
}
protected bool IsNodeNameHandled (string name) protected bool IsNodeNameHandled (string name)
{ {
switch (name) { switch (name) {

4
generator/ClassGen.cs
View file

@ -50,7 +50,9 @@ namespace GtkSharp.Generation {
sw.WriteLine ("\tusing System.Runtime.InteropServices;"); sw.WriteLine ("\tusing System.Runtime.InteropServices;");
sw.WriteLine (); sw.WriteLine ();
sw.WriteLine ("#region Autogenerated code"); sw.WriteLine ("#region Autogenerated code");
if (IsDeprecated)
sw.WriteLine ("\t[Obsolete]");
sw.Write ("\tpublic class " + Name); sw.Write ("\tpublic class " + Name);
sw.WriteLine (" {"); sw.WriteLine (" {");
sw.WriteLine (); sw.WriteLine ();

6
generator/Makefile.am
View file

@ -1,8 +1,8 @@
assemblydir = $(bindir) assemblydir = $(libdir)/gtk-sharp-2.0
assembly_DATA = gapi_codegen.exe assembly_DATA = gapi_codegen.exe
bin_SCRIPTS = gapi-codegen bin_SCRIPTS = gapi2-codegen
CLEANFILES = gapi_codegen.exe CLEANFILES = gapi_codegen.exe
DISTCLEANFILES = gapi-codegen DISTCLEANFILES = gapi2-codegen
references = references =

33
generator/Method.cs
View file

@ -44,15 +44,18 @@ namespace GtkSharp.Generation {
private string name, cname, safety; private string name, cname, safety;
private string protection = "public"; private string protection = "public";
private bool is_get, is_set; private bool is_get, is_set;
private bool needs_ref = false; private bool needs_ref = false;
private bool deprecated = false;
public Method (string libname, XmlElement elem, ClassBase container_type) public Method (string libname, XmlElement elem, ClassBase container_type)
{ {
this.elem = elem; this.elem = elem;
if (elem["parameters"] != null) { if (elem["parameters"] != null) {
parms = new Parameters (elem["parameters"], container_type.NS); parms = new Parameters (elem["parameters"], container_type.NS);
} }
this.container_type = container_type; this.container_type = container_type;
if (!container_type.IsDeprecated && elem.HasAttribute ("deprecated"))
deprecated = elem.GetAttribute ("deprecated") == "1";
this.name = elem.GetAttribute("name"); this.name = elem.GetAttribute("name");
if (name == "GetType") if (name == "GetType")
name = "GetGType"; name = "GetGType";
@ -65,6 +68,12 @@ namespace GtkSharp.Generation {
if (elem.HasAttribute ("needs_ref")) if (elem.HasAttribute ("needs_ref"))
this.needs_ref = (elem.GetAttribute ("needs_ref") == "1"); this.needs_ref = (elem.GetAttribute ("needs_ref") == "1");
} }
public bool IsDeprecated {
get {
return deprecated;
}
}
public bool IsGetter { public bool IsGetter {
get { get {
@ -80,7 +89,8 @@ namespace GtkSharp.Generation {
private bool IsShared { private bool IsShared {
get { get {
return elem.HasAttribute("shared"); return elem.HasAttribute("shared") &&
(elem.GetAttribute("shared") == "true");
} }
} }
@ -209,8 +219,9 @@ namespace GtkSharp.Generation {
} }
private void GenerateDeclCommon (StreamWriter sw, ClassBase implementor) private void GenerateDeclCommon (StreamWriter sw, ClassBase implementor)
{ {
if (elem.HasAttribute("shared")) if (elem.HasAttribute("shared") &&
(elem.GetAttribute("shared") == "true"))
sw.Write("static "); sw.Write("static ");
sw.Write(safety); sw.Write(safety);
Method dup = null; Method dup = null;
@ -248,7 +259,8 @@ namespace GtkSharp.Generation {
if (!Initialize ()) if (!Initialize ())
return; return;
if (elem.HasAttribute("shared")) if (elem.HasAttribute("shared") &&
(elem.GetAttribute("shared") == "true"))
return; return;
if (is_get || is_set) if (is_get || is_set)
@ -300,7 +312,8 @@ namespace GtkSharp.Generation {
if (!Initialize ()) if (!Initialize ())
return; return;
if (implementor != null && elem.HasAttribute("shared")) if (implementor != null && elem.HasAttribute("shared") &&
(elem.GetAttribute ("shared") == "true"))
return; return;
/* we are generated by the get Method, if there is one */ /* we are generated by the get Method, if there is one */
@ -325,7 +338,9 @@ namespace GtkSharp.Generation {
GenerateImport (gen_info.Writer); GenerateImport (gen_info.Writer);
if (comp != null && s_ret == comp.parms.AccessorReturnType) if (comp != null && s_ret == comp.parms.AccessorReturnType)
comp.GenerateImport (gen_info.Writer); comp.GenerateImport (gen_info.Writer);
if (IsDeprecated)
gen_info.Writer.WriteLine("\t\t[Obsolete]");
gen_info.Writer.Write("\t\t"); gen_info.Writer.Write("\t\t");
if (protection != "") if (protection != "")
gen_info.Writer.Write("{0} ", protection); gen_info.Writer.Write("{0} ", protection);

6
generator/ObjectGen.cs
View file

@ -121,8 +121,10 @@ namespace GtkSharp.Generation {
SymbolTable table = SymbolTable.Table; SymbolTable table = SymbolTable.Table;
sw.WriteLine ("#region Autogenerated code"); sw.WriteLine ("#region Autogenerated code");
sw.Write ("\tpublic class " + Name); if (IsDeprecated)
sw.WriteLine ("\t[Obsolete]");
sw.Write ("\tpublic {0} class " + Name, IsAbstract ? "abstract" : "");
string cs_parent = table.GetCSType(Elem.GetAttribute("parent")); string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
if (cs_parent != "") if (cs_parent != "")
sw.Write (" : " + cs_parent); sw.Write (" : " + cs_parent);

3
generator/Parser.cs
View file

@ -30,7 +30,8 @@ namespace GtkSharp.Generation {
public class Parser { public class Parser {
private XmlDocument Load (string filename) private XmlDocument Load (string filename)
{ {
Console.WriteLine (filename);
XmlDocument doc = new XmlDocument (); XmlDocument doc = new XmlDocument ();
try { try {

2
generator/gapi-codegen.in
View file

@ -1,2 +0,0 @@
#!/bin/sh
@RUNTIME@ @prefix@/bin/gapi_codegen.exe "$@"

2
generator/gapi2-codegen.in Executable file
View file

@ -0,0 +1,2 @@
#!/bin/sh
@RUNTIME@ @prefix@/lib/gtk-sharp-2.0/gapi_codegen.exe "$@"

2
glade/.cvsignore
View file

@ -1,4 +1,4 @@
glade-sharp.pc *.pc
AssemblyInfo.cs AssemblyInfo.cs
*.dll *.dll
*.dll.config *.dll.config

8
glade/Makefile.am
View file

@ -4,7 +4,7 @@ if ENABLE_GLADE
TARGET = $(ASSEMBLY) $(ASSEMBLY).config TARGET = $(ASSEMBLY) $(ASSEMBLY).config
APIS = $(API) $(ADDITIONAL_API) APIS = $(API) $(ADDITIONAL_API)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = glade-sharp.pc pkgconfig_DATA = glade-sharp-2.0.pc
else else
TARGET = TARGET =
APIS = APIS =
@ -18,12 +18,12 @@ ASSEMBLY_NAME = glade-sharp
references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll
ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY = $(ASSEMBLY_NAME).dll
gapidir = $(datadir)/gapi gapidir = $(datadir)/gapi-2.0
noinst_DATA = $(TARGET) noinst_DATA = $(TARGET)
gapi_DATA = $(APIS) gapi_DATA = $(APIS)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk
DISTCLEANFILES = glade-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs DISTCLEANFILES = glade-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs
sources = \ sources = \
HandlerNotFoundExeception.cs \ HandlerNotFoundExeception.cs \
@ -44,7 +44,7 @@ EXTRA_DIST = \
$(METADATA) \ $(METADATA) \
$(customs) \ $(customs) \
$(sources) \ $(sources) \
glade-sharp.pc.in glade-sharp-2.0.pc.in
$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
cp $(srcdir)/$(RAW_API) $(API) cp $(srcdir)/$(RAW_API) $(API)

2
glade/XML.custom
View file

@ -36,7 +36,7 @@
glade_set_custom_handler (callback_wrapper.NativeDelegate, IntPtr.Zero); glade_set_custom_handler (callback_wrapper.NativeDelegate, IntPtr.Zero);
} }
[DllImport("gladesharpglue")] [DllImport("gladesharpglue-2.0")]
static extern IntPtr gtksharp_glade_xml_get_filename (IntPtr raw); static extern IntPtr gtksharp_glade_xml_get_filename (IntPtr raw);
public string Filename { public string Filename {

2
glade/glade-api.raw
View file

@ -317,7 +317,7 @@
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GType" name="type"/> <parameter type="GType" name="type"/>
<parameter type="GladeNewFunc" name="new"/> <parameter type="GladeNewFunc" name="new_func"/>
<parameter type="GladeBuildChildrenFunc" name="build_children"/> <parameter type="GladeBuildChildrenFunc" name="build_children"/>
<parameter type="GladeFindInternalChildFunc" name="find_internal_child"/> <parameter type="GladeFindInternalChildFunc" name="find_internal_child"/>
</parameters> </parameters>

4
glade/glade-sharp.pc.in → glade/glade-sharp-2.0.pc.in
View file

@ -6,5 +6,5 @@ libdir=${exec_prefix}/lib
Name: Glade# Name: Glade#
Description: Glade# - Glade .NET Binding Description: Glade# - Glade .NET Binding
Version: @VERSION@ Version: @VERSION@
Requires: gtk-sharp Requires: gtk-sharp-2.0
Libs: -r:${libdir}/mono/@PACKAGE@/glade-sharp.dll Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glade-sharp.dll

12
glade/glue/Makefile.am
View file

@ -1,22 +1,22 @@
lib_LTLIBRARIES = $(TARGET) lib_LTLIBRARIES = $(TARGET)
if ENABLE_GLADE if ENABLE_GLADE
TARGET = libgladesharpglue.la TARGET = libgladesharpglue-2.0.la
else else
TARGET = TARGET =
endif endif
libgladesharpglue_la_LDFLAGS = -module -avoid-version -no-undefined libgladesharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
libgladesharpglue_la_SOURCES = \ libgladesharpglue_2_0_la_SOURCES = \
gladexml.c gladexml.c
libgladesharpglue_la_LIBADD = $(GLADE_LIBS) libgladesharpglue_2_0_la_LIBADD = $(GLADE_LIBS)
INCLUDES = $(GLADE_CFLAGS) -I$(top_srcdir) INCLUDES = $(GLADE_CFLAGS) -I$(top_srcdir)
libgladesharpglue.dll: $(libgladesharpglue_la_OBJECTS) libgladesharpglue.rc libgladesharpglue.def libgladesharpglue.dll: $(libgladesharpglue_2_0_la_OBJECTS) libgladesharpglue.rc libgladesharpglue.def
./build-dll libgladesharpglue $(VERSION) ./build-dll libgladesharpglue-2.0 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

8
glade/glue/makefile.win32
View file

@ -7,16 +7,16 @@ GLUE_OBJS = \
gladexml.o \ gladexml.o \
win32dll.o win32dll.o
all: gladesharpglue.dll all: gladesharpglue-2.0.dll
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
gladesharpglue.dll: $(GLUE_OBJS) gladesharpglue-2.0.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libgladesharpglue.a --dllname=gladesharpglue.dll --driver-name=gcc --output-def=gladesharpglue.def $(GLUE_OBJS) $(GTK_LIBS) $(DLLWRAP) --output-lib=libgladesharpglue-2.0.a --dllname=gladesharpglue-2.0.dll --driver-name=gcc --output-def=gladesharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
clean: clean:
rm -f gladesharpglue.dll *.o libgladesharpglue.a rm -f gladesharpglue-2.0.dll *.o libgladesharpglue-2.0.a

2
glib/GException.cs
View file

@ -33,7 +33,7 @@ namespace GLib {
this.errptr = errptr; this.errptr = errptr;
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_error_get_message (IntPtr errptr); static extern IntPtr gtksharp_error_get_message (IntPtr errptr);
public override string Message { public override string Message {
get { get {

4
glib/List.cs
View file

@ -34,7 +34,7 @@ namespace GLib {
return new List (g_list_copy (Handle)); return new List (g_list_copy (Handle));
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_list_get_data (IntPtr l); static extern IntPtr gtksharp_list_get_data (IntPtr l);
internal override IntPtr GetData (IntPtr current) internal override IntPtr GetData (IntPtr current)
@ -42,7 +42,7 @@ namespace GLib {
return gtksharp_list_get_data (current); return gtksharp_list_get_data (current);
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_list_get_next (IntPtr l); static extern IntPtr gtksharp_list_get_next (IntPtr l);
internal override IntPtr Next (IntPtr current) internal override IntPtr Next (IntPtr current)

4
glib/Marshaller.cs
View file

@ -173,7 +173,7 @@ namespace GLib {
return local_epoch.AddSeconds ((int)time_t + utc_offset); return local_epoch.AddSeconds ((int)time_t + utc_offset);
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_unichar_to_utf8_string (uint c); static extern IntPtr gtksharp_unichar_to_utf8_string (uint c);
public static char GUnicharToChar (uint ucs4_char) public static char GUnicharToChar (uint ucs4_char)
@ -186,7 +186,7 @@ namespace GLib {
return ret [0]; return ret [0];
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern uint glibsharp_utf16_to_gunichar (ushort c); static extern uint glibsharp_utf16_to_gunichar (ushort c);
public static uint CharToGUnichar (char c) public static uint CharToGUnichar (char c)

14
glib/Object.cs
View file

@ -137,7 +137,7 @@ namespace GLib {
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_register_type (string name, IntPtr parent_type); static extern IntPtr gtksharp_register_type (string name, IntPtr parent_type);
protected static GType RegisterGType (System.Type t) protected static GType RegisterGType (System.Type t)
@ -184,7 +184,7 @@ namespace GLib {
Raw = g_object_new (gtype.Val, IntPtr.Zero); Raw = g_object_new (gtype.Val, IntPtr.Zero);
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_object_newv (IntPtr gtype, int n_params, string[] names, GLib.Value[] vals); static extern IntPtr gtksharp_object_newv (IntPtr gtype, int n_params, string[] names, GLib.Value[] vals);
protected void CreateNativeObject (string[] names, GLib.Value[] vals) protected void CreateNativeObject (string[] names, GLib.Value[] vals)
@ -206,7 +206,7 @@ namespace GLib {
} }
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
private static extern IntPtr gtksharp_get_type_id (IntPtr obj); private static extern IntPtr gtksharp_get_type_id (IntPtr obj);
public static GLib.GType GType { public static GLib.GType GType {
@ -215,7 +215,7 @@ namespace GLib {
} }
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_get_type_name (IntPtr raw); static extern IntPtr gtksharp_get_type_name (IntPtr raw);
protected string TypeName { protected string TypeName {
@ -304,7 +304,7 @@ namespace GLib {
g_object_set_property (Raw, name, ref val); g_object_set_property (Raw, name, ref val);
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern void gtksharp_override_virtual_method (IntPtr gtype, string name, Delegate cb); static extern void gtksharp_override_virtual_method (IntPtr gtype, string name, Delegate cb);
protected static void OverrideVirtualMethod (GType gtype, string name, Delegate cb) protected static void OverrideVirtualMethod (GType gtype, string name, Delegate cb)
@ -315,7 +315,7 @@ namespace GLib {
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]
protected static extern void g_signal_chain_from_overridden (IntPtr args, ref GLib.Value retval); protected static extern void g_signal_chain_from_overridden (IntPtr args, ref GLib.Value retval);
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern bool gtksharp_is_object (IntPtr obj); static extern bool gtksharp_is_object (IntPtr obj);
internal static bool IsObject (IntPtr obj) internal static bool IsObject (IntPtr obj)
@ -323,7 +323,7 @@ namespace GLib {
return gtksharp_is_object (obj); return gtksharp_is_object (obj);
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern int gtksharp_object_get_ref_count (IntPtr obj); static extern int gtksharp_object_get_ref_count (IntPtr obj);
protected int RefCount { protected int RefCount {

8
glib/ObjectManager.cs
View file

@ -32,7 +32,7 @@ namespace GLib {
private static Hashtable types = new Hashtable (); private static Hashtable types = new Hashtable ();
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_get_type_name (IntPtr raw); static extern IntPtr gtksharp_get_type_name (IntPtr raw);
public static GLib.Object CreateObject (IntPtr raw) public static GLib.Object CreateObject (IntPtr raw)
@ -107,13 +107,13 @@ namespace GLib {
return expected_string; return expected_string;
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern int gtksharp_get_type_id (IntPtr raw); static extern int gtksharp_get_type_id (IntPtr raw);
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern int gtksharp_get_parent_type (int typ); static extern int gtksharp_get_parent_type (int typ);
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_get_type_name_for_id (int typ); static extern IntPtr gtksharp_get_type_name_for_id (int typ);
static Type LookupType (string mangled) static Type LookupType (string mangled)

4
glib/SList.cs
View file

@ -34,7 +34,7 @@ namespace GLib {
return new SList (g_slist_copy (Handle)); return new SList (g_slist_copy (Handle));
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_slist_get_data (IntPtr l); static extern IntPtr gtksharp_slist_get_data (IntPtr l);
internal override IntPtr GetData (IntPtr current) internal override IntPtr GetData (IntPtr current)
@ -42,7 +42,7 @@ namespace GLib {
return gtksharp_slist_get_data (current); return gtksharp_slist_get_data (current);
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_slist_get_next (IntPtr l); static extern IntPtr gtksharp_slist_get_next (IntPtr l);
internal override IntPtr Next (IntPtr current) internal override IntPtr Next (IntPtr current)

9
glib/Value.cs
View file

@ -41,10 +41,10 @@ namespace GLib {
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]
static extern void g_value_unset (ref GLib.Value val); static extern void g_value_unset (ref GLib.Value val);
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_value_create_from_property(ref GLib.Value val, IntPtr obj, string name); static extern IntPtr gtksharp_value_create_from_property(ref GLib.Value val, IntPtr obj, string name);
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_value_create_from_type_and_property(ref GLib.Value val, IntPtr gtype, string name); static extern IntPtr gtksharp_value_create_from_type_and_property(ref GLib.Value val, IntPtr gtype, string name);
public void Dispose () public void Dispose ()
@ -297,12 +297,15 @@ namespace GLib {
return new EnumWrapper (g_value_get_enum (ref val), false); return new EnumWrapper (g_value_get_enum (ref val), false);
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_value_get_value_type (ref Value val); static extern IntPtr gtksharp_value_get_value_type (ref Value val);
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]
static extern bool g_type_is_a (IntPtr type, IntPtr is_a_type); static extern bool g_type_is_a (IntPtr type, IntPtr is_a_type);
[DllImport("libgobject-2.0-0.dll")]
static extern void g_value_take_boxed (ref Value val, IntPtr data);
public object Val public object Val
{ {
get { get {

4
glib/ValueArray.cs
View file

@ -72,7 +72,7 @@ namespace GLib {
} }
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern IntPtr gtksharp_value_array_get_array (IntPtr raw); static extern IntPtr gtksharp_value_array_get_array (IntPtr raw);
public IntPtr ArrayPtr { public IntPtr ArrayPtr {
@ -113,7 +113,7 @@ namespace GLib {
g_value_array_remove (Handle, idx); g_value_array_remove (Handle, idx);
} }
[DllImport("glibsharpglue")] [DllImport("glibsharpglue-2.0")]
static extern int gtksharp_value_array_get_count (IntPtr raw); static extern int gtksharp_value_array_get_count (IntPtr raw);
// ICollection // ICollection

12
glib/glue/Makefile.am
View file

@ -1,8 +1,8 @@
lib_LTLIBRARIES = libglibsharpglue.la lib_LTLIBRARIES = libglibsharpglue-2.0.la
libglibsharpglue_la_LDFLAGS = -module -avoid-version -no-undefined libglibsharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
libglibsharpglue_la_SOURCES = \ libglibsharpglue_2_0_la_SOURCES = \
error.c \ error.c \
list.c \ list.c \
object.c \ object.c \
@ -15,12 +15,12 @@ libglibsharpglue_la_SOURCES = \
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32
libglibsharpglue_la_LIBADD = $(GLIB_LIBS) libglibsharpglue_2_0_la_LIBADD = $(GLIB_LIBS)
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
libgtksharpglue.dll: $(libgtksharpglue_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def libgtksharpglue.dll: $(libgtksharpglue_2_0_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
./build-dll libgtksharpglue $(VERSION) ./build-dll libgtksharpglue-2.0 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

8
glib/glue/makefile.win32
View file

@ -14,16 +14,16 @@ GLUE_OBJS = \
valuearray.o \ valuearray.o \
win32dll.o win32dll.o
all: glibsharpglue.dll all: glibsharpglue-2.0.dll
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^ $(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
glibsharpglue.dll: $(GLUE_OBJS) glibsharpglue-2.0.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libglibsharpglue.a --dllname=glibsharpglue.dll --driver-name=gcc --output-def=glibsharpglue.def $(GLUE_OBJS) $(GTK_LIBS) $(DLLWRAP) --output-lib=libglibsharpglue-2.0.a --dllname=glibsharpglue-2.0.dll --driver-name=gcc --output-def=glibsharpglue-2.0.def $(GLUE_OBJS) $(GTK_LIBS)
clean: clean:
rm -f glibsharpglue.dll *.o libglibsharpglue.a rm -f glibsharpglue-2.0.dll *.o libglibsharpglue-2.0.a

14
glib/glue/value.c
View file

@ -25,8 +25,6 @@
void gtksharp_value_create_from_property (GValue *value, GObject *obj, const gchar* name); void gtksharp_value_create_from_property (GValue *value, GObject *obj, const gchar* name);
void gtksharp_value_create_from_type_and_property (GValue *value, GType gtype, const gchar* name); void gtksharp_value_create_from_type_and_property (GValue *value, GType gtype, const gchar* name);
GType gtksharp_value_get_value_type (GValue *value); GType gtksharp_value_get_value_type (GValue *value);
gpointer glibsharp_value_get_boxed (GValue *value);
void glibsharp_value_set_boxed (GValue *value, gpointer boxed);
/* */ /* */
void void
@ -51,15 +49,3 @@ gtksharp_value_get_value_type (GValue *value)
return G_VALUE_TYPE (value); return G_VALUE_TYPE (value);
} }
gpointer
glibsharp_value_get_boxed (GValue *value)
{
return g_value_get_boxed (value);
}
void
glibsharp_value_set_boxed (GValue *value, gpointer boxed)
{
g_value_set_boxed (value, boxed);
}

2
gnome/.cvsignore
View file

@ -1,4 +1,4 @@
gnome-sharp.pc *.pc
AssemblyInfo.cs AssemblyInfo.cs
*.dll *.dll
*.dll.config *.dll.config

2
gnome/Canvas.custom
View file

@ -33,7 +33,7 @@
gnome_canvas_w2c_affine(Handle, affine); gnome_canvas_w2c_affine(Handle, affine);
} }
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern double gnomesharp_canvas_get_pixels_per_unit (IntPtr raw); static extern double gnomesharp_canvas_get_pixels_per_unit (IntPtr raw);
[DllImport("gnomecanvas-2")] [DllImport("gnomecanvas-2")]

22
gnome/CanvasItem.custom
View file

@ -34,7 +34,7 @@
g_object_ref (Handle); g_object_ref (Handle);
} }
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern IntPtr gtksharp_gnome_canvas_item_get_canvas (IntPtr i); static extern IntPtr gtksharp_gnome_canvas_item_get_canvas (IntPtr i);
public Canvas Canvas { public Canvas Canvas {
get { return GLib.Object.GetObject (gtksharp_gnome_canvas_item_get_canvas (this.Handle), false) as Canvas; } get { return GLib.Object.GetObject (gtksharp_gnome_canvas_item_get_canvas (this.Handle), false) as Canvas; }
@ -56,10 +56,10 @@
gnome_canvas_item_i2w_affine(Handle, affine); gnome_canvas_item_i2w_affine(Handle, affine);
} }
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern void gnomesharp_canvas_item_base_realize (IntPtr handle); static extern void gnomesharp_canvas_item_base_realize (IntPtr handle);
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern void gnomesharp_canvas_item_override_realize (GLib.GType gtype, RealizeDelegate cb); static extern void gnomesharp_canvas_item_override_realize (GLib.GType gtype, RealizeDelegate cb);
delegate void RealizeDelegate (IntPtr item); delegate void RealizeDelegate (IntPtr item);
@ -85,10 +85,10 @@
gnomesharp_canvas_item_base_realize (Handle); gnomesharp_canvas_item_base_realize (Handle);
} }
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern double gnomesharp_canvas_item_base_point (IntPtr handle, double x, double y, int cx, int cy, out IntPtr actual_item_handle); static extern double gnomesharp_canvas_item_base_point (IntPtr handle, double x, double y, int cx, int cy, out IntPtr actual_item_handle);
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern void gnomesharp_canvas_item_override_point (GLib.GType gtype, PointDelegate cb); static extern void gnomesharp_canvas_item_override_point (GLib.GType gtype, PointDelegate cb);
delegate double PointDelegate (IntPtr item, double x, double y, int cx, int cy, out IntPtr actual_item_handle); delegate double PointDelegate (IntPtr item, double x, double y, int cx, int cy, out IntPtr actual_item_handle);
@ -120,10 +120,10 @@
return result; return result;
} }
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern void gnomesharp_canvas_item_base_draw (IntPtr handle, IntPtr drawable, int x, int y, int width, int height); static extern void gnomesharp_canvas_item_base_draw (IntPtr handle, IntPtr drawable, int x, int y, int width, int height);
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern void gnomesharp_canvas_item_override_draw (GLib.GType gtype, DrawDelegate cb); static extern void gnomesharp_canvas_item_override_draw (GLib.GType gtype, DrawDelegate cb);
delegate void DrawDelegate (IntPtr handle, IntPtr drawable, int x, int y, int width, int height); delegate void DrawDelegate (IntPtr handle, IntPtr drawable, int x, int y, int width, int height);
@ -150,10 +150,10 @@
gnomesharp_canvas_item_base_draw (Handle, drawable.Handle, x, y, width, height); gnomesharp_canvas_item_base_draw (Handle, drawable.Handle, x, y, width, height);
} }
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern void gnomesharp_canvas_item_base_render (IntPtr handle, ref CanvasBuf buf); static extern void gnomesharp_canvas_item_base_render (IntPtr handle, ref CanvasBuf buf);
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern void gnomesharp_canvas_item_override_render (GLib.GType gtype, RenderDelegate cb); static extern void gnomesharp_canvas_item_override_render (GLib.GType gtype, RenderDelegate cb);
delegate void RenderDelegate (IntPtr handle, ref CanvasBuf buf); delegate void RenderDelegate (IntPtr handle, ref CanvasBuf buf);
@ -179,10 +179,10 @@
gnomesharp_canvas_item_base_render (Handle, ref buf); gnomesharp_canvas_item_base_render (Handle, ref buf);
} }
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern void gnomesharp_canvas_item_base_update (IntPtr handle, double[] affine, ref Art.SVP clip_path, int flags); static extern void gnomesharp_canvas_item_base_update (IntPtr handle, double[] affine, ref Art.SVP clip_path, int flags);
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern void gnomesharp_canvas_item_override_update (GLib.GType gtype, UpdateDelegate cb); static extern void gnomesharp_canvas_item_override_update (GLib.GType gtype, UpdateDelegate cb);
delegate void UpdateDelegate (IntPtr item, IntPtr affine_ptr, IntPtr clip_path, int flags); delegate void UpdateDelegate (IntPtr item, IntPtr affine_ptr, IntPtr clip_path, int flags);

2
gnome/CanvasPoints.custom
View file

@ -23,7 +23,7 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern System.IntPtr static extern System.IntPtr
gtksharp_gnome_canvas_points_new_from_array (uint num_points, double[] coords); gtksharp_gnome_canvas_points_new_from_array (uint num_points, double[] coords);

5
gnome/Gnome.metadata
View file

@ -50,6 +50,8 @@
<attr path="/api/namespace/object[@cname='GnomeCanvasShape']/property[@name='Dash']" name="type">ArtVpathDash</attr> <attr path="/api/namespace/object[@cname='GnomeCanvasShape']/property[@name='Dash']" name="type">ArtVpathDash</attr>
<attr path="/api/namespace/object[@cname='GnomeClient']/signal[@name='Connect']" name="name">Connected</attr> <attr path="/api/namespace/object[@cname='GnomeClient']/signal[@name='Connect']" name="name">Connected</attr>
<attr path="/api/namespace/object[@cname='GnomeClient']/signal[@name='Disconnect']" name="name">Disconnected</attr> <attr path="/api/namespace/object[@cname='GnomeClient']/signal[@name='Disconnect']" name="name">Disconnected</attr>
<attr path="/api/namespace/object[@cname='GnomeDialog']/method[@name='Close']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeDialog']/method[@name='SetClose']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeDruid']/constructor[@cname='gnome_druid_new_with_window']" name="hidden">1</attr> <attr path="/api/namespace/object[@cname='GnomeDruid']/constructor[@cname='gnome_druid_new_with_window']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeDruid']/method[@cname='gnome_druid_construct_with_window']/*/*[@name='window']" name="pass_as">out</attr> <attr path="/api/namespace/object[@cname='GnomeDruid']/method[@cname='gnome_druid_construct_with_window']/*/*[@name='window']" name="pass_as">out</attr>
<attr path="/api/namespace/object[@cname='GnomeDruid']/method[@cname='gnome_druid_construct_with_window']/*/*[@name='parent']" name="null_ok">1</attr> <attr path="/api/namespace/object[@cname='GnomeDruid']/method[@cname='gnome_druid_construct_with_window']/*/*[@name='parent']" name="null_ok">1</attr>
@ -94,8 +96,7 @@
<attr path="/api/namespace/object[@cname='GnomeIconList']/signal[@name='FocusIcon']" name="name">IconFocused</attr> <attr path="/api/namespace/object[@cname='GnomeIconList']/signal[@name='FocusIcon']" name="name">IconFocused</attr>
<attr path="/api/namespace/object[@cname='GnomeIconList']/signal[@name='SelectIcon']" name="name">IconSelected</attr> <attr path="/api/namespace/object[@cname='GnomeIconList']/signal[@name='SelectIcon']" name="name">IconSelected</attr>
<attr path="/api/namespace/object[@cname='GnomeIconList']/signal[@name='UnselectIcon']" name="name">IconUnselected</attr> <attr path="/api/namespace/object[@cname='GnomeIconList']/signal[@name='UnselectIcon']" name="name">IconUnselected</attr>
<attr path="/api/namespace/object[@cname='GnomeIconTheme']/method[@name='GetSearchPath']" name="hidden">1</attr> <attr path="/api/namespace/object[@cname='GnomeIconTheme']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomeIconTheme']/method[@name='ListIcons']" name="hidden">1</attr>
<attr path="/api/namespace/object[@cname='GnomePrintConfig']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr> <attr path="/api/namespace/object[@cname='GnomePrintConfig']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomePrintConfig']/method[@name='Get']/return-type" name="type">gchar*</attr> <attr path="/api/namespace/object[@cname='GnomePrintConfig']/method[@name='Get']/return-type" name="type">gchar*</attr>
<attr path="/api/namespace/object[@cname='GnomePrintDialog']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr> <attr path="/api/namespace/object[@cname='GnomePrintDialog']/method/*/*[@type='const-guchar*']" name="type">const-gchar*</attr>

56
gnome/IconData.cs Normal file
View file

@ -0,0 +1,56 @@
// IconData.cs - Manual implementation of GnomeIconData struct in GTK+-2.4.
//
// Authors: Jeroen Zwartepoorte <jeroen@xs4all.nl>
//
// Copyright (c) 2004 Novell, Inc.
namespace Gnome {
using System;
using System.Collections;
using System.Runtime.InteropServices;
[StructLayout(LayoutKind.Sequential)]
public struct IconData {
public bool HasEmbeddedRect;
public int X0;
public int Y0;
public int X1;
public int Y1;
private IntPtr _attach_points;
public Gnome.IconDataPoint attach_points {
get { return Gnome.IconDataPoint.New (_attach_points); }
}
public int NAttachPoints;
public string DisplayName;
public static Gnome.IconData Zero = new Gnome.IconData ();
public static Gnome.IconData New(IntPtr raw) {
if (raw == IntPtr.Zero) {
return Gnome.IconData.Zero;
}
Gnome.IconData self = new Gnome.IconData();
self = (Gnome.IconData) Marshal.PtrToStructure (raw, self.GetType ());
return self;
}
[DllImport("gnomeui-2")]
static extern void gnome_icon_data_free(ref Gnome.IconData raw);
public void Free() {
gnome_icon_data_free(ref this);
}
[DllImport("gnomeui-2")]
static extern IntPtr gnome_icon_data_dup(ref Gnome.IconData raw);
public Gnome.IconData Dup() {
IntPtr raw_ret = gnome_icon_data_dup(ref this);
Gnome.IconData ret = Gnome.IconData.New (raw_ret);
return ret;
}
}
}

68
gnome/IconTheme.cs Normal file
View file

@ -0,0 +1,68 @@
// IconTheme.cs - Manual implementation of GnomeIconTheme class in GTK+-2.4.
//
// Authors: Jeroen Zwartepoorte <jeroen@xs4all.nl>
//
// Copyright (c) 2004 Novell, Inc.
namespace Gnome {
using System;
using System.Collections;
using System.Runtime.InteropServices;
public class IconTheme : Gtk.IconTheme {
~IconTheme()
{
Dispose();
}
protected IconTheme(GLib.GType gtype) : base(gtype) {}
public IconTheme(IntPtr raw) : base(raw) {}
[DllImport("gnomeui-2")]
static extern IntPtr gnome_icon_theme_new();
public IconTheme() : base (IntPtr.Zero)
{
Raw = gnome_icon_theme_new();
}
[DllImport("gnomeui-2")]
static extern bool gnome_icon_theme_get_allow_svg(IntPtr raw);
[DllImport("gnomeui-2")]
static extern void gnome_icon_theme_set_allow_svg(IntPtr raw, bool allow_svg);
public bool AllowSvg {
get {
bool raw_ret = gnome_icon_theme_get_allow_svg(Handle);
bool ret = raw_ret;
return ret;
}
set {
gnome_icon_theme_set_allow_svg(Handle, value);
}
}
[DllImport("gnomeui-2")]
static extern IntPtr gnome_icon_theme_lookup_icon(IntPtr raw, string icon_name, int size, ref Gnome.IconData icon_data, out int base_size);
public string LookupIcon(string icon_name, int size, Gnome.IconData icon_data, out int base_size) {
IntPtr raw_ret = gnome_icon_theme_lookup_icon(Handle, icon_name, size, ref icon_data, out base_size);
string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
return ret;
}
[DllImport("gnomeui-2")]
static extern IntPtr gnome_icon_theme_get_type();
public static new GLib.GType GType {
get {
IntPtr raw_ret = gnome_icon_theme_get_type();
GLib.GType ret = new GLib.GType(raw_ret);
return ret;
}
}
}
}

11
gnome/Makefile.am
View file

@ -5,7 +5,7 @@ TARGET = $(ASSEMBLY) $(ASSEMBLY).config
APIS = $(API) APIS = $(API)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnome-sharp.pc pkgconfig_DATA = gnome-sharp-2.0.pc
else else
TARGET = TARGET =
@ -20,14 +20,16 @@ ASSEMBLY_NAME = gnome-sharp
references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll
ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY = $(ASSEMBLY_NAME).dll
gapidir = $(datadir)/gapi gapidir = $(datadir)/gapi-2.0
noinst_DATA = $(TARGET) noinst_DATA = $(TARGET)
gapi_DATA = $(APIS) gapi_DATA = $(APIS)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk
DISTCLEANFILES = gnome-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs DISTCLEANFILES = gnome-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs
sources = \ sources = \
IconData.cs \
IconTheme.cs \
Modules.cs \ Modules.cs \
voidObjectAffineSVPintSignal.cs voidObjectAffineSVPintSignal.cs
@ -60,6 +62,7 @@ customs = \
IconTextItem.custom \ IconTextItem.custom \
IconTheme.custom \ IconTheme.custom \
Print.custom \ Print.custom \
PrintContext.custom \
PrintDialog.custom \ PrintDialog.custom \
PrintJob.custom \ PrintJob.custom \
Program.custom \ Program.custom \
@ -74,7 +77,7 @@ EXTRA_DIST = \
$(METADATA) \ $(METADATA) \
$(customs) \ $(customs) \
$(sources) \ $(sources) \
gnome-sharp.pc.in gnome-sharp-2.0.pc.in
$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
cp $(srcdir)/$(RAW_API) $(API) cp $(srcdir)/$(RAW_API) $(API)

272
gnome/PrintContext.custom Normal file
View file

@ -0,0 +1,272 @@
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_beginpage (IntPtr raw, string name);
public PrintReturnCode BeginPage (string name) {
return (PrintReturnCode)gnome_print_beginpage (Handle, name);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_showpage (IntPtr raw);
public PrintReturnCode ShowPage () {
return (PrintReturnCode)gnome_print_showpage (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_end_doc (IntPtr raw);
public PrintReturnCode EndDoc () {
return (PrintReturnCode)gnome_print_end_doc (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_gsave (IntPtr raw);
public PrintReturnCode SaveGraphicState () {
return (PrintReturnCode)gnome_print_gsave (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_grestore (IntPtr raw);
public PrintReturnCode RestoreGraphicState () {
return (PrintReturnCode)gnome_print_grestore (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_newpath (IntPtr raw);
public PrintReturnCode NewPath () {
return (PrintReturnCode)gnome_print_newpath (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_moveto (IntPtr raw, double x, double y);
public PrintReturnCode MoveTo (double x, double y) {
return (PrintReturnCode)gnome_print_moveto (Handle, x, y);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_lineto (IntPtr raw, double x, double y);
public PrintReturnCode LineTo (double x, double y) {
return (PrintReturnCode)gnome_print_lineto (Handle, x, y);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_curveto (IntPtr raw, double x1, double y1, double x2, double y2, double x3, double y3);
public PrintReturnCode CurveTo (double x1, double y1, double x2, double y2, double x3, double y3) {
return (PrintReturnCode)gnome_print_curveto (Handle, x1, y1, x2, y2, x3, y3);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_closepath (IntPtr raw);
public PrintReturnCode ClosePath () {
return (PrintReturnCode)gnome_print_closepath (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_strokepath (IntPtr raw);
public PrintReturnCode StrokePath () {
return (PrintReturnCode)gnome_print_strokepath (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_bpath (IntPtr raw, ref Art.Bpath bpath, bool append);
public PrintReturnCode Bpath (Art.Bpath bpath, bool append) {
return (PrintReturnCode)gnome_print_bpath (Handle, ref bpath, append);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_vpath (IntPtr raw, ref Art.Vpath vpath, bool append);
public PrintReturnCode Vpath (Art.Vpath vpath, bool append) {
return (PrintReturnCode)gnome_print_vpath (Handle, ref vpath, append);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_arcto (IntPtr raw, double x, double y, double radius, double angle1, double angle2, int direction);
public PrintReturnCode ArcTo (double x, double y, double radius, double angle1, double angle2, int direction) {
return (PrintReturnCode)gnome_print_arcto (Handle, x, y, radius, angle1, angle2, direction);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_setrgbcolor (IntPtr raw, double r, double g, double b);
public PrintReturnCode SetRgbColor (double r, double g, double b) {
return (PrintReturnCode)gnome_print_setrgbcolor (Handle, r, g, b);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_setopacity (IntPtr raw, double opacity);
public PrintReturnCode SetOpacity (double opacity) {
return (PrintReturnCode)gnome_print_setopacity (Handle, opacity);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_setlinewidth (IntPtr raw, double width);
public PrintReturnCode SetLineWidth (double width) {
return (PrintReturnCode)gnome_print_setlinewidth (Handle, width);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_setmiterlimit (IntPtr raw, double limit);
public PrintReturnCode SetMiterLimit (double limit) {
return (PrintReturnCode)gnome_print_setmiterlimit (Handle, limit);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_setlinejoin (IntPtr raw, int jointype);
public PrintReturnCode SetLineJoin (int jointype) {
return (PrintReturnCode)gnome_print_setlinejoin (Handle, jointype);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_setlinecap (IntPtr raw, int captype);
public PrintReturnCode SetLineCap (int captype) {
return (PrintReturnCode)gnome_print_setlinecap (Handle, captype);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_setdash (IntPtr raw, int n_values, IntPtr value, double offset);
// FIXME!
/*public PrintReturnCode SetDash (double values[], double offset) {
return (PrintReturnCode)gnome_print_setdash (Handle, values.Length, values, offset);
}*/
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_setfont (IntPtr raw, ref Font font);
public PrintReturnCode SetFont (Font font) {
return (PrintReturnCode)gnome_print_setfont (Handle, ref font);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_clip (IntPtr raw);
public PrintReturnCode Clip () {
return (PrintReturnCode)gnome_print_clip (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_eoclip (IntPtr raw);
public PrintReturnCode EvenOddClip () {
return (PrintReturnCode)gnome_print_eoclip (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_concat (IntPtr raw, IntPtr matrix);
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_scale (IntPtr raw, double sx, double sy);
public PrintReturnCode Scale (double sx, double sy) {
return (PrintReturnCode)gnome_print_scale (Handle, sx, sy);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_rotate (IntPtr raw, double theta);
public PrintReturnCode Rotate (double theta) {
return (PrintReturnCode)gnome_print_rotate (Handle, theta);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_translate (IntPtr raw, double x, double y);
public PrintReturnCode Translate (double x, double y) {
return (PrintReturnCode)gnome_print_translate (Handle, x, y);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_fill (IntPtr raw);
public PrintReturnCode Fill () {
return (PrintReturnCode)gnome_print_fill (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_eofill (IntPtr raw);
public PrintReturnCode EvenOddFill () {
return (PrintReturnCode)gnome_print_eofill (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_stroke (IntPtr raw);
public PrintReturnCode Stroke () {
return (PrintReturnCode)gnome_print_stroke (Handle);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_show (IntPtr raw, string text);
public PrintReturnCode Show (string text) {
return (PrintReturnCode)gnome_print_show (Handle, text);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_show_sized (IntPtr raw, string text, int bytes);
public PrintReturnCode ShowSized (string text, int bytes) {
return (PrintReturnCode)gnome_print_show_sized (Handle, text, bytes);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_glyphlist (IntPtr raw, IntPtr glyphlist);
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_grayimage (IntPtr raw, string data, int width, int height, int rowstride);
public PrintReturnCode GrayImage (string data, int width, int height, int rowstride) {
return (PrintReturnCode)gnome_print_grayimage (Handle, data, width, height, rowstride);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_rgbimage (IntPtr raw, string data, int width, int height, int rowstride);
public PrintReturnCode RgbImage (string data, int width, int height, int rowstride) {
return (PrintReturnCode)gnome_print_rgbimage (Handle, data, width, height, rowstride);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_rgbaimage (IntPtr raw, string data, int width, int height, int rowstride);
public PrintReturnCode RgbaImage (string data, int width, int height, int rowstride) {
return (PrintReturnCode)gnome_print_rgbaimage (Handle, data, width, height, rowstride);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_line_stroked (IntPtr raw, double x0, double y0, double x1, double y1);
public PrintReturnCode LineStroked (double x0, double y0, double x1, double y1) {
return (PrintReturnCode)gnome_print_line_stroked (Handle, x0, y0, x1, y1);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_rect_stroked (IntPtr raw, double x, double y, double width, double height);
public PrintReturnCode RectStroked (double x, double y, double width, double height) {
return (PrintReturnCode)gnome_print_rect_stroked (Handle, x, y, width, height);
}
[DllImport("gnomeprint-2-2")]
static extern int gnome_print_rect_filled (IntPtr raw, double x, double y, double width, double height);
public PrintReturnCode RectFilled (double x, double y, double width, double height) {
return (PrintReturnCode)gnome_print_rect_filled (Handle, x, y, width, height);
}

2
gnome/Program.custom
View file

@ -32,7 +32,7 @@ struct PropertyArg {
public GLib.Value value; public GLib.Value value;
} }
[DllImport("gnomesharpglue")] [DllImport("gnomesharpglue-2.0")]
static extern System.IntPtr static extern System.IntPtr
gtksharp_gnome_program_init (string app_id, string app_version, ref ModuleInfo module, int argc, string[] argv, int nargs, PropertyArg[] args); gtksharp_gnome_program_init (string app_id, string app_version, ref ModuleInfo module, int argc, string[] argv, int nargs, PropertyArg[] args);

12
gnome/glue/Makefile.am
View file

@ -1,14 +1,14 @@
lib_LTLIBRARIES = $(TARGET) lib_LTLIBRARIES = $(TARGET)
if ENABLE_GNOME if ENABLE_GNOME
TARGET = libgnomesharpglue.la TARGET = libgnomesharpglue-2.0.la
else else
TARGET = TARGET =
endif endif
libgnomesharpglue_la_LDFLAGS = -module -avoid-version -no-undefined libgnomesharpglue_2_0_la_LDFLAGS = -module -avoid-version -no-undefined
libgnomesharpglue_la_SOURCES = \ libgnomesharpglue_2_0_la_SOURCES = \
canvas.c \ canvas.c \
canvasitem.c \ canvasitem.c \
canvaspoints.c \ canvaspoints.c \
@ -19,12 +19,12 @@ libgnomesharpglue_la_SOURCES = \
program.c \ program.c \
# #
libgnomesharpglue_la_LIBADD = $(GNOME_LIBS) libgnomesharpglue_2_0_la_LIBADD = $(GNOME_LIBS)
INCLUDES = $(GNOME_CFLAGS) -I$(top_srcdir) INCLUDES = $(GNOME_CFLAGS) -I$(top_srcdir)
libgnomesharpglue.dll: $(libgnomesharpglue_la_OBJECTS) libgnomesharpglue.rc libgnomesharpglue.def libgnomesharpglue.dll: $(libgnomesharpglue_2_0_la_OBJECTS) libgnomesharpglue.rc libgnomesharpglue.def
./build-dll libgnomesharpglue $(VERSION) ./build-dll libgnomesharpglue-2.0 $(VERSION)
CLEANFILES = lib*.a lib*.dll CLEANFILES = lib*.a lib*.dll

1219
gnome/gnome-api.raw
View file

File diff suppressed because it is too large Load diff

4
gnome/gnome-sharp.pc.in → gnome/gnome-sharp-2.0.pc.in
View file

@ -6,5 +6,5 @@ libdir=${exec_prefix}/lib
Name: Gnome# Name: Gnome#
Description: Gnome# - GNOME .NET Binding Description: Gnome# - GNOME .NET Binding
Version: @VERSION@ Version: @VERSION@
Requires: gtk-sharp art-sharp Requires: gtk-sharp-2.0 art-sharp-2.0
Libs: -r:${libdir}/mono/@PACKAGE@/gnome-sharp.dll Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gnome-sharp.dll

2
gnomedb/.cvsignore
View file

@ -1,4 +1,4 @@
gnomedb-sharp.pc *.pc
AssemblyInfo.cs AssemblyInfo.cs
*.dll *.dll
*.dll.config *.dll.config

8
gnomedb/Makefile.am
View file

@ -2,7 +2,7 @@ if ENABLE_GNOMEDB
TARGET = $(ASSEMBLY) $(ASSEMBLY).config TARGET = $(ASSEMBLY) $(ASSEMBLY).config
APIS = $(API) APIS = $(API)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnomedb-sharp.pc pkgconfig_DATA = gnomedb-sharp-2.0.pc
else else
TARGET = TARGET =
APIS = APIS =
@ -15,12 +15,12 @@ ASSEMBLY_NAME = gnomedb-sharp
references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll /r:../gnome/gnome-sharp.dll /r:../gda/gda-sharp.dll references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll /r:../gnome/gnome-sharp.dll /r:../gda/gda-sharp.dll
ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY = $(ASSEMBLY_NAME).dll
gapidir = $(datadir)/gapi gapidir = $(datadir)/gapi-2.0
noinst_DATA = $(TARGET) noinst_DATA = $(TARGET)
gapi_DATA = $(APIS) gapi_DATA = $(APIS)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk
DISTCLEANFILES = gnomedb-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs DISTCLEANFILES = gnomedb-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs
sources = \ sources = \
Application.cs Application.cs
@ -38,7 +38,7 @@ EXTRA_DIST = \
$(METADATA) \ $(METADATA) \
$(customs) \ $(customs) \
$(sources) \ $(sources) \
gnomedb-sharp.pc.in gnomedb-sharp-2.0.pc.in
$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
cp $(srcdir)/$(RAW_API) $(API) cp $(srcdir)/$(RAW_API) $(API)

2
gnomedb/gnomedb-sharp.pc.in → gnomedb/gnomedb-sharp-2.0.pc.in
View file

@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib
Name: GnomeDB# Name: GnomeDB#
Description: GnomeDB# - GNOMEDB .NET Binding Description: GnomeDB# - GNOMEDB .NET Binding
Version: @VERSION@ Version: @VERSION@
Libs: -r:${libdir}/mono/@PACKAGE@/gnomedb-sharp.dll Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gnomedb-sharp.dll

1
gnomedb/gnomedb-sharp.dll.config.in
View file

@ -1,3 +1,4 @@
<configuration> <configuration>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/> <dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/>
</configuration> </configuration>

10
gnomevfs/.cvsignore Normal file
View file

@ -0,0 +1,10 @@
*.dll
*.dll.config
AssemblyInfo.cs
generated
generated-stamp
Makefile
Makefile.in
*-api.xml
*.pc
gtk-sharp.snk

6
gnomevfs/AssemblyInfo.cs.in Normal file
View file

@ -0,0 +1,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
[assembly:AssemblyVersion("@API_VERSION@")]
[assembly:AssemblyDelaySign(true)]
[assembly:AssemblyKeyFile("gtk-sharp.snk")]

99
gnomevfs/Async.cs Normal file
View file

@ -0,0 +1,99 @@
//
// Async.cs: Bindings for gnome-vfs asynchronized functions calls.
//
// Author:
// Jeroen Zwartepoorte <jeroen@xs4all.nl>
//
// (C) Copyright Jeroen Zwartepoorte 2004
//
using System;
using System.IO;
using System.Runtime.InteropServices;
namespace Gnome.Vfs {
public class Async {
public enum Priority {
Min = -10,
Default = 0,
Max = 10
}
[DllImport ("gnomevfs-2")]
private static extern void gnome_vfs_async_cancel (IntPtr handle);
public static void Cancel (Handle handle)
{
gnome_vfs_async_cancel (handle.Raw);
}
[DllImport ("gnomevfs-2")]
private static extern void gnome_vfs_async_close (IntPtr handle, AsyncCallbackNative callback, IntPtr data);
public static void Close (Handle handle, AsyncCallback callback)
{
AsyncCallbackWrapper wrapper = new AsyncCallbackWrapper (callback, null);
gnome_vfs_async_close (handle.Raw, wrapper.NativeDelegate, IntPtr.Zero);
}
[DllImport ("gnomevfs-2")]
private static extern void gnome_vfs_async_create (out IntPtr handle, string uri, OpenMode mode, bool exclusive, uint perm, int priority, AsyncCallbackNative callback, IntPtr data);
public static Handle Create (string uri, OpenMode mode, bool exclusive, FilePermissions perm, int priority, AsyncCallback callback)
{
IntPtr handle = IntPtr.Zero;
AsyncCallbackWrapper wrapper = new AsyncCallbackWrapper (callback, null);
gnome_vfs_async_create (out handle, uri, mode, exclusive, (uint)perm, priority, wrapper.NativeDelegate, IntPtr.Zero);
return new Handle (handle);
}
public static Handle Create (Uri uri, OpenMode mode, bool exclusive, FilePermissions perm, int priority, AsyncCallback callback)
{
return Create (uri.ToString (), mode, exclusive, perm, priority, callback);
}
[DllImport ("gnomevfs-2")]
private static extern void gnome_vfs_async_open (out IntPtr handle, string uri, OpenMode mode, int priority, AsyncCallbackNative callback, IntPtr data);
public static Handle Open (string uri, OpenMode mode, int priority, AsyncCallback callback)
{
IntPtr handle = IntPtr.Zero;
AsyncCallbackWrapper wrapper = new AsyncCallbackWrapper (callback, null);
gnome_vfs_async_open (out handle, uri, mode, priority, wrapper.NativeDelegate, IntPtr.Zero);
return new Handle (handle);
}
public static Handle Open (Uri uri, OpenMode mode, int priority, AsyncCallback callback)
{
return Open (uri.ToString (), mode, priority, callback);
}
[DllImport ("gnomevfs-2")]
private static extern void gnome_vfs_async_read (IntPtr handle, out byte buffer, uint bytes, AsyncReadCallbackNative callback, IntPtr data);
public static void Read (Handle handle, out byte buffer, uint bytes, AsyncReadCallback callback)
{
AsyncReadCallbackWrapper wrapper = new AsyncReadCallbackWrapper (callback, null);
gnome_vfs_async_read (handle.Raw, out buffer, bytes, wrapper.NativeDelegate, IntPtr.Zero);
}
[DllImport ("gnomevfs-2")]
private static extern void gnome_vfs_async_seek (IntPtr handle, SeekPosition whence, long offset, AsyncCallbackNative callback, IntPtr data);
public static void Seek (Handle handle, SeekPosition whence, long offset, AsyncCallback callback)
{
AsyncCallbackWrapper wrapper = new AsyncCallbackWrapper (callback, null);
gnome_vfs_async_seek (handle.Raw, whence, offset, wrapper.NativeDelegate, IntPtr.Zero);
}
[DllImport ("gnomevfs-2")]
private static extern void gnome_vfs_async_write (IntPtr handle, out byte buffer, uint bytes, AsyncWriteCallbackNative callback, IntPtr data);
public static void Write (Handle handle, out byte buffer, uint bytes, AsyncWriteCallback callback)
{
AsyncWriteCallbackWrapper wrapper = new AsyncWriteCallbackWrapper (callback, null);
gnome_vfs_async_write (handle.Raw, out buffer, bytes, wrapper.NativeDelegate, IntPtr.Zero);
}
}
}

Some files were not shown because too many files have changed in this diff Show more