900b14290c
* */*-api.xml: Regen, adding gtype="..." to many enum types * generator/EnumGen.cs (Generate): if the enum has the "gtype" property, add a GTypeAttribute pointing to an internal FooGType class whose GType property can be used to get the enum's GType. * generator/ObjectGen.cs: s/ObjectManager.RegisterType/GType.Register/ * glib/GTypeAttribute.cs: attribute for indicating a property that will return the GType of a type (particularly for enums, which can't have GType properties added to them). * glib/GType.cs: renamed from Type.cs to match the type name (public static readonly GType ...): add a few missing types. (Register): moved from ObjectManager.RegisterType (LookupGType): moved from TypeConverter.LookupType and extended to handle GTypeAttribute. Also, fix mappings for sbyte/byte/char, and return specific GTypes for Object subclasses rather than always returning GType.Object. [Fixes #74699] (LookupType): moved from ObjectWrapper.LookupType (ToString): return the type name * glib/Object.cs (RegisterGType): s/ObjectManager.Register/GType.Register/ (LookupGType): Make this protected internal so GType can access it. * glib/ObjectManager.cs (RegisterType): deprecate in favor of GType.Register. (LookupType): moved to GType * glib/TypeConverter.cs (LookupType): now a deprecated wrapper around GType.LookupGType. * glib/Value.cs: Use GType casts rather than TypeConverter * gtk/NodeStore.cs (ScanType): * gtk/ListStore.custom (ListStore): * gtk/TreeStore.custom (TreeStore): Use (GType) cast rather than TypeConverter. Remove the error check and exception, since the cast never returns GType.Invalid. (The check probably predates GLib.ManagedValue.) * gnome/PanelAppletFactory.cs (Register): Use a GType cast rather than GLib.Object.LookupGType (which is no longer accessible after an mcs bugfix) * sample/GtkDemo/DemoIconView.cs (CreateStore): use the Type[] constructor rather than the GType[] constructor, since it translates typeof(Gdk.Pixbuf) correctly now. svn path=/trunk/gtk-sharp/; revision=44038
93 lines
2.8 KiB
C#
93 lines
2.8 KiB
C#
// GLib.ObjectManager.cs - GLib ObjectManager class implementation
|
|
//
|
|
// Author: Mike Kestner <mkestner@speakeasy.net>
|
|
//
|
|
// Copyright <c> 2001-2002 Mike Kestner
|
|
// Copyright <c> 2004-2005 Novell, Inc.
|
|
//
|
|
// This program is free software; you can redistribute it and/or
|
|
// modify it under the terms of version 2 of the Lesser 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
|
|
// Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser 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.
|
|
|
|
|
|
namespace GLib {
|
|
|
|
using System;
|
|
using System.Runtime.InteropServices;
|
|
using System.Reflection;
|
|
|
|
public class ObjectManager {
|
|
|
|
static BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.CreateInstance;
|
|
|
|
public static GLib.Object CreateObject (IntPtr raw)
|
|
{
|
|
if (raw == IntPtr.Zero)
|
|
return null;
|
|
|
|
Type type = GetTypeOrParent (raw);
|
|
|
|
if (type == null)
|
|
return null;
|
|
|
|
GLib.Object obj;
|
|
try {
|
|
obj = Activator.CreateInstance (type, flags, null, new object[] {raw}, null) as GLib.Object;
|
|
} catch (MissingMethodException) {
|
|
throw new GLib.MissingIntPtrCtorException ("GLib.Object subclass " + type + " must provide a protected or public IntPtr ctor to support wrapping of native object handles.");
|
|
}
|
|
return obj;
|
|
}
|
|
|
|
[Obsolete ("Replaced by GType.Register (GType, Type)")]
|
|
public static void RegisterType (string native_name, string managed_name, string assembly)
|
|
{
|
|
RegisterType (native_name, managed_name + "," + assembly);
|
|
}
|
|
|
|
[Obsolete ("Replaced by GType.Register (GType, Type)")]
|
|
public static void RegisterType (string native_name, string mangled)
|
|
{
|
|
RegisterType (new GType (g_type_from_name (native_name)), Type.GetType (mangled));
|
|
}
|
|
|
|
[Obsolete ("Replaced by GType.Register (GType, Type)")]
|
|
public static void RegisterType (GType native_type, System.Type type)
|
|
{
|
|
GType.Register (native_type, type);
|
|
}
|
|
|
|
static Type GetTypeOrParent (IntPtr obj)
|
|
{
|
|
IntPtr typeid = gtksharp_get_type_id (obj);
|
|
|
|
Type result = GType.LookupType (typeid);
|
|
while (result == null) {
|
|
typeid = g_type_parent (typeid);
|
|
if (typeid == IntPtr.Zero)
|
|
return null;
|
|
result = GType.LookupType (typeid);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
[DllImport("glibsharpglue-2")]
|
|
static extern IntPtr gtksharp_get_type_id (IntPtr raw);
|
|
|
|
[DllImport("libgobject-2.0-0.dll")]
|
|
static extern IntPtr g_type_parent (IntPtr typ);
|
|
|
|
[DllImport("libgobject-2.0-0.dll")]
|
|
static extern IntPtr g_type_from_name (string name);
|
|
}
|
|
}
|