gtk: Move all .custom files to partial classes

There are no real code changes in this commit, just a lot of file
renaming and boilerplate additions.

A few .custom files are just removed, because the corresponding class in
GTK is gone, so they were not really used anymore.

Some files need to be re-indented, but that will be done in a separate
commit, so that git can track the renamed files correctly and not be
confused by all the changes.

gtk/Accel.cs

@@ -1,4 +1,4 @@
-// Accel.custom - customizations to Gtk.Accel
+// Accel.cs - customizations to Gtk.Accel
 //
 // Authors: Mike Kestner  <mkestner@ximian.com>
 //
@@ -18,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Accel {
+
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern void gtk_accel_map_save(IntPtr file_name);
 
@@ -128,4 +135,5 @@
 				result [i] = list [i] as AccelGroup;
 			return result;
 		}
-
+	}
+}

gtk/AccelKey.cs

@@ -13,10 +13,18 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial struct AccelKey {
+
 public AccelKey (Gdk.Key key, Gdk.ModifierType mods, Gtk.AccelFlags flags)
 {
 	this.Key = key;
 	this.AccelMods = mods;
 	this._bitfield0 = 0;
 	this.AccelFlags = flags;
+}
+	}
 }

gtk/Action.cs

@@ -1,11 +1,9 @@
-// Gtk.Action.custom - Gtk Action class customizations
+// Gtk.Action.cs - Gtk Action class customizations
 //
 // Author: John Luke  <john.luke@gmail.com>
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+    using System;
+    using System.Runtime.InteropServices;
+
+    public partial class Action {
+
 	public Action (string name, string label) : this (name, label, null, null)
 	{
 	}
@@ -37,3 +42,5 @@
             	return result;
             }
         }
+    }
+}

gtk/ActionGroup.cs

@@ -1,4 +1,4 @@
-// ActionGroup.custom - Syntactic C# sugar for easily defining Actions.
+// ActionGroup.cs - Syntactic C# sugar for easily defining Actions.
 //
 // Authors:  Jeroen Zwartepoorte  <jeroen@xs4all.nl>
 //
@@ -18,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class ActionGroup {
+
 		public Action this[string name] {
 			get {
 				return GetAction (name);
@@ -84,3 +91,5 @@
 				result [i] = list [i] as Gtk.Action;
 			return result;
 		}
+	}
+}

gtk/Adjustment.cs

@@ -1,7 +1,5 @@
 //
-// Gtk.Adjustment.custom - Allow customization of values in the GtkAdjustment
+// Gtk.Adjustment.cs - Allow customization of values in the GtkAdjustment
-//
-// This code is inserted after the automatically generated code.
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of version 2 of the Lesser GNU General 
@@ -18,6 +16,13 @@
 // Boston, MA 02111-1307, USA.
 //
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Adjustment {
+
 [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 static extern IntPtr gtk_adjustment_new(double value, double lower, double upper, double step_increment, double page_increment, double page_size);
 
@@ -55,4 +60,6 @@ public void SetBounds (double lower, double upper, double step_increment, double
 	PageSize = page_size;
 
 	g_object_thaw_notify (this.Handle);
+}
+	}
 }

gtk/Bin.cs

@@ -1,11 +1,9 @@
-// Gtk.Bin.custom - Gtk Bin class customizations
+// Gtk.Bin.cs - Gtk Bin class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Bin {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_bin_get_child(IntPtr raw);
@@ -40,4 +44,5 @@
 				val.Dispose ();
 			}
 		}
-
+	}
+}

gtk/Builder.cs

@@ -1,4 +1,4 @@
-// Builder.custom - customizations to Gtk.Builder
+// Builder.cs - customizations to Gtk.Builder
 //
 // Authors: Stephane Delcroix  <stephane@delcroix.org>
 // The biggest part of this code is adapted from glade#, by
@@ -23,6 +23,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Builder {
 
 [System.Serializable]
 public class HandlerNotFoundException : SystemException
@@ -410,4 +416,5 @@ void BindFields (object target, Type type)
 	}
 	while (type != typeof(object) && type != null);
 }
-
+	}
+}

gtk/Button.cs

@@ -1,11 +1,9 @@
-// Gtk.Button.custom - Gtk Button class customizations
+// Gtk.Button.cs - Gtk Button class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Button {
 
 [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 static extern IntPtr gtk_button_new_from_stock(IntPtr stock_id);
@@ -44,4 +48,6 @@ public Button (string stock_id) : base (IntPtr.Zero)
 public Button (Widget widget) : this ()
 {
 	Add (widget);
+}
+	}
 }

gtk/Calendar.cs

@@ -1,12 +1,10 @@
-// Gtk.Calendar.Custom - Gtk Calendar class customizations
+// Gtk.Calendar.cs - Gtk Calendar class customizations
 //
 // Author:
 //	 Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 // Copyright (c) 2003 Ximian, Inc. (http://www.ximian.com)
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -21,6 +19,11 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class Calendar {
 
 public DateTime GetDate ()
 {
@@ -54,4 +57,6 @@ public DateTime Date
                 SelectMonth(month,year);
                 SelectDay(day);
         }        
+}
+	}
 }

gtk/CellLayout.cs

@@ -1,4 +1,4 @@
-//  Gtk.CellLayout.custom - Gtk CellLayout customizations
+//  Gtk.CellLayout.cs - Gtk CellLayout customizations
 //
 //  Author:  Mike Kestner  <mkestner@novell.com>
 //
@@ -18,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial interface CellLayout {
 
 		void SetAttributes (CellRenderer renderer, object[] attrs);
 
+	}
+}

gtk/CellLayoutAdapter.cs

@@ -1,4 +1,4 @@
-//  Gtk.CellLayoutAdaptor.custom - Gtk CellLayoutAdaptor customizations
+//  Gtk.CellLayoutAdaptor.cs - Gtk CellLayoutAdaptor customizations
 //
 //  Authors:  Mike Kestner  <mkestner@novell.com>
 //
@@ -18,6 +18,11 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class CellLayoutAdapter {
 
 		public void SetAttributes (CellRenderer cell, params object[] attrs)
 		{
@@ -29,3 +34,5 @@
 				AddAttribute (cell, (string) attrs [i], (int) attrs [i + 1]);
 			}
 		}
+	}
+}

gtk/CellRenderer.cs

@@ -1,5 +1,5 @@
 //
-// CellRenderer.custom - Gtk CellRenderer class customizations
+// CellRenderer.cs - Gtk CellRenderer class customizations
 //
 // Author: Todd Berman <tberman@sevenl.net>,
 //         Peter Johanson <peter@peterjohanson.com>
@@ -7,9 +7,6 @@
 // Copyright (C) 2004 Todd Berman
 // Copyright (C) 2007 Peter Johanson
 //
-// This code is inserted after the automatically generated code.
-//
-//
 // 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.
@@ -24,6 +21,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class CellRenderer {
+
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_cell_renderer_start_editing (IntPtr handle, IntPtr evnt, IntPtr widget, IntPtr path, ref Gdk.Rectangle bg_area, ref Gdk.Rectangle cell_area, int flags);
 
@@ -100,4 +104,5 @@
 			cell_area = Gdk.Rectangle.New (native_cell_area);
 			Marshal.FreeHGlobal (native_cell_area);
 		}
-
+	}
+}

gtk/CellView.cs

