Commit graph

134 commits

Author SHA1 Message Date
Gonzalo Paniagua Javier b5cfb4ba67 2003-04-15 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* gtk/TreeView.custom:
	(GetPathAtPos): added 3 overloads of this method so that the caller
	does not need to create extra variables that may not use.

	* api/gtk-api.xml:
	* sources/Gtk.metadata: added pass_out attribute for tx and ty
	arguments of TreeView::WidgetToTreeCoords. Hide TreeView::GetPathAtPos.

svn path=/trunk/gtk-sharp/; revision=13677
2003-04-16 02:26:12 +00:00
Lee Mallabone 90fac8a1ad Hide the Copy, Free and Hash methods in Gdk.Color and override GetHashCode().
svn path=/trunk/gtk-sharp/; revision=13606
2003-04-14 18:01:28 +00:00
Lee Mallabone 6395590d34 Fix bugs #27835 and #38672 by correcting problems in the generated ColorSelection binding.
svn path=/trunk/gtk-sharp/; revision=13600
2003-04-14 17:04:13 +00:00
Lee Mallabone 591c9eca8f Apply a modified version of a patch from Artemis <artemis@yandex.ru>, to fix and clean DrawPolygon and DrawLines in Gdk.Drawable.
svn path=/trunk/gtk-sharp/; revision=13133
2003-04-04 07:24:02 +00:00
Lee Mallabone 95a81a7706 Add a custom constructor to Entry, and fix API bugs with Widget and Frame.
svn path=/trunk/gtk-sharp/; revision=13021
2003-04-02 08:26:36 +00:00
Lee Mallabone b68542269f Add a default zero-arg constructor for Gtk.Viewport.
svn path=/trunk/gtk-sharp/; revision=12869
2003-03-27 19:15:04 +00:00
Lee Mallabone 438b788722 Fix crashes in TreeView.ScrollToCell.
svn path=/trunk/gtk-sharp/; revision=12830
2003-03-25 19:05:40 +00:00
Gonzalo Paniagua Javier 7ab055de16 2003-03-25 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* api/gtk-api.xml: changed DisplayOptions by SetDisplayOptions.
	* sources/Gtk.metadata: added rename hint for DisplayOptions. Moved
	GtkHTMLStream hints to 'misc' area (they were in 'rename' area).

	* gtk/Calendar.custom: added a .net style GetDate override.
	* sample/CalendarApp.cs: updated to new methods in the Calendar API.

svn path=/trunk/gtk-sharp/; revision=12799
2003-03-25 00:47:13 +00:00
Charles Iliya Krempeaux 94f05965a8 2003-03-14 Charles Iliya Krempeaux <charles@reptile.ca>
* sources/makefile : Added a "distclean" rule, so
	  that typing it will remove any source code directories,
	  and their contents.  (This works by just deleting all
	  the subdirectories.  Except for "CVS" of course.)

svn path=/trunk/gtk-sharp/; revision=12546
2003-03-15 19:09:53 +00:00
Rodrigo Moya b2cdb3a585 2003-03-14 Rodrigo Moya <rodrigo@ximian.com>
* configure.in:
	* sources/makefile:
	* sources/gtk-sharp.sources: updated for libgda/libgnomedb 0.11.

	* sources/Gda.metadata: hide GdaBatch class.

svn path=/trunk/gtk-sharp/; revision=12509
2003-03-14 11:45:19 +00:00
Duncan Mak a3d22ce2c2 * gdk/Pixbuf.custom: Add a nice version of Gdk.Pixbuf.Pixels that
return a 'byte *'.

* sources/Gdk.metadata:
* api/gdk-api.xml: Hide Gdk.Pixbuf.Pixels.

svn path=/trunk/gtk-sharp/; revision=12491
2003-03-14 03:04:15 +00:00
Charles Iliya Krempeaux b08b51132f 2003-03-01 Charles Iliya Krempeaux <charles@reptile.ca>
* sources/README : Updated it to include mention of GStreamer
	  and librsvg.  Also mentioned being able to use
	  "make get-source-code" to get the source code too.
	  Then added alot of content.

svn path=/trunk/gtk-sharp/; revision=12490
2003-03-14 01:41:12 +00:00
Charles Iliya Krempeaux 5ebd8d64a7 2003-02-27 Charles Iliya Krempeaux <charles@reptile.ca>
* sources/makefile : Updated the "make get-source-code"
	  functionality to create the Symbolic Links and get
	  gtkhtml from CVS, as specified by "sources/READDME".

svn path=/trunk/gtk-sharp/; revision=12489
2003-03-14 01:07:39 +00:00
Mike Kestner 68f214f699 2003-03-01 Mike Kestner <mkestner@speakeasy.net>
* api/gdk-api.xml : make Color.Parse retval a gboolean. Also change
	some libname override rules to use win32 dllnames.
	* sources/Gdk.metadata : rules for above.

svn path=/trunk/gtk-sharp/; revision=12095
2003-03-01 22:18:09 +00:00
Gonzalo Paniagua Javier 5fa688fb04 2003-02-28 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* api/gdk-api.xml:
	* sources/Gdk.metadata: hide GdkColormap.AllocColor.

	* gdk/Colormap.custom: AllocColor is here.

	* gconf/tools/schemagen.cs: XmlDocument.Load (string) takes an Uri.

svn path=/trunk/gtk-sharp/; revision=12055
2003-02-28 07:41:59 +00:00
Mike Kestner d5ec2ba7cb 2003-02-26 Charles Iliya Krempeaux <charles@reptile.ca>
* configure.in : Added support for Rsvg.NET -- librsvg
 	  .NET bindings.  (Made a check for the library.  And
 	  made it so "rsvg/Makefile" would be generated.  Also
 	  made it so it will display if rsvg-sharp.dll will
 	  be generated or not.)
 	* makefile :  Added support for Rsvg.NET -- librsvg
           .NET bindings.  (Added an entry for Rsvg.NET.)
        * sources/gtk-sharp.sources : Added an entry for
 	  Rsvg.NET -- librsvg .NET bindings.
        * rsvg/ : Created "rsvg/" directory.  (To hold stuff
 	  for Rsvg.NET.)
        * rsvg/Tool.cs : Created Rsvg.Tool class to hold
 	  various procedures (which were not automatically
 	  wrapped).
 	* rsvg/Makefile.in : Created "rsvg/Makefile.in".
 	* api/Makefile.in : Added and entry for Rsvg.NET.

