ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2009-08-30 Christian Hoff <christian_hoff@gmx.net>

Browse source 
Complete the major version jump. Gtk# 3 and 2 are now both
	installable within the same prefix.

	* */glue/Makefile.am: Produce *sharpglue-3 gluelibs.
	* *.custom, *.cs: pinvoke the new glue library.
	* *-2.0.pc.in: Rename to *-3.0.pc.in.

svn path=/trunk/gtk-sharp/; revision=140941
This commit is contained in:
Christian Hoff 2009-08-30 20:06:33 +00:00
parent 33fd1cbece
commit 1e97a1046f
29 changed files with 120 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.include
View file

@ -36,7 +36,7 @@ generated-stamp: $(API) $(INCLUDE_API) $(top_builddir)/generator/gapi_codegen.ex
$(RUNTIME) $(top_builddir)/generator/gapi_codegen.exe --generate $(API) \
$(api_includes) \
--outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
--gluelib-name=$(pkg)sharpglue-2 --glue-filename=glue/generated.c \
--gluelib-name=$(pkg)sharpglue-3 --glue-filename=glue/generated.c \
--glue-includes=$(glue_includes) \
&& touch generated-stamp

2
atk/Misc.custom
View file

@ -21,7 +21,7 @@
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
[DllImport("atksharpglue-2")]
[DllImport("atksharpglue-3")]
static extern void atksharp_misc_set_singleton_instance (IntPtr misc);
public static void SetSingletonInstance (Misc misc)

6
atk/Util.custom
View file

