diff --git a/ChangeLog b/ChangeLog
index fd1afb6ab..52270a28c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-29  Todd Berman  <tberman@off.net>
+
+	* gtk/ComboBox.custom: Add a header.
+	* gtk/FileChooserDialog.custom: Add subclassing support, and a header.
+	* gtk/FileChooserWidget.custom: Add a header.
+
 2004-10-29  Todd Berman  <tberman@off.net>
 
 	* gtk/FileChooserDialog.custom: Add Filenames property to return
diff --git a/gtk/ComboBox.custom b/gtk/ComboBox.custom
index 550a54cf3..0a3497105 100644
--- a/gtk/ComboBox.custom
+++ b/gtk/ComboBox.custom
@@ -1,3 +1,24 @@
+//  Gtk.RadioMenuItem.custom - Gtk RadioMenuItem customizations
+//
+//  Authors:  Todd Berman  <tberman@off.net>
+//
+//  Copyright (c) 2004 Todd Berman
+//
+// 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-2.0-0.dll")]
 static extern IntPtr gtk_combo_box_get_model (IntPtr raw);
 
diff --git a/gtk/FileChooserDialog.custom b/gtk/FileChooserDialog.custom
index 5369bee77..6ed2df530 100644
--- a/gtk/FileChooserDialog.custom
+++ b/gtk/FileChooserDialog.custom
@@ -1,8 +1,38 @@
+//  Gtk.RadioMenuItem.custom - Gtk RadioMenuItem customizations
+//
+//  Authors:  Todd Berman  <tberman@off.net>
+//            Jeroen Zwartepoorte  <jeroen@xs4all.nl>
+//
+//  Copyright (c) 2004 Todd Berman, Jeroen Zwartepoorte
+//
+// 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-2.0-0.dll")]
 		static extern IntPtr gtk_file_chooser_dialog_new(string title, IntPtr parent, int action, IntPtr nil);
 
 		public FileChooserDialog (string title, Window parent, FileChooserAction action)
 		{
+			if (GetType () != typeof (FileChooserDialog)) {
+				CreateNativeObject (new string[0], new GLib.Value[0]);
+				Title = title;
+				if (parent != null)
+					Parent = parent;
+				Action = action;
+				return;
+			}
 			Raw = gtk_file_chooser_dialog_new (title, parent == null ? IntPtr.Zero : parent.Handle, (int)action, IntPtr.Zero);
 		}
 		
@@ -11,6 +41,14 @@
 		
 		public FileChooserDialog (string title, Window parent, FileChooserAction action, string backend)
 		{
+			if (GetType () != typeof (FileChooserDialog)) {
+				CreateNativeObject (new string[] { "file-system-backend" }, new GLib.Value[] { new GLib.Value (backend) } );
+				Title = title;
+				if (parent != null)
+					Parent = parent;
+				Action = action;
+				return;
+			}
 			Raw = gtk_file_chooser_dialog_new_with_backend (title, parent == null ? IntPtr.Zero : parent.Handle, (int)action, backend, IntPtr.Zero);
 		}
 
diff --git a/gtk/FileChooserWidget.custom b/gtk/FileChooserWidget.custom
index faaf9becb..b1eb84357 100644
--- a/gtk/FileChooserWidget.custom
+++ b/gtk/FileChooserWidget.custom
@@ -1,3 +1,24 @@
+//  Gtk.RadioMenuItem.custom - Gtk RadioMenuItem customizations
+//
+//  Authors:  Todd Berman  <tberman@off.net>
+//
+//  Copyright (c) 2004 Todd Berman
+//
+// 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-2.0-0.dll")]
 static extern IntPtr gtk_file_chooser_get_filenames (IntPtr raw);