ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-02-02 17:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

2009-07-02 Christian Hoff <christian_hoff@gmx.net>

Browse source 
* configure.in.in: Target .net 2.0 profile
	* gapi-cdecl-insert: Kill. We are now using the UnmanagedFunctionPointerAttribute
	for callbacks.
	* glib/CdeclCallback: Mark obsolete.
	* generator/*.cs:
	* *.custom: Use [UnmanagedFunctionPointer (CallingConvention.Cdecl)] instead of
	[GLib.CDeclCallback].

svn path=/trunk/gtk-sharp/; revision=137323
This commit is contained in:
Christian Hoff 2009-07-02 20:18:10 +00:00
parent 3d6b4f7281
commit 940cf88750
38 changed files with 56 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2009-07-02 Christian Hoff <christian_hoff@gmx.net>
* configure.in.in: Target .net 2.0 profile
* gapi-cdecl-insert: Kill. We are now using the UnmanagedFunctionPointerAttribute
for callbacks.
* glib/CdeclCallback: Mark obsolete.
* generator/*.cs:
* *.custom: Use [UnmanagedFunctionPointer (CallingConvention.Cdecl)] instead of
[GLib.CDeclCallback].
2009-06-15 Christian Hoff <christian_hoff@gmx.net> 2009-06-15 Christian Hoff <christian_hoff@gmx.net>
* gtk/Widget.custom: Don't use [MarshalAs] for struct fields since * gtk/Widget.custom: Don't use [MarshalAs] for struct fields since

1
Makefile.am
View file

@ -3,7 +3,6 @@ SUBDIRS = sources generator parser glib gio cairo pango atk gdk gtk glade gtkdot
EXTRA_DIST = \ EXTRA_DIST = \
mono.snk \ mono.snk \
gtk-sharp.snk \ gtk-sharp.snk \
gapi-cdecl-insert \
makefile.win32 \ makefile.win32 \
policy.config.in \ policy.config.in \
AssemblyInfo.cs.in \ AssemblyInfo.cs.in \

7
Makefile.include
View file

@ -55,16 +55,9 @@ $(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config $(SNK)
build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS) build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
if PLATFORM_WIN32
GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
else
GAPI_CDECL_INSERT=
endif
$(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references) $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)
@rm -f $(ASSEMBLY).mdb @rm -f $(ASSEMBLY).mdb
$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(GENERATED_SOURCES) $(build_sources) $(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(GENERATED_SOURCES) $(build_sources)
$(GAPI_CDECL_INSERT)
install-data-local: install-data-local:
@if test -n '$(pkg)'; then \ @if test -n '$(pkg)'; then \

4
atk/Util.custom
View file

@ -22,7 +22,7 @@
// Boston, MA 02111-1307, USA. // Boston, MA 02111-1307, USA.
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate uint AddGlobalEventListenerNativeDelegate (GLib.Signal.EmissionHookNative hook, IntPtr event_type); delegate uint AddGlobalEventListenerNativeDelegate (GLib.Signal.EmissionHookNative hook, IntPtr event_type);
static AddGlobalEventListenerDelegate add_global_event_listener_handler; static AddGlobalEventListenerDelegate add_global_event_listener_handler;
@ -51,7 +51,7 @@
} }
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RemoveListenerNativeDelegate (uint listener_id); delegate void RemoveListenerNativeDelegate (uint listener_id);
static RemoveListenerDelegate remove_global_event_listener_handler; static RemoveListenerDelegate remove_global_event_listener_handler;

16
cairo/Makefile.am
View file

@ -1,17 +1,15 @@
ASSEMBLY_NAME = Mono.Cairo ASSEMBLY_NAME = Mono.Cairo
ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY = $(ASSEMBLY_NAME).dll
POLICY_ASSEMBLY = policy.1.0.$(ASSEMBLY)
POLICY_CONFIG = policy.1.0.config
if ENABLE_MONO_CAIRO if ENABLE_MONO_CAIRO
TARGET=$(ASSEMBLY) $(POLICY_ASSEMBLY) TARGET=$(ASSEMBLY)
else else
TARGET= TARGET=
endif endif
noinst_DATA = $(TARGET) noinst_DATA = $(TARGET)
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLY) mono.snk CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb mono.snk
sources = \ sources = \
Antialias.cs \ Antialias.cs \
@ -73,25 +71,17 @@ $(ASSEMBLY): $(build_sources) mono.snk
@rm -f $(ASSEMBLY).mdb @rm -f $(ASSEMBLY).mdb
$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources) $(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
$(POLICY_ASSEMBLY): $(srcdir)/$(POLICY_CONFIG) mono.snk
echo "Creating policy.1.0.$(ASSEMBLY)";
$(AL) -link:$(POLICY_CONFIG) -out:$@ -keyfile:mono.snk;
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \
echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) /i $(POLICY_ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
$(GACUTIL) /i $(POLICY_ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \
fi fi
uninstall-local: uninstall-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \
echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) /u policy.1.0.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) /u policy.1.0.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
fi fi
EXTRA_DIST = $(sources) $(POLICY_CONFIG) EXTRA_DIST = $(sources)

10
cairo/policy.1.0.config
View file

@ -1,10 +0,0 @@
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Mono.Cairo" publicKeyToken="35e10195dab3c99f" />
<bindingRedirect oldVersion="1.0.5000.0" newVersion="2.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

2
configure.in.in
View file

@ -122,7 +122,7 @@ if test "x$RUNTIME" != "no" ; then
RUNTIME=mono RUNTIME=mono
fi fi
AC_PATH_PROG(CSC, mcs, no) AC_PATH_PROG(CSC, gmcs, no)
if test `uname -s` = "Darwin"; then if test `uname -s` = "Darwin"; then
LIB_PREFIX= LIB_PREFIX=
LIB_SUFFIX=.dylib LIB_SUFFIX=.dylib

67
gapi-cdecl-insert
View file

@ -1,67 +0,0 @@
#!/bin/sh
#
# gapi-cdecl-insert : Inserts il into an assembly for CDecl callback delegates.
#
# Author: Christian Hoff <christian_hoff@gmx.net>
#
# Copyright (c) 2005 Novell, Inc.
# Copyright (c) 2009 Christian Hoff
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public
# License as published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
usage="Usage: gapi-cdecl-insert [--keyfile=<file>] <assembly_path>";
while [ $1 ]; do
arg=`expr "$1" : '--keyfile=\(.*\)'`
if [ $? -eq 0 ]; then # check whether "expr" has returned an error code
if [ -z $keyfile ]; then
keyfile=$arg
else
echo -e "--keyfile option cannot be defined multiple times\n${usage}"
fi
else
if [ -z $assembly ]; then
assembly=$1
else
echo -e "Only one input file allowed\n${usage}"
exit 1
fi
fi
shift # Replaces $1 with next param
done
if [ -n "$keyfile" -a ! -r "$keyfile" ]; then
echo -e "${0}: ERROR: Assembly key file \"$keyfile\" does not exist"
exit 2
fi
if [ ! -r "$assembly" ]; then
echo -e "${0}: ERROR: Assembly \"$assembly\" does not exist"
exit 3
fi
echo -e "${0}: Executing ildasm"
echo `ildasm ${assembly} /out:${assembly}.raw`
echo -e "${0}: Parsing generated IL"
sed 's/^[ \t]*\.custom instance void .*GLib\.CDeclCallbackAttribute::\.ctor.*$/.custom instance void [mscorlib]System\.Runtime\.InteropServices\.UnmanagedFunctionPointerAttribute::\.ctor\(valuetype [mscorlib]System\.Runtime\.InteropServices\.CallingConvention\) = \( 01 00 02 00 00 00 00 00 \) /' < ${assembly}.raw > ${assembly}.il
rm "$assembly"
echo -e "${0}: Executing ilasm"
if [ -z $keyfile ]; then
echo `ilasm /quiet /dll /output=${assembly} /resource=${assembly}.res ${assembly}.il`
else
echo `ilasm /quiet /dll /output=${assembly} /resource=${assembly}.res /key=${keyfile} ${assembly}.il`
fi
rm "${assembly}.raw"
rm "${assembly}.il"
rm "${assembly}.res"

2
gdk/Pixbuf.custom
View file

@ -188,7 +188,7 @@
this.notify = notify; this.notify = notify;
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
public delegate void NativeDelegate (IntPtr buf, IntPtr data); public delegate void NativeDelegate (IntPtr buf, IntPtr data);
void ReleaseHandles (IntPtr buf, IntPtr data) void ReleaseHandles (IntPtr buf, IntPtr data)

2
generator/CallbackGen.cs
View file

@ -201,7 +201,7 @@ namespace GtkSharp.Generation {
sw.WriteLine ("\tusing System.Runtime.InteropServices;"); sw.WriteLine ("\tusing System.Runtime.InteropServices;");
sw.WriteLine (); sw.WriteLine ();
sw.WriteLine ("#region Autogenerated code"); sw.WriteLine ("#region Autogenerated code");
sw.WriteLine ("\t[GLib.CDeclCallback]"); sw.WriteLine ("\t[UnmanagedFunctionPointer (CallingConvention.Cdecl)]");
sw.WriteLine ("\tinternal delegate " + retval.MarshalType + " " + wrapper + "(" + parms.ImportSignature + ");"); sw.WriteLine ("\tinternal delegate " + retval.MarshalType + " " + wrapper + "(" + parms.ImportSignature + ");");
sw.WriteLine (); sw.WriteLine ();
GenInvoker (gen_info, sw); GenInvoker (gen_info, sw);

2
generator/Signal.cs
View file

@ -219,7 +219,7 @@ namespace GtkSharp.Generation {
native_signature += ", " + CallbackSig; native_signature += ", " + CallbackSig;
native_signature += ", IntPtr gch"; native_signature += ", IntPtr gch";
sw.WriteLine ("\t\t[GLib.CDeclCallback]"); sw.WriteLine ("\t\t[UnmanagedFunctionPointer (CallingConvention.Cdecl)]");
sw.WriteLine ("\t\tdelegate {0} {1} ({2});", retval.ToNativeType, DelegateName, native_signature); sw.WriteLine ("\t\tdelegate {0} {1} ({2});", retval.ToNativeType, DelegateName, native_signature);
sw.WriteLine (); sw.WriteLine ();
sw.WriteLine ("\t\tstatic {0} {1} ({2})", retval.ToNativeType, CallbackName, native_signature); sw.WriteLine ("\t\tstatic {0} {1} ({2})", retval.ToNativeType, CallbackName, native_signature);

2
generator/VirtualMethod.cs
View file

@ -73,7 +73,7 @@ namespace GtkSharp.Generation {
if (parms.Count > 0) if (parms.Count > 0)
native_signature += parms.ImportSignature; native_signature += parms.ImportSignature;
sw.WriteLine ("\t\t[GLib.CDeclCallback]"); sw.WriteLine ("\t\t[UnmanagedFunctionPointer (CallingConvention.Cdecl)]");
sw.WriteLine ("\t\tdelegate {0} {1}NativeDelegate ({2});", retval.ToNativeType, this.Name, native_signature); sw.WriteLine ("\t\tdelegate {0} {1}NativeDelegate ({2});", retval.ToNativeType, this.Name, native_signature);
sw.WriteLine (); sw.WriteLine ();
sw.WriteLine ("\t\tstatic {0} {1}_cb ({2})", retval.ToNativeType, this.Name, native_signature); sw.WriteLine ("\t\tstatic {0} {1}_cb ({2})", retval.ToNativeType, this.Name, native_signature);

2
glade/XML.custom
View file

@ -182,7 +182,7 @@
this.handler_type = type; this.handler_type = type;
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RawXMLConnectFunc (IntPtr handler_name, IntPtr objekt, delegate void RawXMLConnectFunc (IntPtr handler_name, IntPtr objekt,
IntPtr signal_name, IntPtr signal_data, IntPtr signal_name, IntPtr signal_data,
IntPtr connect_object, int after, IntPtr user_data); IntPtr connect_object, int after, IntPtr user_data);

1
glib/CDeclCallbackAttribute.cs
View file

@ -23,6 +23,7 @@ namespace GLib {
using System; using System;
[Obsolete ("Use System.Runtime.InteropServices.UnmanagedFunctionPointerAttribute instead")]
public sealed class CDeclCallbackAttribute : Attribute public sealed class CDeclCallbackAttribute : Attribute
{ {
} }

2
glib/DelegateWrapper.cs
View file

@ -69,7 +69,7 @@ namespace GLib {
} }
} }
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
private delegate void DestroyNotify (IntPtr data); private delegate void DestroyNotify (IntPtr data);
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]

2
glib/DestroyNotify.cs
View file

@ -23,7 +23,7 @@ namespace GLib {
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
public delegate void DestroyNotify (IntPtr data); public delegate void DestroyNotify (IntPtr data);
public class DestroyHelper { public class DestroyHelper {

2
glib/IOChannel.cs
View file

@ -25,7 +25,7 @@ namespace GLibSharp {
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using GLib; using GLib;
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
internal delegate bool IOFuncNative(IntPtr source, int condition, IntPtr data); internal delegate bool IOFuncNative(IntPtr source, int condition, IntPtr data);
internal class IOFuncWrapper { internal class IOFuncWrapper {

2
glib/Idle.cs
View file

@ -34,7 +34,7 @@ namespace GLib {
public class Idle { public class Idle {
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate bool IdleHandlerInternal (); delegate bool IdleHandlerInternal ();

7
glib/Makefile.am
View file

@ -92,16 +92,9 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
cp $(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) gtk-sharp.snk AssemblyInfo.cs $(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
@rm -f $(ASSEMBLY).mdb @rm -f $(ASSEMBLY).mdb
$(CSC) $(CSFLAGS) -unsafe -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources) $(CSC) $(CSFLAGS) -unsafe -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
$(GAPI_CDECL_INSERT)
policy.%.config: $(top_builddir)/policy.config policy.%.config: $(top_builddir)/policy.config
sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@ sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@

4
glib/ManagedValue.cs
View file

@ -58,9 +58,9 @@ namespace GLib {
} }
} }
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate IntPtr CopyFunc (IntPtr gch); delegate IntPtr CopyFunc (IntPtr gch);
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void FreeFunc (IntPtr gch); delegate void FreeFunc (IntPtr gch);
static CopyFunc copy; static CopyFunc copy;

6
glib/Object.cs
View file

@ -257,7 +257,7 @@ namespace GLib {
} }
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void GetPropertyDelegate (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec); delegate void GetPropertyDelegate (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec);
static void GetPropertyCallback (IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec) static void GetPropertyCallback (IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec)
@ -275,7 +275,7 @@ namespace GLib {
} }
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void SetPropertyDelegate (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec); delegate void SetPropertyDelegate (IntPtr GObject, uint property_id, ref GLib.Value value, IntPtr pspec);
static void SetPropertyCallback(IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec) static void SetPropertyCallback(IntPtr handle, uint property_id, ref GLib.Value value, IntPtr param_spec)
@ -475,7 +475,7 @@ namespace GLib {
} }
} }
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void NotifyDelegate (IntPtr handle, IntPtr pspec, IntPtr gch); delegate void NotifyDelegate (IntPtr handle, IntPtr pspec, IntPtr gch);
void NotifyCallback (IntPtr handle, IntPtr pspec, IntPtr gch) void NotifyCallback (IntPtr handle, IntPtr pspec, IntPtr gch)

2
glib/Signal.cs
View file

@ -63,7 +63,7 @@ namespace GLib {
public IntPtr param_types; public IntPtr param_types;
} }
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
public delegate bool EmissionHookNative (ref InvocationHint hint, uint n_pvals, IntPtr pvals, IntPtr data); public delegate bool EmissionHookNative (ref InvocationHint hint, uint n_pvals, IntPtr pvals, IntPtr data);
public delegate bool EmissionHook (InvocationHint ihint, object[] inst_and_param_values); public delegate bool EmissionHook (InvocationHint ihint, object[] inst_and_param_values);

4
glib/SignalClosure.cs
View file

@ -136,7 +136,7 @@ namespace GLib {
} }
} }
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void ClosureMarshal (IntPtr closure, IntPtr return_val, uint n_param_vals, IntPtr param_values, IntPtr invocation_hint, IntPtr marshal_data); delegate void ClosureMarshal (IntPtr closure, IntPtr return_val, uint n_param_vals, IntPtr param_values, IntPtr invocation_hint, IntPtr marshal_data);
static void MarshalCallback (IntPtr raw_closure, IntPtr return_val, uint n_param_vals, IntPtr param_values, IntPtr invocation_hint, IntPtr marshal_data) static void MarshalCallback (IntPtr raw_closure, IntPtr return_val, uint n_param_vals, IntPtr param_values, IntPtr invocation_hint, IntPtr marshal_data)
@ -183,7 +183,7 @@ namespace GLib {
} }
} }
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void ClosureNotify (IntPtr data, IntPtr closure); delegate void ClosureNotify (IntPtr data, IntPtr closure);
static void NotifyCallback (IntPtr data, IntPtr raw_closure) static void NotifyCallback (IntPtr data, IntPtr raw_closure)

2
glib/Spawn.cs
View file

@ -60,7 +60,7 @@ namespace GLib {
public delegate void SpawnChildSetupFunc (); public delegate void SpawnChildSetupFunc ();
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
internal delegate void SpawnChildSetupFuncNative (IntPtr gch); internal delegate void SpawnChildSetupFuncNative (IntPtr gch);
internal class SpawnChildSetupWrapper { internal class SpawnChildSetupWrapper {

2
glib/Timeout.cs
View file

@ -32,7 +32,7 @@ namespace GLib {
public class Timeout { public class Timeout {
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate bool TimeoutHandlerInternal (); delegate bool TimeoutHandlerInternal ();
internal class TimeoutProxy : SourceProxy { internal class TimeoutProxy : SourceProxy {

2
glib/ToggleRef.cs
View file

@ -120,7 +120,7 @@ namespace GLib {
} }
} }
[CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void ToggleNotifyHandler (IntPtr data, IntPtr handle, bool is_last_ref); delegate void ToggleNotifyHandler (IntPtr data, IntPtr handle, bool is_last_ref);
static void RefToggled (IntPtr data, IntPtr handle, bool is_last_ref) static void RefToggled (IntPtr data, IntPtr handle, bool is_last_ref)

2
gtk/CellRenderer.custom
View file

@ -46,7 +46,7 @@
// We have to implement this VM manually because x_offset, y_offset, width and height params may be NULL and therefore cannot be treated as "out int" // We have to implement this VM manually because x_offset, y_offset, width and height params may be NULL and therefore cannot be treated as "out int"
// TODO: Implement "nullable" attribute for value type parameters in GAPI // TODO: Implement "nullable" attribute for value type parameters in GAPI
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void OnGetSizeDelegate (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height); delegate void OnGetSizeDelegate (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height);
static void OnGetSize_cb (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height) static void OnGetSize_cb (IntPtr item, IntPtr widget, IntPtr cell_area_ptr, IntPtr x_offset, IntPtr y_offset, IntPtr width, IntPtr height)

2
gtk/Clipboard.custom
View file

@ -88,7 +88,7 @@
static RichTextReceivedFuncNative rt_rcvd_marshaler; static RichTextReceivedFuncNative rt_rcvd_marshaler;
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RichTextReceivedFuncNative (IntPtr clipboard, IntPtr format, IntPtr text, UIntPtr length, IntPtr data); delegate void RichTextReceivedFuncNative (IntPtr clipboard, IntPtr format, IntPtr text, UIntPtr length, IntPtr data);

2
gtk/Container.custom
View file

@ -90,7 +90,7 @@ static extern void gtksharp_container_override_forall (IntPtr gtype, ForallDeleg
[DllImport("gtksharpglue-2")] [DllImport("gtksharpglue-2")]
static extern void gtksharp_container_invoke_gtk_callback (IntPtr cb, IntPtr handle, IntPtr data); static extern void gtksharp_container_invoke_gtk_callback (IntPtr cb, IntPtr handle, IntPtr data);
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void ForallDelegate (IntPtr container, bool include_internals, IntPtr cb, IntPtr data); delegate void ForallDelegate (IntPtr container, bool include_internals, IntPtr cb, IntPtr data);
static ForallDelegate ForallOldCallback; static ForallDelegate ForallOldCallback;

2
gtk/Input.custom
View file

@ -22,7 +22,7 @@
[DllImport("libgtk-win32-2.0-0.dll")] [DllImport("libgtk-win32-2.0-0.dll")]
static extern uint gtk_input_add_full(int source, int condition, InputFunctionNative function, GtkSharp.CallbackMarshalNative marshal, IntPtr data, GLib.DestroyNotify destroy); static extern uint gtk_input_add_full(int source, int condition, InputFunctionNative function, GtkSharp.CallbackMarshalNative marshal, IntPtr data, GLib.DestroyNotify destroy);
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void InputFunctionNative(IntPtr data, int source, int condition); delegate void InputFunctionNative(IntPtr data, int source, int condition);
class InputFunctionWrapper { class InputFunctionWrapper {

4
gtk/ListStore.custom
View file

@ -223,7 +223,7 @@
return new TreeEnumerator(this); return new TreeEnumerator(this);
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch); delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch);
static void RowsReorderedSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch) static void RowsReorderedSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch)
@ -249,7 +249,7 @@
} }
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedVMDelegate (IntPtr tree_model, IntPtr path, IntPtr iter, IntPtr new_order); delegate void RowsReorderedVMDelegate (IntPtr tree_model, IntPtr path, IntPtr iter, IntPtr new_order);
static RowsReorderedVMDelegate RowsReorderedVMCallback; static RowsReorderedVMDelegate RowsReorderedVMCallback;

4
gtk/TextView.custom
View file

@ -35,7 +35,7 @@
Raw = gtk_text_view_new_with_buffer (buffer.Handle); Raw = gtk_text_view_new_with_buffer (buffer.Handle);
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void MoveFocusSignalDelegate (IntPtr arg0, int arg1, IntPtr gch); delegate void MoveFocusSignalDelegate (IntPtr arg0, int arg1, IntPtr gch);
static void MoveFocusSignalCallback (IntPtr arg0, int arg1, IntPtr gch) static void MoveFocusSignalCallback (IntPtr arg0, int arg1, IntPtr gch)
@ -55,7 +55,7 @@
} }
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void MoveFocusVMDelegate (IntPtr text_view, int direction); delegate void MoveFocusVMDelegate (IntPtr text_view, int direction);
static MoveFocusVMDelegate MoveFocusVMCallback; static MoveFocusVMDelegate MoveFocusVMCallback;

4
gtk/TreeModelAdapter.custom
View file

@ -77,7 +77,7 @@
return ret; return ret;
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch); delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch);
static void RowsReorderedSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch) static void RowsReorderedSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch)
@ -104,7 +104,7 @@
} }
#if false #if false
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedVMDelegate (IntPtr tree_model, IntPtr path, IntPtr iter, IntPtr new_order); delegate void RowsReorderedVMDelegate (IntPtr tree_model, IntPtr path, IntPtr iter, IntPtr new_order);
static RowsReorderedVMDelegate RowsReorderedVMCallback; static RowsReorderedVMDelegate RowsReorderedVMCallback;

4
gtk/TreeModelFilter.custom
View file

@ -81,7 +81,7 @@
return TreeIter.Zero; return TreeIter.Zero;
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch); delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch);
static void RowsReorderedSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch) static void RowsReorderedSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch)
@ -107,7 +107,7 @@
} }
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedVMDelegate (IntPtr tree_model, IntPtr path, IntPtr iter, IntPtr new_order); delegate void RowsReorderedVMDelegate (IntPtr tree_model, IntPtr path, IntPtr iter, IntPtr new_order);
static RowsReorderedVMDelegate RowsReorderedVMCallback; static RowsReorderedVMDelegate RowsReorderedVMCallback;

4
gtk/TreeModelSort.custom
View file

@ -105,7 +105,7 @@
DefaultSortFunc = sort_func; DefaultSortFunc = sort_func;
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch); delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch);
static void RowsReorderedSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch) static void RowsReorderedSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch)
@ -131,7 +131,7 @@
} }
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedVMDelegate (IntPtr tree_model, IntPtr path, IntPtr iter, IntPtr new_order); delegate void RowsReorderedVMDelegate (IntPtr tree_model, IntPtr path, IntPtr iter, IntPtr new_order);
static RowsReorderedVMDelegate RowsReorderedVMCallback; static RowsReorderedVMDelegate RowsReorderedVMCallback;

4
gtk/TreeStore.custom
View file

@ -403,7 +403,7 @@
DefaultSortFunc = sort_func; DefaultSortFunc = sort_func;
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch); delegate void RowsReorderedSignalDelegate (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch);
static void RowsReorderedSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch) static void RowsReorderedSignalCallback (IntPtr arg0, IntPtr arg1, IntPtr arg2, IntPtr arg3, IntPtr gch)
@ -429,7 +429,7 @@
} }
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void RowsReorderedVMDelegate (IntPtr tree_model, IntPtr path, IntPtr iter, IntPtr new_order); delegate void RowsReorderedVMDelegate (IntPtr tree_model, IntPtr path, IntPtr iter, IntPtr new_order);
static RowsReorderedVMDelegate RowsReorderedVMCallback; static RowsReorderedVMDelegate RowsReorderedVMCallback;

2
gtk/Widget.custom
View file

@ -191,7 +191,7 @@ struct GClosure {
IntPtr notifiers; IntPtr notifiers;
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void ClosureMarshal (IntPtr closure, IntPtr return_val, uint n_param_vals, IntPtr param_values, IntPtr invocation_hint, IntPtr marshal_data); delegate void ClosureMarshal (IntPtr closure, IntPtr return_val, uint n_param_vals, IntPtr param_values, IntPtr invocation_hint, IntPtr marshal_data);
[DllImport("libgobject-2.0-0.dll")] [DllImport("libgobject-2.0-0.dll")]

4
gtk/Window.custom
View file

@ -86,7 +86,7 @@
} }
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void MoveFocusSignalDelegate (IntPtr arg0, int arg1, IntPtr gch); delegate void MoveFocusSignalDelegate (IntPtr arg0, int arg1, IntPtr gch);
static void MoveFocusSignalCallback (IntPtr arg0, int arg1, IntPtr gch) static void MoveFocusSignalCallback (IntPtr arg0, int arg1, IntPtr gch)
@ -106,7 +106,7 @@
} }
} }
[GLib.CDeclCallback] [UnmanagedFunctionPointer (CallingConvention.Cdecl)]
delegate void MoveFocusVMDelegate (IntPtr window, int direction); delegate void MoveFocusVMDelegate (IntPtr window, int direction);
static MoveFocusVMDelegate MoveFocusVMCallback; static MoveFocusVMDelegate MoveFocusVMCallback;