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

2004-05-28 Mike Kestner <mkestner@ximian.com>

Browse source 
* generator/ObjectGen.cs : adjust to ObjectManager ns change.
	* glib/ManagedValue.cs : move to GLib and internalize.
	* glib/Object.cs : adjust to ObjectManager ns change.
	* glib/ObjectManager.cs : move to GLib.
	* glib/TypeConverter.cs : move to GLib.  return ManagedValue.GType
	when we can't match a type instead of GType.None.
	* gtk/*.custom: adjust for new TypeConverter ns and behavior.

2004-05-28  Mike Kestner  <mkestner@ximian.com>

	* en/* : run updater. fix a few *Sharp copy/pastisms.

svn path=/trunk/gtk-sharp/; revision=28362
This commit is contained in:
Mike Kestner 2004-05-28 16:59:21 +00:00
parent 71d07af98a
commit 73632b2747
22 changed files with 192 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2004-05-28 Mike Kestner <mkestner@ximian.com>
* generator/ObjectGen.cs : adjust to ObjectManager ns change.
* glib/ManagedValue.cs : move to GLib and internalize.
* glib/Object.cs : adjust to ObjectManager ns change.
* glib/ObjectManager.cs : move to GLib.
* glib/TypeConverter.cs : move to GLib. return ManagedValue.GType
when we can't match a type instead of GType.None.
* gtk/*.custom: adjust for new TypeConverter ns and behavior.
2004-05-28 Mike Kestner <mkestner@ximian.com> 2004-05-28 Mike Kestner <mkestner@ximian.com>
* gtk/Makefile.am : add new custom. * gtk/Makefile.am : add new custom.

4
doc/ChangeLog
View file

@ -1,3 +1,7 @@
2004-05-28 Mike Kestner <mkestner@ximian.com>
* en/* : run updater. fix a few *Sharp copy/pastisms.
2004-05-27 Mike Kestner <mkestner@ximian.com> 2004-05-27 Mike Kestner <mkestner@ximian.com>
* en/* : run updater * en/* : run updater

2
doc/Makefile.am
View file

@ -18,7 +18,7 @@ gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
update: update:
for i in $(DIRS); do \ for i in $(DIRS); do \
$(UPDATER) ../$$i/*.dll -o ./en -f || exit 1; \ $(UPDATER) ../$$i/*.dll -o ./en || exit 1; \
done done
sources = \ sources = \

1
doc/en/.cvsignore Normal file
View file

@ -0,0 +1 @@
*Sharp

2
doc/en/GLib/Marshaller.xml
View file

@ -1,4 +1,4 @@
<Type Name="Marshaller" FullName="GLibSharp.Marshaller"> <Type Name="Marshaller" FullName="GLib.Marshaller">
<TypeSignature Language="C#" Value="public class Marshaller" Maintainer="auto" /> <TypeSignature Language="C#" Value="public class Marshaller" Maintainer="auto" />
<AssemblyInfo> <AssemblyInfo>
<AssemblyName>glib-sharp</AssemblyName> <AssemblyName>glib-sharp</AssemblyName>

4
doc/en/GtkSharp/ObjectManager.xml → doc/en/GLib/ObjectManager.xml
View file

@ -1,4 +1,4 @@
<Type Name="ObjectManager" FullName="GtkSharp.ObjectManager"> <Type Name="ObjectManager" FullName="GLib.ObjectManager">
<TypeSignature Language="C#" Value="public class ObjectManager" Maintainer="auto" /> <TypeSignature Language="C#" Value="public class ObjectManager" Maintainer="auto" />
<AssemblyInfo> <AssemblyInfo>
<AssemblyName>glib-sharp</AssemblyName> <AssemblyName>glib-sharp</AssemblyName>
@ -78,7 +78,7 @@
<Parameters /> <Parameters />
<Docs> <Docs>
<summary>To be added</summary> <summary>To be added</summary>
<returns>an object of type <see cref="T:GtkSharp.ObjectManager" /></returns> <returns>an object of type <see cref="T:GLib.ObjectManager" /></returns>
<remarks>To be added</remarks> <remarks>To be added</remarks>
</Docs> </Docs>
</Member> </Member>

8
doc/en/GLib/SignalArgs.xml
View file

@ -1,4 +1,4 @@
<Type Name="SignalArgs" FullName="GtkSharp.SignalArgs"> <Type Name="SignalArgs" FullName="GLib.SignalArgs">
<TypeSignature Language="C#" Value="public class SignalArgs : System.EventArgs" Maintainer="auto" /> <TypeSignature Language="C#" Value="public class SignalArgs : System.EventArgs" Maintainer="auto" />
<AssemblyInfo> <AssemblyInfo>
<AssemblyName>glib-sharp</AssemblyName> <AssemblyName>glib-sharp</AssemblyName>
@ -27,7 +27,7 @@
<Parameters /> <Parameters />
<Docs> <Docs>
<summary>Creates a SignalArgs object with no return value and no arguments.</summary> <summary>Creates a SignalArgs object with no return value and no arguments.</summary>
<returns>an object of type <see cref="T:GtkSharp.SignalArgs" /></returns> <returns>an object of type <see cref="T:GLib.SignalArgs" /></returns>
<remarks> <remarks>
</remarks> </remarks>
</Docs> </Docs>
@ -42,7 +42,7 @@
<Docs> <Docs>
<summary>Creates a SignalArgs object with a return value and no arguments.</summary> <summary>Creates a SignalArgs object with a return value and no arguments.</summary>
<param name="retval">an object of type <see cref="T:System.Object" /></param> <param name="retval">an object of type <see cref="T:System.Object" /></param>
<returns>an object of type <see cref="T:GtkSharp.SignalArgs" /></returns> <returns>an object of type <see cref="T:GLib.SignalArgs" /></returns>
<remarks> <remarks>
</remarks> </remarks>
</Docs> </Docs>
@ -59,7 +59,7 @@
<summary>Creates a SignalArgs object with a return value and a list of arguments.</summary> <summary>Creates a SignalArgs object with a return value and a list of arguments.</summary>
<param name="retval">an object of type <see cref="T:System.Object" /></param> <param name="retval">an object of type <see cref="T:System.Object" /></param>
<param name="args">an object of type <see cref="T:System.Object" /> []</param> <param name="args">an object of type <see cref="T:System.Object" /> []</param>
<returns>an object of type <see cref="T:GtkSharp.SignalArgs" /></returns> <returns>an object of type <see cref="T:GLib.SignalArgs" /></returns>
<remarks> <remarks>
</remarks> </remarks>
</Docs> </Docs>

4
doc/en/GLib/SignalCallback.xml
View file

@ -1,4 +1,4 @@
<Type Name="SignalCallback" FullName="GtkSharp.SignalCallback"> <Type Name="SignalCallback" FullName="GLib.SignalCallback">
<TypeSignature Language="C#" Value="public abstract class SignalCallback" Maintainer="auto" /> <TypeSignature Language="C#" Value="public abstract class SignalCallback" Maintainer="auto" />
<AssemblyInfo> <AssemblyInfo>
<AssemblyName>glib-sharp</AssemblyName> <AssemblyName>glib-sharp</AssemblyName>
@ -175,7 +175,7 @@
<param name="obj">a <see cref="T:GLib.Object" /></param> <param name="obj">a <see cref="T:GLib.Object" /></param>
<param name="eh">a <see cref="T:System.Delegate" /></param> <param name="eh">a <see cref="T:System.Delegate" /></param>
<param name="argstype">a <see cref="T:System.Type" /></param> <param name="argstype">a <see cref="T:System.Type" /></param>
<returns>a <see cref="T:GtkSharp.SignalCallback" /></returns> <returns>a <see cref="T:GLib.SignalCallback" /></returns>
<remarks>To be added</remarks> <remarks>To be added</remarks>
</Docs> </Docs>
</Member> </Member>

12
doc/en/GLib/Type.xml
View file

@ -2,7 +2,8 @@
<TypeSignature Language="C#" Value="public class Type" Maintainer="auto" /> <TypeSignature Language="C#" Value="public class Type" Maintainer="auto" />
<AssemblyInfo> <AssemblyInfo>
<AssemblyName>glib-sharp</AssemblyName> <AssemblyName>glib-sharp</AssemblyName>
<AssemblyPublicKey></AssemblyPublicKey> <AssemblyPublicKey>
</AssemblyPublicKey>
<AssemblyVersion>0.0.0.0</AssemblyVersion> <AssemblyVersion>0.0.0.0</AssemblyVersion>
<AssemblyCulture>neutral</AssemblyCulture> <AssemblyCulture>neutral</AssemblyCulture>
<Attributes /> <Attributes />
@ -10,7 +11,8 @@
<ThreadSafetyStatement>To be added</ThreadSafetyStatement> <ThreadSafetyStatement>To be added</ThreadSafetyStatement>
<Docs> <Docs>
<summary>An arbitrary data type similar to a CORBA Any which is used to get and set properties on Objects.</summary> <summary>An arbitrary data type similar to a CORBA Any which is used to get and set properties on Objects.</summary>
<remarks></remarks> <remarks>
</remarks>
</Docs> </Docs>
<Base> <Base>
<BaseTypeName>System.Object</BaseTypeName> <BaseTypeName>System.Object</BaseTypeName>
@ -29,7 +31,8 @@
<summary>Constructs a new Type from a native GType value.</summary> <summary>Constructs a new Type from a native GType value.</summary>
<param name="val">an object of type <see cref="T:System.UInt32" /></param> <param name="val">an object of type <see cref="T:System.UInt32" /></param>
<returns>an object of type <see cref="T:GLib.Type" /></returns> <returns>an object of type <see cref="T:GLib.Type" /></returns>
<remarks></remarks> <remarks>
</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="Value"> <Member MemberName="Value">
@ -41,7 +44,8 @@
<Docs> <Docs>
<summary>The native value of a Type object.</summary> <summary>The native value of a Type object.</summary>
<returns>an object of type <see cref="T:System.UInt32" /></returns> <returns>an object of type <see cref="T:System.UInt32" /></returns>
<remarks></remarks> <remarks>
</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="ToString"> <Member MemberName="ToString">

2
doc/en/GLibSharp/TypeConverter.xml → doc/en/GLib/TypeConverter.xml
View file

@ -1,4 +1,4 @@
<Type Name="TypeConverter" FullName="GLibSharp.TypeConverter"> <Type Name="TypeConverter" FullName="GLib.TypeConverter">
<TypeSignature Language="C#" Value="public class TypeConverter" Maintainer="auto" /> <TypeSignature Language="C#" Value="public class TypeConverter" Maintainer="auto" />
<AssemblyInfo> <AssemblyInfo>
<AssemblyName>glib-sharp</AssemblyName> <AssemblyName>glib-sharp</AssemblyName>

3
doc/en/GLib/WrapperClassAttribute.xml
View file

@ -2,7 +2,8 @@
<TypeSignature Language="C#" Value="public class WrapperClassAttribute : System.Attribute" Maintainer="auto" /> <TypeSignature Language="C#" Value="public class WrapperClassAttribute : System.Attribute" Maintainer="auto" />
<AssemblyInfo> <AssemblyInfo>
<AssemblyName>glib-sharp</AssemblyName> <AssemblyName>glib-sharp</AssemblyName>
<AssemblyPublicKey></AssemblyPublicKey> <AssemblyPublicKey>
</AssemblyPublicKey>
<AssemblyVersion>0.0.0.0</AssemblyVersion> <AssemblyVersion>0.0.0.0</AssemblyVersion>
<AssemblyCulture>neutral</AssemblyCulture> <AssemblyCulture>neutral</AssemblyCulture>
<Attributes /> <Attributes />

110
doc/en/GLibSharp/ManagedValue.xml
View file

@ -1,110 +0,0 @@
<Type Name="ManagedValue" FullName="GLibSharp.ManagedValue">
<TypeSignature Language="C#" Value="public class ManagedValue" Maintainer="auto" />
<AssemblyInfo>
<AssemblyName>glib-sharp</AssemblyName>
<AssemblyPublicKey>
</AssemblyPublicKey>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
<AssemblyCulture>neutral</AssemblyCulture>
<Attributes />
</AssemblyInfo>
<ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
<Docs>
<summary>Managed types boxer</summary>
<remarks>Utility class for creating GBoxed wrappers around managed types</remarks>
</Docs>
<Base>
<BaseTypeName>System.Object</BaseTypeName>
</Base>
<Interfaces />
<Attributes />
<Members>
<Member MemberName="Copy">
<MemberSignature Language="C#" Value="public static IntPtr Copy (IntPtr ptr);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.IntPtr</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="ptr" Type="System.IntPtr" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="ptr">a <see cref="T:System.IntPtr" /></param>
<returns>a <see cref="T:System.IntPtr" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="Free">
<MemberSignature Language="C#" Value="public static void Free (IntPtr ptr);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="ptr" Type="System.IntPtr" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="ptr">a <see cref="T:System.IntPtr" /></param>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="WrapObject">
<MemberSignature Language="C#" Value="public static IntPtr WrapObject (object obj);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.IntPtr</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="obj" Type="System.Object" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="obj">a <see cref="T:System.Object" /></param>
<returns>a <see cref="T:System.IntPtr" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="ObjectForWrapper">
<MemberSignature Language="C#" Value="public static object ObjectForWrapper (IntPtr ptr);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Object</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="ptr" Type="System.IntPtr" />
</Parameters>
<Docs>
<summary>To be added</summary>
<param name="ptr">a <see cref="T:System.IntPtr" /></param>
<returns>a <see cref="T:System.Object" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public ManagedValue ();" />
<MemberType>Constructor</MemberType>
<ReturnValue />
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:GLibSharp.ManagedValue" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="GType">
<MemberSignature Language="C#" Value="public static GLib.GType GType { get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>GLib.GType</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:GLib.GType" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
</Members>
</Type>

130
doc/en/Gtk/Settings.xml
View file

@ -215,5 +215,135 @@
<remarks>To be added</remarks> <remarks>To be added</remarks>
</Docs> </Docs>
</Member> </Member>
<Member MemberName="CursorBlink">
<MemberSignature Language="C#" Value="public bool CursorBlink { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.Boolean</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:System.Boolean" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="CursorBlinkTime">
<MemberSignature Language="C#" Value="public int CursorBlinkTime { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.Int32</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:System.Int32" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="DndDragThreshold">
<MemberSignature Language="C#" Value="public int DndDragThreshold { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.Int32</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:System.Int32" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="DoubleClickTime">
<MemberSignature Language="C#" Value="public int DoubleClickTime { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.Int32</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:System.Int32" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="FontName">
<MemberSignature Language="C#" Value="public string FontName { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:System.String" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="IconSizes">
<MemberSignature Language="C#" Value="public string IconSizes { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:System.String" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="KeyThemeName">
<MemberSignature Language="C#" Value="public string KeyThemeName { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:System.String" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="MenuBarAccel">
<MemberSignature Language="C#" Value="public string MenuBarAccel { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:System.String" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="SplitCursor">
<MemberSignature Language="C#" Value="public bool SplitCursor { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.Boolean</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:System.Boolean" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="ThemeName">
<MemberSignature Language="C#" Value="public string ThemeName { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added</summary>
<returns>a <see cref="T:System.String" /></returns>
<remarks>To be added</remarks>
</Docs>
</Member>
</Members> </Members>
</Type> </Type>

2
generator/ObjectGen.cs
View file

@ -319,7 +319,7 @@ namespace GtkSharp.Generation {
foreach (string key in dir_info.objects.Keys) { foreach (string key in dir_info.objects.Keys) {
if (GetExpected(key) != ((string) dir_info.objects[key] + "," + dir_info.assembly_name)) if (GetExpected(key) != ((string) dir_info.objects[key] + "," + dir_info.assembly_name))
sw.WriteLine ("\t\t\tGtkSharp.ObjectManager.RegisterType(\"" + key + "\", \"" + dir_info.objects [key] + "," + dir_info.assembly_name + "\");"); sw.WriteLine ("\t\t\tGLib.ObjectManager.RegisterType(\"" + key + "\", \"" + dir_info.objects [key] + "," + dir_info.assembly_name + "\");");
} }
sw.WriteLine ("\t\t}"); sw.WriteLine ("\t\t}");

4
glib/ManagedValue.cs
View file

@ -4,7 +4,7 @@
// //
// (c) 2002 Rachel Hestilow // (c) 2002 Rachel Hestilow
namespace GLibSharp { namespace GLib {
using System; using System;
using System.Collections; using System.Collections;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -25,7 +25,7 @@ namespace GLibSharp {
// arbitrary pointer values is fine. Still, it might be useful // arbitrary pointer values is fine. Still, it might be useful
// to use GCHandle later on. // to use GCHandle later on.
public class ManagedValue { internal class ManagedValue {
private class ValueHolder { private class ValueHolder {
public object val; public object val;
public int ref_count; public int ref_count;

4
glib/Object.cs
View file

@ -85,7 +85,7 @@ namespace GLib {
return obj; return obj;
} }
obj = GtkSharp.ObjectManager.CreateObject(o); obj = GLib.ObjectManager.CreateObject(o);
if (obj == null) if (obj == null)
return null; return null;
@ -129,7 +129,7 @@ namespace GLib {
{ {
GType parent_gtype = LookupGType (t.BaseType); GType parent_gtype = LookupGType (t.BaseType);
string name = t.FullName.Replace(".", "_"); string name = t.FullName.Replace(".", "_");
GtkSharp.ObjectManager.RegisterType (name, t.FullName, t.Assembly.GetName().Name); GLib.ObjectManager.RegisterType (name, t.FullName, t.Assembly.GetName().Name);
GType gtype = new GType (gtksharp_register_type (name, parent_gtype.Val)); GType gtype = new GType (gtksharp_register_type (name, parent_gtype.Val));
ConnectDefaultHandlers (gtype, t); ConnectDefaultHandlers (gtype, t);
g_types[t] = gtype; g_types[t] = gtype;

10
glib/ObjectManager.cs
View file

@ -1,7 +1,11 @@
// Generated File. Do not modify. // GLib.ObjectManager.cs - GLib ObjectManager class implementation
// <c> 2001-2002 Mike Kestner //
// Author: Mike Kestner <mkestner@speakeasy.net>
//
// Copyright <c> 2001-2002 Mike Kestner
// Copyright <c> 2004 Novell, Inc.
namespace GtkSharp { namespace GLib {
using System; using System;
using System.Collections; using System.Collections;

5
glib/TypeConverter.cs
View file

@ -4,11 +4,10 @@
// //
// (c) 2002 Rachel Hestilow // (c) 2002 Rachel Hestilow
namespace GLibSharp { namespace GLib {
using System; using System;
using System.Collections; using System.Collections;
using System.Reflection; using System.Reflection;
using GLib;
public class TypeConverter { public class TypeConverter {
@ -40,7 +39,7 @@ namespace GLibSharp {
if (type.IsValueType) if (type.IsValueType)
return GType.Pointer; return GType.Pointer;
return GType.None; return ManagedValue.GType;
} }
} }
} }

9
glib/Value.cs
View file

@ -10,7 +10,6 @@ namespace GLib {
using System; using System;
using System.Collections; using System.Collections;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using GLibSharp;
[StructLayout (LayoutKind.Sequential)] [StructLayout (LayoutKind.Sequential)]
public struct Value : IDisposable { public struct Value : IDisposable {
@ -175,9 +174,7 @@ namespace GLib {
pad_1 = pad_2 = 0; pad_1 = pad_2 = 0;
GType gtype = TypeConverter.LookupType (obj.GetType ()); GType gtype = TypeConverter.LookupType (obj.GetType ());
if (gtype == GType.None) { if (gtype == GType.Object) {
g_value_init (ref this, ManagedValue.GType.Val);
} else if (gtype == GType.Object) {
g_value_init (ref this, ((GLib.Object) obj).NativeType.Val); g_value_init (ref this, ((GLib.Object) obj).NativeType.Val);
} else { } else {
g_value_init (ref this, gtype.Val); g_value_init (ref this, gtype.Val);
@ -320,8 +317,8 @@ namespace GLib {
} }
set { set {
IntPtr buf; IntPtr buf;
GType type = GLibSharp.TypeConverter.LookupType (value.GetType()); GType type = TypeConverter.LookupType (value.GetType());
if (type == GType.None) if (type == ManagedValue.GType)
g_value_set_boxed (ref this, ManagedValue.WrapObject (value)); g_value_set_boxed (ref this, ManagedValue.WrapObject (value));
else if (type == GType.String) else if (type == GType.String)
g_value_set_string (ref this, (string) value); g_value_set_string (ref this, (string) value);

8
gtk/ListStore.custom
View file

@ -91,14 +91,10 @@
GLib.GType[] gtypes = new GLib.GType[types.Length]; GLib.GType[] gtypes = new GLib.GType[types.Length];
int i = 0; int i = 0;
foreach (Type type in types) { foreach (Type type in types) {
GLib.GType ctype = GLibSharp.TypeConverter.LookupType (type); GLib.GType ctype = GLib.TypeConverter.LookupType (type);
if (ctype == GLib.GType.None) { if (ctype == GLib.GType.Invalid)
gtypes[i] = GLibSharp.ManagedValue.GType;
} else if (ctype == GLib.GType.Invalid) {
throw new Exception ("Unknown type"); throw new Exception ("Unknown type");
} else {
gtypes[i] = ctype; gtypes[i] = ctype;
}
i++; i++;
} }

8
gtk/NodeStore.cs
View file

@ -305,14 +305,10 @@ namespace Gtk {
int col = tnva.Column; int col = tnva.Column;
pi = mi as PropertyInfo; pi = mi as PropertyInfo;
getters [col] = pi; getters [col] = pi;
GLib.GType ctype = GLibSharp.TypeConverter.LookupType (pi.PropertyType); GLib.GType ctype = GLib.TypeConverter.LookupType (pi.PropertyType);
if (ctype == GLib.GType.None) { if (ctype == GLib.GType.Invalid)
ctypes[col] = GLibSharp.ManagedValue.GType;
} else if (ctype == GLib.GType.Invalid) {
throw new Exception ("Unknown type"); throw new Exception ("Unknown type");
} else {
ctypes[col] = ctype; ctypes[col] = ctype;
}
break; break;
default: default:
Console.WriteLine ("Unknown custom attr: " + attr); Console.WriteLine ("Unknown custom attr: " + attr);

8
gtk/TreeStore.custom
View file

@ -138,14 +138,10 @@
GLib.GType[] gtypes = new GLib.GType[types.Length]; GLib.GType[] gtypes = new GLib.GType[types.Length];
int i = 0; int i = 0;
foreach (Type type in types) { foreach (Type type in types) {
GLib.GType ctype = GLibSharp.TypeConverter.LookupType (type); GLib.GType ctype = GLib.TypeConverter.LookupType (type);
if (ctype == GLib.GType.None) { if (ctype == GLib.GType.Invalid)
gtypes[i] = GLibSharp.ManagedValue.GType;
} else if (ctype == GLib.GType.Invalid) {
throw new Exception ("Unknown type"); throw new Exception ("Unknown type");
} else {
gtypes[i] = ctype; gtypes[i] = ctype;
}
i++; i++;
} }