From 6c25e8c60860d09f6ba51f5a5d873172698d6a36 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 27 May 2004 02:06:05 +0000 Subject: [PATCH] 2004-05-25 Mike Kestner * gtkhtml/Gtk.metadata : hide Gtk.HTML the ctors. * gtkhtml/HTML.custom : new manual impl for ctors. * gtkhtml/Makefile.am : add new custom [Fixes #59148] 2004-05-25 Mike Kestner * */Makefile.am : rm -f generated/* in case it doesn't exist yet. svn path=/trunk/gtk-sharp/; revision=28214 --- ChangeLog | 11 +++++++++++ art/Makefile.am | 2 +- atk/Makefile.am | 2 +- gda/Makefile.am | 2 +- gdk/Makefile.am | 2 +- glade/Makefile.am | 2 +- gnome/Makefile.am | 2 +- gnomedb/Makefile.am | 2 +- gtk/Makefile.am | 2 +- gtkhtml/Gtk.metadata | 2 ++ gtkhtml/HTML.custom | 37 +++++++++++++++++++++++++++++++++++++ gtkhtml/Makefile.am | 5 +++-- pango/Makefile.am | 2 +- rsvg/Makefile.am | 2 +- vte/Makefile.am | 2 +- 15 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 gtkhtml/HTML.custom diff --git a/ChangeLog b/ChangeLog index cee5e88e7..bc318f639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-05-25 Mike Kestner + + * gtkhtml/Gtk.metadata : hide Gtk.HTML the ctors. + * gtkhtml/HTML.custom : new manual impl for ctors. + * gtkhtml/Makefile.am : add new custom + [Fixes #59148] + +2004-05-25 Mike Kestner + + * */Makefile.am : rm -f generated/* in case it doesn't exist yet. + 2004-05-25 Dan Winship * gtk/Gtk.metadata : mark a ref param in SizeRequested diff --git a/art/Makefile.am b/art/Makefile.am index 0b73bc906..d9a533ee4 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -49,7 +49,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp diff --git a/atk/Makefile.am b/atk/Makefile.am index 4f215f861..5c322f73d 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -37,7 +37,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ --gluelib-name=atksharpglue --glue-filename=glue/generated.c \ diff --git a/gda/Makefile.am b/gda/Makefile.am index f7f4a7fcc..8644f8df8 100644 --- a/gda/Makefile.am +++ b/gda/Makefile.am @@ -46,7 +46,7 @@ $(API): $(srcdir)/$(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp diff --git a/gdk/Makefile.am b/gdk/Makefile.am index ddab97f2d..528023a60 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -75,7 +75,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ --gluelib-name=gdksharpglue --glue-filename=glue/generated.c \ diff --git a/glade/Makefile.am b/glade/Makefile.am index bb5f4fcb9..c2582e276 100644 --- a/glade/Makefile.am +++ b/glade/Makefile.am @@ -52,7 +52,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp diff --git a/gnome/Makefile.am b/gnome/Makefile.am index 72bafce82..da8c361bc 100644 --- a/gnome/Makefile.am +++ b/gnome/Makefile.am @@ -88,7 +88,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp diff --git a/gnomedb/Makefile.am b/gnomedb/Makefile.am index bb457daad..a9a9aaa54 100644 --- a/gnomedb/Makefile.am +++ b/gnomedb/Makefile.am @@ -46,7 +46,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 69d0cbeb2..4971cf70e 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -105,7 +105,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ --gluelib-name=gtksharpglue --glue-filename=glue/generated.c \ diff --git a/gtkhtml/Gtk.metadata b/gtkhtml/Gtk.metadata index aa44703f3..b21b84b89 100644 --- a/gtkhtml/Gtk.metadata +++ b/gtkhtml/Gtk.metadata @@ -1,5 +1,7 @@ + 1 + 1 OnCommand Begin Begin diff --git a/gtkhtml/HTML.custom b/gtkhtml/HTML.custom new file mode 100644 index 000000000..944bfaa21 --- /dev/null +++ b/gtkhtml/HTML.custom @@ -0,0 +1,37 @@ +// Gtk.HTML.custom - Gtk HTML class customizations +// +// Author: Mike Kestner +// +// Copyright (C) 2004 Novell, Inc. +// +// This code is inserted after the automatically generated code. + + [DllImport("gtkhtml-3.0")] + static extern IntPtr gtk_html_new(); + + public HTML () : base (IntPtr.Zero) + { + if (GetType () != typeof (HTML)) { + CreateNativeObject (new string [0], new GLib.Value[0]); + Construct (this); + return; + } + Raw = gtk_html_new(); + } + + [DllImport("gtkhtml-3.0")] + static extern IntPtr gtk_html_new_from_string(string Astr, int len); + + public HTML (string Astr) : base (IntPtr.Zero) + { + if (GetType () != typeof (HTML)) { + CreateNativeObject (new string [0], new GLib.Value[0]); + Construct (this); + LoadFromString (Astr); + return; + } + + Raw = gtk_html_new_from_string(Astr, Astr.Length); + } + + diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am index c3d7408bd..4c634c0c7 100644 --- a/gtkhtml/Makefile.am +++ b/gtkhtml/Makefile.am @@ -26,7 +26,8 @@ sources = build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -customs = \ +customs = \ + HTML.custom \ HTMLStream.custom build_customs = $(addprefix $(srcdir)/, $(customs)) @@ -46,7 +47,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp diff --git a/pango/Makefile.am b/pango/Makefile.am index 8e1c6b8ad..044fa55d7 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -41,7 +41,7 @@ $(API): $(srcdir)/$(METADATA) $(srcdir)/$(RAW_API) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp diff --git a/rsvg/Makefile.am b/rsvg/Makefile.am index 01fbef4e1..e8bc6f9c3 100644 --- a/rsvg/Makefile.am +++ b/rsvg/Makefile.am @@ -47,7 +47,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp diff --git a/vte/Makefile.am b/vte/Makefile.am index 93f224f72..374a275b9 100644 --- a/vte/Makefile.am +++ b/vte/Makefile.am @@ -45,7 +45,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm generated/* && \ + rm -f generated/* && \ $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp