2004-03-12 Mike Kestner <mkestner@ximian.com>

* */Makefile.am : automakify the build
	* */Makefile.in : kill
	* *.custom : remove System.Drawing dependencies
	* *.cs : remove System.Drawing dependencies
	* *-api.xml : mv to *-api.raw
	* glue/* : mv to lib specific gluelibs for glib, gdk, gtk, and glade.
	* gtk/gtk-symbols : alias GtkType to GType
	* sources/gtk-sharp-sources.xml : create .raw files. They are now
	transformed to .xml files by the metadata compilation step.

svn path=/trunk/gtk-sharp/; revision=23967
This commit is contained in:
Mike Kestner 2004-03-12 21:18:11 +00:00
parent c8d505e7ca
commit e83c55a242
204 changed files with 29460 additions and 29090 deletions

1
AUTHORS Normal file
View file

@ -0,0 +1 @@
Mike Kestner <mkestner@ximian.com>

View file

@ -1,3 +1,15 @@
2004-03-12 Mike Kestner <mkestner@ximian.com>
* */Makefile.am : automakify the build
* */Makefile.in : kill
* *.custom : remove System.Drawing dependencies
* *.cs : remove System.Drawing dependencies
* *-api.xml : mv to *-api.raw
* glue/* : mv to lib specific gluelibs for glib, gdk, gtk, and glade.
* gtk/gtk-symbols : alias GtkType to GType
* sources/gtk-sharp-sources.xml : create .raw files. They are now
transformed to .xml files by the metadata compilation step.
2004-03-08 Mike Kestner <mkestner@ximian.com> 2004-03-08 Mike Kestner <mkestner@ximian.com>
* generator/ObjectGen.cs : ignore virtual_method elems for now. * generator/ObjectGen.cs : ignore virtual_method elems for now.

14
Makefile.am Normal file
View file

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

View file

@ -1,71 +0,0 @@
NATIVE_DIRS = glue parser
DIRS=generator glib pango atk gdk gtk glade art gnome gtkhtml gda gnomedb gconf rsvg vte sample
ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT)))
CSC=$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe
MCS=mcs
all: linux
windows:
for i in $(DIRS); do \
CSC=$(CSC) $(MAKE) -C $$i windows || exit 1; \
done;
unix:
@echo "'make unix' is broken for now."
linux: native binding
binding:
for i in $(DIRS); do \
MCS="$(MCS)" $(MAKE) -C $$i || exit 1;\
done;
native:
for i in $(NATIVE_DIRS); do \
$(MAKE) -C $$i || exit 1; \
done
clean:
for i in $(NATIVE_DIRS) $(DIRS); do \
$(MAKE) -C $$i clean || exit 1; \
done;
gen-clean:
for i in $(DIRS); do \
$(MAKE) -C $$i clean || exit 1; \
done;
distclean: clean
for i in $(NATIVE_DIRS); do \
$(MAKE) -C $$i distclean || exit 1; \
done
for i in $(DIRS); do \
$(MAKE) -C $$i distclean || true; \
rm -f $$i/Makefile; \
done
rm -f config.cache config.h config.log config.status libtool
rm -f gtk-sharp.pc
rm -f Makefile
maintainer-clean: distclean
rm -f aclocal.m4 config.guess config.h.in config.sub
rm -f configure install-sh ltmain.sh missing
rm -f mkinstalldirs stamp-h glue/Makefile.in
install: install-native install-binding install-pkgconfig
install-binding:
for i in $(DIRS); do \
$(MAKE) -C $$i install || exit 1; \
done
install-native:
for i in $(NATIVE_DIRS); do \
$(MAKE) -C $$i install || exit 1; \
done
install-pkgconfig:
./mkinstalldirs $(DESTDIR)@prefix@/lib/pkgconfig
cp gtk-sharp.pc $(DESTDIR)@prefix@/lib/pkgconfig

1
NEWS Normal file
View file

@ -0,0 +1 @@
try CNN

52
art/Makefile.am Normal file
View file

@ -0,0 +1,52 @@
if ENABLE_LIBART
TARGET = $(ASSEMBLY)
APIS = $(API) $(ADDITIONAL_API)
else
TARGET =
APIS =
endif
API = art-api.xml
RAW_API = art-api.raw
ADDITIONAL_API = art-symbols.xml
INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml $(top_srcdir)/gdk/gdk-symbols.xml
METADATA = Art.metadata
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
ASSEMBLY = $(ASSEMBLY_NAME).dll
assemblydir = $(libdir)
apidir = $(datadir)/gapi
assembly_DATA = $(TARGET)
api_DATA = $(APIS)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API)
sources =
build_sources = $(addprefix $(srcdir)/, $(sources))
dist_sources = $(sources)
customs =
build_customs = $(addprefix $(srcdir)/, $(customs))
dist_customs = $(customs)
EXTRA_DIST = \
$(RAW_API) \
$(ADDITIONAL_API) \
$(METADATA) \
$(dist_customs) \
$(dist_sources)
$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
cp $(srcdir)/$(RAW_API) $(API)
chmod u+w $(API)
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs)
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
&& touch generated-stamp
$(ASSEMBLY): $(build_sources) generated-stamp
$(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs

View file

@ -1,42 +0,0 @@
APIS=art-api.xml art-symbols.xml
INCLUDE_APIS = ../atk/atk-api.xml \
../pango/pango-api.xml \
../gdk/gdk-api.xml \
../gdk/gdk-symbols.xml
RUNTIME=@MONO@
MCS=mcs
ASSEMBLY=art-sharp.dll
all: $(ASSEMBLY)
generated-stamp: $(APIS) ../generator/gapi_codegen.exe Art.metadata
$(RUNTIME) ../parser/gapi-fixup.exe --api=art-api.xml --metadata=Art.metadata && \
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \
--include $(INCLUDE_APIS) --outdir=generated --customdir=. \
--assembly-name=art-sharp && touch generated-stamp
$(ASSEMBLY): generated-stamp
$(MCS) --unsafe --target library \
-r System.Drawing -r ../glib/glib-sharp.dll \
-r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \
-r ../gdk/gdk-sharp.dll -o $(ASSEMBLY) --recurse '*.cs'
clean:
rm -f generated-stamp
rm -f $(ASSEMBLY)
rm -rf generated
prefix=@prefix@
DESTDIR=
apidir=$(DESTDIR)$(prefix)/share/gapi
libdir=$(DESTDIR)$(prefix)/lib
install: all
../mkinstalldirs $(libdir) && \
../mkinstalldirs $(apidir) && \
for i in $(APIS); do \
cp $$i $(apidir) || true; \
done && \
cp $(ASSEMBLY) $(libdir)

1069
art/art-api.raw Normal file

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

41
atk/Makefile.am Normal file
View file

@ -0,0 +1,41 @@
API = atk-api.xml
RAW_API = atk-api.raw
METADATA = Atk.metadata
ASSEMBLY_NAME = atk-sharp
references = /r:../glib/glib-sharp.dll
ASSEMBLY = $(ASSEMBLY_NAME).dll
assemblydir = $(libdir)
gapidir = $(datadir)/gapi
assembly_DATA = $(ASSEMBLY)
gapi_DATA = $(API)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API)
sources =
build_sources = $(addprefix $(srcdir)/, $(sources))
customs =
build_customs = $(addprefix $(srcdir)/, $(customs))
EXTRA_DIST = \
makefile.win32 \
$(RAW_API) \
$(METADATA) \
$(customs) \
$(sources)
$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
cp $(srcdir)/$(RAW_API) $(API)
chmod u+w $(API)
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
--outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
&& touch generated-stamp
$(ASSEMBLY): $(build_sources) generated-stamp
$(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs

View file

@ -1,38 +0,0 @@
APIS= atk-api.xml
INCLUDE_APIS = ../pango/pango-api.xml
RUNTIME=@MONO@
MCS=mcs
ASSEMBLY=atk-sharp.dll
all: $(ASSEMBLY)
generated-stamp: $(APIS) ../generator/gapi_codegen.exe Atk.metadata
$(RUNTIME) ../parser/gapi-fixup.exe --api=atk-api.xml --metadata=Atk.metadata && \
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \
--include $(INCLUDE_APIS) --outdir=generated --customdir=. \
--assembly-name=atk-sharp && touch generated-stamp
$(ASSEMBLY): generated-stamp
$(MCS) --unsafe --target library \
-r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \
-o $(ASSEMBLY) --recurse '*.cs'
clean:
rm -f generated-stamp
rm -f $(ASSEMBLY)
rm -rf generated
prefix=@prefix@
DESTDIR=
apidir=$(DESTDIR)$(prefix)/share/gapi
libdir=$(DESTDIR)$(prefix)/lib
install: all
../mkinstalldirs $(libdir) && \
../mkinstalldirs $(apidir) && \
for i in $(APIS); do \
cp $$i $(apidir) || true; \
done && \
cp $(ASSEMBLY) $(libdir)

View file

@ -1,5 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<api><!-- <api>
<!--
This file was automatically generated. This file was automatically generated.
Please DO NOT MODIFY THIS FILE, modify .metadata files instead. Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
@ -367,7 +368,7 @@
</method> </method>
</interface> </interface>
<interface name="Document" cname="AtkDocument"> <interface name="Document" cname="AtkDocument">
<method cname="atk_document_get_document" name="GetTheDocument"> <method name="GetDocument" cname="atk_document_get_document">
<return-type type="gpointer"/> <return-type type="gpointer"/>
</method> </method>
<method name="GetDocumentType" cname="atk_document_get_document_type"> <method name="GetDocumentType" cname="atk_document_get_document_type">
@ -1533,7 +1534,7 @@
<struct name="Attribute" cname="AtkAttribute"> <struct name="Attribute" cname="AtkAttribute">
<field cname="name" type="gchar*"/> <field cname="name" type="gchar*"/>
<field cname="value" type="gchar*"/> <field cname="value" type="gchar*"/>
<method name="SetFree" cname="atk_attribute_set_free" shared="true" hidden="1"> <method name="SetFree" cname="atk_attribute_set_free" shared="true">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="AtkAttributeSet*" name="attrib_set"/> <parameter type="AtkAttributeSet*" name="attrib_set"/>
@ -1646,7 +1647,7 @@
</parameters> </parameters>
</method> </method>
</class> </class>
<class cname="AtkState_" name="StateManager"> <class name="State" cname="AtkState_">
<method name="TypeForName" cname="atk_state_type_for_name" shared="true"> <method name="TypeForName" cname="atk_state_type_for_name" shared="true">
<return-type type="AtkStateType"/> <return-type type="AtkStateType"/>
<parameters> <parameters>

View file

@ -10,8 +10,14 @@ windows: generated-stamp
generated-stamp: ../generator/codegen.exe atk-api.xml generated-stamp: ../generator/codegen.exe atk-api.xml
../generator/codegen --generate $(APIS) --outdir=generated --customdir=. --assembly-name=atk-sharp && touch generated-stamp ../generator/codegen --generate $(APIS) --outdir=generated --customdir=. --assembly-name=atk-sharp && touch generated-stamp
atk-api.xml: atk-api.raw Atk.metadata
cp atk-api.raw atk-api.xml
chmod u+w atk-api.xml
../parser/gapi-fixup.exe --api=atk-api.xml --metadata=Atk.metadata
clean: clean:
rm -f generated-stamp rm -f generated-stamp
rm -f $(ASSEMBLY) rm -f $(ASSEMBLY)
rm -rf generated rm -rf generated
rm -f atk-api.xml

View file

@ -38,7 +38,6 @@ if test "x$PKG_CONFIG" = "xno"; then
fi fi
dnl for use on the build system dnl for use on the build system
dnl pkg-config is stupid
BUILD_GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` BUILD_GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
BUILD_GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` BUILD_GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
AC_SUBST(BUILD_GTK_CFLAGS) AC_SUBST(BUILD_GTK_CFLAGS)
@ -57,19 +56,44 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir],
fi fi
) )
PKG_CHECK_MODULES(MONO_DEPENDENCY, mono) PKG_CHECK_MODULES(MONO_DEPENDENCY, mono, has_mono=true, has_mono=false)
if test "x$has_mono" = "xtrue"; then
if test `uname -s` = "Darwin"; then if test `uname -s` = "Darwin"; then
MONO=`which mint` RUNTIME=`which mint`
CSC=`which mcs`
else else
MONO=`which mono` RUNTIME=`which mono`
CSC=`which mcs`
fi fi
AC_SUBST(MONO) else
AC_PATH_PROG(CSC, csc.exe, $PATH)
if test x$CSC = ""; then
AC_MSG_ERROR([You need to install either mono or .Net])
else
RUNTIME=
fi
fi
AC_SUBST(RUNTIME)
AC_SUBST(CSC)
PKG_CHECK_MODULES(GLIB, glib-2.0)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
PKG_CHECK_MODULES(XML, libxml-2.0)
AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS)
## Versions of dependencies ## Versions of dependencies
GNOME_REQUIRED_VERSION=2.0.0 GNOME_REQUIRED_VERSION=2.2.0
GTK_REQUIRED_VERSION=2.2.0 GTK_REQUIRED_VERSION=2.2.0
PKG_CHECK_MODULES(BASE_DEPENDENCIES, libgnomecanvas-2.0 >= $GNOME_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no)
PKG_CHECK_MODULES(LIBART, libart-2.0 >= $GNOME_REQUIRED_VERSION, enable_libart=yes, enable_libart=no)
AC_SUBST(LIBART_CFLAGS)
AC_SUBST(LIBART_LIBS)
PKG_CHECK_MODULES(BASE_DEPENDENCIES, libgnomecanvas-2.0 >= $GNOME_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOME_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no)
if test "x$enable_gnome" = "xno"; then if test "x$enable_gnome" = "xno"; then
PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION) PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION)
@ -120,6 +144,7 @@ fi
AC_SUBST(BASE_DEPENDENCIES_CFLAGS) AC_SUBST(BASE_DEPENDENCIES_CFLAGS)
AC_SUBST(BASE_DEPENDENCIES_LIBS) AC_SUBST(BASE_DEPENDENCIES_LIBS)
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")
AM_CONDITIONAL(ENABLE_GDA, test "x$enable_gda" = "xyes") AM_CONDITIONAL(ENABLE_GDA, test "x$enable_gda" = "xyes")
@ -132,30 +157,41 @@ AM_CONDITIONAL(ENABLE_VTE, test "x$enable_vte" = "xyes")
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_OUTPUT([ AC_OUTPUT([
glue/Makefile sources/Makefile
parser/Makefile parser/Makefile
parser/GAPI/Makefile
generator/Makefile generator/Makefile
generator/gapi-codegen generator/gapi-codegen
glib/Makefile glib/Makefile
glib/glue/Makefile
pango/Makefile pango/Makefile
atk/Makefile atk/Makefile
art/Makefile art/Makefile
gdk/Makefile gdk/Makefile
gdk/glue/Makefile
gtk/Makefile gtk/Makefile
gtk/glue/Makefile
glade/Makefile glade/Makefile
glade/glue/Makefile
gnome/Makefile gnome/Makefile
gnome/glue/Makefile
gda/Makefile gda/Makefile
gnomedb/Makefile gnomedb/Makefile
gconf/Makefile gconf/Makefile
gconf/doc/Makefile
gconf/GConf/Makefile gconf/GConf/Makefile
gconf/GConf.PropertyEditors/Makefile gconf/GConf.PropertyEditors/Makefile
gconf/tools/Makefile gconf/tools/Makefile
gst/Makefile gconf/tools/gconfsharp-schemagen
gtkhtml/Makefile gtkhtml/Makefile
rsvg/Makefile rsvg/Makefile
vte/Makefile vte/Makefile
sample/GtkDemo/Makefile
sample/Makefile sample/Makefile
sample/gconf/Makefile
sample/pixmaps/Makefile
sample/rsvg/Makefile sample/rsvg/Makefile
sample/test/Makefile
gtk-sharp.pc gtk-sharp.pc
parser/gapi.pc parser/gapi.pc
parser/gapi-fixup parser/gapi-fixup
@ -169,6 +205,7 @@ echo " * Installation prefix = $prefix"
echo "" echo ""
echo " Optional assemblies included in the build:" echo " Optional assemblies included in the build:"
echo "" echo ""
echo " * art-sharp.dll: $enable_libart"
echo " * gnome-sharp.dll: $enable_gnome" echo " * gnome-sharp.dll: $enable_gnome"
echo " * glade-sharp.dll: $enable_glade" echo " * glade-sharp.dll: $enable_glade"
echo " * gda-sharp.dll: $enable_gda" echo " * gda-sharp.dll: $enable_gda"

View file

@ -1 +1,2 @@
Makefile Makefile
Makefile.in

View file

@ -1,2 +1,3 @@
Makefile Makefile
Makefile.in
*.dll *.dll

View file

@ -53,8 +53,8 @@ namespace GConf.PropertyEditors
if (control == null) if (control == null)
throw new InvalidGladeKeyException (control_name); throw new InvalidGladeKeyException (control_name);
if (control is Gnome.ColorPicker) //if (control is Gnome.ColorPicker)
editor = new PropertyEditorColorPicker (key, (Gnome.ColorPicker) control); //editor = new PropertyEditorColorPicker (key, (Gnome.ColorPicker) control);
else if (control is Gnome.FileEntry) else if (control is Gnome.FileEntry)
editor = new PropertyEditorFileEntry (key, (Gnome.FileEntry) control); editor = new PropertyEditorFileEntry (key, (Gnome.FileEntry) control);
else if (control is Gtk.SpinButton) else if (control is Gtk.SpinButton)

View file

@ -0,0 +1,35 @@
if ENABLE_GNOME
TARGET=$(ASSEMBLY)
else
TARGET=
endif
ASSEMBLY = gconf-sharp-peditors.dll
assemblydir = $(libdir)
assembly_DATA = $(TARGET)
CLEANFILES = $(ASSEMBLY)
EXTRA_DIST = \
PropertyEditorColorPicker.cs \
$(sources)
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:../../glade/glade-sharp.dll /r:../GConf/gconf-sharp.dll
sources = \
PropertyEditor.cs \
PropertyEditorBool.cs \
PropertyEditorEnum.cs \
PropertyEditorEntry.cs \
PropertyEditorFileEntry.cs \
PropertyEditorOptionMenu.cs \
PropertyEditorRadioButton.cs \
PropertyEditorSpinButton.cs \
PropertyEditorToggleButton.cs \
EditorShell.cs
build_sources = $(addprefix $(srcdir)/, $(sources))
$(ASSEMBLY): $(build_sources)
$(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources)

View file

@ -1,30 +0,0 @@
MCS = mcs
DESTDIR =
prefix=@prefix@
SOURCES = \
PropertyEditor.cs \
PropertyEditorBool.cs \
PropertyEditorColorPicker.cs \
PropertyEditorEnum.cs \
PropertyEditorEntry.cs \
PropertyEditorFileEntry.cs \
PropertyEditorOptionMenu.cs \
PropertyEditorRadioButton.cs \
PropertyEditorSpinButton.cs \
PropertyEditorToggleButton.cs \
EditorShell.cs \
#
all: gconf-sharp-peditors.dll
gconf-sharp-peditors.dll: $(SOURCES)
$(MCS) $(SOURCES) -L ../../glib -L ../../pango -L ../../atk -L ../../gdk -L ../../gtk -L ../../art -L ../../gnome -L ../GConf -L ../../glade /r:glib-sharp.dll /r:pango-sharp.dll /r:atk-sharp.dll /r:gdk-sharp.dll /r:gtk-sharp.dll /r:art-sharp.dll /r:gnome-sharp.dll /r:glade-sharp.dll /r:gconf-sharp.dll /r:System.Drawing /target:library /out:gconf-sharp-peditors.dll
install: all
../../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
cp gconf-sharp-peditors.dll $(DESTDIR)$(prefix)/lib
clean:
rm -f gconf-sharp-peditors.dll

27
gconf/GConf/Makefile.am Normal file
View file

@ -0,0 +1,27 @@
ASSEMBLY = gconf-sharp.dll
assemblydir = $(libdir)
assembly_DATA = $(ASSEMBLY)
CLEANFILES = $(ASSEMBLY)
EXTRA_DIST = \
$(sources)
references = \
/r:../../glib/glib-sharp.dll
sources = \
ClientBase.cs \
Client.cs \
ChangeSet.cs \
_Entry.cs \
NoSuchKeyException.cs \
NotifyEventArgs.cs \
NotifyEventHandler.cs \
NotifyWrapper.cs \
Value.cs
build_sources = $(addprefix $(srcdir)/, $(sources))
$(ASSEMBLY): $(build_sources)
$(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources)

View file

@ -1,28 +0,0 @@
MCS = mcs
DESTDIR =
prefix=@prefix@
SOURCES = \
ClientBase.cs \
Client.cs \
ChangeSet.cs \
_Entry.cs \
NoSuchKeyException.cs \
NotifyEventArgs.cs \
NotifyEventHandler.cs \
NotifyWrapper.cs \
Value.cs \
#
all: gconf-sharp.dll
gconf-sharp.dll: $(SOURCES)
$(MCS) $(SOURCES) -L ../../glib /r:glib-sharp.dll /target:library /out:gconf-sharp.dll
install: all
../../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
cp gconf-sharp.dll $(DESTDIR)$(prefix)/lib
clean:
rm -f gconf-sharp.dll

1
gconf/Makefile.am Normal file
View file

@ -0,0 +1 @@
SUBDIRS = GConf GConf.PropertyEditors tools doc

View file

@ -1,24 +0,0 @@
SUBDIRS = GConf GConf.PropertyEditors tools
@ENABLE_GNOME_TRUE@ all: linux
@ENABLE_GNOME_FALSE@ all:
linux:
for i in $(SUBDIRS); do \
$(MAKE) -C $$i || exit 1; \
done
install: all
for i in $(SUBDIRS); do \
$(MAKE) -C $$i install || exit 1; \
done
clean:
for i in $(SUBDIRS); do \
$(MAKE) -C $$i clean || exit 1; \
done
distclean: clean
for i in $(SUBDIRS); do \
rm -f $$i/Makefile; \
done

2
gconf/doc/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
Makefile
Makefile.in

1
gconf/doc/Makefile.am Normal file
View file

@ -0,0 +1 @@
EXTRA_DIST = intro.html

View file

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

13
gconf/tools/Makefile.am Normal file
View file

@ -0,0 +1,13 @@
assemblydir = $(bindir)
assembly_DATA = gconfsharp-schemagen.exe
bin_SCRIPTS = gconfsharp-schemagen
CLEANFILES = gconfsharp-schemagen.exe
DISTCLEANFILES = gconfsharp-schemagen
EXTRA_DIST = \
schemagen.cs \
gconfsharp-schemagen.in
gconfsharp-schemagen.exe: $(srcdir)/schemagen.cs
$(CSC) /out:gconfsharp-schemagen.exe $(srcdir)/schemagen.cs

View file

@ -1,27 +0,0 @@
MCS = mcs
DESTDIR =
prefix=@prefix@
bindir = $(prefix)/bin
SOURCES = \
schemagen.cs \
#
all: gconfsharp-schemagen.exe gconfsharp-schemagen
gconfsharp-schemagen.exe: $(SOURCES)
$(MCS) /out:gconfsharp-schemagen.exe $(SOURCES)
gconfsharp-schemagen: gconfsharp-schemagen.in
sed -e 's^\@bindir\@^$(bindir)^g' < gconfsharp-schemagen.in > gconfsharp-schemagen.tmp \
&& mv gconfsharp-schemagen.tmp gconfsharp-schemagen \
&& chmod +x gconfsharp-schemagen
install: all
../../mkinstalldirs $(DESTDIR)$(prefix)/bin && \
chmod +x gconfsharp-schemagen && cp gconfsharp-schemagen.exe gconfsharp-schemagen $(DESTDIR)$(bindir)
clean:
rm -f gconfsharp-schemagen.exe
rm -f gconfsharp-schemagen

49
gda/Makefile.am Normal file
View file

@ -0,0 +1,49 @@
if ENABLE_GDA
TARGET = $(ASSEMBLY)
APIS = $(API)
else
TARGET =
APIS =
endif
API = gda-api.xml
RAW_API = gda-api.raw
METADATA = Gda.metadata
ASSEMBLY_NAME = gda-sharp
references = /r:../glib/glib-sharp.dll
ASSEMBLY = $(ASSEMBLY_NAME).dll
assemblydir = $(libdir)
gapidir = $(datadir)/gapi
assembly_DATA = $(TARGET)
gapi_DATA = $(APIS)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API)
sources = \
Application.cs
build_sources = $(addprefix $(srcdir)/, $(sources))
customs =
build_customs = $(addprefix $(srcdir)/, $(customs))
EXTRA_DIST = \
$(RAW_API) \
$(METADATA) \
$(customs) \
$(sources)
$(API): $(srcdir)/$(srcdir)/$(METADATA)
cp $(srcdir)/$(RAW_API) $(API)
chmod u+w $(API)
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
--outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
&& touch generated-stamp
$(ASSEMBLY): $(build_sources) generated-stamp
$(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs

View file

@ -1,38 +0,0 @@
APIS= gda-api.xml
RUNTIME=@MONO@
MCS=mcs
ASSEMBLY=gda-sharp.dll
@ENABLE_GDA_TRUE@ all: $(ASSEMBLY)
@ENABLE_GDA_FALSE@ all:
all: $(ASSEMBLY)
generated-stamp: $(APIS) ../generator/gapi_codegen.exe Gda.metadata
$(RUNTIME) ../parser/gapi-fixup.exe --api=gda-api.xml --metadata=Gda.metadata && \
$(RUNTIME) ../generator/gapi_codegen.exe \
--generate $(APIS) --outdir=generated --customdir=. \
--assembly-name=gda-sharp && touch generated-stamp
$(ASSEMBLY): generated-stamp *.cs
$(MCS) --unsafe --target library \
-r ../glib/glib-sharp.dll -o $(ASSEMBLY) --recurse '*.cs'
clean:
rm -f generated-stamp
rm -f $(ASSEMBLY)
rm -rf generated
prefix=@prefix@
DESTDIR=
apidir=$(DESTDIR)$(prefix)/share/gapi
libdir=$(DESTDIR)$(prefix)/lib
install: all
@ENABLE_GDA_TRUE@ ../mkinstalldirs $(libdir) && \
@ENABLE_GDA_TRUE@ ../mkinstalldirs $(apidir) && \
@ENABLE_GDA_TRUE@ for i in $(APIS); do \
@ENABLE_GDA_TRUE@ cp $$i $(apidir) || true; \
@ENABLE_GDA_TRUE@ done && \
@ENABLE_GDA_TRUE@ cp $(ASSEMBLY) $(libdir)

View file

@ -1,5 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<api><!-- <api>
<!--
This file was automatically generated. This file was automatically generated.
Please DO NOT MODIFY THIS FILE, modify .metadata files instead. Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
@ -411,46 +412,46 @@
</object> </object>
<object name="DataModel" cname="GdaDataModel" parent="GObject"> <object name="DataModel" cname="GdaDataModel" parent="GObject">
<field cname="priv" type="GdaDataModelPrivate*"/> <field cname="priv" type="GdaDataModelPrivate*"/>
<signal cname="changed" when="LAST" name="DataChanged"> <signal name="Changed" cname="changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GdaDataModel*" name="model"/> <parameter type="GdaDataModel*" name="model"/>
</parameters> </parameters>
</signal> </signal>
<signal cname="row_inserted" when="LAST" name="RowInsertedEvent"> <signal name="RowInserted" cname="row_inserted" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GdaDataModel*" name="model"/> <parameter type="GdaDataModel*" name="model"/>
<parameter type="gint" name="row"/> <parameter type="gint" name="row"/>
</parameters> </parameters>
</signal> </signal>
<signal cname="row_updated" when="LAST" name="RowUpdatedEvent"> <signal name="RowUpdated" cname="row_updated" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GdaDataModel*" name="model"/> <parameter type="GdaDataModel*" name="model"/>
<parameter type="gint" name="row"/> <parameter type="gint" name="row"/>
</parameters> </parameters>
</signal> </signal>
<signal cname="row_removed" when="LAST" name="RowRemovedEvent"> <signal name="RowRemoved" cname="row_removed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GdaDataModel*" name="model"/> <parameter type="GdaDataModel*" name="model"/>
<parameter type="gint" name="row"/> <parameter type="gint" name="row"/>
</parameters> </parameters>
</signal> </signal>
<signal cname="begin_edit" when="LAST" name="BeginEditing"> <signal name="BeginEdit" cname="begin_edit" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GdaDataModel*" name="model"/> <parameter type="GdaDataModel*" name="model"/>
</parameters> </parameters>
</signal> </signal>
<signal cname="cancel_edit" when="LAST" name="CancelEditing"> <signal name="CancelEdit" cname="cancel_edit" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GdaDataModel*" name="model"/> <parameter type="GdaDataModel*" name="model"/>
</parameters> </parameters>
</signal> </signal>
<signal cname="end_edit" when="LAST" name="EndEditing"> <signal name="EndEdit" cname="end_edit" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GdaDataModel*" name="model"/> <parameter type="GdaDataModel*" name="model"/>
@ -644,7 +645,7 @@
<parameter type="gboolean" name="standalone"/> <parameter type="gboolean" name="standalone"/>
</parameters> </parameters>
</method> </method>
<method name="ToXmlNode" cname="gda_data_model_to_xml_node" hidden="1"> <method name="ToXmlNode" cname="gda_data_model_to_xml_node">
<return-type type="xmlNodePtr"/> <return-type type="xmlNodePtr"/>
<parameters> <parameters>
<parameter type="const-gchar*" name="name"/> <parameter type="const-gchar*" name="name"/>
@ -670,7 +671,7 @@
<parameter type="gint" name="cols"/> <parameter type="gint" name="cols"/>
</parameters> </parameters>
</constructor> </constructor>
<method name="SetNColumns" cname="gda_data_model_array_set_n_columns" new_flag="1"> <method name="SetNColumns" cname="gda_data_model_array_set_n_columns">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="gint" name="cols"/> <parameter type="gint" name="cols"/>
@ -712,7 +713,7 @@
<parameter type="gint" name="cols"/> <parameter type="gint" name="cols"/>
</parameters> </parameters>
</constructor> </constructor>
<method name="SetNColumns" cname="gda_data_model_hash_set_n_columns" new_flag="1"> <method name="SetNColumns" cname="gda_data_model_hash_set_n_columns">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="gint" name="cols"/> <parameter type="gint" name="cols"/>
@ -795,7 +796,7 @@
</parameters> </parameters>
</method> </method>
</object> </object>
<object name="Export" cname="GdaExport" parent="GObject" hidden="1"> <object name="Export" cname="GdaExport" parent="GObject">
<field cname="priv" type="GdaExportPrivate*"/> <field cname="priv" type="GdaExportPrivate*"/>
<signal name="ObjectSelected" cname="object_selected" when="LAST"> <signal name="ObjectSelected" cname="object_selected" when="LAST">
<return-type type="void"/> <return-type type="void"/>
@ -1207,7 +1208,7 @@
</object> </object>
<object name="XmlDatabase" cname="GdaXmlDatabase" parent="GObject"> <object name="XmlDatabase" cname="GdaXmlDatabase" parent="GObject">
<field cname="priv" type="GdaXmlDatabasePrivate*"/> <field cname="priv" type="GdaXmlDatabasePrivate*"/>
<signal cname="changed" when="LAST" name="DataChanged"> <signal name="Changed" cname="changed" when="LAST">
<return-type type="void"/> <return-type type="void"/>
<parameters> <parameters>
<parameter type="GdaXmlDatabase*" name="xmldb"/> <parameter type="GdaXmlDatabase*" name="xmldb"/>
@ -1458,7 +1459,7 @@
</parameters> </parameters>
</method> </method>
</struct> </struct>
<struct name="Command" cname="GdaCommand" opaque="1"> <struct name="Command" cname="GdaCommand">
<field cname="text" type="gchar*"/> <field cname="text" type="gchar*"/>
<field cname="type" type="GdaCommandType"/> <field cname="type" type="GdaCommandType"/>
<field cname="options" type="GdaCommandOptions"/> <field cname="options" type="GdaCommandOptions"/>
@ -1528,7 +1529,7 @@
<field cname="value" type="GdaValue*"/> <field cname="value" type="GdaValue*"/>
<field cname="attributes" type="GdaFieldAttributes*"/> <field cname="attributes" type="GdaFieldAttributes*"/>
</struct> </struct>
<struct name="FieldAttributes" cname="GdaFieldAttributes" opaque="1"> <struct name="FieldAttributes" cname="GdaFieldAttributes">
<field cname="defined_size" type="gint"/> <field cname="defined_size" type="gint"/>
<field cname="name" type="gchar*"/> <field cname="name" type="gchar*"/>
<field cname="table" type="gchar*"/> <field cname="table" type="gchar*"/>
@ -1672,7 +1673,7 @@
<field cname="precision" type="glong"/> <field cname="precision" type="glong"/>
<field cname="width" type="glong"/> <field cname="width" type="glong"/>
</struct> </struct>
<struct name="Parameter" cname="GdaParameter" opaque="1"> <struct name="Parameter" cname="GdaParameter">
<field cname="name" type="gchar*"/> <field cname="name" type="gchar*"/>
<field cname="value" type="GdaValue*"/> <field cname="value" type="GdaValue*"/>
<method name="Free" cname="gda_parameter_free"> <method name="Free" cname="gda_parameter_free">
@ -3226,7 +3227,7 @@
</parameters> </parameters>
</method> </method>
</class> </class>
<class name="Type" cname="GdaType_" hidden="1"> <class name="Type" cname="GdaType_">
<method name="FromString" cname="gda_type_from_string" shared="true"> <method name="FromString" cname="gda_type_from_string" shared="true">
<return-type type="GdaValueType"/> <return-type type="GdaValueType"/>
<parameters> <parameters>

View file

@ -21,19 +21,6 @@ public Color (byte r, byte g, byte b)
Pixel = 0; Pixel = 0;
} }
public Color (System.Drawing.Color color)
{
byte r, g, b;
r = color.R;
g = color.G;
b = color.B;
Red = (ushort) (r << 8 | r);
Green = (ushort) (g << 8 | g);
Blue = (ushort) (b << 8 | b);
Pixel = 0;
}
[DllImport("libgdk-win32-2.0-0.dll")] [DllImport("libgdk-win32-2.0-0.dll")]
static extern uint gdk_color_hash(ref Gdk.Color raw); static extern uint gdk_color_hash(ref Gdk.Color raw);

View file

@ -6,7 +6,7 @@
// Copyright (C) 2003 Novell, Inc. // Copyright (C) 2003 Novell, Inc.
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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 {
@ -16,7 +16,7 @@ public unsafe DragProtocol DragProtocol {
} }
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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 {
@ -26,7 +26,7 @@ public bool IsSource {
} }
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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 {
@ -36,7 +36,7 @@ public Gdk.Window SourceWindow {
} }
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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 {
@ -46,7 +46,7 @@ public Gdk.Window DestWindow {
} }
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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 {
@ -64,7 +64,7 @@ public Atom [] Targets {
} }
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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 {
@ -73,7 +73,7 @@ public DragAction Actions {
} }
} }
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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 {
@ -83,7 +83,7 @@ public DragAction SuggestedAction {
} }
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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 {
@ -93,7 +93,7 @@ public DragAction Action {
} }
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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 {

View file

@ -5,26 +5,11 @@
// This code is inserted after the automatically generated code. // This code is inserted after the automatically generated code.
/// <summary> Size property </summary>
/// <remarks> Returns the size of the Drawble </remarks>
public System.Drawing.Size Size {
get {
int x, y;
GetSize (out x, out y);
return new System.Drawing.Size (x, y);
}
}
public void DrawRectangle(Gdk.GC gc, bool filled, Gdk.Rectangle area) public void DrawRectangle(Gdk.GC gc, bool filled, Gdk.Rectangle area)
{ {
gdk_draw_rectangle(Handle, gc.Handle, filled, area.X, area.Y, area.Width, area.Height); gdk_draw_rectangle(Handle, gc.Handle, filled, area.X, area.Y, area.Width, area.Height);
} }
public void DrawRectangle(Gdk.GC gc, bool filled, System.Drawing.Rectangle area)
{
gdk_draw_rectangle(Handle, gc.Handle, filled, area.X, area.Y, area.Width, area.Height);
}
[DllImport("libgdk-win32-2.0-0.dll")] [DllImport("libgdk-win32-2.0-0.dll")]
static extern void gdk_draw_polygon(IntPtr raw, IntPtr gc, int filled, Gdk.Point[] points, int npoints); static extern void gdk_draw_polygon(IntPtr raw, IntPtr gc, int filled, Gdk.Point[] points, int npoints);

View file

@ -13,13 +13,13 @@ namespace Gdk {
public class Event : GLib.IWrapper { public class Event : GLib.IWrapper {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern EventType gtksharp_gdk_event_get_event_type (IntPtr evt); static extern EventType gtksharp_gdk_event_get_event_type (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern IntPtr gtksharp_gdk_event_get_window (IntPtr evt); static extern IntPtr gtksharp_gdk_event_get_window (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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")]

View file

@ -11,31 +11,31 @@ namespace Gdk {
public class EventButton : Event { public class EventButton : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_button_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_button_get_time (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern double gtksharp_gdk_event_button_get_x (IntPtr evt); static extern double gtksharp_gdk_event_button_get_x (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern double gtksharp_gdk_event_button_get_y (IntPtr evt); static extern double gtksharp_gdk_event_button_get_y (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_button_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_button_get_state (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_button_get_button (IntPtr evt); static extern uint gtksharp_gdk_event_button_get_button (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern IntPtr gtksharp_gdk_event_button_get_device (IntPtr evt); static extern IntPtr gtksharp_gdk_event_button_get_device (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,16 +11,16 @@ namespace Gdk {
public class EventClient : Event { public class EventClient : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_client_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_client_get_time (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,16 +11,16 @@ namespace Gdk {
public class EventConfigure : Event { public class EventConfigure : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern int gtksharp_gdk_event_configure_get_x (IntPtr evt); static extern int gtksharp_gdk_event_configure_get_x (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern int gtksharp_gdk_event_configure_get_y (IntPtr evt); static extern int gtksharp_gdk_event_configure_get_y (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern int gtksharp_gdk_event_configure_get_width (IntPtr evt); static extern int gtksharp_gdk_event_configure_get_width (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,34 +11,34 @@ namespace Gdk {
public class EventCrossing : Event { public class EventCrossing : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_crossing_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_crossing_get_time (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern double gtksharp_gdk_event_crossing_get_x (IntPtr evt); static extern double gtksharp_gdk_event_crossing_get_x (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern double gtksharp_gdk_event_crossing_get_y (IntPtr evt); static extern double gtksharp_gdk_event_crossing_get_y (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_crossing_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_crossing_get_state (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern IntPtr gtksharp_gdk_event_crossing_get_subwindow (IntPtr evt); static extern IntPtr gtksharp_gdk_event_crossing_get_subwindow (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern CrossingMode gtksharp_gdk_event_crossing_get_mode (IntPtr evt); static extern CrossingMode gtksharp_gdk_event_crossing_get_mode (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern NotifyType gtksharp_gdk_event_crossing_get_detail (IntPtr evt); static extern NotifyType gtksharp_gdk_event_crossing_get_detail (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,16 +11,16 @@ namespace Gdk {
public class EventDND : Event { public class EventDND : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_dnd_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_dnd_get_time (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern IntPtr gtksharp_gdk_event_dnd_get_context (IntPtr evt); static extern IntPtr gtksharp_gdk_event_dnd_get_context (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,13 +11,13 @@ namespace Gdk {
public class EventExpose : Event { public class EventExpose : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern Rectangle gtksharp_gdk_event_expose_get_area (IntPtr evt); static extern Rectangle gtksharp_gdk_event_expose_get_area (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern IntPtr gtksharp_gdk_event_expose_get_region (IntPtr evt); static extern IntPtr gtksharp_gdk_event_expose_get_region (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,7 +11,7 @@ namespace Gdk {
public class EventFocus : Event { public class EventFocus : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,19 +11,19 @@ namespace Gdk {
public class EventKey : Event { public class EventKey : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_key_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_key_get_time (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_key_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_key_get_state (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_key_get_keyval (IntPtr evt); static extern uint gtksharp_gdk_event_key_get_keyval (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,31 +11,31 @@ namespace Gdk {
public class EventMotion : Event { public class EventMotion : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_motion_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_motion_get_time (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern double gtksharp_gdk_event_motion_get_x (IntPtr evt); static extern double gtksharp_gdk_event_motion_get_x (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern double gtksharp_gdk_event_motion_get_y (IntPtr evt); static extern double gtksharp_gdk_event_motion_get_y (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_motion_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_motion_get_state (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
static extern IntPtr gtksharp_gdk_event_motion_get_device (IntPtr evt); static extern IntPtr gtksharp_gdk_event_motion_get_device (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,13 +11,13 @@ namespace Gdk {
public class EventProperty : Event { public class EventProperty : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_property_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_property_get_time (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern IntPtr gtksharp_gdk_event_property_get_atom (IntPtr evt); static extern IntPtr gtksharp_gdk_event_property_get_atom (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,10 +11,10 @@ namespace Gdk {
public class EventProximity : Event { public class EventProximity : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_proximity_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_proximity_get_time (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,28 +11,28 @@ namespace Gdk {
public class EventScroll : Event { public class EventScroll : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_scroll_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_scroll_get_time (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern double gtksharp_gdk_event_scroll_get_x (IntPtr evt); static extern double gtksharp_gdk_event_scroll_get_x (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern double gtksharp_gdk_event_scroll_get_y (IntPtr evt); static extern double gtksharp_gdk_event_scroll_get_y (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_scroll_get_state (IntPtr evt); static extern uint gtksharp_gdk_event_scroll_get_state (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern ScrollDirection gtksharp_gdk_event_scroll_get_direction (IntPtr evt); static extern ScrollDirection gtksharp_gdk_event_scroll_get_direction (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,19 +11,19 @@ namespace Gdk {
public class EventSelection : Event { public class EventSelection : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern uint gtksharp_gdk_event_selection_get_time (IntPtr evt); static extern uint gtksharp_gdk_event_selection_get_time (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern IntPtr gtksharp_gdk_event_selection_get_selection (IntPtr evt); static extern IntPtr gtksharp_gdk_event_selection_get_selection (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern IntPtr gtksharp_gdk_event_selection_get_target (IntPtr evt); static extern IntPtr gtksharp_gdk_event_selection_get_target (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern IntPtr gtksharp_gdk_event_selection_get_property (IntPtr evt); static extern IntPtr gtksharp_gdk_event_selection_get_property (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,10 +11,10 @@ namespace Gdk {
public class EventSetting : Event { public class EventSetting : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
static extern SettingAction gtksharp_gdk_event_setting_get_action (IntPtr evt); static extern SettingAction gtksharp_gdk_event_setting_get_action (IntPtr evt);
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,7 +11,7 @@ namespace Gdk {
public class EventVisibility : Event { public class EventVisibility : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

View file

@ -11,10 +11,10 @@ namespace Gdk {
public class EventWindowState : Event { public class EventWindowState : Event {
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
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) {}

78
gdk/Makefile.am Normal file
View file

@ -0,0 +1,78 @@
SUBDIRS = glue
API = gdk-api.xml
RAW_API = gdk-api.raw
ADDITIONAL_API = gdk-symbols.xml
INCLUDE_API = ../pango/pango-api.xml
METADATA = Gdk.metadata
ASSEMBLY_NAME = gdk-sharp
references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll
ASSEMBLY = $(ASSEMBLY_NAME).dll
assemblydir = $(libdir)
gapidir = $(datadir)/gapi
assembly_DATA = $(ASSEMBLY)
gapi_DATA = $(API) $(ADDITIONAL_API)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API)
sources = \
EventButton.cs \
EventClient.cs \
EventConfigure.cs \
EventCrossing.cs \
Event.cs \
EventDND.cs \
EventExpose.cs \
EventFocus.cs \
EventKey.cs \
EventMotion.cs \
EventProperty.cs \
EventProximity.cs \
EventScroll.cs \
EventSelection.cs \
EventSetting.cs \
EventVisibility.cs \
EventWindowState.cs \
Key.cs
build_sources = $(addprefix $(srcdir)/, $(sources))
customs = \
Color.custom \
DeviceAxis.custom \
Display.custom \
DisplayManager.custom \
DragContext.custom \
Drawable.custom \
Global.custom \
Pixbuf.custom \
PixbufLoader.custom \
Point.custom \
Rectangle.custom \
Screen.custom \
Selection.custom \
Window.custom
build_customs = $(addprefix $(srcdir)/, $(customs))
EXTRA_DIST = \
makefile.win32 \
$(RAW_API) \
$(ADDITIONAL_API) \
$(METADATA) \
$(customs) \
$(sources)
$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
cp $(srcdir)/$(RAW_API) $(API)
chmod u+w $(API)
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs)
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
&& touch generated-stamp
$(ASSEMBLY): $(build_sources) generated-stamp
$(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs

View file

@ -1,40 +0,0 @@
APIS= gdk-api.xml gdk-symbols.xml
INCLUDE_APIS = ../atk/atk-api.xml \
../pango/pango-api.xml
RUNTIME=@MONO@
MCS=mcs
ASSEMBLY=gdk-sharp.dll
all: $(ASSEMBLY)
generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe Gdk.metadata
$(RUNTIME) ../parser/gapi-fixup.exe --api=gdk-api.xml --metadata=Gdk.metadata && \
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \
--include $(INCLUDE_APIS) --outdir=generated --customdir=. \
--assembly-name=gdk-sharp && touch generated-stamp
$(ASSEMBLY): *.cs generated-stamp
$(MCS) --unsafe --target library \
-r System.Drawing -r ../glib/glib-sharp.dll \
-r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \
-o $(ASSEMBLY) --recurse '*.cs'
clean:
rm -f generated-stamp
rm -f $(ASSEMBLY)
rm -rf generated
prefix=@prefix@
DESTDIR=
apidir=$(DESTDIR)$(prefix)/share/gapi
libdir=$(DESTDIR)$(prefix)/lib
install: all
../mkinstalldirs $(libdir) && \
../mkinstalldirs $(apidir) && \
for i in $(APIS); do \
cp $$i $(apidir); \
done && \
cp $(ASSEMBLY) $(libdir)

View file

@ -138,23 +138,6 @@
return new Pixbuf (raw_ret); return new Pixbuf (raw_ret);
} }
//
// Add an overload that takes System.Drawing.Color arguments instead of uint32 values for colors
//
public void CompositeColor(Gdk.Pixbuf dest, int dest_x, int dest_y, int dest_width, int dest_height,
double offset_x, double offset_y, double scale_x, double scale_y,
Gdk.InterpType interp_type, int overall_alpha, int check_x, int check_y,
int check_size, System.Drawing.Color color1, System.Drawing.Color color2)
{
gdk_pixbuf_composite_color(Handle, dest.Handle, dest_x, dest_y, dest_width, dest_height, offset_x,
offset_y, scale_x, scale_y, (int) interp_type, overall_alpha, check_x, check_y, check_size,
(uint) color1.ToArgb (), (uint) color2.ToArgb ());
}
public Gdk.Pixbuf CompositeColorSimple(int dest_width, int dest_height, Gdk.InterpType interp_type, int overall_alpha, int check_size, System.Drawing.Color color1, System.Drawing.Color color2) {
return CompositeColorSimple (dest_width, dest_height, interp_type, overall_alpha, check_size, (uint) color1.ToArgb (), (uint) color2.ToArgb ());
}
// //
// the 'Pixels' property // the 'Pixels' property
// //

View file

@ -29,8 +29,3 @@ public Rectangle (int x, int y, int width, int height)
this.Height = height; this.Height = height;
} }
public static implicit operator System.Drawing.Rectangle (Gdk.Rectangle rect)
{
return new System.Drawing.Rectangle (rect.X, rect.Y, rect.Width, rect.Height);
}

View file

@ -6,17 +6,17 @@
// //
// This code is inserted after the automatically generated code. // This code is inserted after the automatically generated code.
[DllImport("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
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("gtksharpglue")] [DllImport("gdksharpglue")]
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());

View file

@ -24,14 +24,6 @@
} }
} }
public System.Drawing.Rectangle FrameExtents {
get {
Gdk.Rectangle rect = Gdk.Rectangle.Zero;
gdk_window_get_frame_extents (Handle, ref rect);
return new System.Drawing.Rectangle (rect.X, rect.Y, rect.Width, rect.Height);
}
}
[DllImport("libgdk-win32-2.0-0.dll")] [DllImport("libgdk-win32-2.0-0.dll")]
static extern void gdk_window_set_icon_list(IntPtr raw, IntPtr pixbufs); static extern void gdk_window_set_icon_list(IntPtr raw, IntPtr pixbufs);
@ -44,43 +36,6 @@
} }
} }
public void Move (System.Drawing.Point p) {
gdk_window_move (Handle, p.X, p.Y);
}
public System.Drawing.Point Origin {
get {
int x, y;
gdk_window_get_origin (Handle, out x, out y);
return new System.Drawing.Point (x, y);
}
}
public System.Drawing.Point RootOrigin {
get {
int x, y;
gdk_window_get_root_origin (Handle, out x, out y);
return new System.Drawing.Point (x, y);
}
}
public void ClearArea(System.Drawing.Rectangle rect) {
gdk_window_clear_area (Handle, rect.X, rect.Y, rect.Width, rect.Height);
}
public void InvalidateRect(System.Drawing.Rectangle rect, bool invalidate_children) {
Gdk.Rectangle grect = new Gdk.Rectangle (rect.X, rect.Y, rect.Width, rect.Height);
gdk_window_invalidate_rect (Handle, ref grect, invalidate_children);
}
public System.Drawing.Point Position {
get {
int x, y;
gdk_window_get_position (Handle, out x, out y);
return new System.Drawing.Point (x, y);
}
}
[DllImport("libgdk-win32-2.0-0.dll")] [DllImport("libgdk-win32-2.0-0.dll")]
static extern IntPtr gdk_window_get_toplevels(); static extern IntPtr gdk_window_get_toplevels();
@ -97,13 +52,3 @@
} }
} }
public void MoveResize (System.Drawing.Rectangle rect) {
gdk_window_move_resize (Handle, rect.X, rect.Y, rect.Width, rect.Height);
}
public void ClearArea (System.Drawing.Rectangle rect, bool expose) {
if (expose)
gdk_window_clear_area_e (Handle, rect.X, rect.Y, rect.Width, rect.Height);
else
gdk_window_clear_area (Handle, rect.X, rect.Y, rect.Width, rect.Height);
}

4368
gdk/gdk-api.raw Normal file

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

7
gdk/glue/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
Makefile
Makefile.in
*.la
*.lo
*.o
.deps
.libs

22
gdk/glue/Makefile.am Normal file
View file

@ -0,0 +1,22 @@
lib_LTLIBRARIES = libgdksharpglue.la
libgdksharpglue_la_SOURCES = \
dragcontext.c \
event.c \
selection.c
# Adding a new glue file?
# Please remember to update makefile.win32
libgdksharpglue_la_LDFLAGS = -module -avoid-version
libgdksharpglue_la_LIBADD = $(BASE_DEPENDENCIES_LIBS)
INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir)
libgdksharpglue.dll: $(libgdksharpglue_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def
./build-dll libgdksharpglue $(VERSION)
CLEANFILES = lib*.a lib*.dll
EXTRA_DIST = makefile.win32 win32dll.c

24
gdk/glue/makefile.win32 Executable file
View file

@ -0,0 +1,24 @@
GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0 libglade-2.0`
GTK_LIBS=`pkg-config --libs gtk+-win32-2.0 libglade-2.0`
CC=gcc -mno-cygwin -mms-bitfields
DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols
GLUE_OBJS = \
dragcontext.o \
event.o \
selection.o \
win32dll.o
all: gdksharpglue.dll
%.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
gdksharpglue.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libgdksharpglue.a --dllname=gdksharpglue.dll --driver-name=gcc --output-def=gdksharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
clean:
rm -f gdksharpglue.dll *.o libgdksharpglue.a

View file

@ -6,12 +6,20 @@ all: windows
windows: generated-stamp windows: generated-stamp
$(CSC) /unsafe /nowarn:0660,0661 /target:library /r:System.Drawing.dll /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:$(ASSEMBLY) /recurse:*.cs $(CSC) /unsafe /nowarn:0660,0661 /target:library /r:System.Drawing.dll /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:$(ASSEMBLY) /recurse:*.cs
cd glue && make -f makefile.win32
generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom
../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=gdk-sharp && touch generated-stamp ../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=gdk-sharp && touch generated-stamp
gdk-api.xml: gdk-api.raw Gdk.metadata
cp gdk-api.raw gdk-api.xml
chmod u+w gdk-api.xml
../parser/gapi-fixup.exe --api=gdk-api.xml --metadata=Gdk.metadata
clean: clean:
rm -f generated-stamp rm -f generated-stamp
rm -f $(ASSEMBLY) rm -f $(ASSEMBLY)
rm -rf generated rm -rf generated
rm -f gdk-api.xml
cd glue && make -f makefile.win32 clean

View file

@ -4,4 +4,5 @@
generated-stamp generated-stamp
gapi-codegen gapi-codegen
Makefile Makefile
Makefile.in

55
generator/Makefile.am Normal file
View file

@ -0,0 +1,55 @@
assemblydir = $(bindir)
assembly_DATA = gapi_codegen.exe
bin_SCRIPTS = gapi-codegen
CLEANFILES = gapi_codegen.exe
DISTCLEANFILES = gapi-codegen
references =
sources = \
AliasGen.cs \
BoxedGen.cs \
CallbackGen.cs \
ClassBase.cs \
ClassGen.cs \
CodeGenerator.cs \
ConstStringGen.cs \
Ctor.cs \
CustomMarshalerGen.cs \
EnumGen.cs \
Field.cs \
GenBase.cs \
GenerationInfo.cs \
IGeneratable.cs \
ImportSignature.cs \
InterfaceGen.cs \
ManagedCallString.cs \
ManualGen.cs \
MethodBody.cs \
Method.cs \
ObjectGen.cs \
OpaqueGen.cs \
Parameters.cs \
Parser.cs \
Property.cs \
Signal.cs \
SignalHandler.cs \
Signature.cs \
SimpleGen.cs \
Statistics.cs \
StringGen.cs \
StructBase.cs \
StructGen.cs \
SymbolTable.cs \
VMSignature.cs
build_sources = $(addprefix $(srcdir)/, $(sources))
dist_sources = $(sources)
EXTRA_DIST = \
makefile.win32 \
$(dist_sources)
gapi_codegen.exe: $(build_sources)
$(CSC) /out:gapi_codegen.exe $(references) $(build_sources)

View file

@ -1,22 +0,0 @@
MCS=mcs
RUNTIME=@MONO@
DESTDIR=
all: gapi_codegen.exe
clean:
rm -f *.exe
distclean:
rm gapi-codegen
prefix=@prefix@
install=@INSTALL@
install: all
../mkinstalldirs $(DESTDIR)$(prefix)/bin && \
$(install) gapi_codegen.exe $(DESTDIR)$(prefix)/bin && \
$(install) gapi-codegen $(DESTDIR)$(prefix)/bin
gapi_codegen.exe: *.cs
$(MCS) --unsafe -o gapi_codegen.exe -r System.Xml *.cs

View file

@ -132,6 +132,8 @@ namespace GtkSharp.Generation {
result = new SimpleGen (cname, name); result = new SimpleGen (cname, name);
else if (type == "manual") else if (type == "manual")
result = new ManualGen (cname, name); result = new ManualGen (cname, name);
else if (type == "alias")
result = new AliasGen (cname, name);
else else
Console.WriteLine ("Parser::ParseSymbol - Unexpected symbol type " + type); Console.WriteLine ("Parser::ParseSymbol - Unexpected symbol type " + type);

55
glade/Makefile.am Normal file
View file

@ -0,0 +1,55 @@
SUBDIRS = glue
if ENABLE_GLADE
TARGET = $(ASSEMBLY)
APIS = $(API) $(ADDITIONAL_API)
else
TARGET =
APIS =
endif
API = glade-api.xml
RAW_API = glade-api.raw
ADDITIONAL_API =
INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml $(top_srcdir)/gdk/gdk-symbols.xml ../gtk/gtk-api.xml $(top_srcdir)/gtk/gtk-symbols.xml
METADATA = Glade.metadata
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
ASSEMBLY = $(ASSEMBLY_NAME).dll
assemblydir = $(libdir)
gapidir = $(datadir)/gapi
assembly_DATA = $(TARGET)
gapi_DATA = $(APIS)
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API)
sources = \
HandlerNotFoundExeception.cs \
WidgetAttribute.cs
build_sources = $(addprefix $(srcdir)/, $(sources))
customs = \
XML.custom
build_customs = $(addprefix $(srcdir)/, $(customs))
EXTRA_DIST = \
makefile.win32 \
$(RAW_API) \
$(METADATA) \
$(customs) \
$(sources)
$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
cp $(srcdir)/$(RAW_API) $(API)
chmod u+w $(API)
$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA)
generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs)
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \
--include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
&& touch generated-stamp
$(ASSEMBLY): $(build_sources) generated-stamp
$(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs

View file

@ -1,46 +0,0 @@
APIS= glade-api.xml
INCLUDE_APIS = ../atk/atk-api.xml \
../pango/pango-api.xml \
../gdk/gdk-api.xml \
../gdk/gdk-symbols.xml \
../gtk/gtk-api.xml \
../gtk/gtk-symbols.xml
RUNTIME=@MONO@
MCS=mcs
ASSEMBLY=glade-sharp.dll
@ENABLE_GLADE_TRUE@ all: $(ASSEMBLY)
@ENABLE_GLADE_FALSE@ all:
generated-stamp: $(APIS) *.custom ../generator/gapi_codegen.exe ../parser/gapi-fixup.exe Glade.metadata
$(RUNTIME) ../parser/gapi-fixup.exe --api=glade-api.xml --metadata=Glade.metadata && \
$(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \
--include $(INCLUDE_APIS) --outdir=generated --customdir=. \
--assembly-name=glade-sharp && touch generated-stamp
$(ASSEMBLY): *.cs generated-stamp
$(MCS) --unsafe --target library \
-r System.Drawing -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 \
-o $(ASSEMBLY) --recurse '*.cs'
clean:
rm -f generated-stamp
rm -f $(ASSEMBLY)
rm -rf generated
prefix=@prefix@
DESTDIR=
apidir=$(DESTDIR)$(prefix)/share/gapi
libdir=$(DESTDIR)$(prefix)/lib
install: all
@ENABLE_GLADE_TRUE@ ../mkinstalldirs $(libdir) && \
@ENABLE_GLADE_TRUE@ ../mkinstalldirs $(apidir) && \
@ENABLE_GLADE_TRUE@ for i in $(APIS); do \
@ENABLE_GLADE_TRUE@ cp $$i $(apidir) || true; \
@ENABLE_GLADE_TRUE@ done && \
@ENABLE_GLADE_TRUE@ cp $(ASSEMBLY) $(libdir)

View file

@ -22,7 +22,7 @@
glade_set_custom_handler (callback_wrapper.NativeDelegate, IntPtr.Zero); glade_set_custom_handler (callback_wrapper.NativeDelegate, IntPtr.Zero);
} }
[DllImport("gtksharpglue")] [DllImport("gladesharpglue")]
static extern IntPtr gtksharp_glade_xml_get_filename (IntPtr raw); static extern IntPtr gtksharp_glade_xml_get_filename (IntPtr raw);
/// <summary>Filename Property</summary> /// <summary>Filename Property</summary>

369
glade/glade-api.raw Normal file
View file

@ -0,0 +1,369 @@
<?xml version="1.0"?>
<api>
<!--
This file was automatically generated.
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Glade" library="libglade-2.0-0.dll">
<callback name="ApplyCustomPropFunc" cname="GladeApplyCustomPropFunc">
<return-type type="void"/>
<parameters>
<parameter type="GladeXML*" name="xml"/>
<parameter type="GtkWidget*" name="widget"/>
<parameter type="const-gchar*" name="propname"/>
<parameter type="const-gchar*" name="value"/>
</parameters>
</callback>
<callback name="BuildChildrenFunc" cname="GladeBuildChildrenFunc">
<return-type type="void"/>
<parameters>
<parameter type="GladeXML*" name="xml"/>
<parameter type="GtkWidget*" name="parent"/>
<parameter type="GladeWidgetInfo*" name="info"/>
</parameters>
</callback>
<callback name="FindInternalChildFunc" cname="GladeFindInternalChildFunc">
<return-type type="GtkWidget*"/>
<parameters>
<parameter type="GladeXML*" name="xml"/>
<parameter type="GtkWidget*" name="parent"/>
<parameter type="const-gchar*" name="childname"/>
</parameters>
</callback>
<callback name="NewFunc" cname="GladeNewFunc">
<return-type type="GtkWidget*"/>
<parameters>
<parameter type="GladeXML*" name="xml"/>
<parameter type="GType" name="widget_type"/>
<parameter type="GladeWidgetInfo*" name="info"/>
</parameters>
</callback>
<callback name="XMLConnectFunc" cname="GladeXMLConnectFunc">
<return-type type="void"/>
<parameters>
<parameter type="const-gchar*" name="handler_name"/>
<parameter type="GObject*" name="object"/>
<parameter type="const-gchar*" name="signal_name"/>
<parameter type="const-gchar*" name="signal_data"/>
<parameter type="GObject*" name="connect_object"/>
<parameter type="gboolean" name="after"/>
<parameter type="gpointer" name="user_data"/>
</parameters>
</callback>
<callback name="XMLCustomWidgetHandler" cname="GladeXMLCustomWidgetHandler">
<return-type type="GtkWidget*"/>
<parameters>
<parameter type="GladeXML*" name="xml"/>
<parameter type="gchar*" name="func_name"/>
<parameter type="gchar*" name="name"/>
<parameter type="gchar*" name="string1"/>
<parameter type="gchar*" name="string2"/>
<parameter type="gint" name="int1"/>
<parameter type="gint" name="int2"/>
<parameter type="gpointer" name="user_data"/>
</parameters>
</callback>
<object name="XML" cname="GladeXML" parent="GObject">
<field cname="filename" type="char*"/>
<field cname="priv" type="GladeXMLPrivate*"/>
<virtual_method name="LookupType" cname="lookup_type">
<return-type type="GType"/>
<parameters>
<parameter type="GladeXML*self" name="arg1"/>
<parameter type="const-char*" name="gtypename"/>
</parameters>
</virtual_method>
<method name="BuildWidget" cname="glade_xml_build_widget">
<return-type type="GtkWidget*"/>
<parameters>
<parameter type="GladeWidgetInfo*" name="info"/>
</parameters>
</method>
<method name="Construct" cname="glade_xml_construct">
<return-type type="gboolean"/>
<parameters>
<parameter type="const-char*" name="fname"/>
<parameter type="const-char*" name="root"/>
<parameter type="const-char*" name="domain"/>
</parameters>
</method>
<method name="EnsureAccel" cname="glade_xml_ensure_accel">
<return-type type="GtkAccelGroup*"/>
</method>
<method name="GetType" cname="glade_xml_get_type" shared="true">
<return-type type="GType"/>
</method>
<method name="GetWidget" cname="glade_xml_get_widget">
<return-type type="GtkWidget*"/>
<parameters>
<parameter type="const-char*" name="name"/>
</parameters>
</method>
<method name="GetWidgetPrefix" cname="glade_xml_get_widget_prefix">
<return-type type="GList*"/>
<parameters>
<parameter type="const-char*" name="name"/>
</parameters>
</method>
<method name="HandleInternalChild" cname="glade_xml_handle_internal_child">
<return-type type="void"/>
<parameters>
<parameter type="GtkWidget*" name="parent"/>
<parameter type="GladeChildInfo*" name="child_info"/>
</parameters>
</method>
<method name="HandleWidgetProp" cname="glade_xml_handle_widget_prop">
<return-type type="void"/>
<parameters>
<parameter type="GtkWidget*" name="widget"/>
<parameter type="const-gchar*" name="prop_name"/>
<parameter type="const-gchar*" name="value_name"/>
</parameters>
</method>
<constructor cname="glade_xml_new">
<parameters>
<parameter type="const-char*" name="fname"/>
<parameter type="const-char*" name="root"/>
<parameter type="const-char*" name="domain"/>
</parameters>
</constructor>
<constructor cname="glade_xml_new_from_buffer">
<parameters>
<parameter type="const-char*" name="buffer"/>
<parameter type="int" name="size"/>
<parameter type="const-char*" name="root"/>
<parameter type="const-char*" name="domain"/>
</parameters>
</constructor>
<method name="RelativeFile" cname="glade_xml_relative_file">
<return-type type="gchar*"/>
<parameters>
<parameter type="const-gchar*" name="filename"/>
</parameters>
</method>
<method name="SetCommonParams" cname="glade_xml_set_common_params">
<return-type type="void"/>
<parameters>
<parameter type="GtkWidget*" name="widget"/>
<parameter type="GladeWidgetInfo*" name="info"/>
</parameters>
</method>
<method name="SetPackingProperty" cname="glade_xml_set_packing_property">
<return-type type="void"/>
<parameters>
<parameter type="GtkWidget*" name="parent"/>
<parameter type="GtkWidget*" name="child"/>
<parameter type="const-char*" name="name"/>
<parameter type="const-char*" name="value"/>
</parameters>
</method>
<method name="SetToplevel" cname="glade_xml_set_toplevel">
<return-type type="void"/>
<parameters>
<parameter type="GtkWindow*" name="window"/>
</parameters>
</method>
<method name="SetValueFromString" cname="glade_xml_set_value_from_string">
<return-type type="gboolean"/>
<parameters>
<parameter type="GParamSpec*" name="pspec"/>
<parameter type="const-gchar*" name="string"/>
<parameter type="GValue*" name="value"/>
</parameters>
</method>
<method name="SignalAutoconnect" cname="glade_xml_signal_autoconnect">
<return-type type="void"/>
</method>
<method name="SignalAutoconnectFull" cname="glade_xml_signal_autoconnect_full">
<return-type type="void"/>
<parameters>
<parameter type="GladeXMLConnectFunc" name="func"/>
<parameter type="gpointer" name="user_data"/>
</parameters>
</method>
<method name="SignalConnect" cname="glade_xml_signal_connect">
<return-type type="void"/>
<parameters>
<parameter type="const-char*" name="handlername"/>
<parameter type="GCallback" name="func"/>
</parameters>
</method>
<method name="SignalConnectData" cname="glade_xml_signal_connect_data">
<return-type type="void"/>
<parameters>
<parameter type="const-char*" name="handlername"/>
<parameter type="GCallback" name="func"/>
<parameter type="gpointer" name="user_data"/>
</parameters>
</method>
<method name="SignalConnectFull" cname="glade_xml_signal_connect_full">
<return-type type="void"/>
<parameters>
<parameter type="const-gchar*" name="handler_name"/>
<parameter type="GladeXMLConnectFunc" name="func"/>
<parameter type="gpointer" name="user_data"/>
</parameters>
</method>
</object>
<struct name="AccelInfo" cname="GladeAccelInfo">
<field cname="key" type="guint"/>
<field cname="modifiers" type="GdkModifierType"/>
<field cname="signal" type="gchar*"/>
</struct>
<struct name="AtkActionInfo" cname="GladeAtkActionInfo">
<field cname="action_name" type="gchar*"/>
<field cname="description" type="gchar*"/>
</struct>
<struct name="AtkRelationInfo" cname="GladeAtkRelationInfo">
<field cname="target" type="gchar*"/>
<field cname="type" type="gchar*"/>
</struct>
<struct name="ChildInfo" cname="GladeChildInfo">
<field cname="properties" type="GladeProperty*"/>
<field cname="n_properties" type="guint"/>
<field cname="child" type="GladeWidgetInfo*"/>
<field cname="internal_child" type="gchar*"/>
</struct>
<struct name="Interface" cname="GladeInterface">
<field cname="requires" type="gchar**"/>
<field cname="n_requires" type="guint"/>
<field cname="toplevels" type="GladeWidgetInfo**"/>
<field cname="n_toplevels" type="guint"/>
<field cname="names" type="GHashTable*"/>
<field cname="strings" type="GHashTable*"/>
<method name="Destroy" cname="glade_interface_destroy">
<return-type type="void"/>
</method>
<method name="Dump" cname="glade_interface_dump">
<return-type type="void"/>
<parameters>
<parameter type="const-gchar*" name="filename"/>
</parameters>
</method>
</struct>
<struct name="Property" cname="GladeProperty">
<field cname="name" type="gchar*"/>
<field cname="value" type="gchar*"/>
</struct>
<struct name="SignalInfo" cname="GladeSignalInfo">
<field cname="name" type="gchar*"/>
<field cname="handler" type="gchar*"/>
<field cname="object" type="gchar*"/>
<field cname="after" bits="1" type="guint"/>
</struct>
<struct name="WidgetInfo" cname="GladeWidgetInfo">
<field cname="parent" type="GladeWidgetInfo*"/>
<field cname="classname" type="gchar*"/>
<field cname="name" type="gchar*"/>
<field cname="properties" type="GladeProperty*"/>
<field cname="n_properties" type="guint"/>
<field cname="atk_props" type="GladeProperty*"/>
<field cname="n_atk_props" type="guint"/>
<field cname="signals" type="GladeSignalInfo*"/>
<field cname="n_signals" type="guint"/>
<field cname="atk_actions" type="GladeAtkActionInfo*"/>
<field cname="n_atk_actions" type="guint"/>
<field cname="relations" type="GladeAtkRelationInfo*"/>
<field cname="n_relations" type="guint"/>
<field cname="accels" type="GladeAccelInfo*"/>
<field cname="n_accels" type="guint"/>
<field cname="children" type="GladeChildInfo*"/>
<field cname="n_children" type="guint"/>
</struct>
<class name="Global" cname="GladeGlobal">
<method name="EnumFromString" cname="glade_enum_from_string" shared="true">
<return-type type="gint"/>
<parameters>
<parameter type="GType" name="type"/>
<parameter type="const-char*" name="string"/>
</parameters>
</method>
<method name="FlagsFromString" cname="glade_flags_from_string" shared="true">
<return-type type="guint"/>
<parameters>
<parameter type="GType" name="type"/>
<parameter type="const-char*" name="string"/>
</parameters>
</method>
<method name="GetWidgetName" cname="glade_get_widget_name" shared="true">
<return-type type="const-char*"/>
<parameters>
<parameter type="GtkWidget*" name="widget"/>
</parameters>
</method>
<method name="GetWidgetTree" cname="glade_get_widget_tree" shared="true">
<return-type type="GladeXML*"/>
<parameters>
<parameter type="GtkWidget*" name="widget"/>
</parameters>
</method>
<method name="ModuleCheckVersion" cname="glade_module_check_version" shared="true">
<return-type type="gchar*"/>
<parameters>
<parameter type="gint" name="version"/>
</parameters>
</method>
<method name="RegisterCustomProp" cname="glade_register_custom_prop" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="GType" name="type"/>
<parameter type="const-gchar*" name="prop_name"/>
<parameter type="GladeApplyCustomPropFunc" name="apply_prop"/>
</parameters>
</method>
<method name="RegisterWidget" cname="glade_register_widget" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="GType" name="type"/>
<parameter type="GladeNewFunc" name="new"/>
<parameter type="GladeBuildChildrenFunc" name="build_children"/>
<parameter type="GladeFindInternalChildFunc" name="find_internal_child"/>
</parameters>
</method>
<method name="SetCustomHandler" cname="glade_set_custom_handler" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="GladeXMLCustomWidgetHandler" name="handler"/>
<parameter type="gpointer" name="user_data"/>
</parameters>
</method>
</class>
<class name="Parser" cname="GladeParser_">
<method name="ParseBuffer" cname="glade_parser_parse_buffer" shared="true">
<return-type type="GladeInterface*"/>
<parameters>
<parameter type="const-gchar*" name="buffer"/>
<parameter type="gint" name="len"/>
<parameter type="const-gchar*" name="domain"/>
</parameters>
</method>
<method name="ParseFile" cname="glade_parser_parse_file" shared="true">
<return-type type="GladeInterface*"/>
<parameters>
<parameter type="const-gchar*" name="file"/>
<parameter type="const-gchar*" name="domain"/>
</parameters>
</method>
</class>
<class name="Standard" cname="GladeStandard_">
<method name="BuildChildren" cname="glade_standard_build_children" shared="true">
<return-type type="void"/>
<parameters>
<parameter type="GladeXML*" name="self"/>
<parameter type="GtkWidget*" name="parent"/>
<parameter type="GladeWidgetInfo*" name="info"/>
</parameters>
</method>
<method name="BuildWidget" cname="glade_standard_build_widget" shared="true">
<return-type type="GtkWidget*"/>
<parameters>
<parameter type="GladeXML*" name="xml"/>
<parameter type="GType" name="widget_type"/>
<parameter type="GladeWidgetInfo*" name="info"/>
</parameters>
</method>
</class>
</namespace>
</api>

View file

@ -1,368 +0,0 @@
<?xml version="1.0"?>
<api><!--
This file was automatically generated.
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Glade" library="libglade-2.0-0.dll">
<callback name="ApplyCustomPropFunc" cname="GladeApplyCustomPropFunc">
<return-type type="void" />
<parameters>
<parameter type="GladeXML*" name="xml" />
<parameter type="GtkWidget*" name="widget" />
<parameter type="const-gchar*" name="propname" />
<parameter type="const-gchar*" name="value" />
</parameters>
</callback>
<callback name="BuildChildrenFunc" cname="GladeBuildChildrenFunc">
<return-type type="void" />
<parameters>
<parameter type="GladeXML*" name="xml" />
<parameter type="GtkWidget*" name="parent" />
<parameter type="GladeWidgetInfo*" name="info" />
</parameters>
</callback>
<callback name="FindInternalChildFunc" cname="GladeFindInternalChildFunc">
<return-type type="GtkWidget*" />
<parameters>
<parameter type="GladeXML*" name="xml" />
<parameter type="GtkWidget*" name="parent" />
<parameter type="const-gchar*" name="childname" />
</parameters>
</callback>
<callback name="NewFunc" cname="GladeNewFunc">
<return-type type="GtkWidget*" />
<parameters>
<parameter type="GladeXML*" name="xml" />
<parameter type="GType" name="widget_type" />
<parameter type="GladeWidgetInfo*" name="info" />
</parameters>
</callback>
<callback name="XMLConnectFunc" cname="GladeXMLConnectFunc">
<return-type type="void" />
<parameters>
<parameter type="const-gchar*" name="handler_name" />
<parameter type="GObject*" name="object" />
<parameter type="const-gchar*" name="signal_name" />
<parameter type="const-gchar*" name="signal_data" />
<parameter type="GObject*" name="connect_object" />
<parameter type="gboolean" name="after" />
<parameter type="gpointer" name="user_data" />
</parameters>
</callback>
<callback name="XMLCustomWidgetHandler" cname="GladeXMLCustomWidgetHandler">
<return-type type="GtkWidget*" />
<parameters>
<parameter type="GladeXML*" name="xml" />
<parameter type="gchar*" name="func_name" />
<parameter type="gchar*" name="name" />
<parameter type="gchar*" name="string1" />
<parameter type="gchar*" name="string2" />
<parameter type="gint" name="int1" />
<parameter type="gint" name="int2" />
<parameter type="gpointer" name="user_data" />
</parameters>
</callback>
<object name="XML" cname="GladeXML" parent="GObject">
<field cname="filename" type="char*" />
<field cname="priv" type="GladeXMLPrivate*" />
<virtual_method name="LookupType" cname="lookup_type">
<return-type type="GType" />
<parameters>
<parameter type="GladeXML*self" name="arg1" />
<parameter type="const-char*" name="gtypename" />
</parameters>
</virtual_method>
<method name="BuildWidget" cname="glade_xml_build_widget">
<return-type type="GtkWidget*" />
<parameters>
<parameter type="GladeWidgetInfo*" name="info" />
</parameters>
</method>
<method name="Construct" cname="glade_xml_construct">
<return-type type="gboolean" />
<parameters>
<parameter type="const-char*" name="fname" />
<parameter type="const-char*" name="root" />
<parameter type="const-char*" name="domain" />
</parameters>
</method>
<method name="EnsureAccel" cname="glade_xml_ensure_accel">
<return-type type="GtkAccelGroup*" />
</method>
<method name="GetType" cname="glade_xml_get_type" shared="true">
<return-type type="GType" />
</method>
<method name="GetWidget" cname="glade_xml_get_widget">
<return-type type="GtkWidget*" />
<parameters>
<parameter type="const-char*" name="name" />
</parameters>
</method>
<method name="GetWidgetPrefix" cname="glade_xml_get_widget_prefix" hidden="1">
<return-type type="GList*" />
<parameters>
<parameter type="const-char*" name="name" />
</parameters>
</method>
<method name="HandleInternalChild" cname="glade_xml_handle_internal_child">
<return-type type="void" />
<parameters>
<parameter type="GtkWidget*" name="parent" />
<parameter type="GladeChildInfo*" name="child_info" />
</parameters>
</method>
<method name="HandleWidgetProp" cname="glade_xml_handle_widget_prop">
<return-type type="void" />
<parameters>
<parameter type="GtkWidget*" name="widget" />
<parameter type="const-gchar*" name="prop_name" />
<parameter type="const-gchar*" name="value_name" />
</parameters>
</method>
<constructor cname="glade_xml_new">
<parameters>
<parameter type="const-char*" name="fname" />
<parameter type="const-char*" name="root" />
<parameter type="const-char*" name="domain" />
</parameters>
</constructor>
<constructor cname="glade_xml_new_from_buffer">
<parameters>
<parameter type="const-char*" name="buffer" />
<parameter type="int" name="size" />
<parameter type="const-char*" name="root" />
<parameter type="const-char*" name="domain" />
</parameters>
</constructor>
<method name="RelativeFile" cname="glade_xml_relative_file">
<return-type type="gchar*" />
<parameters>
<parameter type="const-gchar*" name="filename" />
</parameters>
</method>
<method name="SetCommonParams" cname="glade_xml_set_common_params">
<return-type type="void" />
<parameters>
<parameter type="GtkWidget*" name="widget" />
<parameter type="GladeWidgetInfo*" name="info" />
</parameters>
</method>
<method name="SetPackingProperty" cname="glade_xml_set_packing_property">
<return-type type="void" />
<parameters>
<parameter type="GtkWidget*" name="parent" />
<parameter type="GtkWidget*" name="child" />
<parameter type="const-char*" name="name" />
<parameter type="const-char*" name="value" />
</parameters>
</method>
<method name="SetToplevel" cname="glade_xml_set_toplevel">
<return-type type="void" />
<parameters>
<parameter type="GtkWindow*" name="window" />
</parameters>
</method>
<method name="SetValueFromString" cname="glade_xml_set_value_from_string">
<return-type type="gboolean" />
<parameters>
<parameter type="GParamSpec*" name="pspec" />
<parameter type="const-gchar*" name="string" />
<parameter type="GValue*" name="value" />
</parameters>
</method>
<method name="SignalAutoconnect" cname="glade_xml_signal_autoconnect">
<return-type type="void" />
</method>
<method name="SignalAutoconnectFull" cname="glade_xml_signal_autoconnect_full">
<return-type type="void" />
<parameters>
<parameter type="GladeXMLConnectFunc" name="func" />
<parameter type="gpointer" name="user_data" />
</parameters>
</method>
<method name="SignalConnect" cname="glade_xml_signal_connect">
<return-type type="void" />
<parameters>
<parameter type="const-char*" name="handlername" />
<parameter type="GCallback" name="func" />
</parameters>
</method>
<method name="SignalConnectData" cname="glade_xml_signal_connect_data">
<return-type type="void" />
<parameters>
<parameter type="const-char*" name="handlername" />
<parameter type="GCallback" name="func" />
<parameter type="gpointer" name="user_data" />
</parameters>
</method>
<method name="SignalConnectFull" cname="glade_xml_signal_connect_full">
<return-type type="void" />
<parameters>
<parameter type="const-gchar*" name="handler_name" />
<parameter type="GladeXMLConnectFunc" name="func" />
<parameter type="gpointer" name="user_data" />
</parameters>
</method>
</object>
<struct name="AccelInfo" cname="GladeAccelInfo">
<field cname="key" type="guint" />
<field cname="modifiers" type="GdkModifierType" />
<field cname="signal" type="gchar*" />
</struct>
<struct name="AtkActionInfo" cname="GladeAtkActionInfo">
<field cname="action_name" type="gchar*" />
<field cname="description" type="gchar*" />
</struct>
<struct name="AtkRelationInfo" cname="GladeAtkRelationInfo">
<field cname="target" type="gchar*" />
<field cname="type" type="gchar*" />
</struct>
<struct name="ChildInfo" cname="GladeChildInfo">
<field cname="properties" type="GladeProperty*" />
<field cname="n_properties" type="guint" />
<field cname="child" type="GladeWidgetInfo*" />
<field cname="internal_child" type="gchar*" />
</struct>
<struct name="Interface" cname="GladeInterface">
<field cname="requires" type="gchar**" />
<field cname="n_requires" type="guint" />
<field cname="toplevels" type="GladeWidgetInfo**" />
<field cname="n_toplevels" type="guint" />
<field cname="names" type="GHashTable*" />
<field cname="strings" type="GHashTable*" />
<method name="Destroy" cname="glade_interface_destroy">
<return-type type="void" />
</method>
<method name="Dump" cname="glade_interface_dump">
<return-type type="void" />
<parameters>
<parameter type="const-gchar*" name="filename" />
</parameters>
</method>
</struct>
<struct name="Property" cname="GladeProperty">
<field cname="name" type="gchar*" />
<field cname="value" type="gchar*" />
</struct>
<struct name="SignalInfo" cname="GladeSignalInfo">
<field cname="name" type="gchar*" />
<field cname="handler" type="gchar*" />
<field cname="object" type="gchar*" />
<field cname="after" bits="1" type="guint" />
</struct>
<struct name="WidgetInfo" cname="GladeWidgetInfo">
<field cname="parent" type="GladeWidgetInfo*" />
<field cname="classname" type="gchar*" />
<field cname="name" type="gchar*" />
<field cname="properties" type="GladeProperty*" />
<field cname="n_properties" type="guint" />
<field cname="atk_props" type="GladeProperty*" />
<field cname="n_atk_props" type="guint" />
<field cname="signals" type="GladeSignalInfo*" />
<field cname="n_signals" type="guint" />
<field cname="atk_actions" type="GladeAtkActionInfo*" />
<field cname="n_atk_actions" type="guint" />
<field cname="relations" type="GladeAtkRelationInfo*" />
<field cname="n_relations" type="guint" />
<field cname="accels" type="GladeAccelInfo*" />
<field cname="n_accels" type="guint" />
<field cname="children" type="GladeChildInfo*" />
<field cname="n_children" type="guint" />
</struct>
<class name="Global" cname="GladeGlobal">
<method name="EnumFromString" cname="glade_enum_from_string" shared="true">
<return-type type="gint" />
<parameters>
<parameter type="GType" name="type" />
<parameter type="const-char*" name="string" />
</parameters>
</method>
<method name="FlagsFromString" cname="glade_flags_from_string" shared="true">
<return-type type="guint" />
<parameters>
<parameter type="GType" name="type" />
<parameter type="const-char*" name="string" />
</parameters>
</method>
<method name="GetWidgetName" cname="glade_get_widget_name" shared="true">
<return-type type="const-char*" />
<parameters>
<parameter type="GtkWidget*" name="widget" />
</parameters>
</method>
<method name="GetWidgetTree" cname="glade_get_widget_tree" shared="true">
<return-type type="GladeXML*" />
<parameters>
<parameter type="GtkWidget*" name="widget" />
</parameters>
</method>
<method name="ModuleCheckVersion" cname="glade_module_check_version" shared="true">
<return-type type="gchar*" />
<parameters>
<parameter type="gint" name="version" />
</parameters>
</method>
<method name="RegisterCustomProp" cname="glade_register_custom_prop" shared="true">
<return-type type="void" />
<parameters>
<parameter type="GType" name="type" />
<parameter type="const-gchar*" name="prop_name" />
<parameter type="GladeApplyCustomPropFunc" name="apply_prop" />
</parameters>
</method>
<method name="RegisterWidget" cname="glade_register_widget" shared="true">
<return-type type="void" />
<parameters>
<parameter type="GType" name="type" />
<parameter type="GladeNewFunc" name="new" />
<parameter type="GladeBuildChildrenFunc" name="build_children" />
<parameter type="GladeFindInternalChildFunc" name="find_internal_child" />
</parameters>
</method>
<method name="SetCustomHandler" cname="glade_set_custom_handler" shared="true">
<return-type type="void" />
<parameters>
<parameter type="GladeXMLCustomWidgetHandler" name="handler" />
<parameter type="gpointer" name="user_data" />
</parameters>
</method>
</class>
<class name="Parser" cname="GladeParser_">
<method name="ParseBuffer" cname="glade_parser_parse_buffer" shared="true">
<return-type type="GladeInterface*" />
<parameters>
<parameter type="const-gchar*" name="buffer" />
<parameter type="gint" name="len" />
<parameter type="const-gchar*" name="domain" />
</parameters>
</method>
<method name="ParseFile" cname="glade_parser_parse_file" shared="true">
<return-type type="GladeInterface*" />
<parameters>
<parameter type="const-gchar*" name="file" />
<parameter type="const-gchar*" name="domain" />
</parameters>
</method>
</class>
<class name="Standard" cname="GladeStandard_">
<method name="BuildChildren" cname="glade_standard_build_children" shared="true">
<return-type type="void" />
<parameters>
<parameter type="GladeXML*" name="self" />
<parameter type="GtkWidget*" name="parent" />
<parameter type="GladeWidgetInfo*" name="info" />
</parameters>
</method>
<method name="BuildWidget" cname="glade_standard_build_widget" shared="true">
<return-type type="GtkWidget*" />
<parameters>
<parameter type="GladeXML*" name="xml" />
<parameter type="GType" name="widget_type" />
<parameter type="GladeWidgetInfo*" name="info" />
</parameters>
</method>
</class>
</namespace>
</api>

7
glade/glue/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
Makefile
Makefile.in
*.la
*.lo
*.o
.deps
.libs

23
glade/glue/Makefile.am Normal file
View file

@ -0,0 +1,23 @@
lib_LTLIBRARIES = $(TARGET)
if ENABLE_GLADE
TARGET = libgladesharpglue.la
else
TARGET =
endif
libgladesharpglue_la_LDFLAGS = -module -avoid-version
libgladesharpglue_la_SOURCES = \
gladexml.c
libgladesharpglue_la_LIBADD = $(BASE_DEPENDENCIES_LIBS)
INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir)
libgladesharpglue.dll: $(libgladesharpglue_la_OBJECTS) libgladesharpglue.rc libgladesharpglue.def
./build-dll libgladesharpglue $(VERSION)
CLEANFILES = lib*.a lib*.dll
EXTRA_DIST = makefile.win32 win32dll.c

22
glade/glue/makefile.win32 Executable file
View file

@ -0,0 +1,22 @@
GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0 libglade-2.0`
GTK_LIBS=`pkg-config --libs gtk+-win32-2.0 libglade-2.0`
CC=gcc -mno-cygwin -mms-bitfields
DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols
GLUE_OBJS = \
gladexml.o \
win32dll.o
all: gladesharpglue.dll
%.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
gladesharpglue.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libgladesharpglue.a --dllname=gladesharpglue.dll --driver-name=gcc --output-def=gladesharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
clean:
rm -f gladesharpglue.dll *.o libgladesharpglue.a

16
glade/glue/win32dll.c Executable file
View file

@ -0,0 +1,16 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#include <stdio.h>
BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
{
return TRUE;
}
/*
BOOL APIENTRY DllMainCRTStartup (HINSTANCE hInst, DWORD reason, LPVOID reserved)
{
return TRUE;
}
*/