@ -40,7 +40,7 @@
public delegate uint AddGlobalEventListenerDelegate (GLib.Signal.EmissionHook hook, string event_type);
[DllImport("atksharpglue-2")]
[DllImport("atksharpglue-3")]
static extern void atksharp_util_override_add_global_event_listener (AddGlobalEventListenerNativeDelegate cb);
public static AddGlobalEventListenerDelegate AddGlobalEventListenerHandler {
set {
@ -66,7 +66,7 @@
}
}
[DllImport("atksharpglue-2")]
[DllImport("atksharpglue-3")]
static extern void atksharp_util_override_remove_global_event_listener (RemoveListenerNativeDelegate cb);
public delegate void RemoveListenerDelegate (uint listener_id);
@ -92,7 +92,7 @@
}
}
[DllImport("atksharpglue-2")]
[DllImport("atksharpglue-3")]
static extern void atksharp_util_override_remove_key_event_listener (RemoveListenerNativeDelegate cb);
public static RemoveListenerDelegate RemoveKeyEventListenerHandler {

14
atk/glue/Makefile.am
View file

@ -1,22 +1,22 @@
lib_LTLIBRARIES = libatksharpglue-2.la
lib_LTLIBRARIES = libatksharpglue-3.la
libatksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libatksharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
libatksharpglue_2_la_SOURCES = \
libatksharpglue_3_la_SOURCES = \
misc.c \
util.c \
vmglueheaders.h
nodist_libatksharpglue_2_la_SOURCES = generated.c
nodist_libatksharpglue_3_la_SOURCES = generated.c
# Adding a new glue file?
libatksharpglue_2_la_LIBADD = $(ATK_LIBS)
libatksharpglue_3_la_LIBADD = $(ATK_LIBS)
INCLUDES = $(ATK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
libatksharpglue.dll: $(libatksharpglue_2_la_OBJECTS) libatksharpglue.rc libatksharpglue.def
./build-dll libatksharpglue-2 $(VERSION)
libatksharpglue.dll: $(libatksharpglue_3_la_OBJECTS) libatksharpglue.rc libatksharpglue.def
./build-dll libatksharpglue-3 $(VERSION)
CLEANFILES = lib*.a lib*.dll

12
configure.in.in
View file

@ -10,7 +10,7 @@ AC_SUBST(API_VERSION)
POLICY_VERSIONS="@POLICY_VERSIONS@"
AC_SUBST(POLICY_VERSIONS)
PACKAGE_VERSION=gtk-sharp-2.0
PACKAGE_VERSION=gtk-sharp-3.0
AC_SUBST(PACKAGE_VERSION)
WIN64DEFINES=
@ -240,11 +240,11 @@ gapi/gapi-2.0-compat.pc
generator/Makefile
generator/gapi3-codegen
glib/Makefile
glib/glib-sharp-2.0.pc
glib/glib-sharp-3.0.pc
glib/glib-sharp.dll.config
glib/glue/Makefile
gio/Makefile
gio/gio-sharp-2.0.pc
gio/gio-sharp-3.0.pc
gio/gio-sharp.dll.config
gio/glue/Makefile
cairo/Makefile
@ -258,16 +258,16 @@ gdk/Makefile
gdk/gdk-sharp.dll.config
gdk/glue/Makefile
gtk/Makefile
gtk/gtk-sharp-2.0.pc
gtk/gtk-sharp-3.0.pc
gtk/gtk-sharp.dll.config
gtk/glue/Makefile
glade/Makefile
glade/glade-sharp.dll.config
glade/glade-sharp-2.0.pc
glade/glade-sharp-3.0.pc
glade/glue/Makefile
gtkdotnet/Makefile
gtkdotnet/gtk-dotnet.dll.config
gtkdotnet/gtk-dotnet-2.0.pc
gtkdotnet/gtk-dotnet-3.0.pc
doc/Makefile
sample/GtkDemo/Makefile
sample/Makefile

6
doc/Makefile.am
View file

@ -16,7 +16,7 @@ ASSEMBLIES = \
lib/vte-sharp.dll \
lib/gtk-dotnet.dll
UPDATER = $(MDOC) update --out=en -pretty --fno-assembly-versions --since="Gtk# 2.14" $(ASSEMBLIES)
UPDATER = $(MDOC) update --out=en -pretty --fno-assembly-versions --since="Gtk# 3.0" $(ASSEMBLIES)
if ENABLE_MONODOC
SOURCESDIR=$(prefix)/lib/monodoc/sources
@ -49,10 +49,10 @@ get-assemblies:
cp $(top_builddir)/../gnome-desktop-sharp/*/*.dll.config lib
update: get-assemblies
$(MDOC) update --out=en --fno-assembly-versions --since="Gtk# 2.14" $(ASSEMBLIES)
$(MDOC) update --out=en --fno-assembly-versions --since="Gtk# 3.0" $(ASSEMBLIES)
update-delete: get-assemblies
$(MDOC) update --out=en --fno-assembly-versions --delete --since="Gtk# 2.14" $(ASSEMBLIES)
$(MDOC) update --out=en --fno-assembly-versions --delete --since="Gtk# 3.0" $(ASSEMBLIES)
CLEANFILES = gtk-sharp-docs.zip gtk-sharp-docs.tree lib

4
gdk/Device.custom
View file

@ -19,10 +19,10 @@
// Boston, MA 02111-1307, USA.
[DllImport("gdksharpglue-2")]
[DllImport("gdksharpglue-3")]
static extern DeviceAxis gtksharp_gdk_device_get_device_axis (IntPtr device, uint axis);
[DllImport("gdksharpglue-2")]
[DllImport("gdksharpglue-3")]
static extern DeviceKey gtksharp_gdk_device_get_device_key (IntPtr device, uint axis);
[DllImport("libgdk-win32-2.0-0.dll")]

2
gdk/DragContext.custom
View file

@ -20,7 +20,7 @@
// Boston, MA 02111-1307, USA.
[DllImport("gdksharpglue-2")]
[DllImport("gdksharpglue-3")]
static extern IntPtr gtksharp_drag_context_get_targets (IntPtr ptr);
public Atom [] Targets {

14
gdk/glue/Makefile.am
View file

@ -1,22 +1,22 @@
lib_LTLIBRARIES = libgdksharpglue-2.la
lib_LTLIBRARIES = libgdksharpglue-3.la
libgdksharpglue_2_la_SOURCES = \
libgdksharpglue_3_la_SOURCES = \
dragcontext.c \
device.c \
vmglueheaders.h
nodist_libgdksharpglue_2_la_SOURCES = generated.c
nodist_libgdksharpglue_3_la_SOURCES = generated.c
# Adding a new glue file?
libgdksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libgdksharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
libgdksharpglue_2_la_LIBADD = $(GTK_LIBS)
libgdksharpglue_3_la_LIBADD = $(GTK_LIBS)
INCLUDES = $(GTK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
libgdksharpglue.dll: $(libgdksharpglue_2_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def
./build-dll libgdksharpglue-2 $(VERSION)
libgdksharpglue.dll: $(libgdksharpglue_3_la_OBJECTS) libgdksharpglue.rc libgdksharpglue.def
./build-dll libgdksharpglue-3 $(VERSION)
CLEANFILES = lib*.a lib*.dll

4
gio/Makefile.am
View file

@ -2,7 +2,7 @@ SUBDIRS = . glue
pkg = gio
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gio-sharp-2.0.pc
pkgconfig_DATA = gio-sharp-3.0.pc
METADATA = Gio.metadata
SYMBOLS =
references = ../glib/glib-sharp.dll
@ -20,7 +20,7 @@ customs = \
FileAdapter.custom \
FileEnumerator.custom
add_dist = gio-sharp-2.0.pc.in
add_dist = gio-sharp-3.0.pc.in
include ../Makefile.include

4
gio/gio-sharp-2.0.pc.in → gio/gio-sharp-3.0.pc.in
View file

@ -2,12 +2,12 @@ prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
assemblies_dir=${libdir}/mono/@PACKAGE_VERSION@
gapidir=${prefix}/share/gapi-2.0
gapidir=${prefix}/share/gapi-3.0
Name: GIO#
Description: GIO# - GIO .NET Binding
Version: @VERSION@
Cflags: -I:${gapidir}/gio-api.xml
Libs: -r:${assemblies_dir}/gio-sharp.dll
Requires: glib-sharp-2.0
Requires: glib-sharp-3.0

14
gio/glue/Makefile.am
View file

@ -1,17 +1,17 @@
lib_LTLIBRARIES = libgiosharpglue-2.la
lib_LTLIBRARIES = libgiosharpglue-3.la
libgiosharpglue_2_la_SOURCES =
libgiosharpglue_3_la_SOURCES =
nodist_libgiosharpglue_2_la_SOURCES = generated.c
nodist_libgiosharpglue_3_la_SOURCES = generated.c
libgiosharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libgiosharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
libgiosharpglue_2_la_LIBADD = $(GIO_LIBS)
libgiosharpglue_3_la_LIBADD = $(GIO_LIBS)
INCLUDES = $(GIO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
libgiosharpglue.dll: $(libgiosharpglue_2_la_OBJECTS) libgiosharpglue.rc libgiosharpglue.def
./build-dll libgiosharpglue-2 $(VERSION)
libgiosharpglue.dll: $(libgiosharpglue_3_la_OBJECTS) libgiosharpglue.rc libgiosharpglue.def
./build-dll libgiosharpglue-3 $(VERSION)
CLEANFILES = lib*.a lib*.dll

4
glade/Makefile.am
View file

@ -3,7 +3,7 @@ SUBDIRS = . glue
if ENABLE_GLADE
pkg = glade
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = glade-sharp-2.0.pc
pkgconfig_DATA = glade-sharp-3.0.pc
else
pkg =
endif
@ -23,7 +23,7 @@ customs = \
Interface.custom \
XML.custom
add_dist = glade-sharp-2.0.pc.in
add_dist = glade-sharp-3.0.pc.in
include ../Makefile.include

2
glade/XML.custom
View file

@ -43,7 +43,7 @@
CustomHandler = handler;
}
[DllImport("gladesharpglue-2")]
[DllImport("gladesharpglue-3")]
static extern IntPtr gtksharp_glade_xml_get_filename (IntPtr raw);
public string Filename {

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

@ -1,12 +1,12 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
gapidir=${prefix}/share/gapi-3.0
Name: Glade#
Description: Glade# - Glade .NET Binding
Version: @VERSION@
Requires: gtk-sharp-2.0
Requires: gtk-sharp-3.0
Cflags: -I:${gapidir}/glade-api.xml
Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glade-sharp.dll

14
glade/glue/Makefile.am
View file

@ -1,24 +1,24 @@
lib_LTLIBRARIES = $(TARGET)
if ENABLE_GLADE
TARGET = libgladesharpglue-2.la
TARGET = libgladesharpglue-3.la
else
TARGET =
endif
libgladesharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libgladesharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
libgladesharpglue_2_la_SOURCES = \
libgladesharpglue_3_la_SOURCES = \
gladexml.c
nodist_libgladesharpglue_2_la_SOURCES = generated.c
nodist_libgladesharpglue_3_la_SOURCES = generated.c
libgladesharpglue_2_la_LIBADD = $(GLADE_LIBS)
libgladesharpglue_3_la_LIBADD = $(GLADE_LIBS)
INCLUDES = $(GLADE_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
libgladesharpglue.dll: $(libgladesharpglue_2_la_OBJECTS) libgladesharpglue.rc libgladesharpglue.def
./build-dll libgladesharpglue-2 $(VERSION)
libgladesharpglue.dll: $(libgladesharpglue_3_la_OBJECTS) libgladesharpglue.rc libgladesharpglue.def
./build-dll libgladesharpglue-3 $(VERSION)
CLEANFILES = lib*.a lib*.dll

6
glib/Makefile.am
View file

@ -5,8 +5,8 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll
ASSEMBLY_NAME = glib-sharp
noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config $(POLICY_ASSEMBLIES)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = glib-sharp-2.0.pc
gapidir = $(datadir)/gapi-2.0
pkgconfig_DATA = glib-sharp-3.0.pc
gapidir = $(datadir)/gapi-3.0
gapi_DATA = glib-api.xml
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk AssemblyInfo.cs $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS)
@ -83,7 +83,7 @@ dist_sources = $(sources)
EXTRA_DIST = \
$(dist_sources) \
$(ASSEMBLY).config.in \
glib-sharp-2.0.pc.in \
glib-sharp-3.0.pc.in \
glib-api.xml
gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk

2
glib/Thread.cs
View file

@ -36,7 +36,7 @@ namespace GLib
g_thread_init (IntPtr.Zero);
}
[DllImport("glibsharpglue-2")]
[DllImport("glibsharpglue-3")]
static extern bool glibsharp_g_thread_supported ();
public static bool Supported

2
glib/glib-sharp-2.0.pc.in → glib/glib-sharp-3.0.pc.in
View file

@ -1,7 +1,7 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
gapidir=${prefix}/share/gapi-3.0
Name: GLib#

12
glib/glue/Makefile.am
View file

@ -1,18 +1,18 @@
lib_LTLIBRARIES = libglibsharpglue-2.la
lib_LTLIBRARIES = libglibsharpglue-3.la
libglibsharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libglibsharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
libglibsharpglue_2_la_SOURCES = \
libglibsharpglue_3_la_SOURCES = \
thread.c
# Adding a new glue file?
libglibsharpglue_2_la_LIBADD = $(GLIB_LIBS)
libglibsharpglue_3_la_LIBADD = $(GLIB_LIBS)
INCLUDES = $(GLIB_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
libgtksharpglue.dll: $(libgtksharpglue_2_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
./build-dll libgtksharpglue-2 $(VERSION)
libgtksharpglue.dll: $(libgtksharpglue_3_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
./build-dll libgtksharpglue-3 $(VERSION)
CLEANFILES = lib*.a lib*.dll

4
gtk/CellRenderer.custom
View file

@ -71,7 +71,7 @@
}
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern void gtksharp_cellrenderer_override_get_size (IntPtr gtype, OnGetSizeDelegate cb);
static OnGetSizeDelegate OnGetSizeCallback;
@ -88,7 +88,7 @@
InternalOnGetSize (widget, ref cell_area, out x_offset, out y_offset, out width, out height);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern void gtksharp_cellrenderer_base_get_size (IntPtr cell, IntPtr widget, IntPtr cell_area, out int x_offset, out int y_offset, out int width, out int height);
private void InternalOnGetSize (Gtk.Widget widget, ref Gdk.Rectangle cell_area, out int x_offset, out int y_offset, out int width, out int height)

8
gtk/Container.custom
View file

@ -19,7 +19,7 @@
// Boston, MA 02111-1307, USA.
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern void gtksharp_container_child_get_property (IntPtr container, IntPtr child, IntPtr property, ref GLib.Value value);
public GLib.Value ChildGetProperty (Gtk.Widget child, string property_name) {
@ -81,13 +81,13 @@ public Widget[] FocusChain {
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern void gtksharp_container_base_forall (IntPtr handle, bool include_internals, IntPtr cb, IntPtr data);
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern void gtksharp_container_override_forall (IntPtr gtype, ForallDelegate cb);
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern void gtksharp_container_invoke_gtk_callback (IntPtr cb, IntPtr handle, IntPtr data);
[UnmanagedFunctionPointer (CallingConvention.Cdecl)]

4
gtk/Makefile.am
View file

@ -8,7 +8,7 @@ endif
pkg = gtk
pkgconfigdir=$(libdir)/pkgconfig
pkgconfig_DATA=gtk-sharp-2.0.pc
pkgconfig_DATA=gtk-sharp-3.0.pc
SYMBOLS = gtk-symbols.xml
INCLUDE_API = $(srcdir)/../glib/glib-api.xml $(top_builddir)/gio/gio-api.xml $(top_builddir)/pango/pango-api.xml $(top_builddir)/atk/atk-api.xml $(top_builddir)/gdk/gdk-api.xml
@ -143,7 +143,7 @@ customs = \
Widget.custom \
Window.custom
add_dist = gtk-sharp-2.0.pc.in
add_dist = gtk-sharp-3.0.pc.in
include ../Makefile.include

60
gtk/Style.custom
View file

@ -35,21 +35,21 @@ static Gdk.GC EnsureGC (IntPtr raw) {
return ret;
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_white_gc (IntPtr style);
public Gdk.GC WhiteGC {
get { return EnsureGC (gtksharp_gtk_style_get_white_gc (Handle)); }
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_black_gc (IntPtr style);
public Gdk.GC BlackGC {
get { return EnsureGC (gtksharp_gtk_style_get_black_gc (Handle)); }
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_fg_gc (IntPtr style, int i);
public Gdk.GC ForegroundGC (StateType state)
@ -58,7 +58,7 @@ public Gdk.GC ForegroundGC (StateType state)
return EnsureGC (raw);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_set_fg_gc (IntPtr style, int i, IntPtr gc);
public void SetForegroundGC (StateType state, Gdk.GC gc)
@ -75,7 +75,7 @@ public Gdk.GC[] ForegroundGCs {
}
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_bg_gc (IntPtr style, int i);
public Gdk.GC BackgroundGC (StateType state)
@ -84,7 +84,7 @@ public Gdk.GC BackgroundGC (StateType state)
return EnsureGC (raw);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_set_bg_gc (IntPtr style, int i, IntPtr gc);
public void SetBackgroundGC (StateType state, Gdk.GC gc)
@ -101,7 +101,7 @@ public Gdk.GC[] BackgroundGCs {
}
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_base_gc (IntPtr style, int i);
public Gdk.GC BaseGC (StateType state)
@ -110,7 +110,7 @@ public Gdk.GC BaseGC (StateType state)
return EnsureGC (raw);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_set_base_gc (IntPtr style, int i, IntPtr gc);
public void SetBaseGC (StateType state, Gdk.GC gc)
@ -118,7 +118,7 @@ public void SetBaseGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_base_gc (Handle, (int) state, gc.Handle);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_text_gc (IntPtr style, int i);
public Gdk.GC TextGC (StateType state)
@ -127,7 +127,7 @@ public Gdk.GC TextGC (StateType state)
return EnsureGC (raw);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_set_text_gc (IntPtr style, int i, IntPtr gc);
public void SetTextGC (StateType state, Gdk.GC gc)
@ -135,7 +135,7 @@ public void SetTextGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_text_gc (Handle, (int) state, gc.Handle);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_text_aa_gc (IntPtr style, int i);
public Gdk.GC TextAAGC (StateType state)
@ -144,7 +144,7 @@ public Gdk.GC TextAAGC (StateType state)
return EnsureGC (raw);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_set_text_aa_gc (IntPtr style, int i, IntPtr gc);
public void SetTextAAGC (StateType state, Gdk.GC gc)
@ -152,7 +152,7 @@ public void SetTextAAGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_text_aa_gc (Handle, (int) state, gc.Handle);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_light_gc (IntPtr style, int i);
public Gdk.GC LightGC (StateType state)
@ -161,7 +161,7 @@ public Gdk.GC LightGC (StateType state)
return EnsureGC (raw);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_set_light_gc (IntPtr style, int i, IntPtr gc);
public void SetLightGC (StateType state, Gdk.GC gc)
@ -169,7 +169,7 @@ public void SetLightGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_light_gc (Handle, (int) state, gc.Handle);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_dark_gc (IntPtr style, int i);
public Gdk.GC DarkGC (StateType state)
@ -178,7 +178,7 @@ public Gdk.GC DarkGC (StateType state)
return EnsureGC (raw);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_set_dark_gc (IntPtr style, int i, IntPtr gc);
public void SetDarkGC (StateType state, Gdk.GC gc)
@ -186,7 +186,7 @@ public void SetDarkGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_dark_gc (Handle, (int) state, gc.Handle);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_mid_gc (IntPtr style, int i);
public Gdk.GC MidGC (StateType state)
@ -195,7 +195,7 @@ public Gdk.GC MidGC (StateType state)
return EnsureGC (raw);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_set_mid_gc (IntPtr style, int i, IntPtr gc);
public void SetMidGC (StateType state, Gdk.GC gc)
@ -203,7 +203,7 @@ public void SetMidGC (StateType state, Gdk.GC gc)
gtksharp_gtk_style_set_mid_gc (Handle, (int) state, gc.Handle);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_bg (IntPtr style, int i);
public Gdk.Color Background (StateType state)
@ -221,7 +221,7 @@ public Gdk.Color[] Backgrounds {
}
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_fg (IntPtr style, int i);
public Gdk.Color Foreground (StateType state)
@ -239,7 +239,7 @@ public Gdk.Color[] Foregrounds {
}
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_text (IntPtr style, int i);
public Gdk.Color Text (StateType state)
@ -257,7 +257,7 @@ public Gdk.Color[] TextColors {
}
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_base (IntPtr style, int i);
public Gdk.Color Base (StateType state)
@ -275,7 +275,7 @@ public Gdk.Color[] BaseColors {
}
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_light (IntPtr style, int i);
public Gdk.Color Light (StateType state)
@ -293,7 +293,7 @@ public Gdk.Color[] LightColors {
}
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_mid (IntPtr style, int i);
public Gdk.Color Mid (StateType state)
@ -311,7 +311,7 @@ public Gdk.Color[] MidColors {
}
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_dark (IntPtr style, int i);
public Gdk.Color Dark (StateType state)
@ -329,9 +329,9 @@ public Gdk.Color[] DarkColors {
}
}
[DllImport ("gtksharpglue-2")]
[DllImport ("gtksharpglue-3")]
static extern int gtksharp_gtk_style_get_thickness (IntPtr style, int x_axis);
[DllImport ("gtksharpglue-2")]
[DllImport ("gtksharpglue-3")]
static extern void gtksharp_gtk_style_set_thickness (IntPtr style, int value);
public int XThickness {
@ -354,7 +354,7 @@ public int YThickness {
}
}
[DllImport ("gtksharpglue-2")]
[DllImport ("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_font_description (IntPtr style);
public Pango.FontDescription FontDescription {
@ -370,10 +370,10 @@ public Pango.FontDescription FontDescription {
}
}
[DllImport ("gtksharpglue-2")]
[DllImport ("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_style_get_bg_pixmap (IntPtr style, int state);
[DllImport ("gtksharpglue-2")]
[DllImport ("gtksharpglue-3")]
static extern void gtksharp_gtk_style_set_bg_pixmap (IntPtr style, int state, IntPtr pixmap);
public Gdk.Pixmap BgPixmap (StateType state)

10
gtk/Widget.custom
View file

@ -34,7 +34,7 @@ protected override void CreateNativeObject (string[] names, GLib.Value[] vals)
base.CreateNativeObject (names, vals);
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern IntPtr gtksharp_gtk_widget_get_allocation (IntPtr style);
public Gdk.Rectangle Allocation {
@ -42,7 +42,7 @@ public Gdk.Rectangle Allocation {
set { SizeAllocate (value); }
}
[DllImport ("gtksharpglue-2")]
[DllImport ("gtksharpglue-3")]
static extern void gtksharp_gtk_widget_set_window (IntPtr widget, IntPtr window);
public Gdk.Window GdkWindow {
get {
@ -63,7 +63,7 @@ public void AddAccelerator (string accel_signal, AccelGroup accel_group, AccelKe
[DllImport("libgtk-win32-2.0-0.dll")]
static extern void gtk_widget_set_state (IntPtr raw, int state);
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern int gtksharp_gtk_widget_get_state (IntPtr raw);
public Gtk.StateType State {
@ -75,10 +75,10 @@ public Gtk.StateType State {
}
}
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern int gtksharp_gtk_widget_get_flags (IntPtr raw);
[DllImport("gtksharpglue-2")]
[DllImport("gtksharpglue-3")]
static extern void gtksharp_gtk_widget_set_flags (IntPtr raw, int flags);
[Obsolete]

14
gtk/glue/Makefile.am
View file

@ -1,24 +1,24 @@
lib_LTLIBRARIES = libgtksharpglue-2.la
lib_LTLIBRARIES = libgtksharpglue-3.la
libgtksharpglue_2_la_SOURCES = \
libgtksharpglue_3_la_SOURCES = \
cellrenderer.c \
container.c \
style.c \
vmglueheaders.h \
widget.c
nodist_libgtksharpglue_2_la_SOURCES = generated.c
nodist_libgtksharpglue_3_la_SOURCES = generated.c
# Adding a new glue file?
libgtksharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined
libgtksharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
libgtksharpglue_2_la_LIBADD = $(GTK_LIBS)
libgtksharpglue_3_la_LIBADD = $(GTK_LIBS)
INCLUDES = $(GTK_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
libgtksharpglue.dll: $(libgtksharpglue_2_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
./build-dll libgtksharpglue-2 $(VERSION)
libgtksharpglue.dll: $(libgtksharpglue_3_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def
./build-dll libgtksharpglue-3 $(VERSION)
CLEANFILES = lib*.a lib*.dll

4
gtk/gtk-sharp-2.0.pc.in → gtk/gtk-sharp-3.0.pc.in
View file

@ -1,7 +1,7 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
gapidir=${prefix}/share/gapi-2.0
gapidir=${prefix}/share/gapi-3.0
Name: Gtk#
@ -9,4 +9,4 @@ Description: Gtk# - GNOME .NET Binding
Version: @VERSION@
Cflags: -I:${gapidir}/pango-api.xml -I:${gapidir}/atk-api.xml -I:${gapidir}/gdk-api.xml -I:${gapidir}/gtk-api.xml
Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/pango-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/atk-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/gdk-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-sharp.dll
Requires: glib-sharp-2.0
Requires: glib-sharp-3.0

11
gtkdotnet/Makefile.am
View file

@ -1,7 +1,7 @@
if ENABLE_DOTNET
TARGET = $(ASSEMBLY) $(ASSEMBLY).config
pkgconfigdir=$(libdir)/pkgconfig
pkgconfig_DATA=gtk-dotnet-2.0.pc
pkgconfig_DATA=gtk-dotnet-3.0.pc
else
TARGET =
endif
@ -26,7 +26,7 @@ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
EXTRA_DIST = \
$(sources) \
$(ASSEMBLY).config.in \
gtk-dotnet-2.0.pc.in
gtk-dotnet-3.0.pc.in
gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk .
@ -34,16 +34,9 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
cp $(top_builddir)/AssemblyInfo.cs .
if PLATFORM_WIN32
GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=gtk-sharp.snk $(ASSEMBLY)
else
GAPI_CDECL_INSERT=
endif
$(ASSEMBLY): $(build_sources) $(references) gtk-sharp.snk AssemblyInfo.cs
@rm -f $(ASSEMBLY).mdb
$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(build_references) $(build_sources)
$(GAPI_CDECL_INSERT)
policy.%.config: $(top_builddir)/policy.config
sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@

2
gtkdotnet/gtk-dotnet-2.0.pc.in → gtkdotnet/gtk-dotnet-3.0.pc.in
View file

@ -6,5 +6,5 @@ libdir=${exec_prefix}/lib
Name: Gtk.DotNet
Description: .NET Extensions for Gtk
Version: @VERSION@
Requires:gtk-sharp-2.0
Requires:gtk-sharp-3.0
Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-dotnet.dll