@@ -1,4 +1,4 @@
-//  Gtk.EntryCompletion.custom - Gtk EntryCompletion customizations
+//  Gtk.CellView.cs - Gtk CellView customizations
 //
 //  Authors:  Todd Berman  <tberman@off.net>
 //  	      Mike Kestner  <mkestner@novell.com>
@@ -20,6 +20,11 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class CellView {
 
 		public void SetAttributes (CellRenderer cell, params object[] attrs)
 		{
@@ -31,3 +36,5 @@
 				AddAttribute (cell, (string) attrs [i], (int) attrs [i + 1]);
 			}
 		}
+	}
+}

gtk/CheckMenuItem.cs

@@ -1,11 +1,9 @@
-// Gtk.CheckMenuItem.custom - Gtk CheckMenuItem class customizations
+// Gtk.CheckMenuItem.cs - Gtk CheckMenuItem class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class CheckMenuItem {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_check_menu_item_new_with_mnemonic (IntPtr label);
@@ -44,4 +48,5 @@
 		public void Toggle() {
 			Active = !Active;
 		}
-
+	}
+}

gtk/Clipboard.cs

@@ -1,4 +1,4 @@
-// Gtk.Clipboard.custom - Customizations for the Clipboard class
+// Gtk.Clipboard.cs - Customizations for the Clipboard class
 //
 // Authors:  Mike Kestner  <mkestner@novell.com>
 //
@@ -18,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Clipboard {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern bool gtk_clipboard_set_with_data(IntPtr raw, TargetEntry[] targets, int n_targets, GtkSharp.ClipboardGetFuncNative get_func, GtkSharp.ClipboardClearFuncNative clear_func, IntPtr data);
@@ -118,4 +124,5 @@
 				rt_rcvd_marshaler = new RichTextReceivedFuncNative (RichTextReceivedCallback);
 			gtk_clipboard_request_rich_text (Handle, buffer == null ? IntPtr.Zero : buffer.Handle, rt_rcvd_marshaler, (IntPtr) GCHandle.Alloc (cb));
 		}
-
+	}
+}

gtk/ColorSelection.cs

@@ -1,4 +1,4 @@
-// Gtk.ColorSelection.custom - customizations and corrections for ColorSelection
+// Gtk.ColorSelection.cs - customizations and corrections for ColorSelection
 // Author: Lee Mallabone <gnome@fonicmonkey.net>
 // Author: Justin Malcolm
 //
@@ -16,6 +16,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class ColorSelection {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_color_selection_palette_to_string(Gdk.Color[] colors, int n_colors);
@@ -73,4 +79,5 @@
 				gtk_color_selection_set_previous_color(Handle, ref value);
 			}
 		}
-
+	}
+}

gtk/ColorSelectionDialog.cs

@@ -1,12 +1,9 @@
-// Gtk.ColorSelectionDialog.custom - Gtk ColorSelectionDialog class customizations
+// Gtk.ColorSelectionDialog.cs - Gtk ColorSelectionDialog class customizations
 //
 // Author: Duncan Mak  (duncan@ximian.com)
 //
 // Copyright (C) 2002 Ximian, Inc. 
 //
-// This code is inserted after the automatically generated code.
-//
-//
 // 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.
@@ -21,7 +18,11 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
 
+	using System;
+
+	public partial class ColorSelectionDialog {
 [Obsolete ("Do not use this class. It will cause your app to crash in mysterious ways.")]
 public class ColorSelectionButton : Gtk.Button {
 	private ColorSelectionDialog color_sel;
@@ -34,4 +35,5 @@ public class ColorSelectionButton : Gtk.Button {
 		color_sel = cs;
 	}
 }
-
+	}
+}

gtk/ComboBox.cs

@@ -1,4 +1,4 @@
-//  Gtk.ComboBox.custom - Gtk ComboBox customizations
+//  Gtk.ComboBox.cs - Gtk ComboBox customizations
 //
 //  Authors:  Todd Berman  <tberman@off.net>
 //  	      Mike Kestner  <mkestner@novell.com>
@@ -20,6 +20,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class ComboBox {
+
 		public ComboBox (string[] entries) : this (new ListStore (typeof (string)))
 		{
 			ListStore store = Model as ListStore;
@@ -60,3 +66,5 @@
 				AddAttribute (cell, (string) attrs [i], (int) attrs [i + 1]);
 			}
 		}
+	}
+}

gtk/Container.cs

@@ -1,4 +1,4 @@
-// Container.custom - customizations to Gtk.Container
+// Container.cs - customizations to Gtk.Container
 //
 // Authors: Mike Kestner  <mkestner@ximian.com>
 //
@@ -18,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Collections;
+	using System.Runtime.InteropServices;
+
+	public partial class Container {
 
 [DllImport("gtksharpglue-3")]
 static extern void gtksharp_container_child_get_property (IntPtr container, IntPtr child, IntPtr property, ref GLib.Value value);
@@ -235,4 +242,6 @@ public virtual ContainerChild this [Widget w] {
 	get {
 		return new ContainerChild (this, w);
 	}
+}
+	}
 }

gtk/Dialog.cs

@@ -1,14 +1,11 @@
 //
-// Gtk.Dialog.custom - Gtk Dialog class customizations
+// Gtk.Dialog.cs - Gtk Dialog class customizations
 //
 // Author: Duncan Mak  (duncan@ximian.com)
 //	   Mike Kestner (mkestner@speakeasy.net)
 //
 // Copyright (C) 2002 Ximian, Inc. and Mike Kestner 
 //
-// This code is inserted after the automatically generated code.
-//
-//
 // 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.
@@ -23,7 +20,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
 
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Dialog {
 [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 static extern IntPtr gtk_dialog_new_with_buttons (IntPtr title, IntPtr i, int flags, IntPtr dummy);
 public Dialog (string title, Gtk.Window parent, Gtk.DialogFlags flags, params object[] button_data) : base(IntPtr.Zero)
@@ -68,4 +70,6 @@ public void Respond (ResponseType response)
 public int SetAlternativeButtonOrderFromArray (int n_params)
 {
 	return -1;
+}
+	}
 }

gtk/Drag.cs

@@ -1,9 +1,7 @@
-// Drag.custom - Gtk.Drag class customizations
+// Drag.cs - Gtk.Drag class customizations
 //
 // Copyright (c) 2005 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -18,6 +16,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Drag {
+
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern void gtk_drag_set_icon_default(IntPtr context);
 
@@ -32,4 +37,5 @@
 				gtk_drag_set_icon_default(value == null ? IntPtr.Zero : value.Handle);
 			}
 		}
-
+	}
+}

gtk/Entry.cs

@@ -1,8 +1,5 @@
 //
-// Gtk.Entry.custom - Allow customization of values in the GtkEntry
+// Gtk.Entry.cs - Allow customization of values in the GtkEntry
-//
-// This code is inserted after the automatically generated code.
-//
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of version 2 of the Lesser GNU General 
@@ -18,7 +15,11 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
 
+	using System;
+
+	public partial class Entry {
 public int InsertText (string new_text)
 {
 	int position = 0;
@@ -37,4 +38,6 @@ public Entry(string initialText): this()
 public bool Editable {
 	get { return IsEditable; }
 	set { IsEditable = value; }
+}
+	}
 }

gtk/EntryCompletion.cs

@@ -1,4 +1,4 @@
-//  Gtk.CellView.custom - Gtk CellView customizations
+//  Gtk.EntryCompletion.cs - Gtk EntryCompletion customizations
 //
 //  Authors:  Todd Berman  <tberman@off.net>
 //  	      Mike Kestner  <mkestner@novell.com>
@@ -20,6 +20,11 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class EntryCompletion {
 
 		public void SetAttributes (CellRenderer cell, params object[] attrs)
 		{
@@ -31,3 +36,5 @@
 				AddAttribute (cell, (string) attrs [i], (int) attrs [i + 1]);
 			}
 		}
+	}
+}

gtk/FileChooserDialog.cs

@@ -1,4 +1,4 @@
-//  Gtk.FileChooserDialog.custom - Gtk FileChooserDialog customizations
+//  Gtk.FileChooserDialog.cs - Gtk FileChooserDialog customizations
 //
 //  Authors:  Todd Berman  <tberman@off.net>
 //            Jeroen Zwartepoorte  <jeroen@xs4all.nl>
@@ -21,6 +21,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class FileChooserDialog {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_file_chooser_dialog_new(IntPtr title, IntPtr parent, int action, IntPtr nil);
@@ -65,4 +71,5 @@
 			for (int i = 0; i < button_data.Length - 1; i += 2)
 				AddButton ((string) button_data [i], (int) button_data [i + 1]);
 		}
-
+	}
+}

gtk/Frame.cs

@@ -0,0 +1,34 @@
+//
+// Gtk.Frame.cs - Gtk Frame class customizations
+//
+// Author: Radek Doulik  (rodo@ximian.com)
+//
+// Copyright (C) 2002 Ximian, Inc. 
+//
+// This code is inserted after the automatically generated code.
+//
+//
+// 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 Gtk {
+
+	using System;
+
+	public partial class Frame {
+
+		public Frame() : this (null) {}
+
+	}
+}

gtk/Frame.custom

@@ -1,25 +0,0 @@
-		//
-		// Gtk.ScrolledWindow.custom - Gtk ScrolledWindow class customizations
-		//
-		// Author: Radek Doulik  (rodo@ximian.com)
-		//
-		// Copyright (C) 2002 Ximian, Inc. 
-		//
-		// This code is inserted after the automatically generated code.
-		//
-//
-// 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.
-
-		public Frame() : this (null) {}

gtk/HBox.cs

@@ -13,5 +13,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class HBox {
 
 public HBox () : this (false, 0) {}
+
+	}
+}

gtk/HScale.cs

@@ -1,11 +1,9 @@
-// Gtk.HScale.custom - Gtk HScale class customizations
+// Gtk.HScale.cs - Gtk HScale class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class HScale {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_hscale_new_with_range (double min, double max, double step);
@@ -39,4 +43,5 @@
 
 			Raw = gtk_hscale_new_with_range (min, max, step);
 		}
-
+	}
+}

gtk/IconFactory.cs

@@ -13,6 +13,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class IconFactory {
+
                 [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
                 extern static void gtk_icon_size_lookup (IconSize size, out int width, out int height);
 
@@ -22,4 +29,5 @@
                 {
                     gtk_icon_size_lookup (size, out width, out height);
                 }
-
+	}
+}

gtk/IconSet.cs

@@ -13,6 +13,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+    using System;
+    using System.Runtime.InteropServices;
+
+    public partial class IconSet {
+
                 [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
                 unsafe static extern void gtk_icon_set_get_sizes (
                         IntPtr raw, out int *pointer_to_enum, out int n_sizes);
@@ -41,3 +48,5 @@
                             return retval;
                         }
                 }
+    }
+}

gtk/IconTheme.cs

@@ -1,4 +1,4 @@
-// IconTheme.custom - customizations to Gtk.IconTheme
+// IconTheme.cs - customizations to Gtk.IconTheme
 //
 // Authors: Mike Kestner  <mkestner@ximian.com>
 //	    Jeroen Zwartepoorte  <jeroen@xs4all.nl>
@@ -20,6 +20,13 @@
 // Boston, MA 02111-1307, USA.
 
 
+namespace Gtk {
+
+	using System;
+	using System.Collections;
+	using System.Runtime.InteropServices;
+
+	public partial class IconTheme {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_icon_theme_list_icons (IntPtr raw, IntPtr context);
@@ -134,4 +141,5 @@
 			GLib.Marshaller.Free (raw_ret);
 			return (int[]) result.ToArray (typeof (int));
 		}
-
+	}
+}

gtk/IconView.cs

@@ -1,4 +1,4 @@
-// IconView.custom - customizations to Gtk.IconView
+// IconView.cs - customizations to Gtk.IconView
 //
 // Authors: Mike Kestner  <mkestner@ximian.com>
 //
@@ -18,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class IconView {
+
 		public void SetAttributes (CellRenderer cell, params object[] attrs)
 		{
 			if (attrs.Length % 2 != 0)
@@ -41,4 +48,5 @@
 		{
 			gtk_icon_view_scroll_to_path(Handle, path == null ? IntPtr.Zero : path.Handle, true, row_align, col_align);
 		}
-
+	}
+}

gtk/Image.cs

@@ -1,4 +1,4 @@
-// Image.custom - Customizations to Gtk.Image
+// Image.cs - Customizations to Gtk.Image
 //
 // Authors: Mike Kestner  <mkestner@novell.com>
 // Authors: Stephane Delcroix  <sdelcroix@novell.com>
@@ -19,6 +19,14 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Collections;
+	using System.Runtime.InteropServices;
+
+	public partial class Image {
+
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_image_new_from_icon_set(IntPtr icon_set, int size);
 
@@ -114,5 +122,5 @@
 				gtk_image_set_from_pixbuf(Handle, value == null ? IntPtr.Zero : value.Handle);
 			}
 		}
-
+	}
-
+}

gtk/ImageMenuItem.cs

@@ -1,11 +1,9 @@
-// Gtk.ImageMenuItem.custom - Gtk ImageMenuItem class customizations
+// Gtk.ImageMenuItem.cs - Gtk ImageMenuItem class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class ImageMenuItem {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_image_menu_item_new_with_mnemonic (IntPtr label);
@@ -40,4 +44,5 @@
 			Raw = gtk_image_menu_item_new_with_mnemonic (native);
 			GLib.Marshaller.Free (native);
 		}
-
+	}
+}

gtk/Init.cs

@@ -1,11 +1,9 @@
-// Gtk.Init.custom - Gtk Init class customizations
+// Gtk.Init.cs - Gtk Init class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,9 +18,16 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class Init {
 
 		public static bool Check (ref string[] argv)
 		{
 			return Application.InitCheck (Environment.CommandLine, ref argv);
 		}
 
+	}
+}

gtk/ItemFactory.custom

@@ -1,43 +0,0 @@
-// Gtk.ItemFactory.custom - Gtk ItemFactory class customizations
-//
-// Author: Mike Kestner <mkestner@ximian.com> 
-//
-// Copyright (C) 2004 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// 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.
-
-		
-		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
-		static extern IntPtr gtk_item_factory_new(IntPtr container_type, IntPtr path, IntPtr accel_group);
-
-		public ItemFactory (GLib.GType container_type, string path, Gtk.AccelGroup accel_group) : base (IntPtr.Zero)
-		{
-			if (GetType () != typeof (ItemFactory)) {
-				CreateNativeObject (new string [0], new GLib.Value [0]);
-				Construct (container_type, path, accel_group);
-				return;
-			}
-			IntPtr native = GLib.Marshaller.StringToPtrGStrdup (path);
-			Raw = gtk_item_factory_new(container_type.Val, native, (accel_group != null) ? accel_group.Handle : IntPtr.Zero);
-			GLib.Marshaller.Free (native);
-		}
-
-		[Obsolete ("Replaced by TranslateFunc property.")]
-		public void SetTranslateFunc (TranslateFunc func, IntPtr data, DestroyNotify notify) 
-		{
-			TranslateFunc = func;
-		}

gtk/Label.cs

@@ -1,7 +1,5 @@
 //
-// Gtk.Label.custom
+// Gtk.Label.cs
-//
-// This code is inserted after the automatically generated code.
 //
 //  Author: John Luke  <jluke@cfl.rr.com>
 //
@@ -20,5 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class Label {
 
 		public Label () : this (null) {}
+
+	}
+}

gtk/ListStore.cs

@@ -1,11 +1,9 @@
-// Gtk.ListStore.Custom - Gtk ListStore class customizations
+// Gtk.ListStore.cs - Gtk ListStore class customizations
 //
 // Author: Kristian Rietveld <kris@gtk.org>
 //
 // (c) 2002 Kristian Rietveld
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Collections;
+	using System.Runtime.InteropServices;
+
+	public partial class ListStore {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent);
@@ -287,4 +292,5 @@
 				RemoveSignalHandler ("rows_reordered", value);
 			}
 		}
-
+	}
+}

gtk/Makefile.am

@@ -11,117 +11,112 @@ references = $(top_builddir)/glib/glib-sharp.dll $(top_builddir)/cairo/cairo-sha
 glue_includes = gtk/gtk.h
 
 sources = 				\
+	Accel.cs			\
+	AccelKey.cs			\
+	Action.cs			\
 	ActionEntry.cs			\
+	ActionGroup.cs		\
+	Adjustment.cs			\
 	Application.cs			\
+	Bin.cs				\
 	BindingAttribute.cs		\
+	Builder.cs			\
+	Button.cs			\
+	Calendar.cs			\
 	CellAreaBox.cs			\
+	CellLayout.cs			\
+	CellLayoutAdapter.cs		\
+	CellRenderer.cs		\
+	CellView.cs			\
+	CheckMenuItem.cs		\
 	ChildPropertyAttribute.cs	\
+	Clipboard.cs			\
+	ColorSelection.cs		\
+	ColorSelectionDialog.cs	\
+	ComboBox.cs			\
 	ComboBoxText.cs			\
+	Container.cs			\
+	Dialog.cs			\
+	Drag.cs			\
+	Entry.cs			\
+	EntryCompletion.cs		\
+	FileChooserDialog.cs		\
+	Frame.cs			\
 	Global.cs			\
+	HBox.cs			\
+	HScale.cs			\
+	IconFactory.cs		\
+	IconSet.cs			\
+	IconTheme.cs			\
+	IconView.cs			\
+	Image.cs			\
+	ImageMenuItem.cs		\
+	Init.cs			\
 	ITreeNode.cs			\
 	Key.cs				\
+	Label.cs			\
+	ListStore.cs			\
+	Menu.cs			\
+	MenuItem.cs			\
+	MessageDialog.cs		\
 	NodeCellDataFunc.cs		\
 	NodeSelection.cs		\
 	NodeStore.cs			\
 	NodeView.cs			\
+	Notebook.cs			\
+	PaperSize.cs			\
+	Plug.cs			\
+	Printer.cs			\
 	RadioActionEntry.cs		\
+	RadioButton.cs		\
+	RadioMenuItem.cs		\
+	RadioToolButton.cs		\
+	RecentManager.cs		\
 	RowsReorderedHandler.cs		\
+	ScrolledWindow.cs		\
+	SelectionData.cs		\
+	Settings.cs			\
+	SpinButton.cs			\
+	StatusIcon.cs			\
+	Stock.cs			\
+	StockItem.cs			\
 	StockManager.cs			\
+	Style.cs			\
 	StyleContext.cs			\
+	Table.cs			\
+	Target.cs			\
+	TargetEntry.cs		\
+	TargetList.cs			\
+	TextAttributes.cs		\
+	TextBuffer.cs			\
+	TextChildAnchor.cs		\
+	TextIter.cs			\
+	TextMark.cs			\
+	TextTag.cs			\
+	TextView.cs			\
 	ThreadNotify.cs			\
 	ToggleActionEntry.cs		\
 	TreeEnumerator.cs		\
+	TreeIter.cs			\
 	TreeMenu.cs			\
-	TreeNodeAttribute.cs		\
+	TreeModel.cs			\
+	TreeModelAdapter.cs		\
+	TreeModelFilter.cs		\
+	TreeModelSort.cs		\
 	TreeNode.cs			\
-	TreeNodeValueAttribute.cs
+	TreeNodeAttribute.cs		\
-
+	TreeNodeValueAttribute.cs	\
-customs = 				\
+	TreePath.cs			\
-	Accel.custom			\
+	TreeSelection.cs		\
-	AccelKey.custom			\
+	TreeStore.cs			\
-	Action.custom			\
+	TreeView.cs			\
-	ActionGroup.custom		\
+	TreeViewColumn.cs		\
-	Adjustment.custom		\
+	UIManager.cs			\
-	Bin.custom			\
+	VBox.cs			\
-	Builder.custom			\
+	Viewport.cs			\
-	Button.custom			\
+	VScale.cs			\
-	Calendar.custom			\
+	Widget.cs			\
-	CellRenderer.custom		\
+	Window.cs
-	CellLayout.custom		\
-	CellLayoutAdapter.custom	\
-	CellView.custom			\
-	CheckMenuItem.custom		\
-	Clipboard.custom		\
-	ColorSelection.custom		\
-	ColorSelectionDialog.custom	\
-	ComboBox.custom			\
-	Container.custom		\
-	Dialog.custom			\
-	Drag.custom			\
-	Entry.custom			\
-	EntryCompletion.custom		\
-	FileChooserDialog.custom	\
-	Frame.custom			\
-	HBox.custom			\
-	HScale.custom			\
-	IconFactory.custom		\
-	IconSet.custom			\
-	IconTheme.custom		\
-	IconView.custom			\
-	Image.custom			\
-	ImageMenuItem.custom		\
-	Init.custom			\
-	ItemFactory.custom		\
-	Label.custom			\
-	ListStore.custom		\
-	MessageDialog.custom		\
-	Menu.custom			\
-	MenuItem.custom			\
-	Notebook.custom			\
-	PaperSize.custom		\
-	Plug.custom			\
-	Printer.custom			\
-	RadioButton.custom		\
-	RadioMenuItem.custom		\
-	RadioToolButton.custom		\
-	RecentManager.custom		\
-	ScrolledWindow.custom		\
-	SelectionData.custom		\
-	Settings.custom			\
-	SpinButton.custom		\
-	StatusIcon.custom		\
-	Stock.custom			\
-	StockItem.custom		\
-	Style.custom			\
-	Table.custom			\
-	Target.custom			\
-	TargetEntry.custom		\
-	TargetList.custom		\
-	TargetPair.custom		\
-	TextAttributes.custom		\
-	TextBuffer.custom		\
-	TextChildAnchor.custom		\
-	TextIter.custom			\
-	TextMark.custom			\
-	TextTag.custom			\
-	TextView.custom			\
-	TooltipsData.custom		\
-	TreeIter.custom			\
-	TreeModel.custom		\
-	TreeModelAdapter.custom		\
-	TreeModelFilter.custom		\
-	TreeModelSort.custom		\
-	TreePath.custom			\
-	TreeSelection.custom		\
-	TreeStore.custom		\
-	TreeViewColumn.custom		\
-	TreeView.custom			\
-	UIManager.custom		\
-	VBox.custom			\
-	VScale.custom			\
-	Viewport.custom			\
-	Widget.custom			\
-	Window.custom
 
 add_dist = gtk-sharp-3.0.pc.in
 

gtk/Menu.cs

@@ -1,11 +1,9 @@
-// Gtk.Menu.custom - Gtk Menu class customizations
+// Gtk.Menu.cs - Gtk Menu class customizations
 //
 // Author: John Luke <john.luke@gmail.com> 
 //
 // Copyright (C) 2004 John Luke
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Menu {
+
 	[Obsolete("Replaced by overload without IntPtr argument")]
 	public void Popup (Gtk.Widget parent_menu_shell, Gtk.Widget parent_menu_item, Gtk.MenuPositionFunc func, IntPtr data, uint button, uint activate_time) {
 		Popup (parent_menu_shell, parent_menu_item, func, button, activate_time);
@@ -49,4 +54,5 @@
 	{
 		gtk_menu_set_active (Handle, index_);
 	}
-
+	}
+}

gtk/MenuItem.cs

@@ -1,11 +1,9 @@
-// Gtk.MenuItem.custom - Gtk MenuItem class customizations
+// Gtk.MenuItem.cs - Gtk MenuItem class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+		
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class MenuItem {
 				
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_menu_item_new_with_mnemonic (IntPtr label);
@@ -40,3 +44,5 @@
 			Raw = gtk_menu_item_new_with_mnemonic (native);
 			GLib.Marshaller.Free (native);
 		}
+	}
+}

gtk/MessageDialog.cs

@@ -13,6 +13,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class MessageDialog {
+
 [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 static extern IntPtr gtk_message_dialog_new (IntPtr parent_window, DialogFlags flags, MessageType type, ButtonsType bt, IntPtr msg, IntPtr args);
 
@@ -37,3 +44,6 @@ public MessageDialog (Gtk.Window parent_window, DialogFlags flags, MessageType t
 }
 
 public MessageDialog (Gtk.Window parent_window, DialogFlags flags, MessageType type, ButtonsType bt, string format, params object[] args) : this (parent_window, flags, type, bt, true, format, args) {}
+
+	}
+}

gtk/Notebook.cs

@@ -1,4 +1,4 @@
-// Notebook.custom - customization for Gtk.Notebook
+// Notebook.cs - customization for Gtk.Notebook
 //
 // Authors: Xavier Amado (xavier@blackbloodstudios.com)
 //          Mike Kestner (mkestner@ximian.com)
@@ -19,6 +19,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Notebook {
 
 public Widget CurrentPageWidget {
         get {
@@ -32,4 +38,6 @@ static extern int gtk_notebook_page_num (IntPtr handle, IntPtr child);
 public int PageNum (Widget child)
 {
 	return gtk_notebook_page_num (Handle, child.Handle);
+}
+	}
 }

gtk/PaperSize.cs

@@ -1,6 +1,4 @@
-// Gtk.PaperSize.custom - Allow customization of values in the GtkPaperSize
+// Gtk.PaperSize.cs - Allow customization of values in the GtkPaperSize
-//
-// This code is inserted after the automatically generated code.
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of version 2 of the Lesser GNU General 
@@ -17,6 +15,12 @@
 // Boston, MA 02111-1307, USA.
 //
 
+namespace Gtk {
+
+	using System;
+
+	public partial class PaperSize {
+
 		static PaperSize letter;
 		public static PaperSize Letter {
 			get {
@@ -79,4 +83,5 @@
 				return b5;
 			}
 		}
-
+	}
+}

gtk/Plug.cs

@@ -1,11 +1,9 @@
-// Gtk.Plug.custom - Gtk Plug class customizations
+// Gtk.Plug.cs - Gtk Plug class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -21,6 +19,13 @@
 // Boston, MA 02111-1307, USA.
 
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Plug {
+
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_plug_new(UIntPtr socket_id);
 
@@ -46,4 +51,5 @@
 			}
 			Raw = gtk_plug_new_for_display (display.Handle, new UIntPtr (socket_id));
 		}
-
+	}
+}

gtk/Printer.cs

@@ -1,4 +1,4 @@
-// Printer.custom - customizations to Gtk.Printer
+// Printer.cs - customizations to Gtk.Printer
 //
 // Authors: Mike Kestner  <mkestner@ximian.com>
 //
@@ -18,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Printer {
+
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern void gtk_enumerate_printers (GtkSharp.PrinterFuncNative func, IntPtr func_data, GLib.DestroyNotify destroy, bool wait);
 
@@ -37,4 +44,5 @@
 			}
 			gtk_enumerate_printers (func_wrapper.NativeDelegate, func_data, destroy, wait);
 		}
-
+	}
+}

gtk/RadioButton.cs

@@ -1,5 +1,5 @@
 //
-//  RadioButton.custom
+//  RadioButton.cs
 //
 //	Author:  John Luke  <jluke@cfl.rr.com>
 //
@@ -18,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class RadioButton {
 
 	[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 	static extern IntPtr gtk_radio_button_new_with_mnemonic (IntPtr group, IntPtr label);
@@ -29,3 +35,5 @@
 		Raw = gtk_radio_button_new_with_mnemonic (IntPtr.Zero, native);
 		GLib.Marshaller.Free (native);
 	}
+	}
+}

gtk/RadioMenuItem.cs

@@ -1,4 +1,4 @@
-//  Gtk.RadioMenuItem.custom - Gtk RadioMenuItem customizations
+//  Gtk.RadioMenuItem.cs - Gtk RadioMenuItem customizations
 //
 //  Authors:  John Luke  <jluke@cfl.rr.com>
 //            Mike Kestner <mkestner@ximian.com>
@@ -19,6 +19,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class RadioMenuItem {
 
 		public RadioMenuItem (string label) : base (IntPtr.Zero)
 		{
@@ -57,4 +63,5 @@
 			Raw = gtk_radio_menu_item_new_with_mnemonic(group == null ? IntPtr.Zero : group.Handle, native_label);
 			GLib.Marshaller.Free (native_label);
 		}
-
+	}
+}

gtk/RadioToolButton.cs

@@ -1,12 +1,9 @@
-// Gtk.RadioToolButton.custom - Gtk RadioToolButton class customizations
+// Gtk.RadioToolButton.cs - Gtk RadioToolButton class customizations
 //
 // Author: Mike Kestner <mkestner@novell.com> 
 //
 // Copyright (c) 2006 Novell, Inc. 
 //
-// This code is inserted after the automatically generated code.
-//
-//
 // 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.
@@ -21,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class RadioToolButton {
+
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_radio_tool_button_new (IntPtr group);
 
@@ -51,4 +55,5 @@
 			Raw = gtk_radio_tool_button_new_from_stock(group == null ? IntPtr.Zero : group.Handle, stock_id_as_native);
 			GLib.Marshaller.Free (stock_id_as_native);
 		}
-
+	}
+}

gtk/RecentManager.cs

@@ -1,4 +1,4 @@
-// RecentManager.custom - customizations to Gtk.RecentManager
+// RecentManager.cs - customizations to Gtk.RecentManager
 //
 // Authors: Mike Kestner  <mkestner@novell.com>
 //
@@ -18,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class RecentManager {
+
 		[Obsolete("Replaced by RecentItems property")]
 		public GLib.List Items { 
 			get {
@@ -26,4 +32,5 @@
 				return ret;
 			}
 		}
-
+	}
+}

gtk/ScrolledWindow.cs

@@ -1,12 +1,10 @@
-		//
+//
-		// Gtk.ScrolledWindow.custom - Gtk ScrolledWindow class customizations
+// Gtk.ScrolledWindow.cs - Gtk ScrolledWindow class customizations
-		//
+//
-		// Author: Radek Doulik  (rodo@ximian.com)
+// Author: Radek Doulik  (rodo@ximian.com)
-		//
+//
-		// Copyright (C) 2002 Ximian, Inc. 
+// Copyright (C) 2002 Ximian, Inc. 
-		//
+//
-		// This code is inserted after the automatically generated code.
-		//
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of version 2 of the Lesser GNU General 
@@ -22,7 +20,14 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+		
+	using System;
+		
+	public partial class ScrolledWindow {
 			
 		public ScrolledWindow () : this (null, null) {
 			SetPolicy (PolicyType.Automatic, PolicyType.Automatic);
 		}
+	}
+}

gtk/SelectionData.cs

@@ -1,4 +1,4 @@
-// SelectionData.custom - customizations for Gtk.SelectionData
+// SelectionData.cs - customizations for Gtk.SelectionData
 //
 // Authors:  Mike Kestner  <mkestner@ximian.com>
 //
@@ -18,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class SelectionData {
+
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		private static extern IntPtr gtk_selection_data_get_text (IntPtr selection_data);
 
@@ -76,3 +83,5 @@
 					return new Gdk.Atom [0];
 			}
 		}
+	}
+}

gtk/Settings.cs

@@ -1,11 +1,9 @@
-// Gtk.Settings.custom - Gtk Settings class customizations
+// Gtk.Settings.cs - Gtk Settings class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,11 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+		
+	using System;
+
+	public partial class Settings {
 		
 		[Obsolete ("Removed from C API, returns IntPtr.Zero")]
 		public IntPtr ColorHash {
@@ -27,3 +30,5 @@
 				return IntPtr.Zero;
 			}
 		}
+	}
+}

gtk/SpinButton.cs

@@ -1,11 +1,9 @@
-// Gtk.SpinButton.custom - Gtk SpinButton class customizations
+// Gtk.SpinButton.cs - Gtk SpinButton class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -21,6 +19,13 @@
 // Boston, MA 02111-1307, USA.
 
 
+namespace Gtk {
+		
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class SpinButton {
+				
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_spin_button_new_with_range (double min, double max, double step);
 
@@ -39,4 +44,5 @@
 
 			Raw = gtk_spin_button_new_with_range (min, max, step);
 		}
-
+	}
+}

gtk/StatusIcon.cs

@@ -1,4 +1,4 @@
-// StatusIcon.custom - customizations to Gtk.StatusIcon
+// StatusIcon.cs - customizations to Gtk.StatusIcon
 //
 // Authors: Mike Kestner  <mkestner@novell.com>
 // Authors: Stephane Delcroix  <sdelcroix@novell.com>
@@ -19,6 +19,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class StatusIcon {
+
 		[Obsolete ("Replaced by (out Screen, out Rectangle, out Orientation) overload")]
 		public bool GetGeometry (Gdk.Screen screen, Gdk.Rectangle area, out Orientation orientation) 
 		{
@@ -98,4 +105,5 @@
 			Marshal.FreeHGlobal (native_area);
 			return ret;
 		}
-
+	}
+}

gtk/Stock.cs

@@ -1,4 +1,4 @@
-// Stock.custom - customizations to Gtk.Stock
+// Stock.cs - customizations to Gtk.Stock
 //
 // Authors: Mike Kestner  <mkestner@ximian.com>
 //
@@ -18,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Stock {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_stock_list_ids ();
@@ -63,4 +69,5 @@
 			item.TranslationDomain = GLib.Marshaller.Utf8PtrToString (const_item.TranslationDomain);
 			return item;
 		}
-
+	}
+}

gtk/StockItem.cs

@@ -1,4 +1,4 @@
-// Stock.custom - customizations to Gtk.Stock
+// StockItem.cs - customizations to Gtk.StockItem
 //
 // Authors: Larry Ewing	<lewing@novell.com>
 //
@@ -18,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial struct StockItem {
+
 	public StockItem (string stock_id, string label, uint keyval, Gdk.ModifierType modifier, string domain)
 	{
 		this.StockId = stock_id;
@@ -26,3 +32,5 @@
 		this.Modifier = modifier;
 		this.TranslationDomain = domain;
 	}	
+	}
+}

gtk/Style.cs

@@ -1,5 +1,5 @@
 //
-// Gtk.Style.custom - Gtk Style class customizations
+// Gtk.Style.cs - Gtk Style class customizations
 //
 // Authors: Rachel Hestilow <hestilow@ximian.com> 
 //          Radek Doulik <rodo@matfyz.cz> 
@@ -8,9 +8,6 @@
 // Copyright (C) 2002, 2003 Rachel Hestilow, Radek Doulik
 // Copyright (C) 2005 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
-//
 // 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.
@@ -25,6 +22,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Style {
 
 #if FIXME30
 static Gdk.GC EnsureGC (IntPtr raw) {
@@ -371,4 +374,5 @@ public Pango.FontDescription FontDescription {
 		return ret;
 	}
 }
-
+	}
+}

gtk/Target.cs

@@ -1,11 +1,9 @@
-// Gtk.Target.custom - Gtk.Target class customizations
+// Gtk.Target.cs - Gtk.Target class customizations
 //
 // Author: Christian Hoff  <christian_hoff@gmx.net>
 //
 // Copyright (c) 2009 Christian Hoff
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Target {
+
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_target_table_new_from_list(IntPtr list, out int n_targets);
 
@@ -34,3 +39,5 @@
 			}
 			return ret;
 		}
+	}
+}

gtk/TargetEntry.cs

@@ -1,11 +1,9 @@
-// Gtk.Window.custom - Gtk Window class customizations
+// Gtk.TargetEntry.cs - Gtk TargetEntry class customizations
 //
 // Author: Ettore Perazzoli <ettore@ximian.com>
 //
 // Copyright (c) 2003 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -21,6 +19,11 @@
 // Boston, MA 02111-1307, USA.
 
 
+namespace Gtk {
+
+	using System;
+
+	public partial struct TargetEntry {
 
 		public TargetEntry (string target, Gtk.TargetFlags flags, uint info)
 		{
@@ -28,3 +31,5 @@
 			this.Flags = flags;
 			this.Info = info;
 		}
+	}
+}

gtk/TargetList.cs

@@ -1,4 +1,4 @@
-// TargetList.custom - customizations for Gtk.TargetList
+// TargetList.cs - customizations for Gtk.TargetList
 //
 // Copyright (c) 2004  Novell, Inc.
 //
@@ -16,6 +16,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TargetList {
+
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_target_list_new(Gtk.TargetEntry[] targets, uint n_targets);
 
@@ -39,3 +46,5 @@
 		{
 			return Target.TableNewFromList (list);
 		}
+	}
+}