View file

@ -6,12 +6,19 @@ all: windows
windows: generated-stamp windows: generated-stamp
$(CSC) /unsafe /nowarn:0660,0661 /target:library /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 /out:$(ASSEMBLY) /recurse:*.cs $(CSC) /unsafe /nowarn:0660,0661 /target:library /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 /out:$(ASSEMBLY) /recurse:*.cs
cd glue && make -f makefile.win32
generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom generated-stamp: ../generator/codegen.exe $(APIS) $(I_APIS) *.custom
../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=glade-sharp && touch generated-stamp ../generator/codegen --generate $(APIS) --include $(I_APIS) --outdir=generated --customdir=. --assembly-name=glade-sharp && touch generated-stamp
glade-api.xml: glade-api.raw Glade.metadata
cp glade-api.raw glade-api.xml
chmod u+w glade-api.xml
../parser/gapi-fixup.exe --api=glade-api.xml --metadata=Glade.metadata
clean: clean:
rm -f generated-stamp rm -f generated-stamp
rm -f $(ASSEMBLY) rm -f $(ASSEMBLY)
rm -rf generated rm -rf generated
cd glue && make -f makefile.win32 clean

View file

@ -18,7 +18,7 @@ namespace GLib {
this.errptr = errptr; this.errptr = errptr;
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
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 {

View file

@ -27,7 +27,7 @@ namespace GLib {
return new List (g_list_copy (Handle)); return new List (g_list_copy (Handle));
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
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)
@ -35,7 +35,7 @@ namespace GLib {
return gtksharp_list_get_data (current); return gtksharp_list_get_data (current);
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
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)

53
glib/Makefile.am Normal file
View file

@ -0,0 +1,53 @@
SUBDIRS = glue
ASSEMBLY = glib-sharp.dll
assemblydir = $(libdir)
assembly_DATA = $(ASSEMBLY)
CLEANFILES = $(ASSEMBLY)
references =
sources = \
Boxed.cs \
DefaultSignalHandlerAttribute.cs \
DelegateWrapper.cs \
EnumWrapper.cs \
FileUtils.cs \
GException.cs \
Idle.cs \
IWrapper.cs \
ListBase.cs \
List.cs \
Log.cs \
MainContext.cs \
ManagedValue.cs \
Markup.cs \
Marshaller.cs \
Object.cs \
ObjectManager.cs \
Opaque.cs \
SignalArgs.cs \
SignalAttribute.cs \
SignalCallback.cs \
SList.cs \
Source.cs \
Thread.cs \
Timeout.cs \
time_t_CustomMarshaler.cs \
TypeConverter.cs \
Type.cs \
TypeFundamentals.cs \
UnwrappedObject.cs \
ValueArray.cs \
Value.cs
build_sources = $(addprefix $(srcdir)/, $(sources))
dist_sources = $(sources)
EXTRA_DIST = \
$(dist_sources) \
makefile.win32
$(ASSEMBLY): $(build_sources)
$(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources)

View file

@ -1,22 +0,0 @@
MCS=mcs
DESTDIR=
prefix=@prefix@
all: linux
windows:
$(CSC) /unsafe /target:library /out:glib-sharp.dll /recurse:*.cs
linux: glib-sharp.dll
glib-sharp.dll: *.cs
$(MCS) --unsafe --target library -o glib-sharp.dll --recurse '*.cs'
clean:
rm -f *.dll
rm -rf generated
install: all
../mkinstalldirs $(DESTDIR)$(prefix)/lib && \
cp glib-sharp.dll $(DESTDIR)$(prefix)/lib || exit 1

View file

@ -163,7 +163,7 @@ namespace GLib {
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
static extern IntPtr gtksharp_register_type (string name, IntPtr parent_type); static extern IntPtr gtksharp_register_type (string name, IntPtr parent_type);
/// <summary> /// <summary>
@ -260,7 +260,7 @@ namespace GLib {
/// The type associated with this object class. /// The type associated with this object class.
/// </remarks> /// </remarks>
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
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 {
@ -269,7 +269,7 @@ namespace GLib {
} }
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
static extern IntPtr gtksharp_get_type_name (IntPtr raw); static extern IntPtr gtksharp_get_type_name (IntPtr raw);
public string TypeName { public string TypeName {
@ -390,7 +390,7 @@ namespace GLib {
g_object_set_property (Raw, name, val.Handle); g_object_set_property (Raw, name, val.Handle);
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
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)
@ -401,7 +401,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, IntPtr retval); protected static extern void g_signal_chain_from_overridden (IntPtr args, IntPtr retval);
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
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)
@ -409,7 +409,7 @@ namespace GLib {
return gtksharp_is_object (obj); return gtksharp_is_object (obj);
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
static extern int gtksharp_object_get_ref_count (IntPtr obj); static extern int gtksharp_object_get_ref_count (IntPtr obj);
public int RefCount { public int RefCount {

View file

@ -12,7 +12,7 @@ namespace GtkSharp {
private static Hashtable types = new Hashtable (); private static Hashtable types = new Hashtable ();
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
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)
@ -81,13 +81,13 @@ namespace GtkSharp {
return expected_string; return expected_string;
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
static extern int gtksharp_get_type_id (IntPtr raw); static extern int gtksharp_get_type_id (IntPtr raw);
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
static extern int gtksharp_get_parent_type (int typ); static extern int gtksharp_get_parent_type (int typ);
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
static extern IntPtr gtksharp_get_type_name_for_id (int typ); static extern IntPtr gtksharp_get_type_name_for_id (int typ);
static Type GetValidParentType (IntPtr raw) static Type GetValidParentType (IntPtr raw)

View file

@ -27,7 +27,7 @@ namespace GLib {
return new SList (g_slist_copy (Handle)); return new SList (g_slist_copy (Handle));
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
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)
@ -35,7 +35,7 @@ namespace GLib {
return gtksharp_slist_get_data (current); return gtksharp_slist_get_data (current);
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
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)

View file

@ -88,10 +88,10 @@ namespace GLib {
// import the glue function to allocate values on heap // import the glue function to allocate values on heap
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
static extern IntPtr gtksharp_value_create(IntPtr type); static extern IntPtr gtksharp_value_create(IntPtr type);
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
static extern IntPtr gtksharp_value_create_from_property(IntPtr obj, string name); static extern IntPtr gtksharp_value_create_from_property(IntPtr obj, string name);
// Constructor to wrap a raw GValue ref. We need the dummy param // Constructor to wrap a raw GValue ref. We need the dummy param
@ -652,7 +652,7 @@ namespace GLib {
return new EnumWrapper (g_value_get_enum (val._val), false); return new EnumWrapper (g_value_get_enum (val._val), false);
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
static extern IntPtr gtksharp_value_get_value_type (IntPtr val); static extern IntPtr gtksharp_value_get_value_type (IntPtr val);
public object Val public object Val

View file

@ -57,7 +57,7 @@ namespace GLib {
} }
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
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 {
@ -98,7 +98,7 @@ namespace GLib {
g_value_array_remove (Handle, idx); g_value_array_remove (Handle, idx);
} }
[DllImport("gtksharpglue")] [DllImport("glibsharpglue")]
static extern int gtksharp_value_array_get_count (IntPtr raw); static extern int gtksharp_value_array_get_count (IntPtr raw);
// ICollection // ICollection

7
glib/glue/.cvsignore Normal file
View file

@ -0,0 +1,7 @@
Makefile
Makefile.in
*.la
*.lo
*.o
.deps
.libs

27
glib/glue/Makefile.am Normal file
View file

@ -0,0 +1,27 @@
lib_LTLIBRARIES = libglibsharpglue.la
libglibsharpglue_la_LDFLAGS = -module -avoid-version
libglibsharpglue_la_SOURCES = \
error.c \
list.c \
object.c \
slist.c \
time_t.c \
type.c \
value.c \
valuearray.c
# Adding a new glue file?
# Please remember to update makefile.win32
libglibsharpglue_la_LIBADD = $(BASE_DEPENDENCIES_LIBS)
INCLUDES = $(BASE_DEPENDENCIES_CFLAGS) -I$(top_srcdir)
libgtksharpglue.dll: $(libgtksharpglue_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
./build-dll libgtksharpglue $(VERSION)
CLEANFILES = lib*.a lib*.dll
EXTRA_DIST = makefile.win32 win32dll.c

29
glib/glue/makefile.win32 Executable file
View file

@ -0,0 +1,29 @@
GTK_CFLAGS=`pkg-config --cflags gtk+-win32-2.0 libglade-2.0`
GTK_LIBS=`pkg-config --libs gtk+-win32-2.0 libglade-2.0`
CC=gcc -mno-cygwin -mms-bitfields
DLLWRAP=dllwrap -mno-cygwin -mms-bitfields --target i386-mingw32 --export-all-symbols
GLUE_OBJS = \
error.o \
list.o \
object.o \
slist.o \
time_t.o \
type.o \
value.o \
valuearray.o \
win32dll.o
all: glibsharpglue.dll
%.o: %.c
$(CC) -c $(CFLAGS) $(GTK_CFLAGS) -o $@ $^
glibsharpglue.dll: $(GLUE_OBJS)
$(DLLWRAP) --output-lib=libglibsharpglue.a --dllname=glibsharpglue.dll --driver-name=gcc --output-def=glibsharpglue.def $(GLUE_OBJS) $(GTK_LIBS)
clean:
rm -f glibsharpglue.dll *.o libglibsharpglue.a

18
glib/glue/object.c Normal file
View file

@ -0,0 +1,18 @@
/* object.c : Glue to clean up GtkObject references.
*
* Author: Mike Kestner <mkestner@speakeasy.net>
*
* <c> 2002 Mike Kestner
*/
#include <glib-object.h>
/* Forward declarations */
int gtksharp_object_get_ref_count (GObject *obj);
/* */
int
gtksharp_object_get_ref_count (GObject *obj)
{
return obj->ref_count;
}

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