svn path=/trunk/gtk-sharp/; revision=12020
2003-02-27 05:16:47 +00:00
Mike Kestner 4bf0846a5f 2003-02-22 Mike Kestner <mkestner@speakeasy.net>
* sources/makefile : patch from Charles Krempeaux to add
	get-source-code target which wgets tarballs.

svn path=/trunk/gtk-sharp/; revision=11842
2003-02-22 19:19:15 +00:00
Mike Kestner c0b574a686 2003-02-21 Mike Kestner <mkestner@speakeasy.net>
* mapdllnames.pl : a little whitespace action
	* api/*-api.xml : move to win32 dllnames
	* */makefile.win32 : remove the mapdllnames step
	* */*.cs : move to win32 dllnames
	* */*.custom : move to win32 dllnames
	* sources/gtk-sharp.sources : move to win32 dllnames

svn path=/trunk/gtk-sharp/; revision=11823
2003-02-22 04:34:56 +00:00
Mike Kestner 90913930a7 oops, mark the Set method, not Get.
svn path=/trunk/gtk-sharp/; revision=11791
2003-02-21 03:44:42 +00:00
Mike Kestner 82cc097ef4 2003-02-20 Mike Kestner <mkestner@speakeasy.net>
* api/gtk-api.xml : hide the Arrow::Set method.
	* sources/Gtk.metadata : metadata for above.

svn path=/trunk/gtk-sharp/; revision=11790
2003-02-21 03:33:42 +00:00
Mike Kestner 284ab36d8b 2003-02-19 Mike Kestner <mkestner@speakeasy.net>
* api/gtk-api.xml : mark TreeModel::GetValue value param out
	suggested by Lee Mallabone <gnome@phonicmonkey.net>
	* sources/Gtk.metadata : metadata for above
	* sources/README : update the gnomedb/gda version reqs

svn path=/trunk/gtk-sharp/; revision=11766
2003-02-20 05:31:14 +00:00
Duncan Mak 8e10c2d7ff * TestFileSelection.cs: Update to reflect FileSelection changes.
* sources/Gtk.metadata: Add GetLayoutOffsets to the rule for out params.

* gtk/FileSelection.custom (Button): Rename to FSButton, so that
we won't wipe out our original Gtk.Button docs.

svn path=/trunk/gtk-sharp/; revision=11761
2003-02-20 04:03:15 +00:00
Duncan Mak bab803685d * api/gtk-api.xml:
* sources/Gtk.metadata: Mark 'out' param in GetSelectionBounds,
thanks to Lee Mallabone for spotting that.

svn path=/trunk/gtk-sharp/; revision=11584
2003-02-14 19:17:10 +00:00
Duncan Mak fdaa84817e * sources/Gtk.metadata:
* api/gtk-api.xml: Gtk.Editable.InsertText should have the
position be marked 'ref', not 'out', because it is an in-out parameter.

* gtk/Entry.custom: Overload for InsertText.
* gtk/Clipboard.custom: New overload for SetText.

svn path=/trunk/gtk-sharp/; revision=11430
2003-02-10 00:32:14 +00:00
Duncan Mak 7a1734be34 Mark out params for methods in GtkCalendar,
GtkCellRenderer, GtkWindow, GtkRuler, GtkLayout, GtkScrolledWindow
and GtkSpinButton. Monotalk is very useful for this kind of work.

svn path=/trunk/gtk-sharp/; revision=11429
2003-02-10 00:09:42 +00:00
Duncan Mak 101589b057 Correct the metadata for the HTMLStream
Write method to make it always regenerate the correct
stuff. Thanks to Rachel for helping me out at the middle of the
night.

svn path=/trunk/gtk-sharp/; revision=11269
2003-02-06 07:25:16 +00:00
Duncan Mak b566d8b21a 2003-02-06 Duncan Mak <duncan@ximian.com>
* api/gtk-api.xml:
* sources/Gtk.metadata:
* gtk/Window.custom: Mark out params in gtk_window_get_size and gtk_window_get_default_size.

svn path=/trunk/gtk-sharp/; revision=11268
2003-02-06 07:03:49 +00:00
Miguel de Icaza 8f6aa9a633 Right fix
svn path=/trunk/gtk-sharp/; revision=11252
2003-02-05 20:11:49 +00:00
Miguel de Icaza d28346ea3c Update blindly
svn path=/trunk/gtk-sharp/; revision=11233
2003-02-05 04:48:43 +00:00
Duncan Mak 4d694b215f * gtk/Widget.custom: Add a nice overload, rename it to
'RequestSize' instead of 'SizeRequest' to avoid a name clash.

* api/gtk-api.xml:
* sources/Gtk.metadata: out param for gtk_widget_get_size_request.

svn path=/trunk/gtk-sharp/; revision=11046
2003-01-30 02:56:49 +00:00
Duncan Mak 984d952967 * api/gtk-api.xml:
* sources/Gtk.metadata:
* sources/Pango.metadata: Add some more metadata rules.

svn path=/trunk/gtk-sharp/; revision=11042
2003-01-30 02:33:38 +00:00
Rodrigo Moya 52081ec9ed 2003-01-28 Rodrigo Moya <rodrigo@ximian.com>
* configure.in:
	* api/gda-api.xml:
	* api/gnomedb-api.xml:
	* sources/gtk-sharp.sources:
	* sources/Gda.metadata: added support for latest libgda/libgnomedb.

svn path=/trunk/gtk-sharp/; revision=10999
2003-01-28 17:59:36 +00:00
Radek Doulik a60825ae80 2003-01-22 Radek Doulik <rodo@ximian.com>
* sources/Gtk.metadata: disable default contructor for Frame in
	metadata

svn path=/trunk/gtk-sharp/; revision=10815
2003-01-22 14:00:06 +00:00
Duncan Mak 26a40b9ebf 2003-01-10 Duncan Mak <duncan@ximian.com>
* sources/Gtk.metadata (GtkTextView): Add a patch from Fredrik
	Nilsson <jymdman@home.se> to add needed 'out' parameters.

svn path=/trunk/gtk-sharp/; revision=10355
2003-01-10 19:11:39 +00:00
Rodrigo Moya 4d30832fa7 2003-01-09 Rodrigo Moya <rodrigo@ximian.com>
* makefile:
	* configure.in:
	* api/Makefile.in:
	* api/gphoto-api.xml:
	* sources/gtk-sharp.sources:
	* gphoto/Makefile.in:
	* gphoto/.cvsignore: removed gphoto2 bindings, to be moved to mphoto.