gtk/TargetPair.custom

@@ -1,33 +0,0 @@
-// Gtk.TargetPair.custom - Gtk TargetPair class customizations
-//
-// Authors:    Mike Kestner  <mkestner@novell.com>
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// 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.
-
-
-		[Obsolete ("Replaced by Target property.")]
-		public Gdk.Atom target {
-			get { 
-				Gdk.Atom ret = new Gdk.Atom(_target);
-				if (ret == null) ret = new Gdk.Atom(_target);
-				return ret;
-			}
-			set { _target = value.Handle; }
-		}
-

gtk/TextAttributes.cs

@@ -14,9 +14,16 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TextAttributes {
 
 		public TextAppearance Appearance {
 			get { return (TextAppearance) Marshal.PtrToStructure (new IntPtr (Handle.ToInt64 () + 4), typeof (TextAppearance)); }
 			set { Marshal.StructureToPtr (value, new IntPtr (Handle.ToInt64 () + 4), false); }
 		}
-
+	}
+}

gtk/TextBuffer.cs

@@ -1,4 +1,4 @@
-// TextBuffer.custom - customizations to Gtk.TextBuffer.
+// TextBuffer.cs - customizations to Gtk.TextBuffer.
 // 
 // Authors:  Mike Kestner  <mkestner@ximian.com>
 //
@@ -18,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TextBuffer {
 
 [DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 static extern void gtk_text_buffer_set_text (IntPtr raw, IntPtr text, int len);
@@ -181,4 +187,5 @@ public Gdk.Atom[] SerializeFormats {
 		return result;
 	}
 }
-
+	}
+}

gtk/TextChildAnchor.cs

@@ -1,4 +1,4 @@
-// TextChildAnchor.custom - customizations to Gtk.TextChildAnchor
+// TextChildAnchor.cs - customizations to Gtk.TextChildAnchor
 //
 // Authors: Mike Kestner  <mkestner@ximian.com>
 //
@@ -18,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TextChildAnchor {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_text_child_anchor_get_widgets (IntPtr raw);
@@ -34,4 +40,5 @@
 				return result;
 			}
 		}
-
+	}
+}

gtk/TextIter.cs

@@ -1,4 +1,4 @@
-// TextIter.custom - customizations to Gtk.TextIter
+// TextIter.cs - customizations to Gtk.TextIter
 //
 // Authors: Mike Kestner  <mkestner@ximian.com>
 //
@@ -18,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial struct TextIter {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern uint gtk_text_iter_get_char(ref Gtk.TextIter raw);
@@ -84,3 +90,5 @@
 		public bool BackwardFindChar (Gtk.TextCharPredicate pred, IntPtr user_data, Gtk.TextIter limit) {
 			return BackwardFindChar (pred, limit);
 		}
+	}
+}

gtk/TextMark.cs

@@ -1,11 +1,9 @@
-// Gtk.TextMark.custom - Gtk TextMark class customizations
+// Gtk.TextMark.cs - Gtk TextMark class customizations
 //
 // Author: Mike Kestner  (mkestner@novell.com)
 //
 // Copyright (C) 2007 Novell, Inc. 
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,9 +18,15 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class TextMark {
 
 		protected TextMark () : base (IntPtr.Zero)
 		{
 			CreateNativeObject (new string [0], new GLib.Value [0]);
 		}
-
+	}
+}

gtk/TextTag.cs

@@ -1,5 +1,5 @@
 		//
-		// Gtk.TextTag.custom - Gtk TextTag class customizations
+		// Gtk.TextTag.cs - Gtk TextTag class customizations
 		//
 		// Author: Radek Doulik  (rodo@ximian.com)
 		//
@@ -22,6 +22,11 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+		
+	using System;
+		
+	public partial class TextTag {
 				
 		public Pango.Weight Weight {
 			get {
@@ -36,3 +41,5 @@
 				val.Dispose ();
 			}
 		}
+	}
+}

gtk/TextView.cs

@@ -1,11 +1,9 @@
-// Gtk.TextView.custom - Gtk TextView class customizations
+// Gtk.TextView.cs - Gtk TextView class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -21,6 +19,13 @@
 // Boston, MA 02111-1307, USA.
 
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TextView {
+				
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_text_view_new_with_buffer (IntPtr buffer);
 
@@ -34,4 +39,5 @@
 
 			Raw = gtk_text_view_new_with_buffer (buffer.Handle);
 		}
-
+	}
+}

gtk/TooltipsData.custom

@@ -1,39 +0,0 @@
-// Gtk.TooltipsData.custom - Gtk TooltipsData class customizations
-//
-// Author: Mike Kestner  <mkestner@novell.com>
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This code is inserted after the automatically generated code.
-//
-// 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.
-
-
-		[Obsolete ("Replaced by Tooltips property.")]
-		public Gtk.Tooltips tooltips {
-			get { 
-				return GLib.Object.GetObject(_tooltips) as Gtk.Tooltips;
-			}
-			set { _tooltips = value == null ? IntPtr.Zero : value.Handle; }
-		}
-
-		[Obsolete ("Replaced by Widget property.")]
-		public Gtk.Widget widget {
-			get { 
-				return GLib.Object.GetObject(_widget) as Gtk.Widget;
-			}
-			set { _widget = value == null ? IntPtr.Zero : value.Handle; }
-		}
-

gtk/TreeIter.cs

@@ -16,6 +16,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial struct TreeIter {
+
 		public IntPtr UserData {
 			get {
 				return _user_data;
@@ -24,4 +30,5 @@
 				_user_data = value;
 			}
 		}
-
+	}
+}

gtk/TreeModel.cs

@@ -1,11 +1,9 @@
-// Gtk.TreeModel.Custom - Gtk TreeModel interface customizations
+// Gtk.TreeModel.cs - Gtk TreeModel interface customizations
 //
 // Author: Kristian Rietveld <kris@gtk.org>
 //
 // Copyright (c) 2002 Kristian Rietveld
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,11 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial interface TreeModel {
 
 	/// <summary>IterChildren Method</summary>
 	/// <remarks>To be completed</remarks>
@@ -43,3 +46,5 @@
 	object GetValue(Gtk.TreeIter iter, int column);
 
 	event RowsReorderedHandler RowsReordered;
+	}
+}

gtk/TreeModelAdapter.cs

@@ -1,4 +1,4 @@
-//  Gtk.TreeModelAdapter.custom - Gtk TreeModelAdapter customizations
+//  Gtk.TreeModelAdapter.cs - Gtk TreeModelAdapter customizations
 //
 //  Author:  Mike Kestner  <mkestner@novell.com>
 //
@@ -18,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TreeModelAdapter {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent);
@@ -176,4 +182,5 @@
 				GLib.Object.GetObject (Handle).RemoveSignalHandler ("rows_reordered", value);
 			}
 		}
-
+	}
+}

gtk/TreeModelFilter.cs

@@ -1,3 +1,10 @@
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TreeModelFilter {
+
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent);
 		public bool IterChildren (out Gtk.TreeIter iter) {
@@ -178,4 +185,5 @@
 				RemoveSignalHandler ("rows_reordered", value);
 			}
 		}
-
+	}
+}

gtk/TreeModelSort.cs

