2004-05-25 Mike Kestner <mkestner@ximian.com>
* 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 <mkestner@ximian.com> * */Makefile.am : rm -f generated/* in case it doesn't exist yet. svn path=/trunk/gtk-sharp/; revision=28214
This commit is contained in:
parent
db317dd185
commit
6c25e8c608
15 changed files with 64 additions and 13 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
2004-05-25 Mike Kestner <mkestner@ximian.com>
|
||||||
|
|
||||||
|
* 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 <mkestner@ximian.com>
|
||||||
|
|
||||||
|
* */Makefile.am : rm -f generated/* in case it doesn't exist yet.
|
||||||
|
|
||||||
2004-05-25 Dan Winship <danw@ximian.com>
|
2004-05-25 Dan Winship <danw@ximian.com>
|
||||||
|
|
||||||
* gtk/Gtk.metadata : mark a ref param in SizeRequested
|
* gtk/Gtk.metadata : mark a ref param in SizeRequested
|
||||||
|
|
|
@ -49,7 +49,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
|
||||||
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs)
|
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) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \
|
||||||
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
&& touch generated-stamp
|
&& touch generated-stamp
|
||||||
|
|
|
@ -37,7 +37,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
|
||||||
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
||||||
rm generated/* && \
|
rm -f generated/* && \
|
||||||
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
||||||
--outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
--gluelib-name=atksharpglue --glue-filename=glue/generated.c \
|
--gluelib-name=atksharpglue --glue-filename=glue/generated.c \
|
||||||
|
|
|
@ -46,7 +46,7 @@ $(API): $(srcdir)/$(srcdir)/$(METADATA)
|
||||||
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
||||||
rm generated/* && \
|
rm -f generated/* && \
|
||||||
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
||||||
--outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
&& touch generated-stamp
|
&& touch generated-stamp
|
||||||
|
|
|
@ -75,7 +75,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
|
||||||
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs)
|
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) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \
|
||||||
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
--gluelib-name=gdksharpglue --glue-filename=glue/generated.c \
|
--gluelib-name=gdksharpglue --glue-filename=glue/generated.c \
|
||||||
|
|
|
@ -52,7 +52,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
|
||||||
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
||||||
rm generated/* && \
|
rm -f generated/* && \
|
||||||
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
||||||
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
&& touch generated-stamp
|
&& touch generated-stamp
|
||||||
|
|
|
@ -88,7 +88,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
|
||||||
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
||||||
rm generated/* && \
|
rm -f generated/* && \
|
||||||
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
||||||
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
&& touch generated-stamp
|
&& touch generated-stamp
|
||||||
|
|
|
@ -46,7 +46,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
|
||||||
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
||||||
rm generated/* && \
|
rm -f generated/* && \
|
||||||
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
||||||
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
&& touch generated-stamp
|
&& touch generated-stamp
|
||||||
|
|
|
@ -105,7 +105,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
|
||||||
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs)
|
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) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \
|
||||||
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
--gluelib-name=gtksharpglue --glue-filename=glue/generated.c \
|
--gluelib-name=gtksharpglue --glue-filename=glue/generated.c \
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<metadata>
|
<metadata>
|
||||||
|
<attr path="//object[@cname='GtkHTML']/constructor[@cname='gtk_html_new']" name="hidden">1</attr>
|
||||||
|
<attr path="//object[@cname='GtkHTML']/constructor[@cname='gtk_html_new_from_string']" name="hidden">1</attr>
|
||||||
<attr path="//object[@cname='GtkHTML']/signal[@name='Command']" name="name">OnCommand</attr>
|
<attr path="//object[@cname='GtkHTML']/signal[@name='Command']" name="name">OnCommand</attr>
|
||||||
<attr path="//object[@cname='GtkHTML']/method[@name='BeginContent']" name="name">Begin</attr>
|
<attr path="//object[@cname='GtkHTML']/method[@name='BeginContent']" name="name">Begin</attr>
|
||||||
<attr path="//object[@cname='GtkHTML']/method[@name='BeginFull']" name="name">Begin</attr>
|
<attr path="//object[@cname='GtkHTML']/method[@name='BeginFull']" name="name">Begin</attr>
|
||||||
|
|
37
gtkhtml/HTML.custom
Normal file
37
gtkhtml/HTML.custom
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
// Gtk.HTML.custom - Gtk HTML class customizations
|
||||||
|
//
|
||||||
|
// Author: Mike Kestner <mkestner@ximian.com>
|
||||||
|
//
|
||||||
|
// 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);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,7 @@ sources =
|
||||||
build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
|
build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
|
||||||
|
|
||||||
customs = \
|
customs = \
|
||||||
|
HTML.custom \
|
||||||
HTMLStream.custom
|
HTMLStream.custom
|
||||||
|
|
||||||
build_customs = $(addprefix $(srcdir)/, $(customs))
|
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)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
||||||
rm generated/* && \
|
rm -f generated/* && \
|
||||||
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
||||||
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
&& touch generated-stamp
|
&& touch generated-stamp
|
||||||
|
|
|
@ -41,7 +41,7 @@ $(API): $(srcdir)/$(METADATA) $(srcdir)/$(RAW_API)
|
||||||
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
||||||
rm generated/* && \
|
rm -f generated/* && \
|
||||||
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
||||||
--outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
&& touch generated-stamp
|
&& touch generated-stamp
|
||||||
|
|
|
@ -47,7 +47,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
|
||||||
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
||||||
rm generated/* && \
|
rm -f generated/* && \
|
||||||
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
||||||
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
&& touch generated-stamp
|
&& touch generated-stamp
|
||||||
|
|
|
@ -45,7 +45,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
|
||||||
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
|
||||||
|
|
||||||
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
|
||||||
rm generated/* && \
|
rm -f generated/* && \
|
||||||
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
|
||||||
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
|
||||||
&& touch generated-stamp
|
&& touch generated-stamp
|
||||||
|
|
Loading…
Add table
Reference in a new issue