svn path=/trunk/gtk-sharp/; revision=10314
2003-01-09 22:54:37 +00:00
Duncan Mak 8400c23479 2003-01-05 Duncan Mak <duncan@ximian.com>
* sources/Gtk.metadata (TextIter.BackwardSearch): Add out param here too.

svn path=/trunk/gtk-sharp/; revision=10192
2003-01-06 00:28:35 +00:00
Duncan Mak 20160aa0fd * sources/Gtk.metadata (TextIter.ForwardSearch): Add out param
* sources/Gdk.metadata (Drawable.GetSize): Add out param.

* gtk/TextBuffer.custom (Clear): Add a new Clear method.

svn path=/trunk/gtk-sharp/; revision=10187
2003-01-05 23:48:45 +00:00
Rodrigo Moya 4f63fe50a9 2002-12-25 Rodrigo Moya <rodrigo@ximian.com>
* sources/gtk-sharp.sources: added libgphoto2.

	* api/gphoto-api.xml: added API file for libgphoto2.

	* gphoto/Makefile.in: added Makefile for building libgphoto2
	bindings.

	* makefile:
	* configure.in:
	* api/Makefile.in: added libgphoto2 to build.

svn path=/trunk/gtk-sharp/; revision=9895
2002-12-26 01:01:22 +00:00
Kristian Rietveld 5bc31b52ca 2002-12-22 Kristian Rietveld <kris@gtk.org>
* sources/Gnome.metadata: add out param rules for a bunch of Canvas
        methods (pointed out by Paul Duran).

        * api/gnome-xml.api: updated

svn path=/trunk/gtk-sharp/; revision=9838
2002-12-23 01:54:38 +00:00
Alp Toker 15589b1c83 2002-12-20 Alp Toker <alp@atoker.com>
* api/gst-api.xml: Make Gst# link to libgstreamer.so as per pkg-config
	--libs gstreamer
	* sources/gtk-sharp.sources: ditto

svn path=/trunk/gtk-sharp/; revision=9791
2002-12-20 05:44:17 +00:00
Gonzalo Paniagua Javier 35ef99c45f 2002-12-15 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* api/gdk-api.xml:
	* sources/Gdk.metadata: PixbufLoader.Pixbuf have to ref the new Pixbuf.

svn path=/trunk/gtk-sharp/; revision=9667
2002-12-15 11:58:37 +00:00
Mike Kestner 3a108845d7 2002-11-21 Mike Kestner <mkestner@speakeasy.net>
* api/*.xml : a few new attrs
	* generator/Parameters.cs : remove redundant ref keywords
	* gtk/ListStore.custom: overload SetColumnTypes
	* gtk/TreeStore.custom: overload SetColumnTypes
	* parser/GAPI/Metadata.pm : allow callback nodes at class level
	* sources/Gtk.metadata : hide ClipboardClearFunc and GetFunc,
	tag types param of SetColumnTypes as array, uncomment needs_ref
	tags on Widget methods to match the current api.xml file

svn path=/trunk/gtk-sharp/; revision=9148
2002-11-22 03:30:18 +00:00
Vladimir Vukicevic 58f6f01d45 * glib/Object.cs: add needs_ref boolean that controls whether
we need to ref this object once we have a pointer to it or not.
By default this is set to true -- constructors and other functions
where we do own the object need to set this to false before setting
the "Raw" property.  Also added Unref and RefCount methods.

* glue/object.c, glue/type.c: some utility functions for
refcounting support

* gdk/Pixbuf.custom: manually wrap a few functions so that
the refcount ends up being correct at the end (need an extra Unref)

* api/gdk-api.xml, sources/Gdk.metadata: metadata updates for
hiding manually-wrapped Pixbuf stuff

svn path=/trunk/gtk-sharp/; revision=8913
2002-11-10 10:09:05 +00:00
Vladimir Vukicevic 9ad6d1b6a4 * generator/StructBase.cs: create a Zero static member for
use when the IntPtr is NULL.

* generator/SignalHandler.cs, generator/CallbackGen.cs: removed
call to Initialize for structs

* gtk/Clipboard.custom, gtk/ClipboardClearFunc.cs,
gtk/ClipboardGetFunc.cs,
gtk/GtkSharp.GtkClipboardClearFuncNative.cs,
gtk/GtkSharp.ClipboardGetFuncNative.cs, SelectionData.custom:
Hand-wrapped selection handling stuff, along with relevant
signals and the like.

* gnome/voidObjectAffineSVPintSignal.cs: removed Initialize
for hand-wrapped signal

* sample/GnomeHelloWorld.cs, sample/Size.cs: compare against
.Zero instead of using IsNull

* api/gtk-api.xml, sources/Gtk.metadata: metadata updates for
hiding some manually-wrapped stuff

svn path=/trunk/gtk-sharp/; revision=8912
2002-11-10 10:03:51 +00:00
Alp Toker cca2363dae 2002-11-03 Alp Toker <alp@atoker.com>
* sources/gtk-sharp.sources: Update to support GStreamer 0.4.2
        * api/gst-api.xml : ditto
        * gst/Application.cs : ditto

svn path=/trunk/gtk-sharp/; revision=8802
2002-11-03 22:03:42 +00:00
Alp Toker e06e2ba8dd Add GStreamer support
svn path=/trunk/gtk-sharp/; revision=8726
2002-11-01 05:01:22 +00:00
Mike Kestner b2f04c1d80 2002-10-26 Mike Kestner <mkestner@speakeasy.net>
Much of this patch from Vlad, with substantial rework by mk.
	* */makefile.win32 : introduce mapdllnames.pl, api, and glue
	* generator/CallbackGen.cs : rework namespacing for csc compilation
	* generator/Parameters.cs : ditto
	* generator/Signal.cs : ditto
	* generator/SignalHandler.cs : ditto
	* glue/win32dll.c : new dll construction source
	* glib/Value.cs : new ushort ctor/cast operator
	* gtk/Table.custom : comment this out until we add a default ctor tag
	* gtk/ThreadNotify.cs : make ReadyEvent public
	* sources/Gdk.metadata : mark a Parse() param as ref

svn path=/trunk/gtk-sharp/; revision=8590
2002-10-27 02:30:51 +00:00
Mike Kestner 2e07bf7e87 2002-10-26 Mike Kestner <mkestner@speakeasy.net>
* api/*.xml : get libgda and libgnomedb metadata setup
	* gconf/*/Makefile.in : patch from MauricioC for -L's and /r's
	* gnomedb/Makefile.in : patch from MauricioC for -L's and /r's
	* generator/ClassBase.cs (ctor): mangle hash names for sigs and props
	* generator/Parameters.cs (MangleName): handle params, null, and ref
	* generator/Parser.cs (ParseNamespace): ignore "hidden" types
	* generator/StructBase.cs (MangleName): handle params, null, and ref
	* glib/Object.cs (Equals): kill, also kill == and !=
	* sources/Gda.metadata : new, make Gda behave without hand edits
	* sources/GnomeDb.metadata : ditto

svn path=/trunk/gtk-sharp/; revision=8577
2002-10-26 08:03:16 +00:00
Kristian Rietveld 27862c71c3 2002-10-08 Kristian Rietveld <kris@gtk.org>
(So Miguel told me just to go ahead and commit -kris)

        * gtk/TreeSelection.custom: new file, defines a working
        GetSelected method (GetSelected is a bit tricky function).

        * generator/InterfaceGen.cs (Generate): also call AppendCustom

        * sources/Gtk.metadata: hide the autogenerated
        Gtk.TreeSelection.GetSelected method.

svn path=/trunk/gtk-sharp/; revision=8071
2002-10-08 19:14:14 +00:00
Rachel Hestilow 6b6bb616b2 2002-09-12 Rachel Hestilow <hestilow@ximian.com>
* sources/Gtk.metadata: Set null_ok on the callback argument
	to Menu.Popup.

	* generator/Parameters.cs: Handle null_ok properly for callback
	arguments.

svn path=/trunk/gtk-sharp/; revision=7412
2002-09-12 20:25:29 +00:00
Rachel Hestilow 32ae593a0e 2002-09-11 Rachel Hestilow <hestilow@ximian.com>
* glib/Object.cs (Ref): Added.

	* gtk/Object.custom (Ref): Overload. Note that we were reffed.
	(DisposeNative): Unref if we were explicitly reffed.

	* generator/Method.cs: Call Ref if needs_ret is set.
	* generator/StructBase.cs: Call Ref on all object accessors.

	* glue/style.c: Ref returned GCs.

	* sources/Gtk.metadata: Set needs_ret on various gdk-related
	accessors in GtkWidget. Hide Ref/Unref methods on Widget and
	RcStyle as these ought to be deprecated anyway.

svn path=/trunk/gtk-sharp/; revision=7380
2002-09-12 05:21:16 +00:00
Rodrigo Moya 8b9ee5b8e1 2002-09-08 Rodrigo Moya <rodrigo@gnome-db.org>
* makefile:
	* configure.in:
	* sources/gtk-sharp.sources: added needed stuff for libgnomedb.

	* gnomedb/Makefile.in:
	* api/Makefile.in:
	* api/gnomedb-api.xml: new files for libgnomedb API.

