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

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

Browse source 
* glib/Value.cs: Change the pad fields handling again as the 
	previous approach didn't work on Win32.   [Fixes #478578]

svn path=/trunk/gtk-sharp/; revision=127892
This commit is contained in:
Christian Hoff 2009-02-24 20:06:07 +00:00
parent e91ff2bdad
commit b2a4c7ee7c
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2009-02-24 Christian Hoff <christian_hoff@gmx.net>
* glib/Value.cs: Change the pad fields handling again as the
previous approach didn't work on Win32. [Fixes #478578]
2009-02-17 Christian Hoff <christian_hoff@gmx.net> 2009-02-17 Christian Hoff <christian_hoff@gmx.net>
* sample/gtk-gio/MountOperation.cs: * sample/gtk-gio/MountOperation.cs:
* gtk/Builder.custom: * gtk/Builder.custom:

35
glib/Value.cs
View file

@ -30,26 +30,38 @@ namespace GLib {
[StructLayout (LayoutKind.Sequential)] [StructLayout (LayoutKind.Sequential)]
public struct Value : IDisposable { public struct Value : IDisposable {
[StructLayout(LayoutKind.Sequential, Size=16)] [StructLayout(LayoutKind.Explicit)]
struct Padding { struct Padding {
[FieldOffset (0)] int v_int;
[FieldOffset (0)] uint v_uint;
[FieldOffset (0)] int v_long;
[FieldOffset (0)] uint v_ulong;
[FieldOffset (0)] long v_int64;
[FieldOffset (0)] ulong v_uint64;
[FieldOffset (0)] float v_float;
[FieldOffset (0)] double v_double;
[FieldOffset (0)] IntPtr v_pointer;
} }
IntPtr type; IntPtr type;
Padding padding; Padding pad1;
Padding pad2;
public static Value Empty; public static Value Empty;
public Value (GLib.GType gtype) public Value (GLib.GType gtype)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
padding = new Padding (); pad1 = new Padding ();
pad2 = new Padding ();
g_value_init (ref this, gtype.Val); g_value_init (ref this, gtype.Val);
} }
public Value (object obj) public Value (object obj)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
padding = new Padding (); pad1 = new Padding ();
pad2 = new Padding ();
GType gtype = (GType) obj.GetType (); GType gtype = (GType) obj.GetType ();
g_value_init (ref this, gtype.Val); g_value_init (ref this, gtype.Val);
@ -100,7 +112,8 @@ namespace GLib {
public Value (EnumWrapper wrap, string type_name) public Value (EnumWrapper wrap, string type_name)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
padding = new Padding (); pad1 = new Padding ();
pad2 = new Padding ();
g_value_init (ref this, GType.FromName (type_name).Val); g_value_init (ref this, GType.FromName (type_name).Val);
if (wrap.flags) if (wrap.flags)
g_value_set_flags (ref this, (uint) (int) wrap); g_value_set_flags (ref this, (uint) (int) wrap);
@ -133,7 +146,8 @@ namespace GLib {
public Value (Opaque val, string type_name) public Value (Opaque val, string type_name)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
padding = new Padding (); pad1 = new Padding ();
pad2 = new Padding ();
g_value_init (ref this, GType.FromName (type_name).Val); g_value_init (ref this, GType.FromName (type_name).Val);
g_value_set_boxed (ref this, val.Handle); g_value_set_boxed (ref this, val.Handle);
} }
@ -151,7 +165,8 @@ namespace GLib {
public Value (GLib.Object obj, string prop_name) public Value (GLib.Object obj, string prop_name)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
padding = new Padding (); pad1 = new Padding ();
pad2 = new Padding ();
InitForProperty (obj, prop_name); InitForProperty (obj, prop_name);
} }
@ -159,7 +174,8 @@ namespace GLib {
public Value (GLib.Object obj, string prop_name, EnumWrapper wrap) public Value (GLib.Object obj, string prop_name, EnumWrapper wrap)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
padding = new Padding (); pad1 = new Padding ();
pad2 = new Padding ();
InitForProperty (obj.NativeType, prop_name); InitForProperty (obj.NativeType, prop_name);
if (wrap.flags) if (wrap.flags)
g_value_set_flags (ref this, (uint) (int) wrap); g_value_set_flags (ref this, (uint) (int) wrap);
@ -171,7 +187,8 @@ namespace GLib {
public Value (IntPtr obj, string prop_name, Opaque val) public Value (IntPtr obj, string prop_name, Opaque val)
{ {
type = IntPtr.Zero; type = IntPtr.Zero;
padding = new Padding (); pad1 = new Padding ();
pad2 = new Padding ();
InitForProperty (GLib.Object.GetObject (obj), prop_name); InitForProperty (GLib.Object.GetObject (obj), prop_name);
g_value_set_boxed (ref this, val.Handle); g_value_set_boxed (ref this, val.Handle);
} }