@@ -1,11 +1,9 @@
-// Gtk.TreeModelSort.Custom - Gtk TreeModelSort class customizations
+// Gtk.TreeModelSort.cs - Gtk TreeModelSort class customizations
 //
 // Author: Kristian Rietveld <kris@gtk.org>
 //
 // Copyright (c) 2002 Kristian Rietveld
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TreeModelSort {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern bool gtk_tree_model_iter_children (IntPtr raw, out Gtk.TreeIter iter, IntPtr parent);
@@ -181,4 +185,5 @@
 				RemoveSignalHandler ("rows_reordered", value);
 			}
 		}
-
+	}
+}

gtk/TreePath.cs

@@ -13,6 +13,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TreePath {
+
 		// Patch submitted by malte on bug #49518
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_tree_path_get_indices(IntPtr raw);
@@ -44,4 +51,5 @@
 		{
 			return ToString ().GetHashCode ();
 		}
-
+	}
+}

gtk/TreeSelection.cs

@@ -1,4 +1,4 @@
-// TreeSelection.custom - customizations to Gtk.TreeSelection
+// TreeSelection.cs - customizations to Gtk.TreeSelection
 //
 // Authors: Mike Kestner  <mkestner@ximian.com>
 //
@@ -18,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TreeSelection {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_tree_selection_get_selected_rows (IntPtr raw, IntPtr model);
@@ -39,3 +45,5 @@
 		{
 			return gtk_tree_selection_get_selected_without_model (Handle, IntPtr.Zero, out iter);
 		}
+	}
+}

gtk/TreeStore.cs

@@ -1,4 +1,4 @@
-// Gtk.TreeStore.Custom - Gtk TreeStore class customizations
+// Gtk.TreeStore.cs - Gtk TreeStore class customizations
 //
 // Authors: Kristian Rietveld <kris@gtk.org>
 //          Mike Kestner <mkestner@ximian.com>
@@ -6,8 +6,6 @@
 // Copyright (c) 2002 Kristian Rietveld
 // Copyright (c) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -22,6 +20,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TreeStore {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern void gtk_tree_store_append (IntPtr raw, out TreeIter iter, ref TreeIter parent);
@@ -403,5 +407,5 @@
 				RemoveSignalHandler ("rows_reordered", value);
 			}
 		}
-
+	}
-
+}

gtk/TreeView.cs

@@ -1,4 +1,4 @@
-// Gtk.TreeView.Custom - Gtk TreeView class customizations
+// Gtk.TreeView.cs - Gtk TreeView class customizations
 //
 // Authors:
 //	Kristian Rietveld <kris@gtk.org>
@@ -7,8 +7,6 @@
 // Copyright (c) 2002 Kristian Rietveld
 // Copyright (c) 2003 Ximian, Inc. (http://www.ximian.com)
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -23,6 +21,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TreeView {
 
 		public Gdk.Color OddRowColor {
 			get {
@@ -147,4 +151,5 @@
 			TreeViewColumn col = new TreeViewColumn (title, cell, attrs);
 			return InsertColumn (col, pos);
 		}
-
+	}
+}

gtk/TreeViewColumn.cs

@@ -1,11 +1,9 @@
-// Gtk.TreeViewColumn.Custom - Gtk TreeViewColumn class customizations
+// Gtk.TreeViewColumn.cs - Gtk TreeViewColumn class customizations
 //
 // Author: Rachel Hestilow <hestilow@ximian.com> 
 //
 // Copyright (c) 2003 Rachel Hestilow 
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class TreeViewColumn {
 
 		public void SetAttributes (CellRenderer cell, params object[] attrs)
 		{
@@ -77,4 +81,5 @@
 			GCHandle gch = GCHandle.Alloc (func_wrapper);
 			gtk_cell_layout_set_cell_data_func (Handle, cell_renderer == null ? IntPtr.Zero : cell_renderer.Handle, func_wrapper.NativeDelegate, (IntPtr) gch, GLib.DestroyHelper.NotifyHandler);
 		}
-
+	}
+}

gtk/UIManager.cs

@@ -1,11 +1,9 @@
-// Gtk.UiManager.custom - Gtk UiManager class customizations
+// Gtk.UiManager.cs - Gtk UiManager class customizations
 //
 // Author: John Luke  <john.luke@gmail.com>
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class UIManager {
+
 		public uint AddUiFromResource (string resource)
 		{
 			if (resource == null)
@@ -65,3 +70,5 @@
 				return result;
 			}
 		}
+	}
+}

gtk/VBox.cs

@@ -13,5 +13,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class VBox {
 
 public VBox () : this (false, 0) {}
+
+	}
+}

gtk/VScale.cs

@@ -1,11 +1,9 @@
-// Gtk.VScale.custom - Gtk VScale class customizations
+// Gtk.VScale.cs - Gtk VScale class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com> 
 //
 // Copyright (C) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -20,6 +18,12 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+	
+	public partial class VScale {
 
 		[DllImport ("libgtk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
 		static extern IntPtr gtk_vscale_new_with_range (double min, double max, double step);
@@ -39,4 +43,5 @@
 
 			Raw = gtk_vscale_new_with_range (min, max, step);
 		}
-
+	}
+}

gtk/Viewport.cs

@@ -15,7 +15,14 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+
+	public partial class Viewport {
 
 		// Make a default constructor that wraps typical usage.
 		public Viewport (): this (null, null) {
 		}
+	}
+}

gtk/Widget.cs

@@ -1,5 +1,5 @@
 //
-// Gtk.Widget.custom - Gtk Widget class customizations
+// Gtk.Widget.cs - Gtk Widget class customizations
 //
 // Authors: Rachel Hestilow <hestilow@ximian.com>,
 //          Brad Taylor <brad@getcoded.net>
@@ -7,9 +7,6 @@
 // Copyright (C) 2007 Brad Taylor
 // Copyright (C) 2002 Rachel Hestilow 
 //
-// This code is inserted after the automatically generated code.
-//
-//
 // 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.
@@ -24,6 +21,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Collections;
+	using System.Runtime.InteropServices;
+
+	public partial class Widget {
 [Obsolete ("Replaced by Window property.")]
 public Gdk.Window GdkWindow {
 	get { return Window; }
@@ -293,7 +297,7 @@ public void Path (out string path, out string path_reversed)
 }
 
 
-// Code from Object.custom in 2.x
+// Code from custom code for Gtk.Object in 2.x
 // Object is gone in 3.x
 
 		static Hashtable destroy_handlers;
@@ -399,3 +403,5 @@ public void Path (out string path, out string path_reversed)
 			gtk_widget_destroy (Handle);
 			InternalDestroyed -= NativeDestroyHandler;
 		}
+	}
+}

gtk/Window.cs

@@ -1,12 +1,10 @@
-// Gtk.Window.custom - Gtk Window class customizations
+// Gtk.Window.cs - Gtk Window class customizations
 //
 // Author: Mike Kestner <mkestner@ximian.com>
 //
 // Copyright (c) 2001 Mike Kestner
 // Copyright (c) 2004 Novell, Inc.
 //
-// This code is inserted after the automatically generated code.
-//
 // 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.
@@ -21,6 +19,13 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+namespace Gtk {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public partial class Window {
+
 		public Window (String title) : this (WindowType.Toplevel)
 		{
 			this.Title = title;
@@ -85,4 +90,5 @@
 				DefaultHeight = value.Height;
 			}
 		}
-
+	}
+}