diff --git a/ChangeLog b/ChangeLog index 92220f07f..a3d9d835d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-08-07 Mike Kestner + + * generator/ObjectGen.cs: kill GType ctor generation. + * glib/InitiallyUnowned.cs: kill obsolete GType ctor. + * glib/Object.cs: kill obsolete GType ctor. + * gtk/Gtk.metadata: kill disable_gtype_ctor rules. + * gtk/Widget.cs: kill obsolete GType ctor. + 2009-08-07 Mike Kestner * glib/Log.cs: rework the LogFunc marshaling and add SetDefaultHandler diff --git a/generator/ObjectGen.cs b/generator/ObjectGen.cs index 3dfc70069..753afc8a6 100644 --- a/generator/ObjectGen.cs +++ b/generator/ObjectGen.cs @@ -97,12 +97,6 @@ namespace GtkSharp.Generation { } } - private bool DisableGTypeCtor { - get { - return Elem.HasAttribute ("disable_gtype_ctor"); - } - } - private class DirectoryInfo { public string assembly_name; public Hashtable objects; @@ -254,10 +248,6 @@ namespace GtkSharp.Generation { if (!Elem.HasAttribute("parent")) return; - if (!DisableGTypeCtor) { - gen_info.Writer.WriteLine("\t\t[Obsolete]"); - gen_info.Writer.WriteLine("\t\tprotected " + Name + "(GLib.GType gtype) : base(gtype) {}"); - } gen_info.Writer.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}"); if (ctors.Count == 0 && !DisableVoidCtor) { gen_info.Writer.WriteLine(); diff --git a/glib/InitiallyUnowned.cs b/glib/InitiallyUnowned.cs index 784fa04ca..726e9ea80 100644 --- a/glib/InitiallyUnowned.cs +++ b/glib/InitiallyUnowned.cs @@ -31,9 +31,6 @@ namespace GLib { protected InitiallyUnowned (IntPtr raw) : base (raw) {} - [Obsolete] - protected InitiallyUnowned (GType gtype) : base (gtype) {} - public new static GLib.GType GType { get { return GType.Object; diff --git a/glib/Object.cs b/glib/Object.cs index f018cb5e4..4df05e382 100644 --- a/glib/Object.cs +++ b/glib/Object.cs @@ -350,12 +350,6 @@ namespace GLib { [DllImport("libgobject-2.0-0.dll")] static extern IntPtr g_object_new (IntPtr gtype, IntPtr dummy); - [Obsolete] - protected Object (GType gtype) - { - Raw = g_object_new (gtype.Val, IntPtr.Zero); - } - struct GParameter { public IntPtr name; public GLib.Value val; diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata index d2eab944f..c0341f29f 100644 --- a/gtk/Gtk.metadata +++ b/gtk/Gtk.metadata @@ -255,7 +255,6 @@ 1 PackEnd PackStart - 1 const-gfilename* 1 1 @@ -577,11 +576,9 @@ true true true - 1 1 1 1 - 1 1 1 PoppedUp @@ -707,7 +704,6 @@ 1 EmitToolbarReconfigured TooltipSet - 1 virtual-root out 1 @@ -782,10 +778,8 @@ 1 1 ScrollAdjustmentsSet - 1 1 [GLib.TypeInitializer (typeof (Gtk.Widget), "ClassInit")] - 1 1 1 true diff --git a/gtk/Widget.custom b/gtk/Widget.custom index b29c32ef0..9ea136f26 100644 --- a/gtk/Widget.custom +++ b/gtk/Widget.custom @@ -24,11 +24,6 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. -[Obsolete] -protected Widget (GLib.GType gtype) : base(gtype) -{ -} - public override void Destroy () { base.Destroy ();