svn path=/trunk/gtk-sharp/; revision=7354
2002-09-11 09:43:17 +00:00
Rodrigo Moya 14e24ebbf9 2002-08-31 Rodrigo Moya <rodrigo@ximian.com>
* api/gda-api.xml: new file for the libgda API.

	* gda/*: added libgda bindings.

	* sources/README: updated requirements.

svn path=/trunk/gtk-sharp/; revision=7167
2002-09-01 10:28:11 +00:00
Rachel Hestilow c8d090f62f 2002-08-31 Rachel Hestilow <hestilow@ximian.com>
Proper GList, GSList support. Read-only for now.

	* glue/list.c: Added.
	* glue/Makefile.am: Add list.c
	* glue/type.c: Add function gtksharp_is_object.

	* glib/ListBase.cs, List.cs: Added.
	* glib/SList.cs: Inherit from ListBase.
	* glib/Object.cs: Add static method "IsObject".

	* generator/Method.cs: Pass on element_type to constructor
	if specified.
	* generator/SymbolTable.cs: Move GList to manual types.

	* sample/GladeViewer.cs: Remove list hacks.

	* sources/Gnome.metadata: Specify element types for
	CanvasPathDef.Split and IconList.GetSelection. Rename
	CanvasPathDef *to methods to properly capitalized *To.
	* sources/Gtk.metadata: Hide Widget.ListAccelClosures until
	GClosure is handled properly.
	* sources/Pango.metadata: Added.

	* sample/test/TestToolbar.cs: Compile with recent delegate changes.

svn path=/trunk/gtk-sharp/; revision=7166
2002-09-01 04:46:38 +00:00
Rachel Hestilow 38e7bdeec5 2002-08-28 Rachel Hestilow <hestilow@ximian.com>
* generator/CallbackGen.cs: Generate wrappers to map
	from managed delegates to native ones.
	* generator/Ctor.cs: Call parms.Initialize for the static case.
	* generator/Parameters.cs: Add "CType" property. Append []
	to CSType if necessary. Add "HideData" property if a container
	wishes to hide the user_data (used in callbacks).
	(Initialize): Add case for callback.
	* generator/SymbolTable.cs: Add size_t.

	* glue/program.c: string[] marshalling is no longer broken,
	remove hack.

	* sources/Gtk.metadata: Disable
	GtkColorSelection.SetChangePaletteHook and
	GtkTreeView.GetSearchEqualFunc for now, they return delegates and
	we don't support native->managed delegate mapping yet.

svn path=/trunk/gtk-sharp/; revision=7133
2002-08-28 20:58:01 +00:00
Rachel Hestilow 6c3d639e49 2002-08-26 Rachel Hestilow <hestilow@ximian.com>
* sources/Gtk.metadata: Add null-ok for Menu.Popup.

svn path=/trunk/gtk-sharp/; revision=7071
2002-08-27 00:50:22 +00:00
Rachel Hestilow f94279195c 2002-08-20 Rachel Hestilow <hestilow@ximian.com>
* makefile: Add parser to build (for install only)
	* parser/makefile: Add distclean target.

	* parser/gapi.pl: Forgot to add this.
	* api/: Replace APIs with correctly generated ones.

svn path=/trunk/gtk-sharp/; revision=6827
2002-08-20 20:35:42 +00:00
Rachel Hestilow e9d1e0b6dc 2002-08-19 Rachel Hestilow <hestilow@ximian.com>
* art/Makefile.in (clean): Change to avoid bugging out on generated/CVS.

	* glib/ObjectManager.cs: Added. Used to be auto-generated, but
	now it can infer names, and relies on per-namespace ObjectManager
	classes to inform it of oddly-named classes.

	* generator/IGeneratable.cs, GenBase.cs: New "DoGenerate" property.
	* generator/*Gen.cs: Honor DoGenerate.
	* generator/CodeGenerator.cs: Support including dependency files
	which will not be generated.
	* generator/ObjectGen.cs: Generate mapping file per-namespace, as one
	that calls back to the one in glib. Only generate if the name does
	not follow the normal conventions, otherwise, GtkSharp.ObjectManager
	can infer the name.
	* generator/Parser.cs: Accept 'generate' flag to pass on to the
	IGeneratables. Parse a new toplevel element, "symbol", which adds
	a type to the SymbolTable (instead of hard-coding it).
	* generator/SignalHandler.cs: Do not optimize signal handler creation,
   instead creating them in their own namespaces. Do not generate
	if the calling Signal told us not to.
	* generator/Signal.cs: Do not generate handlers if container's DoGenerate
	is false. Adjust to the marshaller name being in a sub-namespace.
	* generator/SymbolTable.cs (AddSimpleType, AddManualType): Used
	to add simple and manually wrapped types at runtime instead of
	compile-time.
	(FromNative): Remove hard-coded cases for manually wrapped types, use
	a generic case instead.

	* api: Added. Move api files and generation targets here.
	* source: Added. Move source parsing here.

	* generator/makefile: Move actual generation to api/.
	* glib/Makefile.in: Remove generated/* target.
	* glue/Makefile.am: Fix to include canvas-marshal. Move canvas stuff
	to GNOME target.

	* gnome/CanvasProxy.cs: Update to work with SignalHandlers being
	namespace-specific.

	* parser/Metadata.pm: Moved to GAPI/Metadata.pm, renamed, etc.
	* parser/gapi2xml.pl: Use GAPI::Metadata.
	* parser/makefile: Install scripts, remove source parse build target.
	Rename formatXML to gapi_format_xml.

svn path=/trunk/gtk-sharp/; revision=6818
2002-08-20 19:56:18 +00:00
Duncan Mak 074dcf2d4a 2002-08-15 Duncan Mak <duncan@ximian.com>
* generator/gtkapi.xml: New Libart stuff.

	* parser/build.pl:
	* gnome/Makefile.in: Added reference to atk-sharp.dll

	* generator/Parameters.cs (MangleName): Added cases for 'in' and 'out'.

svn path=/trunk/gtk-sharp/; revision=6651
2002-08-15 16:44:41 +00:00
Rachel Hestilow e6ea0015b5 2002-08-12 Rachel Hestilow <hestilow@ximian.com>
[ Patch from Ricardo Fernandez Pascual <rfp1@ono.com> for
	  libglade support (slightly modified) ]

	* configure.in: Conditionally compile glade support.
	* makefile: Add glade directory.
	* glade/: Added.
	* sample/makefile.in: Add (conditional) glade example.
	* sample/GladeViewer.cs: Added.
	* glue/gladexml.c: Added.
	* glue/Makefile.am: Updated.

	* parser/build.pl: Parse libglade-2.0.0.
	* parser/README: Update requirements.

2002-08-12  Rachel Hestilow  <hestilow@ximian.com>

   * parser/gapi_pp.pl: Handle "typedef struct {...}" construct.

	* glue/canvaspoints.c: Added.
	* glue/Makefile.am: Updated.

 	* gnome/CanvasPoints.custom: Added. (Doesn't seem to work right yet,
	looking into this.)

svn path=/trunk/gtk-sharp/; revision=6601
2002-08-12 19:14:44 +00:00
Mike Kestner 8896672938 2002-08-09 Kristian Rietveld <kris@gtk.org>
* parser/Gtk.metadata: add a bunch of out arg rules, add
       a vararg rule for the ListStore constructor, change method names of
       TreeModel's signal emission methods, remove opaque rule of
       GtkTreeIter, remove null_ok rules of TreeModel.IterNChildren
       and TreeModel.IterNthChild.

       * parser/Metadata.pm: add some code to be able to filter on
       parameter names.

       * generator/Method.cs: a method with accessor args and a non-void
       return value cannot be written as property.

       * sample/Makefile.in, sample/TreeViewDemo.cs: add a simple TreeView
       demo app.

       * gtk/ListStore.custom, gtk/TreeModel.custom, gtk/TreeModelSort.custom,
       gtk/TreeStore.custom, gtk/TreeView.custom: customizations.

svn path=/trunk/gtk-sharp/; revision=6576
2002-08-10 19:15:58 +00:00
Mike Kestner 903349cd37 2002-08-08 Mike Kestner <mkestner@speakeasy.net>
* generator/Method.cs : s/GetType/GetGType. Don't generated static
	  methods for interfaces.
	* glib/Object.cs : add GType prop
	* gnome/*.custom : s/Type/GType
	* parser/Gtk.metadata : rule to make TreeIter opaque
	* parser/gapi2xml.pl : handle interface methods properly
	* sample/Fifteen.cs : s/Type/GType

svn path=/trunk/gtk-sharp/; revision=6556
2002-08-09 03:56:27 +00:00
Rachel Hestilow 034534a606 2002-08-05 Rachel Hestilow <hestilow@ximian.com>
* parser/Gnome.metadata: Patch from duncan for
	bug #28553 (canvas item event handler rename).

svn path=/trunk/gtk-sharp/; revision=6447
2002-08-05 22:42:58 +00:00
Rachel Hestilow 54838fec29 2002-08-03 Rachel Hestilow <hestilow@ximian.com>
* generator/Method.cs: Support libname overrides. Call parms.Finish.
	* generator/Parameters.cs: New method parms.Finish. Generate a temporary
	holder variable for enum out parameters.
	* generator/Property.cs: Pass a boolean to EnumWrapper indicating.
	if these are flags.
	* generator/StructBase.cs: Disable array marshalling (it is
	broken in mono.)
	* generator/SymbolTable.cs: Add methods IsEnumFlags.

	* glib/EnumWrapper.cs: New bool "flags".
	* glib/Value.cs: Call flags variant on GValue for enum props, if needed.

	* glue/Makefile.am, glue/style.c, glue/widget.c: Add widget
	and style field accessor methods.

	* gtk/Style.custom, Widget.custom: Added.

	* parser/README: Update requirements (needed for pixbuf drawable hack)
	* parser/Gdk.metadata: Fix library for pixbuf methods in gdk.
	Add Window.GetPointer "out" parameters.
	* parser/gapi2xml.pl: Remap gdk_draw_* methods to Drawable.

	* sample/Makefile.in: Add size and scribble samples.
	* sample/Scribble.cs: Added.

svn path=/trunk/gtk-sharp/; revision=6387
2002-08-03 22:24:37 +00:00
Rachel Hestilow 7648593a67 2002-08-02 Rachel Hestilow <hestilow@ximian.com>
[ Mike, this is everything I wanted in for the release. ]

	* generator/StructBase.cs: Generate field accessors for wrapped
	types (opaque, object, and structs/boxed). Bitfields, unions, and
	arrays are still unsupported for accessors, and are probably marshalling
	incorrectly. But this is enough to get events working (see example
	in sample/GnomeHelloWorld.cs).

	* parser/Metadata.pm: Support a "delete" directive, and set metadata
	on structs and boxed (previously was only checking objects and interfaces).

	* parser/Gdk.metadata: Delete bogus entries GdkWindowObject and
	GdkPixmapObject (more evil drawable stuff.)

	* sample/GnomeHelloWorld.cs: Show an example of how to use marshalled
	events, in our selection callback.

svn path=/trunk/gtk-sharp/; revision=6370
2002-08-02 22:35:23 +00:00
Rachel Hestilow 967e3e9c5a 2002-07-30 Rachel Hestilow <hestilow@ximian.com>
* generator/ClassBase.cs: Change hasDefaultConstructor to protected,
	adjust now that it is an attr and not a subnode. Also add virtual
	property AssignToName (for ctors).

	* generator/Ctor.cs: Add property ForceStatic.
	(Generate): Optimize return code a bit for the static case.

	* generator/Method.cs: Assign to a "raw_ret" pointer before calling
	FromNativeReturn.

	* generator/Parameters.cs: Change "out ref" to "out", not "ref".

	* generator/Property.cs: Fix to work correctly with all object and
	struct types (mostly just some if-cases added).

	* generator/SignalHandler.cs: Remove args_type and argfields (unused).
	(Generate): Initialize struct if necessary.

	* generator/StructBase.cs: Massive reworking to support methods, ctors,
	etc.

	* generator/SymbolTable.cs: Add GdkAtom and gconstpointer simple types.

	* glib/Boxed.cs: Accept both IntPtr and object ctors. Add access for both.

	* glib/Opaque.cs: Fix copy/pasted copyright notice, remove data and event
	fields. Fix docs.

	* glib/Value.cs: Work correctly with boxed properties.

	* gnome/Modules.cs: Use new struct ctors.

	* gnome/Program.custom: Remove Get, this is being generated now.

	* parser/Gdk.metadata: Fix the drawable classes to inherit correctly.

	* parser/Metadata.pm: Change per-class attributes to actually be
	attributes.

	* parser/Gtk.metadata: Add a dummy attribute value for disabledefaultctor.

	* parser/gapi2xml.pl: Add hacks for the (broken) Drawable and Bitmap
	typedefs.

	* sample/test/TestColorSelection.cs: Display color string in hex format,
	update to use IsNull instead of == null, and size dialog to look pretty.

	* sample/Size.cs: Added.

svn path=/trunk/gtk-sharp/; revision=6264
2002-07-30 23:02:12 +00:00
Rachel Hestilow 4d92d54b3f 2002-07-25 Rachel Hestilow <hestilow@ximian.com>
[about 60% of the marshalling patch that I lost.
	 The rest to come tomorrow.]

	* generator/BoxedGen.cs, StructGen.cs: Move most of this to StructBase,
	delete large chunks duplicated from ClassBase.

	* generator/IGeneratable.cs: Add MarshalReturnType, FromNativeReturn.

	* generator/ClassBase.cs: Move ctor stuff here. Add a CallByName
	overload with no parameters for the "self" reference.

	* generator/EnumGen.cs, CallbackGen.cs: Implement new MarshalReturnType,
	  FromNativeReturn.

   * generator/Method.cs: Use container_type.MarshalType, CallByName, and
	  SymbolTable.FromNativeReturn when generating call and import sigs.

	* generator/OpaqueGen.cs: Added.

	* generator/Property.cs: Handle boxed and opaques differently.

	* generator/SymbolTable.cs: Update for the opaque stuff and the new Return
	methods. Also change GetClassGen to simply call the as operator.

	* glib/Boxed.cs: Update for struct usage -- this is now a wrapper for
	  the purposes of using with Value.

   * glib/Opaque.cs: Added. New base class for opaque structs.

	* glue/textiter.c, gtk/TextIter.custom: Remove.

	* gnome/Program.cs: Update for new struct marshalling.

	* parser/Metadata.pm: Use our own getChildrenByTagName.

	* parser/README: Update for new requirements (was out of sync with
	  build.pl)

	* parser/gapi2xml.pl: Hide struct like const in field elements.

	* parser/gapi_pp.pl: Handle embedded union fields (poorly).

	* sample/test/TestColorSelection.cs: Comment out null color tests
     for now.

svn path=/trunk/gtk-sharp/; revision=6186
2002-07-26 06:08:52 +00:00
Mike Kestner 7ba51928a5 2002-07-23 Mike Kestner <mkestner@speakeasy.net>
* generator/Method.cs : implement static method generation.
	* parser/Gnome.metadata : map AppBar::ClearPrompt signal collision.
	* parser/Gtk.metadata : map IMContext::DeleteSurrounding collision.
	* parser/gapi2xml.pl : mark shared methods in the XML.

svn path=/trunk/gtk-sharp/; revision=6096
2002-07-23 22:23:40 +00:00
Duncan Mak d789d80bc0 Forgot to add gtk_radio_button_new_with_mnemonic
svn path=/trunk/gtk-sharp/; revision=5878
2002-07-17 18:30:10 +00:00
Duncan Mak 6de1f261a2 2002-07-18 Duncan Mak <duncan@ximian.com>
* parser/Gtk.metadata: Mark gtk_radio_menu_item_new_with_label,
	gtk_radio_button_new_with_label and gtk_radio_button_new with
	null_ok flags.

svn path=/trunk/gtk-sharp/; revision=5877
2002-07-17 18:05:48 +00:00
Radek Doulik 33b715ef83 2002-07-17 Radek Doulik <rodo@ximian.com>
* gtk/ScrolledWindow.custom: new file with ScrolledWindow custom
	default constructor

	* parser/Metadata.pm: addClassData subroutine to add
	<disabledefaultconstructor/>

	* parser/Gtk.metadata: disable default constructor for
	ScrolledWindow

	* generator/ObjectGen.cs: added hasDefaultConstructor flag, dont
	generate default protected empty constructor if
	hasDefaultConstructor is false, it will be provided by .custom
	file

	* generator/makefile (RUNTIME): use RUNTIME variable

svn path=/trunk/gtk-sharp/; revision=5854
2002-07-17 15:05:22 +00:00
Rachel Hestilow 9e29ccbf0a 2002-07-17 Rachel Hestilow <hestilow@ximian.com>
* parser/Gtk.metadata: Tag MenuItem.SetSubmenu as null-ok.

svn path=/trunk/gtk-sharp/; revision=5853
2002-07-17 14:44:01 +00:00
Rachel Hestilow faf9967df6 2002-07-17 Rachel Hestilow <hestilow@ximian.com>
* generator/Method.cs: Honor array in return type.

	* parser/Gtk.metadata: Tag FileSelection.GetSelections as array.
	* parser/Metadata.pm: Add "return" target.

	* parser/gtkhtml, parser/README: Add gtkhtml-stream.[ch].
	Needed for url-requested signal. The actual wrapper for this
	compiles but is badly borked, it will probably need a lot of love.

svn path=/trunk/gtk-sharp/; revision=5852
2002-07-17 14:31:13 +00:00
Rachel Hestilow eb38e65353 2002-07-13 Rachel Hestilow <hestilow@ximian.com>
* generator/Parameters.cs: Allow nulls if null_ok set.
	* generator/SymbolTable.cs: Add method IsStruct.
	* parser/Gtk.metadata, Gdk.metadata, Gnome.metadata: Merge in
	null_ok from *.defs. This is probably incomplete though, I've
	already found one method that wasn't listed.

	* sample/GnomeHelloWorld.cs: Remove IntPtr.Zero hack.

svn path=/trunk/gtk-sharp/; revision=5792
2002-07-14 01:32:18 +00:00
Rachel Hestilow fb1256d2f3 2002-07-13 Rachel Hestilow <hestilow@ximian.com>
* parser/Gnome.metadata, Gtk.metadata: More conflict
	fixes.
	* parser/build.pl: Fully qualify all lib names. (Gtk+ packages
	are now LFS-compliant in Debian...)
	* parser/gapi2xml.pl: Fix for whitespace in fields, defines,
	and docs.

	* generator/BoxedGen.cs: Remove extraneous CallByName definition,
	add "override" keyword to FromNative.
	(Generate): Generate methods after fields.
	* generator/ClassBase.cs: Change CallByName, FromNative to virtual.
	(.ctor): Ignore "hidden" nodes. Set container on signal.
	(GenSignals, GenMethods): Add "implementor" argument for interface
	use.
	(Get(Method|Signal|Property)Recursively): Rework to correctly
	recurse interfaces.
	(Implements): Added.
	* generator/Ctor.cs (Initialize): Move clash initialization completely
	out of Generate, so we can check for collisions.
	* generator/Method.cs (GenerateDeclCommon): Check for duplicates,
	for "new" keyword.
	(Generate): Add "implementor" argument.
	* generator/ObjectGen.cs (Generate): Initialize ctor clashes on
	this and all parents, before generating.
	(Ctors, InitializeCtors): Added.
	* generator/Signal.cs: Store the container_type, check for
	collisions.
	* generator/StructGen.cs: Add "override" keyword to overriden methods.

	* gtk/FileSelection.custom (ActionArea): Add "new" keyword.

svn path=/trunk/gtk-sharp/; revision=5782
2002-07-13 20:31:23 +00:00
Mike Kestner 79e7514057 2002-07-09 Mike Kestner <mkestner@speakeasy.net>
* generator/ClassBase.cs : handle overloaded method hash collision
	* generator/SignalHandler.cs : generate *Handler delegates. stub *Args
	* parser/Gtk.metadata : add *Defaults method renaming

svn path=/trunk/gtk-sharp/; revision=5678
2002-07-10 03:09:39 +00:00
Rachel Hestilow 00e98b4c30 2002-07-01 Rachel Hestilow <hestilow@ximian.com>
* generator/gtkapi.xml:
	* parser/build.pl: Fix to use 3.0 (accidentally reverted in
	last commit).

	* generator/SymbolTable.cs (simple_types): Map gssize and gsize.
	* parser/Gdk.metadata: Tag PixbufLoader.Write's data parameter
	as array.

svn path=/trunk/gtk-sharp/; revision=5533
2002-07-02 03:35:07 +00:00
Rachel Hestilow 34cf63f0cc 2002-06-26 Rachel Hestilow <hestilow@ximian.com>
* parser/Gtk.metadata: Change gtk_label_new to be the
	preferred constructor.

	* gdk/Event.cs: Add "IsValid" property (sometimes NULL events
	get sent in signals).

	* sample/GnomeHelloWorld.cs: Check to make sure iconlist event
	is valid.

svn path=/trunk/gtk-sharp/; revision=5462
2002-06-26 11:08:22 +00:00
Rachel Hestilow 02c9fb725c 2002-06-26 Rachel Hestilow <hestilow@ximian.com>
* configure.in, makefile, makefile.win32: add gnome.

	* doc/index.html, netdoc.xsl: Add gnome.

	* gdk/Event.cs: New manual wrap for GdkEvent.

	* generator/ClassBase.cs: Add methods GetProperty,
	GetPropertyRecursively, GetMethodRecursively.
	Move Parent property here from ObjectGen.cs. Pass this pointer
	into Property.

	* generator/Ctor.cs: Generate docs.

	* generator/Method.cs, Property.cs: Tag method as "new" if a
	Method/Property with the same name is found in the class hierarchy.

	* generator/SignalHandler.cs: Correctly wrap complex signal argument
	types. Add gnome directory.

	* generator/SymbolTable.cs: Add manually wrapped types hash
	(contains GLib.GSList and Gdk.Event). Add method IsManuallyWrapped.

	* glib/SList.cs: Add constructor from IntPtr.

	* glue/slist.c, glue/event.c: Added (field accessor glue).

	* glue/Makefile.am: Update.

	* parser/Gtk.metadata: Add new signal renames for new signals
	exposed by GdkEvent changes.

	* parser/README, parser/build.pl: Add libgnome, libgnomecanvas,
	libgnomeui.

	* parser/gapi2xml.pl: Handle literal-length array parameters,
	and NULL property doc strings.

	* sample/: Add new test GnomeHelloWorld.cs.

	* gnome/: Added.

	* parser/Gnome.metadata: Added.

svn path=/trunk/gtk-sharp/; revision=5461
2002-06-26 08:36:05 +00:00
Mike Kestner 304427af77 2002-06-25 Mike Kestner <mkestner@speakeasy.net>
* generator/gtkapi.xml : lots of fixes, plus GtkHTML!
	* parser/Gtk.metadata : add a bunch of renames.
	* parser/build.pl : Add the gtkhtml parse.
	* parser/README : module list to parse

svn path=/trunk/gtk-sharp/; revision=5459
2002-06-26 00:54:05 +00:00
Rachel Hestilow 1f4ff5bb86 2002-06-24 Rachel Hestilow <hestilow@ximian.com>
* glib/EnumWrapper.cs: New class which holds an enum int.

	* glib/Value.cs: Add support for glib enum types. We needed
	to use EnumWrapper for this because otherwise the int operator
	wouldn't know which glib function to use.

	* generator/BoxedGen.cs, ClassBase.cs, Ctor.cs, EnumGen.cs,
	InterfaceGen.cs, Method.cs, ObjectGen.cs, Signal.cs, StructGen.cs:
	Create more doc stubs.

	* generator/Property.cs: Generate enum values correctly.

	* generator/Ctor.cs: Refactor generation to honor metadata-specified
	collision preference.

	* parser/Gtk.metadata: Added constructor collision preferences to
	all known clashes.

	* parse/Gdk.metadata: Added (for Pixbuf clashes).

svn path=/trunk/gtk-sharp/; revision=5437
2002-06-24 22:04:10 +00:00
Rachel Hestilow 7fb558bea0 2002-06-23 Rachel Hestilow <hestilow@ximian.com>
* generator/ClassBase.cs: Add accessors for methods and signals.
	Change GenSignals and GenMethods to public, as csc has a different
	idea of protected than mcs. Handle interface collisions in
	GenMethods.

	* generator/Method.cs: Add accessor Protection - "public" by default.

	* generator/ObjectGen.cs: Make sure wrapper's Signals hashtable only
	gets generated once. Generate a list of collisions for GenMethods.
	Remove dead foreach loop from Validate.

	* generator/Paramaters.cs (CreateSignature): Initialize last_param.

	* parser/Gtk.metadata: Add property & event collision renames
	for TextBuffer and OldEditable.

	* sample/makefile.win32: Reference atk-sharp.dll.

	* makefile.win32: Do not build gdk.imaging.

svn path=/trunk/gtk-sharp/; revision=5420
2002-06-23 03:38:02 +00:00
Rachel Hestilow 6857128f07 2002-06-21 Rachel Hestilow <hestilow@ximian.com>
* generator/ClassBase.cs: New base class for classes and interfaces.

	* generator/InterfaceGen.cs: Inherit from ClassBase, generate declarations.

	* generator/ObjectGen.cs: Move half of this into ClassBase.

	* generator/Method.cs: Turn all applicable Get/Set functions into .NET
	accessors. Remove redundant == overload and move into Equals, as
	it was confusing "!= null".

	* generator/Parameters.cs: Alter signature creation to accept "is_set"
	option, add support for variable arguments. Add properties "Count",
	"IsVarArgs", "VAType".

	* generator/Ctor.cs: Fixup for changes in Parameters (indenting,
	signature creation).

	* generator/Signal.cs: Support generating declarations.

	* generator/SymbolTable: Change GetObjectGen to GetClassGen.

	* glib/IWrapper.cs: Move "Handle" declaration to here, so
	both classes and interfaces can benefit from it.

	* glib/Object.cs: Inherit from IWrapper.cs

	* parser/Metadata.pm: Support attribute changes on constructors,
	methods, signals, and paramater lists.

	* parser/gapi2xml.pl: Parse init funcs for interfaces. Ignore "_"
	functions here.

	* parser/gapi_pp.pl: Remove boxed_type_register check, as it will
	be caught in the init funcs.

	* parser/Atk.metadata: Added.

	* parser/Gtk.metadata: Add all needed signal/method collision
	renames. Rename GtkEditable.Editable accessors to IsEditable,
	as .NET does not like accessors with the same name as their
	declaring type. Tag TreeStore constructor as varargs.

	* samples/ButtonApp.cs: s/EmitAdd/Add.

	* samples/Menu.cs: s/EmitAdd/Add, s/Activate/Activated.

svn path=/trunk/gtk-sharp/; revision=5394
2002-06-21 17:15:19 +00:00
Rachel Hestilow eea6465cf2 2002-06-09 Rachel Hestilow <hestilow@ximian.com>
* generator/GenBase.cs: new method AppendCustom, moved from ObjectGen.
	* generator/BoxedGen.cs, ObjectGen.cs, StructGen.cs:
	Call AppendCustom in Generate ();
	* generator/Method.cs, Parameters.cs: Add support for "out"
	parameters. Additionally, output an accessor instead of a
	regular method if it is an accessor-style function (ie GetStartIter).
	* generator/Property.cs: Add additional cast to Boxed, if necessary.
	* glue/textiter.c: New constructor for GtkTextIter.
	* glue/Makefile.am: Add textiter.c, build with Gtk+ cflags.
	* configure.in: Check for Gtk+ cflags.
	* parser/Metadata.pm, Gtk.metadata: Added.
	* parser/gapi2xml.pl: Call Metadata::fixup on the document.
	Also work around gtk's screwy boxed type name registration
	(GtkFoo -> GtkTypeFoo).
	* gtk/TextIter.custom: Added.

svn path=/trunk/gtk-sharp/; revision=5205
2002-06-10 12:34:09 +00:00