diff --git a/ChangeLog b/ChangeLog index 7b8fb3a13..4a22305e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-05-28 Mike Kestner + + * 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 * gtk/Makefile.am : add new custom. diff --git a/doc/ChangeLog b/doc/ChangeLog index ea7daddf1..3e6e9dc60 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2004-05-28 Mike Kestner + + * en/* : run updater. fix a few *Sharp copy/pastisms. + 2004-05-27 Mike Kestner * en/* : run updater diff --git a/doc/Makefile.am b/doc/Makefile.am index 730e1e160..2604d419d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -18,7 +18,7 @@ gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml update: for i in $(DIRS); do \ - $(UPDATER) ../$$i/*.dll -o ./en -f || exit 1; \ + $(UPDATER) ../$$i/*.dll -o ./en || exit 1; \ done sources = \ diff --git a/doc/en/.cvsignore b/doc/en/.cvsignore new file mode 100644 index 000000000..a4c3b64f7 --- /dev/null +++ b/doc/en/.cvsignore @@ -0,0 +1 @@ +*Sharp diff --git a/doc/en/GLib/Marshaller.xml b/doc/en/GLib/Marshaller.xml index 61240fb58..a6156bc99 100644 --- a/doc/en/GLib/Marshaller.xml +++ b/doc/en/GLib/Marshaller.xml @@ -1,4 +1,4 @@ - + glib-sharp diff --git a/doc/en/GtkSharp/ObjectManager.xml b/doc/en/GLib/ObjectManager.xml similarity index 95% rename from doc/en/GtkSharp/ObjectManager.xml rename to doc/en/GLib/ObjectManager.xml index 059b8415d..9c93f8575 100644 --- a/doc/en/GtkSharp/ObjectManager.xml +++ b/doc/en/GLib/ObjectManager.xml @@ -1,4 +1,4 @@ - + glib-sharp @@ -78,7 +78,7 @@ To be added - an object of type + an object of type To be added diff --git a/doc/en/GLib/SignalArgs.xml b/doc/en/GLib/SignalArgs.xml index f5f3be10c..5984683bc 100644 --- a/doc/en/GLib/SignalArgs.xml +++ b/doc/en/GLib/SignalArgs.xml @@ -1,4 +1,4 @@ - + glib-sharp @@ -27,7 +27,7 @@ Creates a SignalArgs object with no return value and no arguments. - an object of type + an object of type @@ -42,7 +42,7 @@ Creates a SignalArgs object with a return value and no arguments. an object of type - an object of type + an object of type @@ -59,7 +59,7 @@ Creates a SignalArgs object with a return value and a list of arguments. an object of type an object of type [] - an object of type + an object of type diff --git a/doc/en/GLib/SignalCallback.xml b/doc/en/GLib/SignalCallback.xml index 05e2f057e..7753f834e 100644 --- a/doc/en/GLib/SignalCallback.xml +++ b/doc/en/GLib/SignalCallback.xml @@ -1,4 +1,4 @@ - + glib-sharp @@ -175,7 +175,7 @@ a a a - a + a To be added diff --git a/doc/en/GLib/Type.xml b/doc/en/GLib/Type.xml index ef09afed0..410b00c60 100644 --- a/doc/en/GLib/Type.xml +++ b/doc/en/GLib/Type.xml @@ -2,7 +2,8 @@ glib-sharp - + + 0.0.0.0 neutral @@ -10,7 +11,8 @@ To be added An arbitrary data type similar to a CORBA Any which is used to get and set properties on Objects. - + + System.Object @@ -29,7 +31,8 @@ Constructs a new Type from a native GType value. an object of type an object of type - + + @@ -41,7 +44,8 @@ The native value of a Type object. an object of type - + + diff --git a/doc/en/GLibSharp/TypeConverter.xml b/doc/en/GLib/TypeConverter.xml similarity index 95% rename from doc/en/GLibSharp/TypeConverter.xml rename to doc/en/GLib/TypeConverter.xml index 93f008a43..9e13db6bb 100644 --- a/doc/en/GLibSharp/TypeConverter.xml +++ b/doc/en/GLib/TypeConverter.xml @@ -1,4 +1,4 @@ - + glib-sharp diff --git a/doc/en/GLib/WrapperClassAttribute.xml b/doc/en/GLib/WrapperClassAttribute.xml index 9d0cf89ae..9b1c4f140 100644 --- a/doc/en/GLib/WrapperClassAttribute.xml +++ b/doc/en/GLib/WrapperClassAttribute.xml @@ -2,7 +2,8 @@ glib-sharp - + + 0.0.0.0 neutral diff --git a/doc/en/GLibSharp/ManagedValue.xml b/doc/en/GLibSharp/ManagedValue.xml deleted file mode 100644 index 740ed157b..000000000 --- a/doc/en/GLibSharp/ManagedValue.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - glib-sharp - - - 0.0.0.0 - neutral - - - Gtk# is thread aware, but not thread safe; See the Gtk# Thread Programming for details. - - Managed types boxer - Utility class for creating GBoxed wrappers around managed types - - - System.Object - - - - - - - Method - - System.IntPtr - - - - - - To be added - a - a - To be added - - - - - Method - - System.Void - - - - - - To be added - a - To be added - - - - - Method - - System.IntPtr - - - - - - To be added - a - a - To be added - - - - - Method - - System.Object - - - - - - To be added - a - a - To be added - - - - - Constructor - - - - To be added - a - To be added - - - - - Property - - GLib.GType - - - - To be added - a - To be added - - - - \ No newline at end of file diff --git a/doc/en/Gtk/Settings.xml b/doc/en/Gtk/Settings.xml index a6470bdea..406ebf4b0 100644 --- a/doc/en/Gtk/Settings.xml +++ b/doc/en/Gtk/Settings.xml @@ -215,5 +215,135 @@ To be added + + + Property + + System.Boolean + + + + To be added + a + To be added + + + + + Property + + System.Int32 + + + + To be added + a + To be added + + + + + Property + + System.Int32 + + + + To be added + a + To be added + + + + + Property + + System.Int32 + + + + To be added + a + To be added + + + + + Property + + System.String + + + + To be added + a + To be added + + + + + Property + + System.String + + + + To be added + a + To be added + + + + + Property + + System.String + + + + To be added + a + To be added + + + + + Property + + System.String + + + + To be added + a + To be added + + + + + Property + + System.Boolean + + + + To be added + a + To be added + + + + + Property + + System.String + + + + To be added + a + To be added + + \ No newline at end of file diff --git a/generator/ObjectGen.cs b/generator/ObjectGen.cs index a4076a833..1481a74d6 100644 --- a/generator/ObjectGen.cs +++ b/generator/ObjectGen.cs @@ -319,7 +319,7 @@ namespace GtkSharp.Generation { foreach (string key in dir_info.objects.Keys) { 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}"); diff --git a/glib/ManagedValue.cs b/glib/ManagedValue.cs index 93d95148f..7fded0ee7 100644 --- a/glib/ManagedValue.cs +++ b/glib/ManagedValue.cs @@ -4,7 +4,7 @@ // // (c) 2002 Rachel Hestilow -namespace GLibSharp { +namespace GLib { using System; using System.Collections; using System.Runtime.InteropServices; @@ -25,7 +25,7 @@ namespace GLibSharp { // arbitrary pointer values is fine. Still, it might be useful // to use GCHandle later on. - public class ManagedValue { + internal class ManagedValue { private class ValueHolder { public object val; public int ref_count; diff --git a/glib/Object.cs b/glib/Object.cs index 56c05bf8d..5b75631cd 100644 --- a/glib/Object.cs +++ b/glib/Object.cs @@ -85,7 +85,7 @@ namespace GLib { return obj; } - obj = GtkSharp.ObjectManager.CreateObject(o); + obj = GLib.ObjectManager.CreateObject(o); if (obj == null) return null; @@ -129,7 +129,7 @@ namespace GLib { { GType parent_gtype = LookupGType (t.BaseType); 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)); ConnectDefaultHandlers (gtype, t); g_types[t] = gtype; diff --git a/glib/ObjectManager.cs b/glib/ObjectManager.cs index 76dd09d73..550fd5a2d 100644 --- a/glib/ObjectManager.cs +++ b/glib/ObjectManager.cs @@ -1,7 +1,11 @@ -// Generated File. Do not modify. -// 2001-2002 Mike Kestner +// GLib.ObjectManager.cs - GLib ObjectManager class implementation +// +// Author: Mike Kestner +// +// Copyright 2001-2002 Mike Kestner +// Copyright 2004 Novell, Inc. -namespace GtkSharp { +namespace GLib { using System; using System.Collections; diff --git a/glib/TypeConverter.cs b/glib/TypeConverter.cs index 3ddbfcbd9..167390867 100644 --- a/glib/TypeConverter.cs +++ b/glib/TypeConverter.cs @@ -4,11 +4,10 @@ // // (c) 2002 Rachel Hestilow -namespace GLibSharp { +namespace GLib { using System; using System.Collections; using System.Reflection; - using GLib; public class TypeConverter { @@ -40,7 +39,7 @@ namespace GLibSharp { if (type.IsValueType) return GType.Pointer; - return GType.None; + return ManagedValue.GType; } } } diff --git a/glib/Value.cs b/glib/Value.cs index 4d6bd8dc6..3fd2f50a2 100755 --- a/glib/Value.cs +++ b/glib/Value.cs @@ -10,7 +10,6 @@ namespace GLib { using System; using System.Collections; using System.Runtime.InteropServices; - using GLibSharp; [StructLayout (LayoutKind.Sequential)] public struct Value : IDisposable { @@ -175,9 +174,7 @@ namespace GLib { pad_1 = pad_2 = 0; GType gtype = TypeConverter.LookupType (obj.GetType ()); - if (gtype == GType.None) { - g_value_init (ref this, ManagedValue.GType.Val); - } else if (gtype == GType.Object) { + if (gtype == GType.Object) { g_value_init (ref this, ((GLib.Object) obj).NativeType.Val); } else { g_value_init (ref this, gtype.Val); @@ -320,8 +317,8 @@ namespace GLib { } set { IntPtr buf; - GType type = GLibSharp.TypeConverter.LookupType (value.GetType()); - if (type == GType.None) + GType type = TypeConverter.LookupType (value.GetType()); + if (type == ManagedValue.GType) g_value_set_boxed (ref this, ManagedValue.WrapObject (value)); else if (type == GType.String) g_value_set_string (ref this, (string) value); diff --git a/gtk/ListStore.custom b/gtk/ListStore.custom index abf37cac9..eb2d8a1df 100644 --- a/gtk/ListStore.custom +++ b/gtk/ListStore.custom @@ -91,14 +91,10 @@ GLib.GType[] gtypes = new GLib.GType[types.Length]; int i = 0; foreach (Type type in types) { - GLib.GType ctype = GLibSharp.TypeConverter.LookupType (type); - if (ctype == GLib.GType.None) { - gtypes[i] = GLibSharp.ManagedValue.GType; - } else if (ctype == GLib.GType.Invalid) { + GLib.GType ctype = GLib.TypeConverter.LookupType (type); + if (ctype == GLib.GType.Invalid) throw new Exception ("Unknown type"); - } else { - gtypes[i] = ctype; - } + gtypes[i] = ctype; i++; } diff --git a/gtk/NodeStore.cs b/gtk/NodeStore.cs index c113b05d6..4ce41e255 100644 --- a/gtk/NodeStore.cs +++ b/gtk/NodeStore.cs @@ -305,14 +305,10 @@ namespace Gtk { int col = tnva.Column; pi = mi as PropertyInfo; getters [col] = pi; - GLib.GType ctype = GLibSharp.TypeConverter.LookupType (pi.PropertyType); - if (ctype == GLib.GType.None) { - ctypes[col] = GLibSharp.ManagedValue.GType; - } else if (ctype == GLib.GType.Invalid) { + GLib.GType ctype = GLib.TypeConverter.LookupType (pi.PropertyType); + if (ctype == GLib.GType.Invalid) throw new Exception ("Unknown type"); - } else { - ctypes[col] = ctype; - } + ctypes[col] = ctype; break; default: Console.WriteLine ("Unknown custom attr: " + attr); diff --git a/gtk/TreeStore.custom b/gtk/TreeStore.custom index 0cc64e43d..7e464f892 100644 --- a/gtk/TreeStore.custom +++ b/gtk/TreeStore.custom @@ -138,14 +138,10 @@ GLib.GType[] gtypes = new GLib.GType[types.Length]; int i = 0; foreach (Type type in types) { - GLib.GType ctype = GLibSharp.TypeConverter.LookupType (type); - if (ctype == GLib.GType.None) { - gtypes[i] = GLibSharp.ManagedValue.GType; - } else if (ctype == GLib.GType.Invalid) { + GLib.GType ctype = GLib.TypeConverter.LookupType (type); + if (ctype == GLib.GType.Invalid) throw new Exception ("Unknown type"); - } else { - gtypes[i] = ctype; - } + gtypes[i] = ctype; i++; }