Upgrade gtkmm to 2.10.8, glibmm to 2.13.3 and add cairomm 1.2.4

git-svn-id: svn://localhost/ardour2/trunk@2630 d708f5d6-7413-0410-9779-e7cbd77b26cf

635 files changed, 29213 insertions, 6551 deletions

diff --git a/libs/gtkmm2/ChangeLog b/libs/gtkmm2/ChangeLog
index 9966e67673..264762a992 100644
--- a/libs/gtkmm2/ChangeLog
+++ b/libs/gtkmm2/ChangeLog
@@ -1,3 +1,2735 @@
+2.10.8:
+
+2007-03-03  Alan Ott  <alan@signal11.us>
+
+	* docs/tutorial/gtkmm-tut.xml: Added a new appendix, about using 
+	Visual Studio 2005.
+	* docs/tutorial/figures/Makefile.am: Mention new screenshots, for the 
+	new appendix.
+	Bug #409102
+
+2007-02-15  Murray Cumming,  <murrayc@murrayc.com>
+
+	* gdk/src/dragcontext.ccg: Use GDK_POINTER_TO_ATOM() instead of a simple 
+	cast, which is more like GTK+ public API.
+
+2007-02-11  Marko Anastasov  <marko@marko.anastasov.name>
+
+	* docs/tutorial/gtkmm-tut.xml: Updated chapter on internationalization.
+	Explains how to set up an autotools-based project, the use of intltool,
+	basic instructions how to add a translation and a resources list.
+
+2007-01-28  Daniel Elstner  <daniel.kitta@gmail.com>
+
+	* gtk/src/actiongroup.ccg (ActionGroup::add): Don't use NULL but
+	static_cast<char*>(0) to terminate the g_object_get() varargs list,
+	to prevent serious breakage on 64-bit systems without GCC magic.
+	Please, everyone, do me a favor and don't use NULL in C++ code,
+	especially not in conjunction with varargs.  Thanks.
+
+2.10.7:
+
+2007-01-25  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/main.ccg: Destructor: Call the cleanup functions, instead of calling 
+	init again. This seems to be a copy/paste error from April 2003. 
+	Bug #383340 from Christopher Raine.
+
+2007-01-20  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/index.html: Add a Google search, restricted to the gtkmm documentation.
+
+2007-01-12  Marko Anastasov  <marko@marko.anastasov.name>
+
+	* gtk/src/printoperation.ccg: Specify a template specialization for
+	Glib::unwrap() to avoid ambiguities detected and reported as errors
+	in Sun Workshop on OpenSolaris. Bug #395572 from Tim Mooney.
+
+2006-12-21  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: libglade with derived widgets: Add more explanation 
+	about the BaseObjectType typedef.
+	Patch from Martin Nordholts in bug #387708.
+
+2006-12-11  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/sizegroup.hg: Added class documentation.
+
+2.10.6:
+
+2006-11-28  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/src/drawable.hg: create_cairo_context(): Specify true to 
+	the Cairo::Context constructor because we have a starting reference. 
+	This should prevent a leak an extra reference.
+	* gtk/src/printcontext.hg: get_cairo_context():
+	* gtk/src/printjob.hg: get_surface(): Pass false to the Cairo constructor, 
+	because we do not receive a reference, and do not use refreturn(). Previously 
+	we did two references were one was needed.
+
+2.10.5:
+
+2006-11-24  Johannes Schmid <johannes.schmid@openismus.com>
+
+	* gtk/src/uimanager.ccg:
+	Fixed a crasher in error handling when exceptions are disabled 
+
+2006-11-24  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: UIManager: Added notes about which 
+	parts are human-readable and which parts are just IDs, with a 
+	suggestion about what part to mark for translation.
+
+2006-11-23  Nate Nielsen  <nielsen@memberwebs.com>
+
+	* gtk/src/style.ccg:
+	* gtk/src/style.hg: lookup_icon_set(): Hand-code this method, 
+	so we can copy the result of gtk_style_lookup_icon_set(), 
+	because it does not give us a new instance.
+	Bug #374094
+
+2006-11-22  Cedric Gustin  <cedric.gustin@gmail.com>
+
+	* configure.in: Do not pkgconfig check gtk+-unix-print-2.0 on
+	win32, as gtk+-unix-print-2.0.pc is not always included in GTK+
+	installers and/or binary archives (like in Tor's binaries).
+	Bug #371882 from Alexis Wilke.
+
+2.10.4:
+
+2006-11-21  Rémi Cardona  <remi2402@free.fr>
+
+	* configure.in:
+	* gtk/gtkmm-2.4.pc.in: Define a GTKMM_PC_ATKMM_DEP conditional and 
+	use it so that atkmm is only required when it is built, and not 
+	when disbaled via --enable-api-atkmm=no.
+	Bug #366930 from John N. Laliberte.
+
+2006-11-14  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in:
+	* gtk/gtkmmconfig.h.in:
+	* scripts/reduced.m4: Added --enable-api-maemo-extensions 
+	configure option, default to false, defining the 
+	GTKMM_MAEMO_EXTENSIONS_ENABLED macro.
+	* gtk/src/textbuffer.hg:
+	* gtk/src/textbuffer.ccg: Put the Maemo-specific API in 
+	ifdefs, using the optional _WRAP_METHOD() parameter.
+
+2006-11-20  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Optional API appendix: Use the 
+	<function> tag.
+
+2006-11-14  Daniel Elstner  <daniel.kitta@gmail.com>
+
+	* autogen.sh: Wholly replace this script with a critter from one
+	of my personal projects, with slight modifications.  This one does
+	some sophisticated stuff like probing version numbers of available
+	automake and aclocal executables, in order to choose the right one
+	accordingly.  All this is necessary to make the build system work
+	robustly in custom environments such as Maemo where automake-1.9
+	doesn't come preinstalled.
+	While we're at it, kill some old cruft such as the check for GNU
+	make.  This test was kind of pointless as the $MAKE variable was
+	never exported.  Also get rid of the --enable-warnings=hardcore
+	magic; this just doesn't belong here and could cause unnecessary
+	trouble to non-developers.
+
+2006-11-13  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/reference/Doxyfile.in: Add missing PREDEFINES so that we build 
+	documentation only for the normal API.
+
+2006-11-12  Ralf Stephan    <ralf@ark.in-berlin.de>
+	
+	* gdk/src/drawable.hg: Add comment paragraph about using cairo.
+
+2006-11-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in:
+	* tests/Makefile.am:
+	* tests/main.cc: Add new test, with commented-out test for an alternative 
+	API that I will add to glibmm.
+
+2.10.3:
+
+2006-11-08  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/adjustment.ccg:
+	* gtk/src/adjustment.hg: Hand-code the constructor so that we can provide 
+	the g_object_new() properties in a non-standard order, so that the value 
+	is not ignored. This is what gtk_adjustment_new() does too.
+	Bug #369335 from Daniel Holbach, via Vincent Levesque in the Ubuntu 
+	Launchpad bug-tracker.
+
+2006-10-11  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Added an appendix describing the optional 
+	API for reduced resources devices, and the corresponding ifdefable macros.
+
+2006-10-11  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/src/gdk_docs_override.xml: Provide a corrected version of the 
+	Drawable::get_image() method, to avoid mentioning a function that 
+	does not exist in gtkmm. Bug #358268 from Evgeny Rippi.  
+
+2006-10-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/gtk_docs_override.xml: Correct the documentation for 
+	gtk_container_remove() and gtk_widget_add_mnemonic_label() to 
+	avoid mention of non-existant destroy signal and destroy() method.
+	Thanks to Nickolai Dobrynin for pointing this out.
+
+2006-10-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/index.html: Correct the links to the Memory Management 
+	and libglademm chapters.
+
+2006-10-02  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/gtkmm/listviewtext.cc: get_column_title(): 
+	Use "" instead of Glib::ustring() in 
+	g_return_val_if_fail() to fix an odd build problem with 
+	gcc 3.3.6. Bug #352226. (Thomas Zajic)
+
+2006-10-01  Murray Cumming  <murrayc@murrayc.com>
+
+	* Makefile.am:
+	* docs/FAQ/Makefile.am:
+	* docs/Makefile.am:
+	* docs/Makefile_web.am_fragment:
+	* docs/images/Makefile.am:
+	* docs/reference/Makefile.am:
+	* docs/tutorial/Makefile.am:
+	* examples/Makefile.am: Upload to the new hoster instead of to sourceforge.
+	Abstracted the host and path names into docs/Makefile_web.am_fragment to 
+	avoid duplication.
+
+2.10.2:
+
+2006-09-21  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* examples/book/socket/Makefile.am: remove source file dependency on a
+	non-existent file.  This was part of an earlier example, but I simplified
+	the example and removed this file so that it would be easier to understand,
+	but forgot to remove it from the Makefile.am
+
+2006-09-19  Johannes Schmid <jhs@gnome.org>
+
+	* scripts/reduced.m4: Added GTKMM_ARG_ENABLE_API_ATKMM() to 
+	add the --enable-api-atkmm configure option.
+	* configure.in: Use GTKMM_ARG_ENABLE_API_ATKMM, and optionally 
+	use the atkmm subdirectory (and its children).
+	* gtk/gtkmmconfig.h.in: undef GTKMM_ATKMM_ENABLED so that 
+	it will be defined (or not) in gtkmmconfig.h.
+	* Makefile.am: Optinally build in the atkmm directory..
+	* demos/Makefile.am:
+	* demos/gtk-demo/Makefile.am:
+	* examples/Makefile.am_fragment:
+	* tests/Makefile.am_fragment: 
+	* gtk/gtkmm/Makefile.am: Make linking and including of 
+	atkmm optional.
+	* gtk/src/main.ccg: Only call Atk::wrap_init() if atkmm is enabled.
+	* gtk/src/widget.hg: Only derive from (and implement) 
+	Atk::Implementor if atkmm is enabled.
+	get_accessible():
+	* gtk/src/combobox.hg: get_popup_accessible():
+	Use the extra ifdef GTKMM_ATKMM_ENABLED option to put ifdefs around this 
+	API, so that it will not be built if we do not have atkmm.
+	Note that this needs the latest glibmm.
+
+2006-09-19  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* configure.in, docs/tutorial/figures/Makefile.am,
+	docs/tutorial/figures/socket-fail.png, docs/tutorial/figures/socket.png,
+	docs/tutorial/gtkmm-tut.xml, examples/book/Makefile.am,
+	examples/book/socket/.cvsignore, examples/book/socket/Makefile.am,
+	examples/book/socket/plug.cc, examples/book/socket/socket.cc: added new
+	chapter to the tutorial on Gtk::Plug and Gtk::Socket, including a simple
+	example program and a couple of screenshots.
+
+2006-08-23  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* configure.in: re-enabled --disable-demos configure option.  It was
+	disabled due to a bit of stupidity on my part.
+
+2.10.1:
+
+2006-08-21  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* NEWS: update for 2.10.1 release
+
+2006-08-21  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* gtk/src/button.hg: fix a typo in the new API for
+	Gtk::Button::get_image_position() (was set_image_position()).  Fixes bug
+	number 352088.
+	* configure.in: bumped revision to 2.10.1 for new release, disabled
+	configuration switch for disabling demos because it was breaking 'make
+	distcheck' and I couldn't get it figured out in time for a release.  For now
+	it will just always build the demos.
+
+2006-08-21  Cedric Gustin  <cedric.gustin@gmail.com>
+
+	* MSVC_Net2003/*.vcproj, MSVC_Net2003/gtkmm.sln: Updated for
+	gtkmm-2.10.
+	* MSVC_Net2003/examples/printing/*: Added printing example.
+	* gtk/src/Makefile_list_of_hg.am_fragment: Moved
+	pagesetupunixdialog.hg, printer.hg, printjob.hg and
+	printunixdialog.hg to files_posix_hg.
+	* gtk/src/pagesetupunixdialog.hg, gtk/src/printer.hg,
+	gtk/src/printjob.hg, gtk/src/printunixdialog.hg: Tag classes with
+	_GTKMMPROC_WIN32_NO_WRAP as they are not supported on win32.
+	* configure.in: Added MSVC project file for printing example to
+	AC_CONFIG_FILES list. Added pangocairo to the list of packages
+	checked by PKG_CHECK_MODULES (required for building DLLs on win32).
+
+2.10.0:
+
+2006-08-17  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in: Correct the needed cairomm version.
+	* gdk/gdkmm/general.h: Add documentation for Cairo::rectangle() and 
+	Cairo::region().
+	* gtk/src/scrolledwindow.hg: get_[v|h]scrollbar(): Do not use refreturn, 
+	because they are widgets, not just refcountable objects.
+
+2006-08-17  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Fix tutorial to include code for the simple
+	printing example
+
+2006-08-16  Marko Anastasov  <marko@marko.anastasov.name>
+
+	* examples/book/printing/advanced/examplewindow.cc:
+	* examples/book/printing/advanced/examplewindow.h:
+	Bind pointers to RefPtrs of PrintFormOperation. This solves the issue
+	of PFOs having unnecessarily increased refcount and makes them deleted
+	as soon as they're completed.
+	Removed on_printoperation_preview_done() as the settings stay in
+	the print dialog anyway.
+	* examples/book/printing/advanced/main.cc: Deleted a commented line.
+	* examples/book/printing/advanced/previewdialog.cc:
+	* examples/book/printing/advanced/previewdialog.h:
+	Explained the use of m_SpinAdjustment.
+	* examples/book/printing/advanced/printformoperation.cc:
+	* examples/book/printing/advanced/printformoperation.h:
+	Uncommented the code for custom tab in print dialog. Within
+	on_create_custom_widget(), use Gtk::manage() for the main vbox too.
+	Removed signal_preview_done.
+
+	Also removed the g_debugs and reformatted some lines in all files.
+
+2006-08-15  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in: Require the latest cairomm (0.7.0), which we 
+	apparently need.
+
+2006-08-11  Marko Anastasov  <marko@marko.anastasov.name>
+
+	* gtk/src/pagesetup.hg
+	* gtk/src/pagesetupunixdialog.hg
+	* gtk/src/printcontext.hg:
+	* gtk/src/printer.hg:
+	* gtk/src/printoperation.hg:
+	* gtk/src/printunixdialog.hg:
+	* gtk/src/recentchooser.hg:
+	* gtk/src/recentchooserdialog.hg:
+	* gtk/src/recentchoosermenu.hg:
+	* gtk/src/recentchooserwidget.hg:
+	* gtk/src/recentfilter.hg:
+	* gtk/src/recentinfo.hg:
+	* gtk/src/recentmanager.hg: Added or updated from C docs.
+	* gtk/src/printoperationpreview.hg: Removed a TODO about ready and
+	got_page_size signals.
+
+2006-08-11  Marko Anastasov  <marko@marko.anastasov.name>
+
+	* docs/tutorial/figures/Makefile.am:
+	* docs/tutorial/figures/printing.png: Added a screenshot of the main
+	window of the printing example(s).
+	* docs/tutorial/gtkmm-tut.xml: Minor changes to the printing chapter:
+	fixed end_print() explanation, mentioning of the advanced example and
+	the title of the example figure.
+
+2.9.10:
+
+2006-08-05  Johannes Schmid  <jhs@cvs.gnome.org>
+
+	* docs/tutorial/gtkmm-tut.xml:
+	Utility is called enum.pl not enums.pl (#350028)
+
+2006-08-03  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/printing/advanced/previewdialog.cc:
+	* examples/book/printing/advanced/previewdialog.h:
+	Store the print context as a member variable instead of using sigc::bind 
+	to use it in on_drawing_area_realized(). Null the print context and preview 
+	refptrs when we call end_preview(), because we have stopped using them, 
+	and maybe we should not be keeping their objects alive. 
+
+2006-08-03  Marko Anastasov  <marko@marko.anastasov.name>
+
+	* examples/book/printing/advanced/previewdialog.cc:
+	* examples/book/printing/advanced/previewdialog.h:
+	* examples/book/printing/advanced/printformoperation.cc:
+	Don't pass page_count as a ctor parameter but access it directly via
+	m_pOperation when needed. It's also incorrect the first way because
+	it has not yet been determined at the point of PreviewDialog's
+	construction. Added an Adjustment to use it with the spin button
+	in PreviewDialog so that spinning within multiple pages actually works.
+
+2006-08-03  Marko Anastasov  <marko@marko.anastasov.name>
+
+	* examples/book/printing/advanced/previewdialog.cc:
+	Added forgotten call to hide() in on_close_clicked().
+
+2006-08-03  Marko Anastasov  <marko@marko.anastasov.name>
+
+	* examples/book/printing/advanced/previewdialog.cc:
+	* examples/book/printing/advanced/previewdialog.h:
+	Added on_hide(), so that we call PrintOperationPreview's end_preview()
+	on window manager's close action too.
+
+2006-08-02  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/printing/advanced/previewdialog.cc: Constructor:
+	Improve the packing of the widgets.
+	on_popreview_got_page_size(): Add a comment to explain.
+
+2006-08-02  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/printing/advanced/previewdialog.cc:
+	Constructor: Initialize m_DpiX and m_DpiY, as noticed by valgrind. 
+	Connect to signals here instead of later, so we do not risk connecting 
+	more than once.
+	on_drawing_area_realized(): Check gdk_window is not null before using it.
+	on_popreview_got_page_size(): Check that drawing_area is realized before 
+	trying to get its allocation. Possibly not necessary. Check the pango 
+	layout is not null before using it.
+	* examples/book/printing/advanced/printformoperation.cc: on_draw_page(): 
+	Check that the print context and pango layout are not null before using 
+	them.
+	* examples/book/printing/advanced/printformoperation.h: Connect to the 
+	hide signal of the dialog instead of delete_event().
+
+2006-08-02  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/printing/advanced/previewdialog.cc:
+	* examples/book/printing/advanced/previewdialog.h: Rename the signal 
+	handlers so it is is bit clearer. Use show_all_children() instead of 
+	show_all() so that the caller can decided when to show the window.
+	* examples/book/printing/advanced/printformoperation.cc: Use show(), 
+	and set the dialog pointer to 0 after deleting it.
+
+2006-08-02  Armin Burgmeier  <armin@arbur.net>
+
+	* gtk/src/fontbutton.hg: Renamed constructor argument to font_name
+	for gmmproc to produce the correct property name.
+
+
+2006-08-02  Marko Anastasov  <marko@marko.anastasov.name>
+
+	* examples/book/printing/advanced/previewdialog.cc:
+	* examples/book/printing/advanced/previewdialog.h:
+	* examples/book/printing/advanced/printformoperation.cc:
+	* examples/book/printing/advanced/printformoperation.h:
+	Further efforts to fix #347857. See comment #14.
+	* gtk/src/pagesetup.hg:
+	Removed some commented conversions for PaperSize which haven't been
+	used ever since convert_gtk.m4 contains the necessary.
+	* gtk/src/printoperationpreview.hg:
+	Fixed the conversion for PrintContext which takes a reference and fixes
+	some of the problems in the bug. Uncommented ready and got_page_size
+	signals.
+	* tools/m4/convert_gtk.m4:
+	Made both conversions for PaperSize (C to Cpp) take a reference.
+	Removed two unnecessary conversions for PrintContext.
+
+2006-08-01  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/figures/Makefile.am:
+	* docs/tutorial/figures/recentchooserdialog.png:
+	* docs/tutorial/gtkmm-tut.xml: added a screenshot of the RecentChooserDialog
+	and a bit of additional explanation to the example
+
+2006-08-01  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/recentchooser.ccg:
+	* gtk/src/recentchooser.hg:
+	* gtk/src/recentinfo.ccg:
+	* gtk/src/recentinfo.hg:
+	* gtk/src/recentmanager.ccg:
+	* gtk/src/recentmanager.hg: Move RecentInfoTraits into recentinfo.hg, and 
+	use it for RecentManager::get_items() as well as the existing 
+	RecentChooser::get_items().
+
+2006-07-30  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/recentchooser.ccg:
+	* gtk/src/recentchooser.hg:
+	* gtk/src/recentinfo.hg:
+	* gtk/src/recentmanager.hg: Use RecentInfo via RefPtr always.
+	* tools/m4/convert_gtk.m4:
+
+2006-07-27  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/index.html: Linked to the wiki page.
+
+20c06-07-26  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/recentinfo.hg: Use _CLASS_OPAQUE_REFCOUNTED instead of 
+	_CLASS_OPAQUE_COPYABLE(), because this struct has ref/unref instead 
+	of copy/free. This causes the reference() and unreference() methods 
+	to generated.
+	* examples/book/printing/advanced/printformoperation.cc: 
+	Wrapping C libraries section: Correct the _CLASS_OPAQUE_COPYABLE 
+	section and mention _CLASS_OPAQUE_REFCOUNTED.
+
+2006-07-25  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* examples/book/recent_files/examplewindow.cc:
+	* examples/book/recent_files/examplewindow.h: Fix recent files example so
+	that it actually pops up a dialog when you select the recent files menu
+	item.  Also added _mnemonics to menu items for easy keyboard navigation :)
+
+2006-07-25  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/printing/advanced/printformoperation.cc:
+	* examples/book/printing/advanced/printformoperation.h: Uncomment out 
+	the on_preview() override again, and add an if that shows that m_refLayout is 
+	null, because on on_begin_print() has never been called.
+
+2006-07-25  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/printing/advanced/examplewindow.cc:
+	* examples/book/printing/advanced/printformoperation.cc:
+	* examples/book/printing/advanced/printformoperation.h:
+	* examples/book/printing/simple/examplewindow.cc: Made the two examples more 
+	like each other, so that it is more obvious what is causing the crash, 
+	though I commented out the crashing override, with a comment.
+
+
+2006-07-24  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Added preliminary chapter on using the new
+	recent files API (RecentManager, RecentChooser, etc).  I really think that
+	the recent_files example could use some simplification, but I haven't
+	tackled that at all yet.  I'm going to leave out any UIManager / Recent
+	files integration for now since it seems like it will be a big manual hack
+	until GtkRecentAction gets introduced in GTK+ 2.12
+	* examples/book/recent_files/Makefile.am: renamed the executable name that
+	seemed to be a copy-paste error and was rather confusing
+
+2.9.9:
+
+2006-07-24  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in: Depend on glibmm 2.11.3 so that the new defines are available 
+	for the (default) --enable-api-default-signal-handlers=yes case.
+	* gtk/src/printcontext.hg:
+	* gtk/src/printer.hg:
+	* gtk/src/printjob.hg:
+	* gtk/src/printoperation.hg:
+	* gtk/src/printoperationpreview.hg:
+	* gtk/src/printsettings.hg:
+	* gtk/src/printunixdialog.hg: Use our special newin2p10 doxygen keyword.
+
+2006-07-24  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/widget.hg: Moved the new composited_changed signal to the bottom 
+	because that is where I like them, and because adding virtual methods in 
+	the middle of other virtual methods changes the offsets of existing 
+	virtual methods, breaking ABI. Also, used no_default_signal, to avoid 
+	even having a virtual method, which would increase the object size, breaking 
+	ABI. I have made this mistake before. This should fix bug #348241. 
+
+2006-07-23  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* gtk/src/recentmanager.hg: change API to use overloaded functions instead
+	of different function names.  RecentManager::add_full() was changed to
+	RecentManager::add_item() per discussion on mailing list.
+
+2006-07-20  Marko Anastasov <marko@marko.anastasov.name>
+
+	* gtk/src/printoperation.hg: Added the forgotten refreturn for
+	get_print_settings(), which fixes a part of #347857.
+
+2006-07-20  Marko Anastasov <marko@marko.anastasov.name>
+
+	* examples/book/printing/advanced/examplewindow.h:
+	* examples/book/printing/advanced/previewdialog.cc:
+	* examples/book/printing/advanced/printformoperation.cc:
+	* examples/book/printing/simple/printformoperation.cc:
+	Replaced calls to pango_cairo_* functions with their wrappers;
+	removed some unnecessary comments.
+
+2006-07-20  Marko Anastasov <marko@marko.anastasov.name>
+
+	* gtk/src/widget.hg: Fixed a typo for input_shape_combine_mask(),
+	to wrap the right GTK method.
+
+2006-07-19  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/container.ccg:
+ 	* gtk/src/entrycompletion.ccg:
+	* gtk/src/entrycompletion.hg:
+	* gtk/src/widget.ccg: Put custom default signal handlers in #ifdefs so that 
+	gtkmm builds when --enable-api-default-signal-handlers was used with glibmm.
+
+2006-07-19  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/spinbutton.hg: Wrap the new wrapped signal, without 
+	a default handler because that would break ABI.
+
+2006-07-18  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* examples/*: reverted changes to includes in example programs
+
+2.9.8:
+
+2006-07-18  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/textbuffer.ccg:
+	* gtk/src/textbuffer.hg: Wrapped some of the functions from gtktextbufferrichtext.h, 
+	but left some of it commented-out while I discover how it should work, to avoid 
+	creating a bad API that we can not change later.
+
+2006-07-10  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* gtk/src/widget.ccg:
+	* gtk/src/widget.hg: wrapped is_composited(), composited_changed signal,
+	input_shape_combine_mask(), unset_input_shape_combine_mask()
+
+2006-07-16  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/index.html: Update links, because inserting the printing chapter increased 
+	subsequent chapter numbers. 
+	* docs/tutorial/gtkmm-tut.xml: Wrapping C libraries: Mentioned _WRAP_ENUM().
+	* gtk/src/togglebutton.ccg:
+	* gtk/src/togglebutton.hg: Added a constructor that takes a stock item, like 
+	Button already has.
+
+2006-07-13  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Minor corrections to the language in the 
+	new printing chapter.
+
+2006-07-13  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: gmmproc appendix: Corrected the description of 
+	the _DEFS() macro, and mention not to include C headers in C++ headers.
+
+2006-07-12  Marko Anastasov <marko@marko.anastasov.name>
+
+	* docs/tutorial/gtkmm-tut.xml: Added a chapter about printing.
+
+2006-07-12  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Added an appendix about wrapping C libraries with 
+	gmmproc, including the various things you need to change when copying an 
+	existing project.
+
+2006-07-10  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/index.html: update to match the style of the new website a bit
+	* docs/tutorial/style.css: change the style of the tutorial slightly to
+	match the website style.  These are just minor tweaks.  Ideally I think they
+	should both get a bit more of an overhaul.
+
+2006-07-09  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* .cvsignore: add a whole bunch of files to .cvsignore
+
+2006-07-09  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* examples/*: Don't include <gtkmm.h> if possible.  Modified all examples to
+	only include the headers that they absolutely need.  Hopefully this speeds
+	up compilation at least slightly and reduces the amount of recompilation
+	needed for examples due to unrelated changes.
+
+2006-07-08  Marko Anastasov <marko@marko.anastasov.name>
+
+	* examples/book/printing/simple/examplewindow.cc:
+	* examples/book/printing/simple/main.cc:
+	* examples/book/printing/simple/printformoperation.cc:
+	Minor code cleanup to fit the tutorial.
+
+2006-07-08  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/entrycompletion.hg:
+	* gtk/src/iconview.hg:
+	* gtk/src/treeviewcolumn.hg: Added TODOs to mention new bases clases 
+	(interfaces that these GTypes now implement) that we may not add as 
+	base classes without breaking C++ ABI. 
+
+2006-07-08  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/printoperationpreview.hg: Commented-out the signals, with a TODO, 
+	for now because they seem to cause a crash when viewing the preview.
+
+2006-07-08  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/printoperation.hg: Derive from, and implement, PrintOperationPreview, 
+	so that the dynamic_cast in the Glib::wrap() in on_preview() can succeed.
+	* examples/book/printing/advanced/examplewindow.cc:
+	* examples/book/printing/simple/examplewindow.cc: Do not set a window 
+	border width. It looks odd, and it is not normal to have a border around the 
+	menu.
+
+2006-07-08  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/printing/advanced/Makefile.am:
+	* examples/book/printing/simple/Makefile.am: Rename the executable to 
+	example, to match the other examples.
+
+2006-07-07  Marko Anastasov <marko@marko.anastasov.name>
+
+	* configure.in
+	* examples/book/printing/Makefile.am: Split the printing example into
+	"simple" and "advanced".
+	* examples/book/printing/advanced/:
+	* examples/book/printing/advanced/Makefile.am:
+	* examples/book/printing/advanced/examplewindow.cc:
+	* examples/book/printing/advanced/examplewindow.h:
+	* examples/book/printing/advanced/main.cc:
+	* examples/book/printing/advanced/previewdialog.cc:
+	* examples/book/printing/advanced/previewdialog.h:
+	* examples/book/printing/advanced/printformoperation.cc:
+	* examples/book/printing/advanced/printformoperation.h:
+	Advanced example meant to demonstrate how to extend the print dialog
+	and create a custom preview dialog.
+	* examples/book/printing/simple:
+	* examples/book/printing/simple/Makefile.am:
+	* examples/book/printing/simple/examplewindow.cc:
+	* examples/book/printing/simple/examplewindow.h:
+	* examples/book/printing/simple/main.cc:
+	* examples/book/printing/simple/printformoperation.cc:
+	* examples/book/printing/simple/printformoperation.h:
+	Printing API example showing the essential work, relying on the
+	external viewer program (previewing still needs more work).
+
+2006-07-07  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/pagesetup.hg:
+	* gtk/src/papersize.hg:
+	* gtk/src/printer.hg:
+	* gtk/src/printjob.hg: 
+	* gtk/src/printoperationpreview.hg:
+	* gtk/src/printsettings.hg: Added class documentation, based on the 
+	C documentation.
+	* gtk/src/printoperation.ccg:
+	* gtk/src/printoperation.hg: custom_widget_appl signal: Pass the 
+	widget by pointer, in case the C developers ever decide that it may be null.
+	SlotPrintSetupDone: Pass a _const_ RefPtr.
+	run_page_setup_dialog_async(), run_page_setup_dialog(): Pass _const_ PageSetup and 
+	PrintSettings, because I think the function does not change them.
+	* examples/book/printing/examplewindow.cc:
+	* examples/book/printing/examplewindow.h:
+	* examples/book/printing/previewdialog.cc:
+	* examples/book/printing/previewdialog.h:
+	* examples/book/printing/printformoperation.cc:
+	* examples/book/printing/printformoperation.h: Some renaming and comments and TODOs.
+
+2006-07-07  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in: Remove the mention of examples/printing, because 
+	it is in examples/book/printing instead.
+
+2006-07-06  Marko Anastasov <marko@marko.anastasov.name>
+
+	* configure.in
+	* examples/book/Makefile.am: Include the printing example.
+	* examples/book/printing/
+	* examples/book/printing/Makefile.am:
+	* examples/book/printing/examplewindow.cc:
+	* examples/book/printing/examplewindow.h:
+	* examples/book/printing/main.cc:
+	* examples/book/printing/previewdialog.cc:
+	* examples/book/printing/previewdialog.h:
+	* examples/book/printing/printformoperation.cc:
+	* examples/book/printing/printformoperation.h: New files -
+	example of the printing API. Previewing is not finished.
+
+2.9.7:
+
+2006-07-05  Marko Anastasov <marko@marko.anastasov.name>
+
+	* demos/gtk-demo/example_change_display.cc:
+	* pango/src/tabarray.ccg: Fix the build by preventing warnings with
+	small workarounds.
+	* gtk/src/gtk_signals.defs: Restored defs for PrintOperationPreview.
+	* gtk/src/printcontext.hg: Removed a TODO for ctor - it's always
+	exposed through PrintOperation's signals.
+
+2006-07-05  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/gtk_signals.defs: Restored Printer and PrintJob defs.
+
+2006-07-05  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/gtk_signals.defs: Restored the Print*Unix stuff.
+
+2006-07-05  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/scrolledwindow.hg: Reimplemented get_h/vscrollbar() with the 
+	new methods in GTK+.
+	* gtk/src/selectiondata.ccg:
+	* gtk/src/selectiondata.hg: Added targets_include_rich_text().
+	* gtk/src/sizegroup.hg: Added get/set_ignore_hidden().
+	* gtk/src/statusicon.hg: Added size_changed signal.
+	* gtk/src/gtk_signals.defs: Regenerated.
+	* gtk/src/notebook.hg: Added page_reordered, page_removed, and page_added 
+	signals.
+
+2006-07-05  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/printoperation.hg: Wrap the preview signal, using PrintOperationPreview 
+	via RefPtr, which might be appropriate. The refcounting might need examination.
+
+2006-07-05  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/printoperation.hg: Commented-out the preview signal for now, because 
+	the conversion is bad/wrong, and it is difficult to do, because gmmproc 
+	assumes that we want to deal with the interface via RefPtr.
+
+2006-06-30  Marko Anastasov <marko@marko.anastasov.name>
+
+	* gtk/src/printoperation.hg: Added a default value of
+	PRINT_OPERATION_ACTION_PRINT_DIALOG to the version of run() without
+	std::auto_ptr<Glib::Error>.
+
+2006-06-25  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: add links to gtkmm_hello and gnomemm_hello
+	programs.  Patch from Gezim Hoxha (fixes #345894)
+
+2006-06-25  Marko Anastasov <marko@marko.anastasov.name>
+
+	* docs/tutorial/gtkmm-tut.xml: Fixed the sentence explaining
+	disconnect() in the Timeouts chapter. #345848 from Gezim Hoxha.
+
+2006-06-24  Marko Anastasov <marko@marko.anastasov.name>
+
+	* gtk/src/printcontext.hg: Renamed the const function get_cairo()
+	to get_cairo_context(), to match the original.
+
+2006-06-24  Marko Anastasov <marko@marko.anastasov.name>
+
+	* docs/tutorial/gtkmm-tut.xml: Typo correction in the Clipboard
+	chapter by Gezim Hoxha.
+
+2.9.6:
+
+2006-06-21  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/printjob.ccg:
+	* gtk/src/printjob.hg: send_job(): This no longer throws an 
+	exception, because the C function no longer takes a GError*.
+	* gtk/src/statusicon.ccg:
+	* gtk/src/statusicon.hg: get_geometry(): Compilation fixes.
+
+2006-06-21  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/label.hg: Added get/set_line_wrap_mode() and property.
+	* gtk/src/menushell.hg: Added get/set_take_focus() and property.
+	* gtk/src/printsettings.ccg:
+	* gtk/src/printsettings.hg: Put the standard settings in a member 
+	class as static const Glib::ustrings, initialized in the .cpp file.
+	* gtk/src/statusicon.ccg:
+	* gtk/src/statusicon.hg: Added get_geometry().
+
+2006-06-21  Marko Anastasov <marko@marko.anastasov.name>
+
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/printer.ccg:
+	* gtk/src/printer.hg: Wrapped get_job_count() which was accidentaly
+	in the ignore list. New function: enumerate_printers().
+
+2006-06-21  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/printunixdialog.ccg: Add the Gtk:: prefix for Label, to 
+	fix the build, and include the label.h header.
+
+2006-06-20  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/printoperation.hg: Include the C header in the private/*.h 
+	file, so that it can use the enum.
+	* gtk/src/printsettings.hg: Remove PRINT_SETTINGS_PRINT_TO_FILE.
+	We really need to make this more like the Stock IDs.
+
+2006-06-20  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/gtk_enums.defs: Updated with enums.pl
+	* gtk/src/messagedialog.hg: Added set_image() and property.
+	* gtk/src/printoperation.hg: Do not include gtkprintoperation.h.
+	preview signal: Pass parent window as pointer, in case it is null.
+	* gtk/src/printoperationpreview.hg: Signals: Do not use 
+	no_default_handler, because this class is new so we do not need to 
+	preserver ABI.
+	* gtk/src/printunixdialog.ccg:
+	* gtk/src/printunixdialog.hg: Added add_custom_tab() overload that 
+	takes a ustring.
+	* gtk/src/printsettings.hg: Remove get/set_print_to_file(), because 
+	the C function was removed from GTK+.
+	* gtk/src/treeview.hg: Correct return type of get_grid_lines().
+	* tools/m4/convert_gtk.m4: Add conversion for TreeViewGridLines enum.
+
+2006-06-20  Marko Anastasov  <marko@marko.anastasov.name>
+
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/gtk_signals.defs: Updated the whole section for
+	PrintOperation.
+	Added defs for PrintOperationPreview: ready and got_page_size.
+	Added accepts_pdf ans accepts_ps properties for Printer.
+	* gtk/src/gtk_vfuncs.defs: Added a section for PrintOperationPreview
+	with render_page, end_preview and is_selected.
+	* gtk/src/printer.hg: New functions (properties likewise):
+	accepts_pdf() and accepts_ps().
+	* gtk/src/printjob.ccg: Include gtktypebuiltins.h.
+	* gtk/src/printjob.hg: New enum: PrintCapabilities.
+	* gtk/src/printoperation.ccg:
+	* gtk/src/printoperation.hg: Added a version of run() without
+	the Window parameter.
+	New signals: done, create_custom_widget, custom_widget_apply,
+	and preview.
+	Renamed properties: number_of_pages and pdf_target. Added n_pages
+	and export_filename instead, and custom_tab_label.
+	* gtk/src/printoperationpreview.ccg:
+	* gtk/src/printoperationpreview.hg: New files.
+	* gtk/gtkmm.h:
+	* gtk/src/Makefile_list_of_hg.am_fragment: Include the new files.
+	* gtk/src/printunixdialog.hg: New functions: add_custom_tab and
+	set_manual_capabilities.
+	* tools/m4/convert_gtk.m4: Added new conversions.
+
+2006-06-19  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/treeview.hg: Added get/set_rubber_banding(), 
+	get/set_grid_lines(), get/set_enable_tree_lines().
+	Added properties for show-expanders, level-indentation, 
+	rubber-banding, enable-grid-lines, and enable-tree-lines.
+
+2.9.5:
+
+2006-06-19  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/treeview.ccg: Provide implementation for 
+	set_search_position_func(). Bug #344787 from 
+	Elijah Newren.
+
+2006-06-19  Elijah Newren  <newren gmail com>
+
+	* autogen.sh: Turn on -Werror for gcc-4.x too.  #345245
+
+2006-06-17  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* gtk/gtkmm/accelmap.cc: add missing initializer (fixes #344788)
+
+2006-06-16  Elijah Newren  <newren gmail com>
+
+	* gtk/src/recentchooser.hg: release_c_type: fix an unused variable
+	warning.  #344786
+
+2006-06-16  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/notebook.ccg: SignalProxy_WindowCreation_gtk_callback:
+	Comment-out unused source parameter and return a value when an 
+	exception is caught, to prevent compiler warnings. 
+	Bug #344771 from Elijah Newren.
+
+2006-06-13  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* pango/pangomm-1.4.pc.in: add pangocairo dependency (fixes #344802).
+	Thanks to Elijah Newren.
+
+2006-06-13  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* examples/book/treeview/listviewtext/examplewindow.cc:
+	* examples/book/treeview/listviewtext/examplewindow.h: fixed an
+	initialization order error when compiling with -Werror (fixes #344789)
+
+2006-06-13  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/aboutdialog.ccg: set_url_hook(): Pass the slot pointer instead of a 
+	pointer to the slot pointer, so that this works again.
+
+2006-06-11  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/assistant.hg: Added update_buttons_state().
+	* gtk/src/button.hg: Added get/set_image_position() and property.
+	* gtk/src/clipboard.ccg:
+	* gtk/src/clipboard.hg: Added request_rich_text(), wait_for_rich_text(), 
+	and wait_rich_text_is_available(). 
+	util_convert_atoms_to_strings(): Prevent memory leak of the result of 
+	gdk_atom_name().
+	* gtk/src/entry.hg: Added get/set_inner_border().
+
+2006-06-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/src/screen.hg: Added get_rgba_visual(), get_rgba_colormap().
+	* pango/src/context.ccg:
+	* pango/src/context.hg: Added get_matrix().
+	* pango/src/renderer.ccg:
+	* pango/src/renderer.hg: Added get_matrix().
+
+2006-06-08  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/custom/custom_widget/custom_gtkrc:
+	* examples/book/custom/custom_widget/mywidget.cc:
+	* examples/book/custom/custom_widget/mywidget.h: Make the RC file stuff 
+	work - the secret is that the style value is only available when the 
+	widget has been realized. However, this only works at the moment when 
+	hacking glibmm to change the gtkmm_ prefix to Gtkmm_, due to bug #343012.
+	* gtk/src/notebook.ccg: set_window_creation_hook(): Adapt to the changed GTK+ C 
+	API, supplying the destroy notification.
+	* gtk/src/printoperation.hg: Removed set_show_dialog(), set_pdf_target(), 
+	set_track_print_status(), run_async().
+	Added set_export_filename(), set_track_print_status(), 
+	set_show_progress(), set_allow_async(), set_custom_tab_label().
+	This is to match the C API.
+	* pango/src/font.ccg:
+	* pango/src/font.hg: Added describe_with_absolute_size(), get_font_map(). 
+	* pango/src/fontdescription.hg: Added set_absolute_size(), get_size_is_absolute().
+	* pango/src/layout.hg: Added get_font_description(), index_to_line_x(). 
+	* tools/m4/convert_pango.m4: Added necessary conversion.
+
+2006-06-07  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/gtk_enums.defs: Updated with enumpl.
+	* gtk/src/gtk_methods.defs: Updated with h2defs.pyt
+	* gtk/src/notebook.ccg:
+	* gtk/src/notebook.hg: Added set_group_id(), get_group_id(), 
+	get_tab_reorderable(), set_tab_reorderable(), 
+	get_tab_detachable(), set_tab_detachable().
+	* gtk/src/printcontext.hg: Added set_cairo_context().
+	* gtk/src/printoperation.hg: run(): Added PrintOperationAction 
+	parameter.
+	* tools/m4/convert_gtk.m4: Added necessary conversion.
+
+2.9.4:
+
+2006-06-06  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/gtk_methods.defs: Updated with h2defs.py.
+
+2006-06-05  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/printcontext.hg: get_cairo() renamed to get_cairo_context(), 
+	get_fontmap() renamed to get_pango_fontmap(), 
+	create_context() renamed to create_pango_context(), 
+	create_layout() renamed to create_pango_layout(), to match the changes in 
+	GTK+.
+	* gtk/src/printjob.ccg:
+	* gtk/src/printjob.hg: send(): Handle the exception and add the ifdefed 
+	alternative for --enable-api-exceptions=no.
+	Comment out get_surface() const, because it does not seem to build with 
+	--enable-api-exceptions at the moment. Added a TODO for that.
+
+2006-05-29  Murray Cumming  <murrayc@murrayc.com>
+
+	* pango/src/Makefile_list_of_hg.am_fragment:
+	* pango/src/cairofontmap.ccg:
+	* pango/src/cairofontmap.hg: Added wrapper of the CairoFontMap interface.
+	* pango/src/context.ccg:
+	* pango/src/context.hg: Added update_from_cairo_context(), 
+	set_cairo_font_options(), set_cairo_font_options(), get_font_options(), 
+	set_resolution(), get_resolution().
+	* pango/src/glyphstring.ccg:
+	* pango/src/glyphstring.hg: Added TODO for pango_cairo_glyph_string_path().
+	* pango/src/layout.ccg:
+	* pango/src/layout.hg: Added create(Cairo::Context), update_from_cairo_context(), 
+	add_to_cairo_context()
+	* pango/src/layoutline.ccg:
+	* pango/src/layoutline.hg: Added show_in_cairo_context(), add_to_cairo_context().
+	* pango/src/pango_methods.defs: Updated with h2defs.py.
+	* tools/m4/convert_pango.m4: Added necessary conversions.
+
+2006-05-26  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* examples/treemodelcustom/exampletreemodel.cc: remove interface
+	registration statements from constructor of the example custom treemodel
+	which were causing runtime warnings.
+
+2006-05-26  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/custom/custom_widget/custom_gtkrc: Add the type prefix 
+	in the style block, which is apparently needed, though it still says it 
+	is an invalid identifier.
+	* examples/book/custom/custom_widget/mywidget.cc: Use _ instead of - 
+	for the style name, in case that is a problem.
+
+2006-05-26  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/reference/Doxyfile.in: In PREDEFINED, set 
+	GLIBMM_VFUNCS_ENABLED, GLIBMM_PROPERTIES_ENABLED, and 
+        GLIBMM_EXCEPTIONS_ENABLED so that those parts of the API 
+	show up in the documentation.
+	* examples/book/custom/custom_widget/custom_gtkrc:
+	* examples/book/custom/custom_widget/mywidget.cc:
+	Attempt (so far unsuccessfully) to show how to make an 
+	aspect of a custom widget themable.
+
+2006-05-22  Marko Anastasov <marko@marko.anastasov.name>
+
+        * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+        * gtk/src/gtk_signals.defs: Added paginate signal for PrintOperation.
+        * gtk/src/printer.hg: Ignore gtk_printer_compare.
+        * gtk/src/printjob.hg: Added set/get_track_print_status().
+        * gtk/src/printoperation.hg: Added set_track_print_status() and cancel()
+        methods, paginate signal.
+
+2006-05-19  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: RefPtr appendix: Reword the bit about using 
+	an official shared_ptr<>. It would not be that easy.
+	* gtk/src/gtk_docs_override.xml: gtk_table_get_homogenous(). Override because 
+	gtk_table_get_homogenous() is for some reason not being automatically changed to 
+	get_homongenous().
+
+2.9.3:
+
+2006-05-18  Murray Cumming  <murrayc@murrayc.com>
+
+        * gdk/src/pixbufloader.hg: Add _CONVERSION() needed by write(), now that
+        glibmm actually does the conversion.
+        * gtk/src/editable.hg: Use _VFUNC_H() as we did before the big #ifdef changes.
+        There is no need to stop using it, and it keeps the vfunc order the same as before.
+
+2006-05-16  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: update the appendix of the tutorial about
+	building with jhbuild
+
+2006-05-16  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/Makefile.am: fix tutorial stylesheet location so that
+	locally installed documentation can find the stylesheet.  Now the locally
+	installed documentation and the published website documentation both install
+	the stylesheet in the same relative location.
+
+2006-05-16  Marko Anastasov <marko@marko.anastasov.name>
+
+	* gtk/src/pagesetupunixdialog.ccg:
+	* gtk/src/pagesetupunixdialog.hg: Changed constructor to make parent be the
+	first parameter, and added an overload without it.
+	* gtk/src/printjob.hg:
+	* gtk/src/printoperation.hg: Fix some property wrappers to take RefPtrs when
+	a property is a Glib object.
+	* gtk/src/printunixdialog.ccg:
+	* gtk/src/printunixdialog.hg: Constructor and property changes as above.
+
+2006-05-16  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/actiongroup.ccg: add(): Pass char** instead of char*.
+
+2006-05-16  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/actiongroup.ccg: add(): Use NULL instead of 0 with g_object_get(), to 
+	avoid the warning about a missing sentinel.
+
+2006-05-16  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/actiongroup.ccg: add(): Use g_object_get(), not 
+	g_object_get_data() to get property data. Fixes a memory corruption crash.
+	This was another regression introduced by the optional API changes.
+	Bug #341895 from Philip Langdale.
+
+2006-05-16  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/pagesetupunixdialog.hg:
+	* gtk/src/printunixdialog.hg: Added TODO comments.
+	* gtk/src/printer.hg:
+	* gtk/src/printjob.hg: set_source_file(): Changed filename parameter 
+	from ustring to std::string. 
+	* tools/m4/convert_gtk.m4: Remove an unnecessary conversion.
+
+2006-05-16  Marko Anastasov <marko@marko.anastasov.name>
+
+	* gtk/src/pagesetupunixdialog.ccg:
+	* gtk/src/pagesetupunixdialog.hg:
+	* gtk/src/printer.ccg:
+	* gtk/src/printer.hg:
+	* gtk/src/printjob.ccg:
+	* gtk/src/printjob.hg:
+	* gtk/src/printunixdialog.ccg:
+	* gtk/src/printunixdialog.hg: New files - Unix printing API.
+	* gtk/src/gtk_signals.defs: Added signal and property defs for new files.
+	* gtk/src/printcontext.hg : Fixed typo for get_cairo()
+	and brought back create_layout().
+	* gtk/src/Makefile_list_of_hg.am_fragment:
+	* gtk/gtkmm.h: Include new files.
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Added get_defs() calls
+	for new types, but commented because the current gtk.h doesn't include
+	their headers.
+	* tools/m4/convert_gtk.m4: Added conversions for GtkPrinter.
+
+2006-05-16  Paul Davis  <pjdavis@engineering.uiowa.edu>
+
+	* gtk/src/table.hg: fix error when trying to remove a widget from a table
+	using Table_Helpers::TableList.erase() (fixes bug #341962)
+
+2006-05-15  Murray Cumming  <murrayc@murrayc.com
+
+	* docs/tutorial/gtkmm-tut.xml: Some typo corrections from Simon Fuhrmann.
+
+2006-05-13  Murray Cumming  <murrayc@murrayc.com
+
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py
+	* gtk/src/printoperation.hg: Change set_nr_of_pages() to set_n_pages().
+	* gtk/src/printsettings.hg: Change set/get_num_copies() to set/get_n_copies().
+	* gtk/src/recentmanager.hg: add_full(): This no longer throws an 
+	exception.
+
+2.9.2:
+
+2006-05-12  Murray Cumming  <murrayc@murrayc.com
+
+	* gtk/src/uimanager.ccg: Fix a typo to fix the build when not disabling 
+	exceptions.
+
+2.9.1:
+
+2006-05-11  Murray Cumming  <murrayc@murrayc.com
+
+	* demos/gtk-demo/demowindow.cc:
+	* demos/gtk-demo/example_iconview.cc: More adapting for the optional API.
+
+2006-05-11  Murray Cumming  <murrayc@murrayc.com
+
+	* demos/gtk-demo/demo-common.cc:
+	* demos/gtk-demo/example_iconview.cc:
+	* demos/gtk-demo/example_images.cc:
+	* demos/gtk-demo/example_pixbufs.cc:
+	* demos/gtk-demo/example_textview.cc:
+	* demos/gtk-demo/example_uimanager.cc:
+	* demos/pixbuf-demo.cc:
+	* docs/tutorial/Makefile.am:
+	* examples/book/custom/custom_container/examplewindow.cc:
+	* examples/book/iconview/examplewindow.cc:
+	* examples/book/input/main.cc:
+	* examples/book/menus/main_menu/examplewindow.cc:
+	* examples/book/menus/popup/examplewindow.cc:
+	* examples/book/menus_and_toolbars/examplewindow.cc:
+	* examples/book/recent_files/examplewindow.cc:
+	* examples/exception/exceptiontest.cc:
+	* gdk/src/pixbuf.ccg:
+	* gdk/src/pixbuf.hg:
+	* gdk/src/pixbufloader.ccg:
+	* gdk/src/pixbufloader.hg:
+	* gtk/gtkmm/cellrenderer_generation.cc:
+	* gtk/gtkmm/treeview_private.cc:
+	* gtk/src/aboutdialog.ccg:
+	* gtk/src/assistant.ccg:
+	* gtk/src/celllayout.ccg:
+	* gtk/src/cellrendereraccel.ccg:
+	* gtk/src/cellrendereraccel.hg:
+	* gtk/src/cellrendererspin.ccg:
+	* gtk/src/cellrendererspin.hg:
+	* gtk/src/clipboard.ccg:
+	* gtk/src/colorselection.ccg:
+	* gtk/src/container.ccg:
+	* gtk/src/entrycompletion.ccg:
+	* gtk/src/filefilter.ccg:
+	* gtk/src/iconview.ccg:
+	* gtk/src/main.ccg:
+	* gtk/src/menu.ccg:
+	* gtk/src/menuitem.ccg:
+	* gtk/src/menushell.ccg:
+	* gtk/src/printoperation.ccg:
+	* gtk/src/printsettings.ccg:
+	* gtk/src/recentchooser.ccg:
+	* gtk/src/recentfilter.ccg:
+	* gtk/src/textiter.hg:
+	* gtk/src/treedragsource.ccg:
+	* gtk/src/treemodel.ccg:
+	* gtk/src/treemodelfilter.ccg:
+	* gtk/src/treeselection.ccg:
+	* gtk/src/treesortable.ccg:
+	* gtk/src/treeview.ccg:
+	* gtk/src/uimanager.ccg:
+	* gtk/src/uimanager.hg:
+	* gtk/src/widget.ccg:
+	* pango/src/fontset.ccg:
+	* tests/main_with_options/main.cc: More adapting for the optional API.
+
+2006-05-11  Murray Cumming  <murrayc@murrayc.com
+
+	* gdk/src/pixbuf.ccg:
+	* gdk/src/pixbuf.hg:
+	* gtk/gtkmm/treeview_private.cc:
+	* gtk/src/aboutdialog.ccg:
+	* gtk/src/clipboard.ccg: 
+	* gtk/src/treemodel.ccg:
+	* gtk/src/treemodelfilter.ccg:
+	* gtk/src/treeselection.ccg:
+	* gtk/src/treesortable.ccg:Added missing #ifdefs needed for use of 
+	--enable-api-exceptions=no with glibmm.
+
+2006-05-10  Murray Cumming  <murrayc@murrayc.com
+
+	* configure.in: Don't build examples/cellrenderercustom because 
+	it needs too much #ifdefing when properties are disabled.
+	* gtk/src/printcontext.ccg:
+	* gtk/src/printcontext.hg:
+	* gtk/src/printoperation.hg: Fix the build by adding a conversion 
+	for the signal, and by removing the unnecessary method implementation.
+
+2006-02-15  Murray Cumming  <murrayc@murrayc.com
+
+	* demos/gtk-demo/demowindow.cc:
+	* demos/gtk-demo/example_menus.cc:
+	* demos/gtk-demo/example_textview.cc:
+	* demos/gtk-demo/example_treeview_editable_cells.cc:
+	* demos/gtk-demo/example_treeview_liststore.cc:
+	* demos/gtk-demo/example_treeview_treestore.cc:
+	* demos/gtk-demo/textwidget.cc:
+	* examples/book/treeview/combo_renderer/examplewindow.cc:
+	* examples/book/treeview/editable_cells/examplewindow.cc:
+	* examples/book/treeview/list/examplewindow.cc:
+	* examples/cellrenderercustom/cellrendererpopup.cc:
+	* examples/cellrenderercustom/cellrenderertoggle.cc:
+	* examples/cellrenderercustom/testpopup.cc:
+	* examples/rulers/rulers.cc:
+	* gtk/gtkmm/cellrenderer_generation.cc:
+	* gtk/gtkmm/cellrenderer_generation.h:
+	* gtk/src/action.ccg:
+	* gtk/src/action.hg:
+	* gtk/src/actiongroup.ccg:
+	* gtk/src/celllayout.ccg:
+	* gtk/src/celllayout.hg:
+	* gtk/src/cellrenderer.ccg:
+	* gtk/src/cellrenderer.hg:
+	* gtk/src/cellrenderercombo.ccg:
+	* gtk/src/cellrenderercombo.hg:
+	* gtk/src/cellrendererpixbuf.ccg:
+	* gtk/src/cellrendererpixbuf.hg:
+	* gtk/src/cellrendererprogress.ccg:
+	* gtk/src/cellrendererprogress.hg:
+	* gtk/src/cellrenderertext.ccg:
+	* gtk/src/cellrenderertext.hg:
+	* gtk/src/cellrenderertoggle.ccg:
+	* gtk/src/cellrenderertoggle.hg:
+	* gtk/src/cellview.ccg:
+	* gtk/src/combobox.ccg:
+	* gtk/src/menuitem.ccg:
+	* gtk/src/texttag.hg:
+	* gtk/src/treeview.hg:
+	* gtk/src/treeviewcolumn.ccg:
+	* gtk/src/treeviewcolumn.hg: Add #ifdef GLIBMM_ENABLE_PROPERTIES around 
+	uses of property proxies and add the set_property<>("name", value) alternatives, 
+	so gtkmm still builds when using this.
+	* examples/Makefile.am: Disable build of cellrenderercustom because 
+	it needs properties (or too much #ifdefing)
+
+2006-05-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/printcontext.hg: Use an #m4 conversion and _WRAP_METHOD() to 
+	generate get_cairo() instead of hand-coding it.
+	get_page_setup(), get_fontmap(): Return a const instance from the const 
+	overloads.
+        Removed the const overload of create_layout(). If you are creating it then 
+	you probably want to change it.
+	* gtk/src/printoperation.hg: Moved signals to the bottom, where we usually put them.
+	set_pdf_target(): Make the filename parameter a std::string, because the encoding of 
+	filenames is unknown.
+
+2006-05-08  Marko Anastasov  <marko@marko.anastasov.name>
+
+	* gtk/src/pagesetup.hg
+	* gtk/src/pagesetup.ccg
+	* gtk/src/papersize.hg
+	* gtk/src/papersize.ccg
+	* gtk/src/printcontext.hg
+	* gtk/src/printcontext.ccg
+	* gtk/src/printoperation.hg
+	* gtk/src/printoperation.ccg
+	* gtk/src/printsettings.hg
+	* gtk/src/printsettings.ccg: New files - the platform-independent
+	part of the printing API.
+	* gtk/src/enums.hg: Added PageOrientation.
+	* gtk/src/Makefile_list_of_hg.am_fragment
+	* gtk/gtkmm.h: Include new files.
+	* tools/m4/convert_pango.m4
+	* tools/m4/convert_gtk.m4: Added new conversions.
+	* tools/extra_defs_gen/generate_defs_gtk.cc:
+	Added GTK_TYPE_PRINT_OPERATION.
+	* gtk/src/gtk_enums.defs:   Regenerated with enums.pl.
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/gtk_signals.defs: Added new properties.
+	* configure.in: Added gtk+-unix-print dependency for upcoming updates.
+
+2006-04-26  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/widget.hg: Added doxygen documentation, marking 
+	signal_get_accessible as deprecated, because it is useless.
+	Bug #338437.
+
+2006-04-24  Armin Burgmeier  <armin@arbur.net>
+
+	* gtk/src/statusicon.ccg: Return value of StatusIcon::create_from_file
+	was undefined, return created StatusIcon instead.
+
+2006-04-21  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/recent_files/.cvsignore:
+	* examples/book/recent_files/Makefile.am:
+	* examples/book/recent_files/examplewindow.cc:
+	* examples/book/recent_files/examplewindow.h:
+	* examples/book/recent_files/main.cc: Added these missing files, to 
+	fix the build.
+	* gtk/src/widget.hg: Use deprecated option with the 
+	get_accessible keyword, because it should not exist, because it 
+	is actually a vfunc, but a quirk of gmmproc means that it was generated 
+	even though it is in the .defs file as a vfunc.
+
+2006-04-21  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/treesortable.hg: Correct the documentation for 
+	SlotCompare. Bug #339129 from Kevin Daughtridge.
+
+2006-04-20  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/treeview.ccg: Mark treeview_target_row as static, to slightly 
+	reduce code size by preventing it from being exported in the ABI.
+
+2006-04-20  Murray Cumming  <murrayc@murrayc.com>
+
+	* pango/src/fontset.ccg: Remove unnecessary anonymous namespace.
+
+2006-04-18  Marko Anastasov <marko@marko.anastasov.name>
+
+	* gtk/src/cellrendererspin.[hg|ccg]: New file.
+	* gtk/src/Makefile_list_of_hg.am_fragment: Include new hg file.
+	* gtk/gtkmm.h: Include the new header.
+	* gtk/src/recentchooser.ccg:
+	* gtk/src/recentchooser.hg: Fix some typos.
+
+2006-04-18  Armin Burgmeier  <armin@arbur.net>
+
+	* gtk/src/cellrenderertext.hg: Change type for ellipsize property from
+	bool to Pango::EllipsizeMode. Also added some new properties.
+	(Note: This is technically a small API break, but a break of something 
+	that could not have worked before, and I don't think it's an ABI break
+	Murray.)
+	* gtk/src/gtk_signals.defs: Regenerated to contain the new properties.
+
+2006-04-18  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/filechooser.hg: Correct the signature of the confirm_overwrite 
+	signature. This is technically a small API/ABI break, but any use of the 
+	signal as it was would have caused crashes and memory corruption, so that's 
+	not something that anyone could complain about us not preserving.
+	Bug #338439 from Maxim Udushlivy.
+
+2006-04-14  Murray Cumming  <murrayc@murrayc.com>
+
+	* tools/m4/convert_base.m4: Remove this unused file. It is in glibmm already.
+
+2006-04-13  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/recentchooser.ccg: Convert the SignalProxy to the new style that 
+	uses static functions instead.
+
+2006-04-12  Armin Burgmeier  <armin@arbur.net>
+
+	* gtk/src/recentchooser.hg:
+	* gtk/src/recentchooser.ccg:
+	* gtk/src/recentchooserwidget.hg:
+	* gtk/src/recentchooserwidget.ccg:
+	* gtk/src/recentchoosermenu.hg:
+	* gtk/src/recentchoosermenu.ccg:
+	* gtk/src/recentchooserdialog.hg:
+	* gtk/src/recentchooserdialog.ccg: Wrapped GtkRecentChooser,
+	GtkRecentChooserDialog, GtkRecentChooserMenu and
+	GtkRecentChooserWidget.
+	* tools/m4/convert_gtk.m4: Added new needed conversions.
+	* gtk/gtkmm.h: Include the new headers.
+	* examples/book/recent_files/: The beginning of an example. To complete 
+	this we need to be able to use RecentFilesMenu with UIManager. The GTK+ 
+	developer is working on this.
+
+2006-04-12  Marko Anastasov <marko@marko.anastasov.name>
+
+        * gtk/src/recentinfo.[ccg|hg]: Added new get_applications() and get_groups()
+        functions that don't take length as a parameter but pass NULL to the
+        underlaying GTK+ functions.
+        * tools/m4/convert_gtk.m4: Removed now unnecessary gsize* to unsigned& conversion.
+
+2006-04-12  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/recentfilter.ccg: Fix some typos to fix the build. 
+	Use the new non-class SignalProxy callbacks idea. (See below)
+
+	* atk/src/hyperlink.hg:
+	* atk/src/hypertext.hg:
+	* atk/src/objectaccessible.hg:
+	* atk/src/table.hg:
+	* gdk/src/colormap.hg:
+	* gdk/src/cursor.hg:
+	* gdk/src/display.hg:
+	* gdk/src/displaymanager.hg:
+	* gdk/src/drawable.hg:
+	* gdk/src/event.hg:
+	* gdk/src/gc.hg:
+	* gdk/src/image.hg:
+	* gdk/src/screen.hg:
+	* gdk/src/visual.hg:
+	* gdk/src/window.hg:
+	* gtk/src/aboutdialog.hg:
+	* gtk/src/accellabel.hg:
+	* gtk/src/actiongroup.hg:
+	* gtk/src/assistant.hg:
+	* gtk/src/button.hg:
+	* gtk/src/clipboard.hg:
+	* gtk/src/combobox.hg:
+	* gtk/src/container.hg:
+	* gtk/src/entry.hg:
+	* gtk/src/entrycompletion.hg:
+	* gtk/src/expander.hg:
+	* gtk/src/filechooser.hg:
+	* gtk/src/frame.hg:
+	* gtk/src/iconinfo.hg:
+	* gtk/src/iconsource.hg:
+	* gtk/src/iconview.hg:
+	* gtk/src/image.hg:
+	* gtk/src/imagemenuitem.hg:
+	* gtk/src/invisible.hg:
+	* gtk/src/label.hg:
+	* gtk/src/layout.hg:
+	* gtk/src/menu.hg:
+	* gtk/src/menuitem.hg:
+	* gtk/src/menutoolbutton.hg:
+	* gtk/src/notebook.hg:
+	* gtk/src/optionmenu.hg:
+	* gtk/src/paned.hg:
+	* gtk/src/range.hg:
+	* gtk/src/scale.hg:
+	* gtk/src/scrolledwindow.hg:
+	* gtk/src/selectiondata.hg:
+	* gtk/src/spinbutton.hg:
+	* gtk/src/statusicon.hg:
+	* gtk/src/textbuffer.hg:
+	* gtk/src/textmark.hg:
+	* gtk/src/texttagtable.hg:
+	* gtk/src/textview.hg:
+	* gtk/src/toolbar.hg:
+	* gtk/src/toolbutton.hg:
+	* gtk/src/toolitem.hg:
+	* gtk/src/treemodelfilter.hg:
+	* gtk/src/treemodelsort.hg:
+	* gtk/src/treerowreference.hg:
+	* gtk/src/treeselection.ccg:
+	* gtk/src/treeselection.hg:
+	* gtk/src/treeview.hg:
+	* gtk/src/uimanager.hg:
+	* gtk/src/viewport.hg:
+	* gtk/src/widget.hg:
+	* gtk/src/window.hg: Use the new constversion option with _WRAP_METHOD() 
+	to reduce code size a little.
+
+2006-04-07  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/gtkmm/treeview_private.cc:
+	* gtk/gtkmm/treeview_private.h:
+	* gtk/src/aboutdialog.ccg:
+	* gtk/src/assistant.ccg:
+	* gtk/src/celllayout.ccg:
+	* gtk/src/clipboard.ccg:
+	* gtk/src/combobox.ccg:
+	* gtk/src/entrycompletion.ccg:
+	* gtk/src/filefilter.ccg:
+	* gtk/src/menu.ccg:
+	* gtk/src/texttagtable.ccg:
+	* gtk/src/treemodelfilter.ccg:
+	* gtk/src/treeselection.ccg:
+	* gtk/src/treesortable.ccg:
+	* gtk/src/treeview.ccg:
+	* gtk/src/treeviewcolumn.ccg: For most hand-coded SignalProxy classes, used 
+	for set_*func() methods, remove them and just pass a copy of the slot around. 
+	The extra indirection is not necessary. Use standalone callback functions, so 
+	that they can be static, saving a few bytes on the library size.
+
+2006-04-12  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/src/pixbuf.ccg:
+	* gdk/src/pixbufloader.ccg:
+	* gtk/src/colorselection.ccg:
+	* gtk/src/container.ccg:
+	* gtk/src/entrycompletion.ccg:
+	* gtk/src/iconview.ccg:
+	* gtk/src/treeiter.ccg:
+	* gtk/src/treemodel.ccg:
+	* gtk/src/treeselection.ccg:
+	* gtk/src/widget.ccg:
+	* pango/src/fontset.ccg: Mark private functions as static, 
+	to stop them being exported in the library, to reduce code size 
+	slightly.
+
+2006-04-11  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* gtk/src/icontheme.ccg: (IconTheme::get_search_path) fixed a segfault
+	caused by de-referencing a NULL pointer, and also fixed a memory leak by
+	freeing the list of search paths whose storage was allocated by GTK+.
+	Closes bug #337874 and #337875
+
+2006-04-11  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/recentfilter.ccg:
+	* gtk/src/recentfilter.hg: Added constructor for the Info 
+	inner class, so that the member variables are initialized.
+	* gtk/src/recentinfo.hg: Split get_icon() into const and non-const 
+	overloads.
+	* gtk/src/recentmanager.hg: Added TODO comment for documentation.
+
+2006-04-11  Marko Anastasov <marko@marko.anastasov.name>
+
+	* gtk/src/recentfilter.[hg|ccg]:
+	* gtk/src/recentinfo.[hg|ccg]:
+	* gtk/src/recentmanager.[hg|ccg]:
+	* gtk/src/Makefile_list_of_hg.am_fragment: Added new files.
+	* tools/m4/convert_gtk.m4: Add new needed conversions.
+	* gtk/gtkmm.h: include the new headers.
+
+2006-04-11  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in:
+	* examples/book/treeview/Makefile.am:
+	* examples/book/treeview/modelsort/.cvsignore:
+	* examples/book/treeview/modelsort/Makefile.am:
+	* examples/book/treeview/modelsort/examplewindow.cc:
+	* examples/book/treeview/modelsort/examplewindow.h:
+	* examples/book/treeview/modelsort/main.cc: Added example of 
+	independently sorted model, with the TreeModelSort parent model. 
+
+2006-04-11  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/gtkmm/listviewtext.cc: Constructor: Use sprintf() instead of 
+	std::stringstream because it is smaller (code size) and faster.
+
+2006-04-07  Cedric Gustin  <cedric.gustin@gmail.com>
+
+	* README.win32: Updated for gtkmm-2.8 (MS Visual Studio 2005).
+	* MSVC_Net2003/*.vcproj: Updated for Visual Studio 2005. Added the
+	/vd2 compiler flag (Bug #158040).
+	* MSVC_Net2003/gtkmm.sln: Updated for Visual Studio 2005.
+	* MSVC_Net2003/gendef/gendef.cc: Redirect output of dumpbin to a
+	file.
+	* build_shared/Makefile_build.am_fragment: Add -DGTKMM_BUILD to
+	the extra_defines compiler flags (switch between
+	dllexport/dllimport on win32).
+	* gtk/src/treeviewcolumn.hg: Tag the TreeViewColumn class with
+	GTKMM_API to avoid auto-import errors with gcc on
+	mingw32/cygwin. Also inline some TreeViewColumn methods. Bug
+	#309030 (Toralf Lund).
+	* gtk/src/object.hg: Tag the Object class with GTKMM_API to make
+	Visual Studio happy.
+
+2006-04-04  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: fixed a few broken links in the jhbuild
+	appendix
+
+2006-03-31  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Added 
+	GTK_TYPE_CELL_RENDERER_SPIN, GTK_TYPE_RECENT_CHOOSER, 
+	GTK_TYPE_RECENT_CHOOSER_MENU, GTK_TYPE_RECENT_CHOOSER_WIDGET, 
+	GTK_TYPE_RECENT_FILTER, GTK_TYPE_RECENT_MANAGER )
+	* gtk/src/gtk_signals.defs: Added sections for the new types.
+
+
+2006-03-28  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/gtk_docs_override.xml: Added override for 
+	gtk_widget_render_icon(), because it mentioned unrefing the result.
+
+2006-03-26  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/src/gdk_docs_override.xml: Override the documentation for 
+	create_cairo_context because it mentions destroying the result, 
+	and says that it is since 2.8 instead of 2.10.
+
+2006-03-23  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/src/pixbufloader.hg: create(): Add documentation, based on 
+	new C documentation.
+
+2006-03-22  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/Makefile.am: Add style.css to EXTRA_DIST.
+	* docs/tutorial/gtkmm-tut.xml: TreeView chapter: Add a 
+	sub-section about sorting, mentioning the simple set_sort_column() 
+	functions and TreeModelSort for independent sorting. Based on 
+	code from the example from R. Douglas Barbieri in bug #334791.
+
+2006-03-22  Murray Cumming <murrayc@murrayc.com>
+
+	* gdk/src/dragcontext.hg: Added set_icon_name().
+	* gtk/src/toolbutton.hg: Added set_icon_name() and 
+	get_icon_name().
+	* gdk/src/pixbuf.hg:
+	* gdk/src/pixbufloader.ccg:
+	* gdk/src/pixbufloader.hg:
+	* gtk/src/aboutdialog.hg:
+	* gtk/src/dialog.hg:
+	* gtk/src/iconview.hg:
+	* gtk/src/linkbutton.hg:
+	* gtk/src/textbuffer.hg:
+	* gtk/src/textchildanchor.hg:
+	* gtk/src/treemodelsort.hg: Added documentation, based on 
+	the C documentation.
+
+2006-03-22  Murray Cumming <murrayc@murrayc.com>
+
+	* configure.in:
+	* examples/book/Makefile.am:
+	* examples/book/iconview/Makefile.am:
+	* examples/book/iconview/examplewindow.cc:
+	* examples/book/iconview/examplewindow.h:
+	* examples/book/iconview/main.cc: Added example from 
+	R. Douglas Barbieri in bug #335388.
+	* examples/book/iconview/gnome-dice-1.svg:
+	* examples/book/iconview/gnome-dice-2.svg:
+	* examples/book/iconview/gnome-dice-3.svg:
+	* examples/book/iconview/gnome-dice-4.svg:
+	* examples/book/iconview/gnome-dice-5.svg:
+	* examples/book/iconview/gnome-dice-6.svg:
+	* examples/book/iconview/mozilla-firefox.png:
+	* examples/book/iconview/xmms.xpm: Sample images for the 
+	example.
+
+2006-03-22  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/index.html: Corrected links to chapters, now that 
+	we added a chapter in the middle. Bug #334989 from Rob Page.
+	* gtk/gtkmm/listviewtext.h: Added groups and newin doxygen 
+	tags.
+
+2006-03-22  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/gtkmm/listviewtext.cc:
+	* gtk/gtkmm/listviewtext.h: Renamed some member variables, and 
+	used ModelColumns via member instance instead of pointer, to 
+	simplify code.
+	* configure.in:
+	* examples/book/treeview/Makefile.am:
+	* examples/book/treeview/listviewtext/Makefile.am:
+	* examples/book/treeview/listviewtext/examplewindow.cc:
+	* examples/book/treeview/listviewtext/examplewindow.h:
+	* examples/book/treeview/listviewtext/main.cc: Added example, 
+	based on treeview/list example.
+	* gtk/gtkmm.h: Include listviewtext.h
+
+2006-03-22  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/gtkmm/Makefile.am:
+	* gtk/gtkmm/listviewtext.cc:
+	* gtk/gtkmm/listviewtext.h: Added ListViewText, a very simple TreeView 
+	convenience class, from J. Baltasar García Perez-Schofield in bug #329333, 
+	with formatting and constness corrections.
+
+2006-03-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/drawingarea/clock/clock.cc:
+	* examples/book/drawingarea/joins/myarea.cc: Update the cairomm enum values for the 
+	latest cairomm API.
+
+2006-03-08  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/combobox.hg: Added get/set_title() and corresponding
+ 	tearoff-title property.
+	* gtk/src/iconview.ccg:
+	* gtk/src/iconview.hg: Added drag and drop methods.
+	* gtk/src/treeview.hg: Corrected a typo in the documentation.
+	* tools/m4/convert_gtk.m4: Added new enum conversion.
+
+2006-02-25  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/treeview.hg: Remove an extra : after a @deprecated.
+
+2006-02-25  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Signals appendix: Remove vague uninteresting stuff 
+	about different functor types, and mention sigc::ptr_fun, mem_fun distinction earlier.
+
+o2006-02-25  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/gtk_docs.xml: Regenerate from the C files.
+	* gtk/src/gtk_docs_override.xml: Update the override for gtk_icon_theme_list_icons(), 
+	so that it shows the correct subset examples. Fixes bug #330966 from John Spray 
+
+2006-02-25  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/gtkmm.h: Include layout.h, cellview.h, and icontheme.h.
+	Bug #332447 from Maxim Udushlivy.
+
+2006-02-24  Rob Page  <page.rob@gmail.com>
+
+ 	* gtk/src/icontheme.ccg: Change int* to int to fix segfault. Bug #332437.
+
+2006-02-25  Murray Cumming  <murrayc@murrayc.com>
+
+        * gtk/src/calendar.hg:
+        * gtk/src/cellrenderer.hg:
+        * gtk/src/messagedialog.hg:
+        * gtk/src/textview.hg:
+        * gtk/src/treemodelfilter.hg:
+        * gtk/src/treepath.hg:
+        * gtk/src/treeview.hg:
+        * gtk/src/widget.hg: Move the deprecated comment into the _WRAP_METHOD() call,
+        using the new feature in glibmm, so that it really shows up in the doxygen
+        documentation.
+
+2006-02-22  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* configure.in: only generate Makefiles for specific features if those
+	features are enabled (e.g. docs, examples, etc)
+
+2006-02-22  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/gtk_docs_override.xml: Added an override for gtk_icon_theme_list_icons() 
+	because it mentions GList, memory management of the items, and providing a NULL 
+	parameter.
+	* gtk/src/icontheme.ccg:
+	* gtk/src/icontheme.hg: Added override of list_icons() that returns all icons, 
+	regardless of context, to match the NULL context case. Bug #330945 from John Spray.
+
+2006-02-18  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: synchronized the list of widgets without
+	windows with the documentation from the Gtk+ tutorial (see
+	http://gtk.org/tutorial/x502.html)
+
+2006-02-18  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/style.css: Fixed a couple of tutorial style issues
+	* docs/tutorial/gtkmm-tut.xml: updated and re-organized the installation
+	section of the tutorial a bit more -- added dependency on cairomm / cairo,
+	reworded a few things, etc.
+	Added a new appendix explaining how to build and install gtkmm from CVS
+	using jhbuild.
+
+2006-02-17  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/src/pixbuf.ccg: save_to_buffer(): Use a terminating NULL when
+	calling gdk_pixbuf_save_to_buffer() to avoid a warning about the sentinel.
+
+2006-02-13  Rob Page  <page.rob@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: minor fixes to gettext chapter, a typo and
+	a broken link (Bug #331077)
+
+2006-02-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/assistant.hg: Wrap the prepared signal, now that it is fixed in GTK+.
+	* gtk/src/entry.hg: Add a link to the email that says it is OK to wrap the 
+	activate signal.
+
+2006-02-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/clipboard.hg: Wrap the owner-changed signal, which was new in 
+	GTK+ 2.8, I think. Use no_default_handler to avoid an ABI break.
+	* gtk/src/gtk_signals.defs: Added defs for GtkClipboard.
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Generate .defs for GtkClipboard.
+	Bug #330139 from Jonathan Jongsma.
+
+2006-01-30  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: fixed a minor typo in the clipboard section
+	of the tutorial that referred to get_data_as_text() instead of
+	get_data_as_string()
+
+2006-01-29  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/Makefile.am: Remove unnecessary icons installation line - 
+	it happens in the sub-directory.
+	* docs/tutorial/figures/Makefile.am:
+	* docs/tutorial/figures/comboboxentry_complex.png:
+	* docs/tutorial/figures/comboboxentry_text.png: Added screenshots.
+	* docs/tutorial/gtkmm-tut.xml: Write basic Combo Boxes chapter, replacing the 
+	text about the deprecated Combo widget, and moving it after the TreeView 
+	chapter, because it needs knowledge of the TreeView.
+	* examples/book/combobox/complex/examplewindow.cc:
+	* examples/book/combobox/text/examplewindow.cc:
+	* examples/book/comboboxentry/complex/examplewindow.cc:
+	* examples/book/comboboxentry/text/examplewindow.cc: Removed useless 
+	commented-out code.
+
+2006-01-29  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/treeview.hg: Added get_search_entry() and 
+	get_headers_clickable().
+	* tools/m4/convert_gtk.m4: Correct the Entry conversion.
+
+2006-01-29  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/widget.ccg:
+	* gtk/src/widget.hg: Added get_action().
+
+2006-01-29  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/gdkmm/general.cc:
+	* gdk/gdkmm/general.h: Added set_source_pixmap().
+	* gtk/src/Makefile_list_of_hg.am_fragment:
+	* gtk/src/action.ccg:
+	* gtk/src/assistant.ccg:
+	* gtk/src/assistant.hg: Added Assistant.
+	* gtk/src/linkbutton.ccg:
+	* gtk/src/linkbutton.hg: Added LinkButton
+	* gtk/gtkmm.h: include the new headers.
+	* gtk/src/cellrenderertoggle.hg: Added indicator-size property.
+	* gtk/src/messagedialog.hg: Added properties.
+	* gtk/src/radioaction.hg: Added set_current_value().
+	* gtk/src/sizegroup.hg: Added get_widgets().
+	* gtk/src/toolbutton.hg: Deprecated the clicked signal, because 
+	it has become a keybinding/action signal.
+	* gtk/src/treeview.ccg:
+	* gtk/src/treeview.hg: Added set_search_position_func().
+	* gtk/src/window.hg: Added get_group().
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Add the new GTK+ 
+	GTypes.
+	* tools/m4/convert_gtk.m4: Add new needed conversions.
+	* gtk/src/gtk_enums.defs: Regenerated with enums.pl
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py
+	* gtk/src/gtk_signals.defs: Added parts with extra_defs.
+
+2006-01-28  Pierre Thierry  <nowhere.man@levallois.eu.org>
+
+	* examples/book/buttons/radiobutton/radiobuttons.cc: add comments and
+	reorganize the example so that it's a bit more understandable for
+	beginners
+	* gtk/src/box.hg: add brief clarification of where widgets end up when
+	packed with a variety of pack_start() and pack_end() calls
+
+2006-01-24  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/Makefile.am: Restore html upload line.
+	* docs/tutorial/gtkmm-tut.xml: Contributing: Added links to bugs page. 
+	* gtk/src/radiobutton.hg: Added documentation for get/set/reset_group().
+
+2006-01-24  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Installation: Move section about 
+	packages before the section about installing from source, so people 
+	see the easiest/best way first. Add warning about installing 
+	source-built stuff in /usr.
+
+2006-01-24  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/Makefile.am: Upload the style.css file when doing 
+	post-html.
+	* docs/tutorial/gtkmm-tut.xml: Add para tags to tip and note tags, 
+	as noticed by the validate-original make target. Remove some of 
+	the initial paragraph about it being a draft. 
+
+2006-01-24  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/Makefile.am:
+	* docs/tutorial/icons/Makefile.am: Restored some files I messed up 
+	by copying stuff into the wrong place.
+
+2006-01-24  Murray Cumming <murrayc@murrayc.com>
+
+	* docs/tutorial/Makefile.am:
+	* docs/tutorial/icons/Makefile.am:
+	* docs/tutorial/icons/caution.png:
+	* docs/tutorial/icons/home.png:
+	* docs/tutorial/icons/important.png:
+	* docs/tutorial/icons/next.png:
+	* docs/tutorial/icons/note.png:
+	* docs/tutorial/icons/prev.png:
+	* docs/tutorial/icons/tip.png:
+	* docs/tutorial/icons/up.png:
+	* docs/tutorial/icons/warning.png: Added missing files.
+
+2006-01-23  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: improve the markup of the tutorial by
+	replacing a lot of the generic 'literal' tags with more specific ones like
+	'classname' or 'function'.  Also marked up a bunch of things that weren't
+	marked up at all.
+
+2006-01-18  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/figures/Makefile.am:
+	* docs/tutorial/figures/*.png: Several updated screenshots from 
+	Jonathon Jongsma. Bug #327142.
+
+2006-01-18  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/gtk_docs_override.xml: Added some new overrides for functions that 
+	mention free() or NULL.
+
+2006-01-15  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+        * docs/tutorial/Makefile.am: Modified makefile to pass some XSL parameters
+        to the xsltproc.  For example, where to find icon images, what filename to
+        use as a CSS stylesheet, etc.
+        * docs/tutorial/insert_example_code.pl: Modified script to mark up the
+        filename with a docbook 'filename' element so that it can be styled more
+        easily
+        * docs/tutorial/style.css: add a new CSS stylesheet for styling the
+        tutorial.  The CSS is based on the GNOME stylesheets used for yelp but a
+        also designed to fit the theme of the gtkmm website.
+        * docs/tutorial/icons/*.png: add a bunch of images from the tango theme to
+        be used for informational and navigational icons.
+
+2005-12-31  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Add screenshot for the aspectframe example.
+	The screenshot was already in CVS, just not linked from the tutorial.
+
+2005-12-31	Jonathon Jongsma	<jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: updated section on prepackaged gtkmm
+	binaries for linux distributions
+
+2006-01-07  Michael J M Thomson  <mjmt@internode.on.net>
+
+	* gtk/gtkmm.h: Include menutoolbutton.h and tearoffmenuitem.h
+
+2005-12-24  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: quick fix for source code location of
+	cairo simple line drawing example
+
+2006-01-04  Cedric Gustin <cedric.gustin@gmail.com>
+
+	* gtk/src/Makefile_list_of_hg.am_fragment: Moved plug.hg and
+	socket.hg from files_posix_hg to files_general_hg as both GtkPlug
+	and GtkSocket are now supported on win32.
+
+2005-12-20  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/container.ccg:
+	* gtk/src/container.hg: Use custom_c_callback option 
+	with _WRAP_SIGNAL for the remove signal, so we can 
+	provide a custom signal callback (as well as the existing 
+	custom default signal callback). This allows us to 
+	check for already-deleted children in connected signal handler 
+	callbacks as well as the default signal handler. This should 
+	be a partial fix for bug #315874 from Philip Langdale.
+
+2005-12-23  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: DrawingArea chapter: Move GDK 
+	stuff into an appendix, and remove reference to X, because it is 
+	not always running on X. 
+
+2005-12-23  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/tutorial/figures/Makefile.am: Mention the new screenshots 
+	so they are disted and uploaded.
+	* docs/tutorial/gtkmm-tut.xml: Fix a source code path.
+
+2005-12-21  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* configure.in: added makefiles for new example directories
+	* docs/tutorial/Makefile.am:
+	* docs/tutorial/figures/drawingarea_lines.png:
+	* docs/tutorial/gtkmm-tut.xml:
+	* examples/book/Makefile.am:
+	* examples/book/drawingarea/main.cc:
+	* examples/book/drawingarea/myarea.cc:
+	* examples/book/drawingarea/myarea.h: complete rework of the drawing area
+	chapter of the gtkmm tutorial to use Cairomm for drawing instead of old
+	Gdk functions.  Updated text and examples, and added several new examles.
+
+2005-12-21  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/texttagtable.ccg: Put a private class in a 
+	anonymous namespace, theoretically to prevent it being 
+	exported as ABI. 
+
+2005-12-20  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/entry.hg: Added xalign and 
+	truncate-multiline properties.
+
+2005-12-20  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/drawingarea/myarea.cc:
+	* gdk/gdkmm/general.cc:
+	* gdk/gdkmm/general.h:
+	* gdk/src/drawable.hg: Use Cairo objects via 
+	Cairo::RefPtr.
+
+2005-12-15  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/adjustment.ccg:
+	* gtk/src/adjustment.hg: Generate the constructor, 
+	instead of hand coding it, because it now uses properties.
+
+2005-12-15  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in:
+	* examples/book/Makefile.am:
+	* examples/book/statusicon/.cvsignore:
+	* examples/book/statusicon/main.cc:
+	Add example.
+	* gtk/gtkmm.h: #include statusicon.h and 
+	cellrendereraccel.h.
+	* gtk/src/statusicon.hg: Rename parameter name for 
+	stock constructor, so it uses the correct property name.
+
+2005-12-15  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/object.hg: Add class documentation, based on 
+	the C documentation. Add documentation for manage().
+
+2005-12-14  Murray Cumming <murrayc@murrayc.com>
+
+	* gdk/src/types.hg: Hide traits from Doxygen.
+
+2005-12-14  Philip Langdale  <plangdale@vmware.com>
+ 
+ 	* gdk/src/window.hg:
+ 	* tools/m4/convert_gdk.m4: Correct the Cursor 
+ 	conversion - it does not need to be copied/leaked. 
+ 	Bug #323920.
+
+2005-12-12  Murray Cumming <murrayc@murrayc.com>
+
+	* configure.in: Depend on gtk+ 2.9.
+	* gtk/src/Makefile_list_of_hg.am_fragment:
+	* gtk/src/cellrendereraccel.ccg:
+	* gtk/src/cellrendereraccel.hg: New CellRenderer.
+	* gtk/gtkmm/cellrenderer_generation.cc:
+	* gtk/gtkmm/cellrenderer_generation.h: 
+	Add a template specialization for AccelKey model 
+	columns.
+	* gtk/src/filechooserbutton.hg: Add 
+	set/get_focus_on_click() and property.
+	* gtk/src/menu.ccg:
+	* gtk/src/menu.hg: Add attach_to_widget() overload 
+	without a destroy callback.
+	* gtk/src/range.hg: Added 
+	get/set_lower_stepper_sensitivity(),
+	get/set_upper_stepper_sensitivity() and properties.
+	* gtk/src/selectiondata.hg: Added targets_include_uri().
+	* gtk/src/statusicon.ccg:
+	* gtk/src/statusicon.hg: New class.
+	* gtk/src/style.hg: Added lookup_color().
+	* gtk/src/textbuffer.hg: Added get_has_selection() and 
+	property. Added text property.
+	* gtk/src/window.hg: Added get/set_deletable() and 
+	property.
+	* tools/extra_defs_gen/generate_defs_gtk.cc: Add new types.
+	* tools/m4/convert_gtk.m4: Add new conversions.
+	* gtk/src/gtk_docs.xml: Update.
+	* gtk/src/gtk_enums.defs: Update
+	* gtk/src/gtk_methods.defs: Update
+	* gtk/src/gtk_signals.defs: Update
+
+2005-12-10  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/expander.hg: Add documentation, base on the 
+	C documentation, mentioning property_expanded().signal_changed().
+
+2005-12-10  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/object.ccg: Use g_object_sink_ref() and 
+	friends instead of now-deprecated gtk_object_sink(). 
+	Maybe it works.
+
+2005-12-06  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* Makefile.am:
+	* configure.in: add configure option for enabling / disabling building of
+	documentation (--enable-docs / --disable-docs)
+
+2005-12-06   Jonathon Jongsma <jonathon.jongsma@gmail.com>
+
+	* configure.in: Look for gmmproc in generic libdir 
+	directory, because that is not always lib/. This 
+	fixes the build on some 64-bit systems.
+
+2005-12-06   Jonathon Jongsma <jonathon.jongsma@gmail.com>
+
+	* gdk/gdkmm-2.4.pc.in: Add cairomm to dependencies. 
+	Bug #323347.
+
+2005-12-02  Murray Cumming <murrayc@murrayc.com>
+
+	* docs/reference/Doxyfile.in: Reword the title of the 
+	since pages, to make it clear that they do not include 
+	new API in subsequent versions.
+
+2005-12-01  Murray Cumming <murrayc@murrayc.com>
+
+	* gdk/gdkmm/general.h: Mark cairo API as new in 2.10.
+
+2005-12-01  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/treemodel.ccg:
+	* gtk/src/treemodel.hg: Added a method overload of 
+	rows_reordered() without the iter, because the GTK+ docs 
+	now say that it can be 0. Added documentation, based on the 
+	C documentation.
+
+2005-12-01  Murray Cumming <murrayc@murrayc.com
+
+	* examples/book/drawingarea/myarea.cc: 
+	on_expose_event(): Port to cairo instead of 
+	draw*(), though the Color and GC part should 
+	probably be ported too.
+
+2005-12-01  Murray Cumming <murrayc@murrayc.com>
+
+	* configure.in: Depend on cairomm.
+	* gdk/gdkmm/general.cc:
+	* gdk/gdkmm/general.h:
+	* gdk/src/drawable.hg: Use C++ Cairo:: types instead of 
+	C cairo_* types.
+
+2005-12-01  Murray Cumming <murrayc@murrayc.com>
+
+	* docs/reference/Doxyfile.in: Add a newline after the 
+	newin xrefitem, to stop doxgygen associating the following 
+	text with the xrefitem, so properties and returns do not 
+	show up in the list of new API.
+
+2005-12-01  Murray Cumming <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Remove link to 
+	non-existing drawing_area_text example. 
+	Bug #311176 from Jonathon Jongsma.
+
+2005-11-30  Murray Cumming <murrayc@murrayc.com>
+ 
+ 	* docs/index.html: Change deprecated link to link to 
+ 	deprecated and new pages page.
+ 	* gdk/src/gdk_docs_override.xml:
+ 	* gtk/src/gtk_docs_override.xml: Change Since: to 
+ 	our @newin tags.
+
+2005-11-30  Murray Cumming <murrayc@murrayc.com>
+
+	* docs/reference/Doxyfile.in: Added ALIASES 
+	for @newin2p2, @newin2p4, @newin2p6, @newin2p8, and 
+	@newin2p10. API marked with these tags will then be 
+	listed together on a page. Doxygen already has @since, 
+	but that does not list them on one page.
+	* gdk/src/displaymanager.hg:
+	* gtk/gtkmm/accelmap.h:
+	* gtk/src/cellrenderer.hg:
+	* gtk/src/clipboard.hg:
+	* gtk/src/colorbutton.hg:
+	* gtk/src/entrycompletion.hg:
+	* gtk/src/expander.hg:
+	* gtk/src/filechooserwidget.hg:
+	* gtk/src/messagedialog.hg:
+	* gtk/src/radiotoolbutton.hg:
+	* gtk/src/rc.hg:
+	* gtk/src/uimanager.hg:
+	* pango/src/fontset.hg: Replace any Since: text with 
+	the new tags.
+
+2005-11-30  Murray Cumming <murrayc@murrayc.com>
+
+	* configure.in:
+	* gtk/gtkmmconfig.h.in: Check for the mkifofs() 
+	function (not available in windows, apparently), and 
+	define HAVE_MKIFOFS.
+	* examples/book/input/main.cc: Do not use mkifofs 
+	if it is not present, to fix build on Windows.
+	Bug #309031 from haleykd.
+
+2005-11-30  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/gtkmm/accelmap.cc:
+	* gtk/gtkmm/accelmap.h: Added lookup_entry(), wrapping 
+	gtk_accel_map_lookup_entry, based on code provided by 
+	Paul Davis in bug #318407.
+
+2005-11-30  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/style.ccg: Fix the cast, to fix the build
+
+2005-11-29  Murray Cumming <murrayc@murrayc.com>
+
+	* build_shared/Makefile_build.am_fragment:
+	* configure.in: Added --enable-deprecated-api option: 
+	Set it to yes to remove deprecated API from the library, 
+	for instance for embedded devices.
+	* gdk/src/color.ccg:
+	* gdk/src/color.hg:
+	* gdk/src/colormap.ccg:
+	* gdk/src/colormap.hg:
+	* gdk/src/image.hg:
+	* gdk/src/window.hg:
+	* gtk/src/calendar.hg:
+	* gtk/src/cellrenderer.hg:
+	* gtk/src/combo.hg:
+	* gtk/src/fileselection.hg:
+	* gtk/src/inputdialog.hg:
+	* gtk/src/messagedialog.hg:
+	* gtk/src/optionmenu.hg:
+	* gtk/src/progress.hg:
+	* gtk/src/textbuffer.ccg:
+	* gtk/src/textbuffer.hg:
+	* gtk/src/textview.ccg:
+	* gtk/src/textview.hg:
+	* gtk/src/toolbar.hg:
+	* gtk/src/treemodel.hg:
+	* gtk/src/treemodelfilter.hg:
+	* gtk/src/treepath.ccg:
+	* gtk/src/treepath.hg:
+	* gtk/src/treesortable.ccg:
+	* gtk/src/treesortable.hg:
+	* gtk/src/treeview.ccg:
+	* gtk/src/treeview.hg:
+	* gtk/src/treeviewcolumn.ccg:
+	* gtk/src/treeviewcolumn.hg:
+	* gtk/src/widget.hg: Use the new gmmproc features to 
+	ifdef-out the deprecated API.
+	* tests/menu_destruction/main.cc:
+	* demos/gtk-demo/example_iconview.cc:
+	* demos/gtk-demo/example_menus.cc:
+	* demos/gtk-demo/example_sizegroup.cc:
+	* demos/gtk-demo/example_textview.cc: 
+	* examples/Makefile.am_fragment:
+	* examples/book/custom/custom_container/mycontainer.cc:
+	* examples/book/dialogs/fileselection/examplewindow.cc:
+	* examples/book/range_widgets/labeledoptionmenu.cc:
+	* examples/book/range_widgets/labeledoptionmenu.h:
+	* examples/cellrenderercustom/popupentry.cc:
+	* examples/stock/stock.cc: Do not use deprecated API.
+
+2005-11-29  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/style.ccg:
+	* gtk/src/style.hg: Added an overload 
+	of set_bg_pixmap() that takes a const 
+	Pixmap, and deprecated the non-const one, 
+	because the pixmap contents are not changed
+	by the method. Bug #313309 from Michael Hofmann.
+
+2005-11-29  Murray Cumming <murrayc@murrayc.com>
+
+	* docs/index.html: Added a link to the 
+	generated list of deprecated API.
+
+2005-11-29  Murray Cumming <murrayc@murrayc.com>
+
+	* gdk/src/window.hg: Added set_urgency_hint().
+
+2005-11-28  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/textbuffer.hg: Added const overloads of 
+	get_text() and get_slice(), deprecating the non-const 
+	versions. Bug #322338 from Ami Tavory.
+
+2005-11-22  Murray Cumming <murrayc@murrayc.com>
+
+	* configure.in:
+	* examples/book/Makefile.am:
+	* examples/book/update_ui/Makefile.am:
+	* examples/book/update_ui/examplewindow.cc:
+	* examples/book/update_ui/examplewindow.h:
+	* examples/book/update_ui/main.cc: Add an example 
+	that uses events_pending() to update the UI, loosely 
+	based on bug #317424 from Gareth Foster.
+
+2005-11-22  Murray Cumming <murrayc@murrayc.com>
+
+	* pango/src/attrlist.ccg:
+	* pango/src/attrlist.hg: Add operator(), because 
+	some methods return null PangoAttrList*s.
+
+2005-11-21  Murray Cumming <murrayc@murrayc.com>
+
+	* gdk/gdkmm/general.cc:
+	* gdk/gdkmm/general.h: Added wrappers for gdk cairo functions, 
+	though we need a real cairo Context class, from a real cairo C++ 
+	API.
+	* gdk/src/drawable.hg: Add TODO about a gdk cairo function.
+	* gtk/src/treeview.hg: Do not use g_asssert in a header, to 
+	avoid a warning about a useless command.
+
+
+2005-11-16  Michael J M Thomson <mjmt@internode.on.net>
+
+	* gdk/src/gc.hg: GC::set_clip_rectangle(): Add a 
+	method overload that takes a const argument, and 
+	deprecate the non-const version. Bug #320631.
+
+2005-11-16  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/widget.hg: Made map() public, 
+	because custom containers sometimes (e.g. GtkNotebook) 
+	need to call it on their child widgets, though we are 
+	not sure when. Bug #320631.
+
+This is the HEAD branch, for new API.
+
+2.8.1:
+
+2005-08-02  Marco Scholten <mscholtn@xs4all.nl>
+
+	* docs/tutorial/gtkmm-tut.xml: changed square to 
+	Penrose triangle and added the missing screenshot
+	in the custom widget chapter.
+	Bug #311176.
+
+2005-10-19  Murray Cumming <murrayc.com>
+
+	* gtk/src/uimanager.hg: Use OWNERSHIP_NONE 
+	with get_action_groups(), because the GList 
+	should not be freed. Bug #31865 from 
+	Colin Law.
+
+2005-10-19  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in: Check for gtk+ 2.8. Bug #317913.
+
+2005-09-28  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/scrolledwindow.hg: get_*scrollbar_visible(): 
+	get_hscrollbar_visible() returned vscrollbar_visible() 
+	and vice-versa. Fixed. Bug #317309 by Bartek Kostrzewa.
+
+2.8.0:
+
+Updated NEWS and increased version.
+
+2.7.4:
+
+2005-08-17  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/src/dragcontext.hg: Corrected commented-out set_icon_name()
+	signature so we get it right when we can add it.
+	* gdk/src/gdk_extra.defs: Added gtk_drag_set_icon_name, copied from 
+	gtk_methods.defs.
+	* gtk/src/gtk_signals.defs.patch: Added this patch to help us 
+	modify the file after regenerating it in future.
+	* gtk/src/toolbutton.hg: Added commented-out set/get_icon_name()
+ 	for use during 2.9. 
+
+2005-08-17  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/src/dragcontext.hg: Comment-out set_icon_name() with a 
+	TODO comment because it is not getting the defs defintion for 
+	some reason.
+	* gdk/src/gdk_signals.defs: Regenerated with generate_extra_defs.
+	* gtk/src/entrycompletion.hg: Properties: Correct key_length 
+	to minimum_key_length, and popup_set_widgth to popup_set_width.
+	* gtk/src/gtk_enums.defs: Removed broken gtktreeprivate.h stuff.
+	* gtk/src/gtk_other.defs: Added new FileChooser signals and 
+	properties. 
+	* gtk/src/gtk_signals.defs: Regenerated with generate_extra_defs.
+	* tools/m4/convert_gtk.m4: Added GtkFileChooserConfirmation.
+
+2005-08-17  Murray Cumming <murrayc@murrayc.com>
+
+	* gdk/src/gdk_docs.xml: Regenerated with docextract_to_xml.py.
+	* gdk/src/gdk_enums.defs: Regenerated with enums.pl.
+	* gdk/src/gdk_methods.defs: Regenerated with h2defs.py
+	* gdk/src/gdk_pixbuf.defs:  Regenerated with h2defs.py
+	* gtk/src/gtk_docs.xml: Regenerated with docextract_to_xml.py.
+	* gtk/src/gtk_enums.defs: Regenerated with enums.pl.
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py
+
+2005-08-01  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/treeview.ccg: unset_model(): Removed 
+	extra ; that was breaking the build.
+
+2005-08-01  Murray Cumming <murrayc@murrayc.com>
+
+	* config.h.in: Added missing undefs, needed 
+	by SUN and Tru64 compilers. Patch from 
+	The Written Word.
+
+2005-08-01  Jonner <jonathon.jongsma@gmail.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Fix the link to the 
+	Gtk::Combo reference docs, though this should talk 
+	about Gtk::ComboBox instead anyway. 
+
+2005-08-01  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/settings.ccg:
+	* gtk/src/settings.hg: Autogenerate get_default():
+	to stop it creating a second wrapper object. 
+	Bug #311311.
+
+2005-07-31  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/treeview.ccg:
+	* gtk/src/treeview.hg: Added unset_model().
+
+2.7.3:
+
+2005-07-16  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/src/pixbufloader.ccg: create_with_type():
+	Really return the created GdkPixbufLoader.
+
+2005-07-16  Ishmal  <rwjj@earthlink.net>
+
+	* gtk/src/treeviewcolumn.hg: TreeViewColumn: 
+	Use GTKMM_API to add dllspec_export and dllspec_import 
+	for MSVC++ 7.1 because it needs the extra help, even when using 
+	--export-all and auto-import. See bug #309030.
+
+2005-07-16  Murray Cumming  <murrayc@murrayc.com>
+
+	* atk/src/atk_docs.xml:
+	* gdk/src/gdk_docs.xml:
+	* gtk/src/gtk_docs.xml:
+	* gtk/src/gtk_enums.defs:
+	* gtk/src/gtk_methods.defs:
+	* pango/src/pango_docs.xml: Regenerated.
+	* gdk/src/display.hg: Added warp_pointer().
+
+2005-07-15  Murray Cumming  <murrayc@murrayc.com>
+
+	* atk/src/atk_enums.defs:
+	* gdk/src/gdk_enums.defs:
+	* pango/src/pango_enums.defs:
+	* gtk/src/gtk_enums.defs: Regenerated with 
+	glibmm/tools/enums.pl
+	* gtk/src/filechooser.hg: Added 
+	get/set_do_overwrite_confirmation() and property and signal.
+	* gtk/src/treerowreference.hg: Added get_model().
+	* gtk/src/treeview.ccg:
+	* gtk/src/treeview.hg: Added const versions of get_path_at_pos(), 
+	get_cell_area(), get_background_area(), get_visible_rect(), 
+	widget_to_tree_coords(), tree_to_widget_coords().
+	Added get_visible_range().
+	* gtk/src/treeviewcolumn.hg: Added queue_resize()
+
+2.7.2:
+
+2005-07-12  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/index.html: Remove links to useless bonobo stuff. Correct the name 
+	of the canvas link, instead of having duplicate libglademm links.
+	* gdk/src/pixbuf.ccg:
+	* gdk/src/pixbuf.hg: Add a save_to_buffer() overload without the options 
+	parameters. Added reference documentation.
+	* gtk/src/entrycompletion.hg: Remove extra ;.
+
+2.7.1:
+
+2005-07-11  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/textiter.hg: Added move_forward/backward_visible_line(s).
+
+2005-07-10  Murray Cumming <murrayc@murrayc.com>
+
+	* gdk/src/dragcontext.hg: Added set_icon(const Glib::ustring& name)
+	* gtk/src/aboutdialog.hg: Added set/get_wrap_license() and property.
+	* gtk/src/dialog.hg: Added get_response_for_widget().
+	* gtk/src/widget.hg: Added drag_source_set_icon(const Glib::ustring& icon_name).
+	* gtk/src/entrycompletion.hg: Added properties, get/set_popup_set_width(), 
+	get/set_popup_single_width().
+	* gtk/src/iconview.hg: Added get_item_at_pos(), get_visible_range(), get/set_cursor(), 
+	scroll_to_path().
+
+2005-07-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* gdk/src/gdk_methods.defs: Regenerated with h2defs.py
+	* gdk/src/cursor.ccg:
+	* gdk/src/cursor.hg: Added get_image() and 
+	a Cursor(name) constructor.
+	* gdk/src/window.hg: Added move_region()
+	* gtk/gtkmm/stock.cc:
+	* gtk/gtkmm/stock.h: Added FULLSCREEN, LEAVE_FULLSCREEN, and 
+	INFO stock items.
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py
+	* gtk/src/image.ccg:
+	* gtk/src/image.hg: Reimplemented clear() with the new 
+	gtk_image_clear() function.
+	* gtk/src/sizegroup.hg: Added ignore_hidden property.
+	* gtk/src/window.hg: Added urgency_hint property, and 
+	get/set_urgency_hint(). Added present(timestamp) overload.
+
+2005-07-06  Claudio Saavedra  <csaavedra@alumnos.utalca.cl>
+
+	* docs/tutorial/gtkmm-tut.xml: Fixed typo in title of chapter about
+	constructors.
+
+2005-07-04  Murray Cumming <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Signals appendix: 
+	Correct ptr_fun/mem_fun typo.
+
+2005-06-09  Daniel Glöckner  <daniel-gl@gmx.net>
+
+	* tools/m4/convert_gdk.m4: Use OWNERSHIP_NONE with 
+	Glib::ListHandle< Glib::RefPtr<Device> instead of 
+	OWNERSHIP_DEEP, to avoid memory problems with 
+	Gdk::Display::list_devices().
+
+2005-05-26  Murray Cumming <murrayc@murrayc.com>
+
+	* docs/Makefile_web.am_fragment: Use different 
+	rsync args to fix recent problem with sourceforge.
+	* docs/tutorial/gtkmm-tut.xml: Fix URL prefix for 
+	glibmm reference links.
+	* gtk/src/comboboxentry.hg: get_entry() docs: 
+	Mention Bin::get_child() instead of get_entry().
+
+2005-04-21  Alexander Nedotsukov <bland@FreeBSD.org>
+
+	* gdk/gdkmm/Makefile.am:
+	* gtk/gtkmm/Makefile.am:
+	Add inter-library dependencies, which might be 
+	needed with some versions of pkg-config.
+
+2005-05-06  Murray Cumming <murrayc@murrayc.com>
+
+	* docs/tutorial/gtkmm-tut.xml: Signals apendix, 
+	X Event signals section: Added explanation of
+	connect(slot, false);
+
+2005-05-03  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/gtkmm/comboboxentrytext.cc: 
+	* gtk/gtkmm/comboboxentrytext.h:
+	* gtk/gtkmm/comboboxtext.cc:
+	* gtk/gtkmm/comboboxtext.h:
+	Deprecated clear() in favour of new 
+	clear_items() method, because clear() exists 
+	in the base CellLayout class and is very different. 
+	Added remove_text() to remove items one at a time.
+	Added doxygen documentation comments.
+
+2005-05-03  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/cellrenderer.hg: Added the 
+	sensitive property, which was maybe new in 
+	GTK+ 2.6.
+
+2005-05-01  Murray Cumming <murrayc@murrayc.com>
+
+	* gdk/src/colormap.ccg:
+	* gdk/src/colormap.hg: Deprecated alloc_colors() and 
+	free_colors(). Add free_color() for use with 
+	alloc_color(). Bug #157744
+
+2005-04-27  Philip Langdale <plangdale@vmware.com>
+
+	* gtk/src/action.hg: 
+	Override default wrap behaviour for get_proxies to
+	use the correct ownership semantics. (bug #172892)
+
+2005-04-24  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/button.hg:
+	* gtk/src/gtk_docs_override.xml:
+	* gtk/src/image.hg:
+	* gtk/src/toolbutton.hg:
+	Documentation: Change mentions of new_from_stock() 
+	to mention the C++ constructors, and document those 
+	constructors. 
+
+2005-04-22  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/cellrenderer.hg: Add documentation 
+	saying that signal_editing_started() does not 
+	work, so use the C API.
+	* gtk/src/combobox.hg: Added TODO comment 
+	for a future ABI break.
+
+2005-04-19  Murray Cumming <murrayc@murrayc.com>
+
+	* configure.in:
+	* examples/book/Makefile.am:
+	* examples/book/comboboxentry/.cvsignore:
+	* examples/book/comboboxentry/Makefile.am:
+	* examples/book/comboboxentry/complex/.cvsignore:
+	* examples/book/comboboxentry/complex/Makefile.am:
+	* examples/book/comboboxentry/complex/examplewindow.cc:
+	* examples/book/comboboxentry/complex/examplewindow.h:
+	* examples/book/comboboxentry/complex/main.cc:
+	* examples/book/comboboxentry/text/.cvsignore:
+	* examples/book/comboboxentry/text/Makefile.am:
+	* examples/book/comboboxentry/text/examplewindow.cc:
+	* examples/book/comboboxentry/text/examplewindow.h:
+	* examples/book/comboboxentry/text/main.cc:
+        Added ComboBoxEntry and ComboBoxEntryText examples, 
+	based on the existing ComboBox and ComboBoxText 
+	examples.
+
+2005-04-15  Murray Cumming  <murrayc@murrayc.com>
+
+	* examples/book/menus_and_toolbars/Makefile.am:
+	* examples/book/menus_and_toolbars/rain.png:
+	Add missing rain.png file and distribute it.
+	* examples/book/menus_and_toolbars/examplewindow.cc:
+	Catch the exception if the pixbuf file is not found.
+
+2005-04-07  Murray Cumming <murrayc@murrayc.com>
+
+	* gdk/src/display.hg:
+	* gdk/src/displaymanager.hg:
+	* gdk/src/pixbufloader.hg:
+	* gdk/src/screen.hg:
+	* gtk/src/accelgroup.hg:
+	* gtk/src/action.hg:
+	* gtk/src/actiongroup.hg:
+	* gtk/src/cellrenderer.hg:
+	* gtk/src/cellrenderertoggle.hg:
+	* gtk/src/colorbutton.hg:
+	* gtk/src/combobox.hg:
+	* gtk/src/entrycompletion.hg:
+	* gtk/src/filechooser.hg:
+	* gtk/src/fontbutton.hg:
+	* gtk/src/radioaction.hg:
+	* gtk/src/radiomenuitem.hg:
+	* gtk/src/range.hg:
+	* gtk/src/textbuffer.hg:
+	* gtk/src/togglebutton.hg:
+	* gtk/src/toolbar.hg:
+	* gtk/src/toolbutton.hg:
+	* gtk/src/toolitem.hg:
+	* gtk/src/treeiter.hg:
+	* gtk/src/uimanager.hg:
+	* gtk/src/widget.hg:
+	Added doxygen documentation for signals, based on 
+	the C documentation (in the .c files) where that 
+	documentation exists.
+
+2005-04-07  Murray Cumming <murrayc@murrayc.com>
+
+	* gtk/src/treeview.ccg:
+	* gtk/src/treeview.hg: Rename 
+	TreeView::_auto_store_on_cellrenderer_toggle_edited() to 
+	TreeView::_auto_store_on_cellrenderer_toggle_edited_with_model()
+	and add back the old _auto_store_on_cellrenderer_toggle_edited(), 
+	so that it still exists for apps built with the old templates. 
+	This is the only non-template code that was changed in the 
+	previous commit.
+
+2005-04-06  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/src/treeview.[hg|ccg]: append_*_(): Pass the model to the 
+	private helper template functions, instead of the treeview, to 
+	prevent the warning when closing the window while editing a cell.
+	Bug #170855.
+
+This is the HEAD branch. The stable branch is gtkmm-2-6. 
+
+2005-03-19  Murray Cumming <murrayc@murrayc.com>
+
+	* demos/gtk-demo/example_treeview_editable_cells.cc:
+	* gtk/src/treeview.ccg:
+	* gtk/src/treeview.hg:
+	Test the result of _get_model_base() for a null refptr,
+	to help avoid a crash when closing a window while the 
+	cell renderer is in edit mode. Bug #170855.
+
+2005-03-17  Claudio Saavedra <csaavedra@alumnos.utalca.cl>
+
+	* docs/tutorial/gtkmm-tut.xml: Fixes typo in #170730. Pointed out 
+	by Jacek Wotka.
+
 2.6.1:
 
 2005-03-12  Claudio Saavedra <csaavedra@alumnos.utalca.cl>
diff --git a/libs/gtkmm2/atk/atkmm/action.cc b/libs/gtkmm2/atk/atkmm/action.cc
index 69a260463c..9af6fe0e85 100644
--- a/libs/gtkmm2/atk/atkmm/action.cc
+++ b/libs/gtkmm2/atk/atkmm/action.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/action.h>
 #include <atkmm/private/action_p.h>
 
@@ -72,14 +73,20 @@ void Action_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->do_action = &do_action_vfunc_callback;
   klass->get_n_actions = &get_n_actions_vfunc_callback;
   klass->get_description = &get_description_vfunc_callback;
   klass->get_name = &get_name_vfunc_callback;
   klass->get_keybinding = &get_keybinding_vfunc_callback;
   klass->set_description = &set_description_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 gboolean Action_Class::do_action_vfunc_callback(AtkAction* self, gint i)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -92,16 +99,20 @@ gboolean Action_Class::do_action_vfunc_callback(AtkAction* self, gint i)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->do_action_vfunc(i
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -118,7 +129,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gint Action_Class::get_n_actions_vfunc_callback(AtkAction* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -131,15 +141,19 @@ gint Action_Class::get_n_actions_vfunc_callback(AtkAction* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_n_actions_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -156,7 +170,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 const gchar* Action_Class::get_description_vfunc_callback(AtkAction* self, gint i)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -169,16 +182,20 @@ const gchar* Action_Class::get_description_vfunc_callback(AtkAction* self, gint
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_description_vfunc(i
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -195,7 +212,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef const gchar* RType;
   return RType();
 }
-
 const gchar* Action_Class::get_name_vfunc_callback(AtkAction* self, gint i)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -208,16 +224,20 @@ const gchar* Action_Class::get_name_vfunc_callback(AtkAction* self, gint i)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_name_vfunc(i
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -234,7 +254,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef const gchar* RType;
   return RType();
 }
-
 const gchar* Action_Class::get_keybinding_vfunc_callback(AtkAction* self, gint i)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -247,16 +266,20 @@ const gchar* Action_Class::get_keybinding_vfunc_callback(AtkAction* self, gint i
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_keybinding_vfunc(i
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -273,7 +296,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef const gchar* RType;
   return RType();
 }
-
 gboolean Action_Class::set_description_vfunc_callback(AtkAction* self, gint i, const gchar* desc)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -286,17 +308,21 @@ gboolean Action_Class::set_description_vfunc_callback(AtkAction* self, gint i, c
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->set_description_vfunc(i
 , Glib::convert_const_gchar_ptr_to_ustring(desc)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -313,6 +339,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Action_Class::wrap_new(GObject* object)
@@ -391,6 +421,10 @@ Glib::ustring Action::get_localized_name(int i)
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 bool Atk::Action::do_action_vfunc(int i) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -404,7 +438,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 int Atk::Action::get_n_actions_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -418,7 +451,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 const char* Atk::Action::get_description_vfunc(int i) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -432,7 +464,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef const char* RType;
   return RType();
 }
-
 const char* Atk::Action::get_name_vfunc(int i) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -446,7 +477,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef const char* RType;
   return RType();
 }
-
 const char* Atk::Action::get_keybinding_vfunc(int i) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -460,7 +490,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef const char* RType;
   return RType();
 }
-
 bool Atk::Action::set_description_vfunc(int i, const Glib::ustring& desc) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -474,6 +503,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/action.h b/libs/gtkmm2/atk/atkmm/action.h
index af8a131378..c31a2c9e31 100644
--- a/libs/gtkmm2/atk/atkmm/action.h
+++ b/libs/gtkmm2/atk/atkmm/action.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_ACTION_H
 #define _ATKMM_ACTION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -154,23 +155,46 @@ public:
   Glib::ustring get_localized_name(int i);
 
 protected:
-    virtual bool do_action_vfunc(int i);
-    virtual int get_n_actions_vfunc() const;
-    virtual const char* get_description_vfunc(int i) const;
-    virtual const char* get_name_vfunc(int i) const;
-    virtual const char* get_keybinding_vfunc(int i) const;
-    virtual bool set_description_vfunc(int i, const Glib::ustring& desc);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool do_action_vfunc(int i);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_n_actions_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual const char* get_description_vfunc(int i) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual const char* get_name_vfunc(int i) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual const char* get_keybinding_vfunc(int i) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool set_description_vfunc(int i, const Glib::ustring& desc);
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -189,5 +213,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_ACTION_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/component.cc b/libs/gtkmm2/atk/atkmm/component.cc
index c4256e7699..8d51116bc1 100644
--- a/libs/gtkmm2/atk/atkmm/component.cc
+++ b/libs/gtkmm2/atk/atkmm/component.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/component.h>
 #include <atkmm/private/component_p.h>
 
@@ -86,6 +87,7 @@ void Component_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->add_focus_handler = &add_focus_handler_vfunc_callback;
   klass->contains = &contains_vfunc_callback;
   klass->ref_accessible_at_point = &ref_accessible_at_point_vfunc_callback;
@@ -99,8 +101,13 @@ void Component_Class::iface_init_function(void* g_iface, void*)
   klass->set_extents = &set_extents_vfunc_callback;
   klass->set_position = &set_position_vfunc_callback;
   klass->set_size = &set_size_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 guint Component_Class::add_focus_handler_vfunc_callback(AtkComponent* self, AtkFocusHandler handler)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -113,15 +120,19 @@ guint Component_Class::add_focus_handler_vfunc_callback(AtkComponent* self, AtkF
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->add_focus_handler_vfunc(handler);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -138,7 +149,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef guint RType;
   return RType();
 }
-
 gboolean Component_Class::contains_vfunc_callback(AtkComponent* self, gint x, gint y, AtkCoordType coord_type)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -151,18 +161,22 @@ gboolean Component_Class::contains_vfunc_callback(AtkComponent* self, gint x, gi
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->contains_vfunc(x
 , y
 , ((CoordType)(coord_type))
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -179,7 +193,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 AtkObject* Component_Class::ref_accessible_at_point_vfunc_callback(AtkComponent* self, gint x, gint y, AtkCoordType coord_type)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -192,18 +205,22 @@ AtkObject* Component_Class::ref_accessible_at_point_vfunc_callback(AtkComponent*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap_copy(obj->get_accessible_at_point_vfunc(x
 , y
 , ((CoordType)(coord_type))
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -220,7 +237,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkObject* RType;
   return RType();
 }
-
 void Component_Class::get_extents_vfunc_callback(AtkComponent* self, gint* x, gint* y, gint* width, gint* height, AtkCoordType coord_type)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -233,8 +249,10 @@ void Component_Class::get_extents_vfunc_callback(AtkComponent* self, gint* x, gi
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_extents_vfunc(*(x)
 , *(y)
@@ -242,11 +260,13 @@ void Component_Class::get_extents_vfunc_callback(AtkComponent* self, gint* x, gi
 , *(height)
 , ((CoordType)(coord_type))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -260,7 +280,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->get_extents)(self, x, y, width, height, coord_type);
   }
 }
-
 void Component_Class::get_position_vfunc_callback(AtkComponent* self, gint* x, gint* y, AtkCoordType coord_type)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -273,18 +292,22 @@ void Component_Class::get_position_vfunc_callback(AtkComponent* self, gint* x, g
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_position_vfunc(*(x)
 , *(y)
 , ((CoordType)(coord_type))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -298,7 +321,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->get_position)(self, x, y, coord_type);
   }
 }
-
 void Component_Class::get_size_vfunc_callback(AtkComponent* self, gint* width, gint* height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -311,17 +333,21 @@ void Component_Class::get_size_vfunc_callback(AtkComponent* self, gint* width, g
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_size_vfunc(*(width)
 , *(height)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -335,7 +361,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->get_size)(self, width, height);
   }
 }
-
 AtkLayer Component_Class::get_layer_vfunc_callback(AtkComponent* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -348,15 +373,19 @@ AtkLayer Component_Class::get_layer_vfunc_callback(AtkComponent* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return ((AtkLayer)(obj->get_layer_vfunc()));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -373,7 +402,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkLayer RType;
   return RType();
 }
-
 gint Component_Class::get_mdi_zorder_vfunc_callback(AtkComponent* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -386,15 +414,19 @@ gint Component_Class::get_mdi_zorder_vfunc_callback(AtkComponent* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_mdi_zorder_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -411,7 +443,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gboolean Component_Class::grab_focus_vfunc_callback(AtkComponent* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -424,15 +455,19 @@ gboolean Component_Class::grab_focus_vfunc_callback(AtkComponent* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->grab_focus_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -449,7 +484,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 void Component_Class::remove_focus_handler_vfunc_callback(AtkComponent* self, guint handler_id)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -462,15 +496,19 @@ void Component_Class::remove_focus_handler_vfunc_callback(AtkComponent* self, gu
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->remove_focus_handler_vfunc(handler_id);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -484,7 +522,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->remove_focus_handler)(self, handler_id);
   }
 }
-
 gboolean Component_Class::set_extents_vfunc_callback(AtkComponent* self, gint x, gint y, gint width, gint height, AtkCoordType coord_type)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -497,8 +534,10 @@ gboolean Component_Class::set_extents_vfunc_callback(AtkComponent* self, gint x,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->set_extents_vfunc(x
 , y
@@ -506,11 +545,13 @@ gboolean Component_Class::set_extents_vfunc_callback(AtkComponent* self, gint x,
 , height
 , ((CoordType)(coord_type))
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -527,7 +568,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Component_Class::set_position_vfunc_callback(AtkComponent* self, gint x, gint y, AtkCoordType coord_type)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -540,18 +580,22 @@ gboolean Component_Class::set_position_vfunc_callback(AtkComponent* self, gint x
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->set_position_vfunc(x
 , y
 , ((CoordType)(coord_type))
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -568,7 +612,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Component_Class::set_size_vfunc_callback(AtkComponent* self, gint width, gint height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -581,17 +624,21 @@ gboolean Component_Class::set_size_vfunc_callback(AtkComponent* self, gint width
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->set_size_vfunc(width
 , height
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -608,6 +655,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Component_Class::wrap_new(GObject* object)
@@ -667,17 +718,17 @@ Glib::RefPtr<Atk::Object> Component::get_accessible_at_point(int x, int y, Coord
 
 void Component::get_extents(int& x, int& y, int& width, int& height, CoordType coord_type) const
 {
-  atk_component_get_extents(const_cast<AtkComponent*>(gobj()), &x, &y, &width, &height, ((AtkCoordType)(coord_type)));
+atk_component_get_extents(const_cast<AtkComponent*>(gobj()), &x, &y, &width, &height, ((AtkCoordType)(coord_type))); 
 }
 
 void Component::get_position(int& x, int& y, CoordType coord_type) const
 {
-  atk_component_get_position(const_cast<AtkComponent*>(gobj()), &x, &y, ((AtkCoordType)(coord_type)));
+atk_component_get_position(const_cast<AtkComponent*>(gobj()), &x, &y, ((AtkCoordType)(coord_type))); 
 }
 
 void Component::get_size(int& width, int& height) const
 {
-  atk_component_get_size(const_cast<AtkComponent*>(gobj()), &width, &height);
+atk_component_get_size(const_cast<AtkComponent*>(gobj()), &width, &height); 
 }
 
 Layer Component::get_layer() const
@@ -697,7 +748,7 @@ bool Component::grab_focus()
 
 void Component::remove_focus_handler(guint handler_id)
 {
-  atk_component_remove_focus_handler(gobj(), handler_id);
+atk_component_remove_focus_handler(gobj(), handler_id); 
 }
 
 bool Component::set_extents(int x, int y, int width, int height, CoordType coord_type)
@@ -716,6 +767,10 @@ bool Component::set_size(int width, int height)
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 guint Atk::Component::add_focus_handler_vfunc(AtkFocusHandler handler) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -729,7 +784,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef guint RType;
   return RType();
 }
-
 bool Atk::Component::contains_vfunc(int x, int y, CoordType coord_type) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -743,7 +797,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 Glib::RefPtr<Atk::Object> Atk::Component::get_accessible_at_point_vfunc(int x, int y, CoordType coord_type) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -757,7 +810,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef Glib::RefPtr<Atk::Object> RType;
   return RType();
 }
-
 void Atk::Component::get_extents_vfunc(int& x, int& y, int& width, int& height, CoordType coord_type) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -768,7 +820,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->get_extents)
     (*base->get_extents)(const_cast<AtkComponent*>(gobj()),&x,&y,&width,&height,((AtkCoordType)(coord_type)));
 }
-
 void Atk::Component::get_position_vfunc(int& x, int& y, CoordType coord_type) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -779,7 +830,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->get_position)
     (*base->get_position)(const_cast<AtkComponent*>(gobj()),&x,&y,((AtkCoordType)(coord_type)));
 }
-
 void Atk::Component::get_size_vfunc(int& width, int& height) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -790,7 +840,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->get_size)
     (*base->get_size)(const_cast<AtkComponent*>(gobj()),&width,&height);
 }
-
 Layer Atk::Component::get_layer_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -804,7 +853,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef Layer RType;
   return RType();
 }
-
 int Atk::Component::get_mdi_zorder_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -818,7 +866,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 bool Atk::Component::grab_focus_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -832,7 +879,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 void Atk::Component::remove_focus_handler_vfunc(guint handler_id) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -843,7 +889,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->remove_focus_handler)
     (*base->remove_focus_handler)(gobj(),handler_id);
 }
-
 bool Atk::Component::set_extents_vfunc(int x, int y, int width, int height, CoordType coord_type) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -857,7 +902,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Component::set_position_vfunc(int x, int y, CoordType coord_type) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -871,7 +915,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Component::set_size_vfunc(int width, int height) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -885,6 +928,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/component.h b/libs/gtkmm2/atk/atkmm/component.h
index 889d626dae..ccde1fb22d 100644
--- a/libs/gtkmm2/atk/atkmm/component.h
+++ b/libs/gtkmm2/atk/atkmm/component.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_COMPONENT_H
 #define _ATKMM_COMPONENT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -283,32 +284,76 @@ public:
   bool set_size(int width, int height);
 
 protected:
-    virtual guint add_focus_handler_vfunc(AtkFocusHandler handler);
-    virtual bool contains_vfunc(int x, int y, CoordType coord_type) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual guint add_focus_handler_vfunc(AtkFocusHandler handler);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool contains_vfunc(int x, int y, CoordType coord_type) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Atk::Object> get_accessible_at_point_vfunc(int x, int y, CoordType coord_type);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_extents_vfunc(int& x, int& y, int& width, int& height, CoordType coord_type) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_position_vfunc(int& x, int& y, CoordType coord_type) const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
-    virtual Glib::RefPtr<Atk::Object> get_accessible_at_point_vfunc(int x, int y, CoordType coord_type);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_size_vfunc(int& width, int& height) const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
-    virtual void get_extents_vfunc(int& x, int& y, int& width, int& height, CoordType coord_type) const;
-    virtual void get_position_vfunc(int& x, int& y, CoordType coord_type) const;
-    virtual void get_size_vfunc(int& width, int& height) const;
-    virtual Layer get_layer_vfunc() const;
-    virtual int get_mdi_zorder_vfunc() const;
-    virtual bool grab_focus_vfunc();
-    virtual void remove_focus_handler_vfunc(guint handler_id);
-    virtual bool set_extents_vfunc(int x, int y, int width, int height, CoordType coord_type);
-    virtual bool set_position_vfunc(int x, int y, CoordType coord_type);
-    virtual bool set_size_vfunc(int width, int height);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Layer get_layer_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_mdi_zorder_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool grab_focus_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void remove_focus_handler_vfunc(guint handler_id);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool set_extents_vfunc(int x, int y, int width, int height, CoordType coord_type);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool set_position_vfunc(int x, int y, CoordType coord_type);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool set_size_vfunc(int width, int height);
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -327,5 +372,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_COMPONENT_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/document.cc b/libs/gtkmm2/atk/atkmm/document.cc
index 64946c6f84..f27b4ff522 100644
--- a/libs/gtkmm2/atk/atkmm/document.cc
+++ b/libs/gtkmm2/atk/atkmm/document.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/document.h>
 #include <atkmm/private/document_p.h>
 
@@ -80,10 +81,16 @@ void Document_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->get_document_type = &get_document_type_vfunc_callback;
   klass->get_document = &get_document_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 const gchar* Document_Class::get_document_type_vfunc_callback(AtkDocument* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -96,15 +103,19 @@ const gchar* Document_Class::get_document_type_vfunc_callback(AtkDocument* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_document_type_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -121,7 +132,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef const gchar* RType;
   return RType();
 }
-
 gpointer Document_Class::get_document_vfunc_callback(AtkDocument* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -134,15 +144,19 @@ gpointer Document_Class::get_document_vfunc_callback(AtkDocument* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_document_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -159,6 +173,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gpointer RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Document_Class::wrap_new(GObject* object)
@@ -212,6 +230,10 @@ gpointer Document::get_document()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 const gchar* Atk::Document::get_document_type_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -225,7 +247,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef const gchar* RType;
   return RType();
 }
-
 gpointer Atk::Document::get_document_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -239,6 +260,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef gpointer RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/document.h b/libs/gtkmm2/atk/atkmm/document.h
index 71808475c3..76c84a4007 100644
--- a/libs/gtkmm2/atk/atkmm/document.h
+++ b/libs/gtkmm2/atk/atkmm/document.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_DOCUMENT_H
 #define _ATKMM_DOCUMENT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -110,19 +111,30 @@ public:
   gpointer get_document();
 
 protected:
-    virtual const gchar* get_document_type_vfunc();
-    virtual gpointer get_document_vfunc() const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual const gchar* get_document_type_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual gpointer get_document_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -141,5 +153,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_DOCUMENT_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/editabletext.cc b/libs/gtkmm2/atk/atkmm/editabletext.cc
index 10e58003b7..eb776c954c 100644
--- a/libs/gtkmm2/atk/atkmm/editabletext.cc
+++ b/libs/gtkmm2/atk/atkmm/editabletext.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/editabletext.h>
 #include <atkmm/private/editabletext_p.h>
 
@@ -73,6 +74,7 @@ void EditableText_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->set_run_attributes = &set_run_attributes_vfunc_callback;
   klass->set_text_contents = &set_text_contents_vfunc_callback;
   klass->insert_text = &insert_text_vfunc_callback;
@@ -80,8 +82,13 @@ void EditableText_Class::iface_init_function(void* g_iface, void*)
   klass->cut_text = &cut_text_vfunc_callback;
   klass->delete_text = &delete_text_vfunc_callback;
   klass->paste_text = &paste_text_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 gboolean EditableText_Class::set_run_attributes_vfunc_callback(AtkEditableText* self, AtkAttributeSet* attrib_set, gint start_offset, gint end_offset)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -94,17 +101,21 @@ gboolean EditableText_Class::set_run_attributes_vfunc_callback(AtkEditableText*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->set_run_attributes_vfunc(attrib_set, start_offset
 , end_offset
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -121,7 +132,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 void EditableText_Class::set_text_contents_vfunc_callback(AtkEditableText* self, const gchar* string)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -134,16 +144,20 @@ void EditableText_Class::set_text_contents_vfunc_callback(AtkEditableText* self,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_text_contents_vfunc(Glib::convert_const_gchar_ptr_to_ustring(string)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -157,7 +171,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_text_contents)(self, string);
   }
 }
-
 void EditableText_Class::insert_text_vfunc_callback(AtkEditableText* self, const gchar* string, gint length, gint* position)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -170,18 +183,22 @@ void EditableText_Class::insert_text_vfunc_callback(AtkEditableText* self, const
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->insert_text_vfunc(Glib::convert_const_gchar_ptr_to_ustring(string)
 , length
 , *(position)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -195,7 +212,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->insert_text)(self, string, length, position);
   }
 }
-
 void EditableText_Class::copy_text_vfunc_callback(AtkEditableText* self, gint start_pos, gint end_pos)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -208,17 +224,21 @@ void EditableText_Class::copy_text_vfunc_callback(AtkEditableText* self, gint st
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->copy_text_vfunc(start_pos
 , end_pos
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -232,7 +252,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->copy_text)(self, start_pos, end_pos);
   }
 }
-
 void EditableText_Class::cut_text_vfunc_callback(AtkEditableText* self, gint start_pos, gint end_pos)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -245,17 +264,21 @@ void EditableText_Class::cut_text_vfunc_callback(AtkEditableText* self, gint sta
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->cut_text_vfunc(start_pos
 , end_pos
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -269,7 +292,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->cut_text)(self, start_pos, end_pos);
   }
 }
-
 void EditableText_Class::delete_text_vfunc_callback(AtkEditableText* self, gint start_pos, gint end_pos)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -282,17 +304,21 @@ void EditableText_Class::delete_text_vfunc_callback(AtkEditableText* self, gint
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->delete_text_vfunc(start_pos
 , end_pos
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -306,7 +332,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->delete_text)(self, start_pos, end_pos);
   }
 }
-
 void EditableText_Class::paste_text_vfunc_callback(AtkEditableText* self, gint position)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -319,16 +344,20 @@ void EditableText_Class::paste_text_vfunc_callback(AtkEditableText* self, gint p
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->paste_text_vfunc(position
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -342,6 +371,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->paste_text)(self, position);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* EditableText_Class::wrap_new(GObject* object)
@@ -391,35 +424,39 @@ bool EditableText::set_run_attributes(const AttributeSet& attrib_set, int start_
 
 void EditableText::set_text_contents(const Glib::ustring& string)
 {
-  atk_editable_text_set_text_contents(gobj(), string.c_str());
+atk_editable_text_set_text_contents(gobj(), string.c_str()); 
 }
 
 void EditableText::insert_text(const Glib::ustring& string, int length, int& position)
 {
-  atk_editable_text_insert_text(gobj(), string.c_str(), length, &position);
+atk_editable_text_insert_text(gobj(), string.c_str(), length, &position); 
 }
 
 void EditableText::copy_text(int start_pos, int end_pos)
 {
-  atk_editable_text_copy_text(gobj(), start_pos, end_pos);
+atk_editable_text_copy_text(gobj(), start_pos, end_pos); 
 }
 
 void EditableText::cut_text(int start_pos, int end_pos)
 {
-  atk_editable_text_cut_text(gobj(), start_pos, end_pos);
+atk_editable_text_cut_text(gobj(), start_pos, end_pos); 
 }
 
 void EditableText::delete_text(int start_pos, int end_pos)
 {
-  atk_editable_text_delete_text(gobj(), start_pos, end_pos);
+atk_editable_text_delete_text(gobj(), start_pos, end_pos); 
 }
 
 void EditableText::paste_text(int position)
 {
-  atk_editable_text_paste_text(gobj(), position);
+atk_editable_text_paste_text(gobj(), position); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 bool Atk::EditableText::set_run_attributes_vfunc(AtkAttributeSet* attrib_set, int start_offset, int end_offset) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -433,7 +470,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 void Atk::EditableText::set_text_contents_vfunc(const Glib::ustring& string) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -444,7 +480,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_text_contents)
     (*base->set_text_contents)(gobj(),string.c_str());
 }
-
 void Atk::EditableText::insert_text_vfunc(const Glib::ustring& string, int length, int& position) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -455,7 +490,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->insert_text)
     (*base->insert_text)(gobj(),string.c_str(),length,&position);
 }
-
 void Atk::EditableText::copy_text_vfunc(int start_pos, int end_pos) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -466,7 +500,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->copy_text)
     (*base->copy_text)(gobj(),start_pos,end_pos);
 }
-
 void Atk::EditableText::cut_text_vfunc(int start_pos, int end_pos) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -477,7 +510,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->cut_text)
     (*base->cut_text)(gobj(),start_pos,end_pos);
 }
-
 void Atk::EditableText::delete_text_vfunc(int start_pos, int end_pos) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -488,7 +520,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->delete_text)
     (*base->delete_text)(gobj(),start_pos,end_pos);
 }
-
 void Atk::EditableText::paste_text_vfunc(int position) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -499,6 +530,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->paste_text)
     (*base->paste_text)(gobj(),position);
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/editabletext.h b/libs/gtkmm2/atk/atkmm/editabletext.h
index 233aa9e892..982673231c 100644
--- a/libs/gtkmm2/atk/atkmm/editabletext.h
+++ b/libs/gtkmm2/atk/atkmm/editabletext.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_EDITABLETEXT_H
 #define _ATKMM_EDITABLETEXT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -153,24 +154,50 @@ public:
   void paste_text(int position);
 
 protected:
-    virtual bool set_run_attributes_vfunc(AtkAttributeSet* attrib_set, int start_offset, int end_offset);
-    virtual void set_text_contents_vfunc(const Glib::ustring& string);
-    virtual void insert_text_vfunc(const Glib::ustring& string, int length, int& position);
-    virtual void copy_text_vfunc(int start_pos, int end_pos);
-    virtual void cut_text_vfunc(int start_pos, int end_pos);
-    virtual void delete_text_vfunc(int start_pos, int end_pos);
-    virtual void paste_text_vfunc(int position);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool set_run_attributes_vfunc(AtkAttributeSet* attrib_set, int start_offset, int end_offset);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_text_contents_vfunc(const Glib::ustring& string);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void insert_text_vfunc(const Glib::ustring& string, int length, int& position);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void copy_text_vfunc(int start_pos, int end_pos);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void cut_text_vfunc(int start_pos, int end_pos);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void delete_text_vfunc(int start_pos, int end_pos);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void paste_text_vfunc(int position);
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -189,5 +216,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_EDITABLETEXT_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/hyperlink.cc b/libs/gtkmm2/atk/atkmm/hyperlink.cc
index d9e1050a7b..3bbf41c426 100644
--- a/libs/gtkmm2/atk/atkmm/hyperlink.cc
+++ b/libs/gtkmm2/atk/atkmm/hyperlink.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/hyperlink.h>
 #include <atkmm/private/hyperlink_p.h>
 
@@ -37,13 +38,15 @@ namespace Atk
 namespace
 {
 
-const Glib::SignalProxyInfo Hyperlink_signal_link_activated_info =
+
+static const Glib::SignalProxyInfo Hyperlink_signal_link_activated_info =
 {
   "link_activated",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -91,6 +94,7 @@ void Hyperlink_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->get_uri = &get_uri_vfunc_callback;
   klass->get_object = &get_object_vfunc_callback;
   klass->get_end_index = &get_end_index_vfunc_callback;
@@ -99,9 +103,14 @@ void Hyperlink_Class::class_init_function(void* g_class, void* class_data)
   klass->get_n_anchors = &get_n_anchors_vfunc_callback;
   klass->link_state = &link_state_vfunc_callback;
   klass->is_selected_link = &is_selected_link_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->link_activated = &link_activated_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 gchar* Hyperlink_Class::get_uri_vfunc_callback(AtkHyperlink* self, gint i)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -114,16 +123,20 @@ gchar* Hyperlink_Class::get_uri_vfunc_callback(AtkHyperlink* self, gint i)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_uri_vfunc(i
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -139,7 +152,6 @@ gchar* Hyperlink_Class::get_uri_vfunc_callback(AtkHyperlink* self, gint i)
   typedef gchar* RType;
   return RType();
 }
-
 AtkObject* Hyperlink_Class::get_object_vfunc_callback(AtkHyperlink* self, gint i)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -152,16 +164,20 @@ AtkObject* Hyperlink_Class::get_object_vfunc_callback(AtkHyperlink* self, gint i
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->get_object_vfunc(i
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -177,7 +193,6 @@ AtkObject* Hyperlink_Class::get_object_vfunc_callback(AtkHyperlink* self, gint i
   typedef AtkObject* RType;
   return RType();
 }
-
 gint Hyperlink_Class::get_end_index_vfunc_callback(AtkHyperlink* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -190,15 +205,19 @@ gint Hyperlink_Class::get_end_index_vfunc_callback(AtkHyperlink* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_end_index_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -214,7 +233,6 @@ gint Hyperlink_Class::get_end_index_vfunc_callback(AtkHyperlink* self)
   typedef gint RType;
   return RType();
 }
-
 gint Hyperlink_Class::get_start_index_vfunc_callback(AtkHyperlink* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -227,15 +245,19 @@ gint Hyperlink_Class::get_start_index_vfunc_callback(AtkHyperlink* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_start_index_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -251,7 +273,6 @@ gint Hyperlink_Class::get_start_index_vfunc_callback(AtkHyperlink* self)
   typedef gint RType;
   return RType();
 }
-
 gboolean Hyperlink_Class::is_valid_vfunc_callback(AtkHyperlink* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -264,15 +285,19 @@ gboolean Hyperlink_Class::is_valid_vfunc_callback(AtkHyperlink* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->is_valid_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -288,7 +313,6 @@ gboolean Hyperlink_Class::is_valid_vfunc_callback(AtkHyperlink* self)
   typedef gboolean RType;
   return RType();
 }
-
 gint Hyperlink_Class::get_n_anchors_vfunc_callback(AtkHyperlink* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -301,15 +325,19 @@ gint Hyperlink_Class::get_n_anchors_vfunc_callback(AtkHyperlink* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_n_anchors_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -325,7 +353,6 @@ gint Hyperlink_Class::get_n_anchors_vfunc_callback(AtkHyperlink* self)
   typedef gint RType;
   return RType();
 }
-
 guint Hyperlink_Class::link_state_vfunc_callback(AtkHyperlink* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -338,15 +365,19 @@ guint Hyperlink_Class::link_state_vfunc_callback(AtkHyperlink* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->link_state_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -362,7 +393,6 @@ guint Hyperlink_Class::link_state_vfunc_callback(AtkHyperlink* self)
   typedef guint RType;
   return RType();
 }
-
 gboolean Hyperlink_Class::is_selected_link_vfunc_callback(AtkHyperlink* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -375,15 +405,19 @@ gboolean Hyperlink_Class::is_selected_link_vfunc_callback(AtkHyperlink* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->is_selected_link_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -399,8 +433,9 @@ gboolean Hyperlink_Class::is_selected_link_vfunc_callback(AtkHyperlink* self)
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Hyperlink_Class::link_activated_callback(AtkHyperlink* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -413,15 +448,19 @@ void Hyperlink_Class::link_activated_callback(AtkHyperlink* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_link_activated();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -434,6 +473,7 @@ void Hyperlink_Class::link_activated_callback(AtkHyperlink* self)
       (*base->link_activated)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Hyperlink_Class::wrap_new(GObject* object)
@@ -486,20 +526,15 @@ Glib::RefPtr<Atk::Object> Hyperlink::get_object(int i)
 {
 
   Glib::RefPtr<Atk::Object> retvalue = Glib::wrap(atk_hyperlink_get_object(gobj(), i));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Atk::Object> Hyperlink::get_object(int i) const
 {
-
-  Glib::RefPtr<const Atk::Object> retvalue = Glib::wrap(atk_hyperlink_get_object(const_cast<AtkHyperlink*>(gobj()), i));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Hyperlink*>(this)->get_object(i);
 }
 
 int Hyperlink::get_end_index() const
@@ -539,27 +574,36 @@ Glib::SignalProxy0< void > Hyperlink::signal_link_activated()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Hyperlink::property_selected_link() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "selected-link");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Hyperlink::property_number_of_anchors() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "number-of-anchors");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Hyperlink::property_end_index() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "end-index");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Hyperlink::property_start_index() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "start-index");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Atk::Hyperlink::on_link_activated()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -569,8 +613,9 @@ void Atk::Hyperlink::on_link_activated()
   if(base && base->link_activated)
     (*base->link_activated)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 gchar* Atk::Hyperlink::get_uri_vfunc(int i) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -583,7 +628,6 @@ gchar* Atk::Hyperlink::get_uri_vfunc(int i) const
   typedef gchar* RType;
   return RType();
 }
-
 Glib::RefPtr<Atk::Object> Atk::Hyperlink::get_object_vfunc(int i) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -596,7 +640,6 @@ Glib::RefPtr<Atk::Object> Atk::Hyperlink::get_object_vfunc(int i)
   typedef Glib::RefPtr<Atk::Object> RType;
   return RType();
 }
-
 int Atk::Hyperlink::get_end_index_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -609,7 +652,6 @@ int Atk::Hyperlink::get_end_index_vfunc() const
   typedef int RType;
   return RType();
 }
-
 int Atk::Hyperlink::get_start_index_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -622,7 +664,6 @@ int Atk::Hyperlink::get_start_index_vfunc() const
   typedef int RType;
   return RType();
 }
-
 bool Atk::Hyperlink::is_valid_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -635,7 +676,6 @@ bool Atk::Hyperlink::is_valid_vfunc() const
   typedef bool RType;
   return RType();
 }
-
 int Atk::Hyperlink::get_n_anchors_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -648,7 +688,6 @@ int Atk::Hyperlink::get_n_anchors_vfunc() const
   typedef int RType;
   return RType();
 }
-
 guint Atk::Hyperlink::link_state_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -661,7 +700,6 @@ guint Atk::Hyperlink::link_state_vfunc() const
   typedef guint RType;
   return RType();
 }
-
 bool Atk::Hyperlink::is_selected_link_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -674,6 +712,7 @@ bool Atk::Hyperlink::is_selected_link_vfunc() const
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/hyperlink.h b/libs/gtkmm2/atk/atkmm/hyperlink.h
index 293137afb0..5a529ec46b 100644
--- a/libs/gtkmm2/atk/atkmm/hyperlink.h
+++ b/libs/gtkmm2/atk/atkmm/hyperlink.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_HYPERLINK_H
 #define _ATKMM_HYPERLINK_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -170,66 +171,108 @@ public:
   bool is_selected_link() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %link_activated()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_link_activated();
 
 
-  /** Specifies whether the AtkHyperlink object is selected.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Specifies whether the AtkHyperlink object is selected.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_selected_link() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The number of anchors associated with the AtkHyperlink object.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The number of anchors associated with the AtkHyperlink object.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_number_of_anchors() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The end index of the AtkHyperlink object.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The end index of the AtkHyperlink object.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_end_index() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The start index of the AtkHyperlink object.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The start index of the AtkHyperlink object.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_start_index() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
-    virtual gchar* get_uri_vfunc(int i) const;
-    virtual Glib::RefPtr<Atk::Object> get_object_vfunc(int i);
-    virtual int get_end_index_vfunc() const;
-    virtual int get_start_index_vfunc() const;
-    virtual bool is_valid_vfunc() const;
-    virtual int get_n_anchors_vfunc() const;
-    virtual guint link_state_vfunc() const;
-    virtual bool is_selected_link_vfunc() const; 
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual gchar* get_uri_vfunc(int i) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Atk::Object> get_object_vfunc(int i);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_end_index_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_start_index_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool is_valid_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_n_anchors_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual guint link_state_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool is_selected_link_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+ 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_link_activated();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/atk/atkmm/hypertext.cc b/libs/gtkmm2/atk/atkmm/hypertext.cc
index f383ba5e74..c0e2781cd2 100644
--- a/libs/gtkmm2/atk/atkmm/hypertext.cc
+++ b/libs/gtkmm2/atk/atkmm/hypertext.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/hypertext.h>
 #include <atkmm/private/hypertext_p.h>
 
@@ -37,7 +38,8 @@ namespace Atk
 namespace
 {
 
-void Hypertext_signal_link_selected_callback(AtkHypertext* self, gint p0,void* data)
+
+static void Hypertext_signal_link_selected_callback(AtkHypertext* self, gint p0,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,int > SlotType;
@@ -45,26 +47,31 @@ void Hypertext_signal_link_selected_callback(AtkHypertext* self, gint p0,void* d
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Hypertext_signal_link_selected_info =
+static const Glib::SignalProxyInfo Hypertext_signal_link_selected_info =
 {
   "link_selected",
   (GCallback) &Hypertext_signal_link_selected_callback,
   (GCallback) &Hypertext_signal_link_selected_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -109,12 +116,18 @@ void Hypertext_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->get_link = &get_link_vfunc_callback;
   klass->get_n_links = &get_n_links_vfunc_callback;
   klass->get_link_index = &get_link_index_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->link_selected = &link_selected_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 AtkHyperlink* Hypertext_Class::get_link_vfunc_callback(AtkHypertext* self, gint link_index)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -127,16 +140,20 @@ AtkHyperlink* Hypertext_Class::get_link_vfunc_callback(AtkHypertext* self, gint
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->get_link_vfunc(link_index
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -153,7 +170,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkHyperlink* RType;
   return RType();
 }
-
 gint Hypertext_Class::get_n_links_vfunc_callback(AtkHypertext* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -166,15 +182,19 @@ gint Hypertext_Class::get_n_links_vfunc_callback(AtkHypertext* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_n_links_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -191,7 +211,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gint Hypertext_Class::get_link_index_vfunc_callback(AtkHypertext* self, gint char_index)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -204,16 +223,20 @@ gint Hypertext_Class::get_link_index_vfunc_callback(AtkHypertext* self, gint cha
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_link_index_vfunc(char_index
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -230,8 +253,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Hypertext_Class::link_selected_callback(AtkHypertext* self, gint p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -244,16 +268,20 @@ void Hypertext_Class::link_selected_callback(AtkHypertext* self, gint p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_link_selected(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -267,6 +295,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->link_selected)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Hypertext_Class::wrap_new(GObject* object)
@@ -316,7 +345,7 @@ Glib::RefPtr<Hyperlink> Hypertext::get_link(int link_index)
 
 Glib::RefPtr<const Hyperlink> Hypertext::get_link(int link_index) const
 {
-  return Glib::wrap(atk_hypertext_get_link(const_cast<AtkHypertext*>(gobj()), link_index));
+  return const_cast<Hypertext*>(this)->get_link(link_index);
 }
 
 int Hypertext::get_n_links() const
@@ -336,6 +365,7 @@ Glib::SignalProxy1< void,int > Hypertext::signal_link_selected()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Atk::Hypertext::on_link_selected(int link_index)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -346,8 +376,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->link_selected)
     (*base->link_selected)(gobj(),link_index);
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 Glib::RefPtr<Hyperlink> Atk::Hypertext::get_link_vfunc(int link_index) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -361,7 +392,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef Glib::RefPtr<Hyperlink> RType;
   return RType();
 }
-
 int Atk::Hypertext::get_n_links_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -375,7 +405,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 int Atk::Hypertext::get_link_index_vfunc(int char_index) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -389,6 +418,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/hypertext.h b/libs/gtkmm2/atk/atkmm/hypertext.h
index 090827662a..406b138dfb 100644
--- a/libs/gtkmm2/atk/atkmm/hypertext.h
+++ b/libs/gtkmm2/atk/atkmm/hypertext.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_HYPERTEXT_H
 #define _ATKMM_HYPERTEXT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -127,24 +128,43 @@ public:
   int get_link_index(int char_index) const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %link_selected(int link_index)</tt>
+   */
+
   Glib::SignalProxy1< void,int > signal_link_selected();
 
 
-    virtual Glib::RefPtr<Hyperlink> get_link_vfunc(int link_index);
-    virtual int get_n_links_vfunc() const;
-    virtual int get_link_index_vfunc(int char_index) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Hyperlink> get_link_vfunc(int link_index);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_n_links_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_link_index_vfunc(int char_index) const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_link_selected(int link_index);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -163,5 +183,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_HYPERTEXT_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/image.cc b/libs/gtkmm2/atk/atkmm/image.cc
index 2f1df28c18..b557a6b929 100644
--- a/libs/gtkmm2/atk/atkmm/image.cc
+++ b/libs/gtkmm2/atk/atkmm/image.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/image.h>
 #include <atkmm/private/image_p.h>
 
@@ -73,12 +74,18 @@ void Image_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->set_image_description = &set_image_description_vfunc_callback;
   klass->get_image_description = &get_image_description_vfunc_callback;
   klass->get_image_position = &get_image_position_vfunc_callback;
   klass->get_image_size = &get_image_size_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 gboolean Image_Class::set_image_description_vfunc_callback(AtkImage* self, const gchar* description)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -91,16 +98,20 @@ gboolean Image_Class::set_image_description_vfunc_callback(AtkImage* self, const
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->set_image_description_vfunc(Glib::convert_const_gchar_ptr_to_ustring(description)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -117,7 +128,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 const gchar* Image_Class::get_image_description_vfunc_callback(AtkImage* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -130,15 +140,19 @@ const gchar* Image_Class::get_image_description_vfunc_callback(AtkImage* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_image_description_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -155,7 +169,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef const gchar* RType;
   return RType();
 }
-
 void Image_Class::get_image_position_vfunc_callback(AtkImage* self, gint* x, gint* y, AtkCoordType coord_type)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -168,18 +181,22 @@ void Image_Class::get_image_position_vfunc_callback(AtkImage* self, gint* x, gin
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_image_position_vfunc(*(x)
 , *(y)
 , ((CoordType)(coord_type))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -193,7 +210,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->get_image_position)(self, x, y, coord_type);
   }
 }
-
 void Image_Class::get_image_size_vfunc_callback(AtkImage* self, gint* width, gint* height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -206,17 +222,21 @@ void Image_Class::get_image_size_vfunc_callback(AtkImage* self, gint* width, gin
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_image_size_vfunc(*(width)
 , *(height)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -230,6 +250,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->get_image_size)(self, width, height);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Image_Class::wrap_new(GObject* object)
@@ -284,15 +308,19 @@ Glib::ustring Image::get_image_description() const
 
 void Image::get_image_size(int& width, int& height) const
 {
-  atk_image_get_image_size(const_cast<AtkImage*>(gobj()), &width, &height);
+atk_image_get_image_size(const_cast<AtkImage*>(gobj()), &width, &height); 
 }
 
 void Image::get_image_position(int& x, int& y, CoordType coord_type) const
 {
-  atk_image_get_image_position(const_cast<AtkImage*>(gobj()), &x, &y, ((AtkCoordType)(coord_type)));
+atk_image_get_image_position(const_cast<AtkImage*>(gobj()), &x, &y, ((AtkCoordType)(coord_type))); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 bool Atk::Image::set_image_description_vfunc(const Glib::ustring& description) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -306,7 +334,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 const char* Atk::Image::get_image_description_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -320,7 +347,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef const char* RType;
   return RType();
 }
-
 void Atk::Image::get_image_position_vfunc(int& x, int& y, CoordType coord_type) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -331,7 +357,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->get_image_position)
     (*base->get_image_position)(const_cast<AtkImage*>(gobj()),&x,&y,((AtkCoordType)(coord_type)));
 }
-
 void Atk::Image::get_image_size_vfunc(int& width, int& height) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -342,6 +367,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->get_image_size)
     (*base->get_image_size)(const_cast<AtkImage*>(gobj()),&width,&height);
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/image.h b/libs/gtkmm2/atk/atkmm/image.h
index a6af34884a..9c36aa57ef 100644
--- a/libs/gtkmm2/atk/atkmm/image.h
+++ b/libs/gtkmm2/atk/atkmm/image.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_IMAGE_H
 #define _ATKMM_IMAGE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -135,22 +136,39 @@ public:
   void get_image_position(int& x, int& y, CoordType coord_type) const;
 
 protected:
-    virtual bool set_image_description_vfunc(const Glib::ustring& description);
-    virtual const char* get_image_description_vfunc() const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool set_image_description_vfunc(const Glib::ustring& description);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual const char* get_image_description_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
-    virtual void get_image_position_vfunc(int& x, int& y, CoordType coord_type) const;
-    virtual void get_image_size_vfunc(int& width, int& height) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_image_position_vfunc(int& x, int& y, CoordType coord_type) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_image_size_vfunc(int& width, int& height) const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -169,5 +187,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_IMAGE_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/implementor.cc b/libs/gtkmm2/atk/atkmm/implementor.cc
index 303bf3d0a1..fc70956d86 100644
--- a/libs/gtkmm2/atk/atkmm/implementor.cc
+++ b/libs/gtkmm2/atk/atkmm/implementor.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/implementor.h>
 #include <atkmm/private/implementor_p.h>
 
@@ -73,9 +74,15 @@ void Implementor_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->ref_accessible = &ref_accessible_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 AtkObject* Implementor_Class::ref_accessible_vfunc_callback(AtkImplementor* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -88,15 +95,19 @@ AtkObject* Implementor_Class::ref_accessible_vfunc_callback(AtkImplementor* self
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->ref_accessibile_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -113,6 +124,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkObject* RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Implementor_Class::wrap_new(GObject* object)
@@ -155,6 +170,10 @@ GType Implementor::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 Glib::RefPtr<Object> Atk::Implementor::ref_accessibile_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -163,11 +182,12 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
 )  );
 
   if(base && base->ref_accessible)
-    return Glib::wrap((*base->ref_accessible)(gobj()));
+    return Glib::wrap((*base->ref_accessible)(gobj()), true);
 
   typedef Glib::RefPtr<Object> RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/implementor.h b/libs/gtkmm2/atk/atkmm/implementor.h
index 7df786ce27..f25fe1a7db 100644
--- a/libs/gtkmm2/atk/atkmm/implementor.h
+++ b/libs/gtkmm2/atk/atkmm/implementor.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_IMPLEMENTOR_H
 #define _ATKMM_IMPLEMENTOR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -93,18 +94,26 @@ private:
 
 
 protected:
-    virtual Glib::RefPtr<Object> ref_accessibile_vfunc();
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Object> ref_accessibile_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -123,5 +132,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_IMPLEMENTOR_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/noopobject.cc b/libs/gtkmm2/atk/atkmm/noopobject.cc
index c9c78627cd..ad39d3bed2 100644
--- a/libs/gtkmm2/atk/atkmm/noopobject.cc
+++ b/libs/gtkmm2/atk/atkmm/noopobject.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/noopobject.h>
 #include <atkmm/private/noopobject_p.h>
 
@@ -83,8 +84,19 @@ void NoOpObject_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* NoOpObject_Class::wrap_new(GObject* object)
 {
@@ -127,6 +139,13 @@ GType NoOpObject::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Atk
 
 
diff --git a/libs/gtkmm2/atk/atkmm/noopobject.h b/libs/gtkmm2/atk/atkmm/noopobject.h
index b5ee9bed0c..1421c0f084 100644
--- a/libs/gtkmm2/atk/atkmm/noopobject.h
+++ b/libs/gtkmm2/atk/atkmm/noopobject.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_NOOPOBJECT_H
 #define _ATKMM_NOOPOBJECT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -116,11 +117,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/atk/atkmm/object.cc b/libs/gtkmm2/atk/atkmm/object.cc
index 44e7301691..b129a0af67 100644
--- a/libs/gtkmm2/atk/atkmm/object.cc
+++ b/libs/gtkmm2/atk/atkmm/object.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/object.h>
 #include <atkmm/private/object_p.h>
 
@@ -69,7 +70,8 @@ Glib::ObjectBase* Object_Class::wrap_new(GObject* object)
 namespace
 {
 
-void Object_signal_children_changed_callback(AtkObject* self, guint p0,gpointer p1,void* data)
+
+static void Object_signal_children_changed_callback(AtkObject* self, guint p0,gpointer p1,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,guint,gpointer > SlotType;
@@ -77,19 +79,23 @@ void Object_signal_children_changed_callback(AtkObject* self, guint p0,gpointer
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0, p1);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Object_signal_children_changed_info =
+static const Glib::SignalProxyInfo Object_signal_children_changed_info =
 {
   "children_changed",
   (GCallback) &Object_signal_children_changed_callback,
@@ -97,7 +103,7 @@ const Glib::SignalProxyInfo Object_signal_children_changed_info =
 };
 
 
-void Object_signal_focus_event_callback(AtkObject* self, gboolean p0,void* data)
+static void Object_signal_focus_event_callback(AtkObject* self, gboolean p0,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,bool > SlotType;
@@ -105,20 +111,24 @@ void Object_signal_focus_event_callback(AtkObject* self, gboolean p0,void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Object_signal_focus_event_info =
+static const Glib::SignalProxyInfo Object_signal_focus_event_info =
 {
   "focus_event",
   (GCallback) &Object_signal_focus_event_callback,
@@ -126,7 +136,7 @@ const Glib::SignalProxyInfo Object_signal_focus_event_info =
 };
 
 
-void Object_signal_property_change_callback(AtkObject* self, AtkPropertyValues* p0,void* data)
+static void Object_signal_property_change_callback(AtkObject* self, AtkPropertyValues* p0,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,AtkPropertyValues* > SlotType;
@@ -134,19 +144,23 @@ void Object_signal_property_change_callback(AtkObject* self, AtkPropertyValues*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Object_signal_property_change_info =
+static const Glib::SignalProxyInfo Object_signal_property_change_info =
 {
   "property_change",
   (GCallback) &Object_signal_property_change_callback,
@@ -154,7 +168,7 @@ const Glib::SignalProxyInfo Object_signal_property_change_info =
 };
 
 
-void Object_signal_state_change_callback(AtkObject* self, const gchar* p0,gboolean p1,void* data)
+static void Object_signal_state_change_callback(AtkObject* self, const gchar* p0,gboolean p1,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,const Glib::ustring&,bool > SlotType;
@@ -162,21 +176,25 @@ void Object_signal_state_change_callback(AtkObject* self, const gchar* p0,gboole
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::convert_const_gchar_ptr_to_ustring(p0)
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Object_signal_state_change_info =
+static const Glib::SignalProxyInfo Object_signal_state_change_info =
 {
   "state_change",
   (GCallback) &Object_signal_state_change_callback,
@@ -184,7 +202,7 @@ const Glib::SignalProxyInfo Object_signal_state_change_info =
 };
 
 
-const Glib::SignalProxyInfo Object_signal_visible_data_changed_info =
+static const Glib::SignalProxyInfo Object_signal_visible_data_changed_info =
 {
   "visible_data_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -192,7 +210,7 @@ const Glib::SignalProxyInfo Object_signal_visible_data_changed_info =
 };
 
 
-void Object_signal_active_descendant_changed_callback(AtkObject* self, gpointer* p0,void* data)
+static void Object_signal_active_descendant_changed_callback(AtkObject* self, gpointer* p0,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,void** > SlotType;
@@ -200,26 +218,31 @@ void Object_signal_active_descendant_changed_callback(AtkObject* self, gpointer*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Object_signal_active_descendant_changed_info =
+static const Glib::SignalProxyInfo Object_signal_active_descendant_changed_info =
 {
   "active_descendant_changed",
   (GCallback) &Object_signal_active_descendant_changed_callback,
   (GCallback) &Object_signal_active_descendant_changed_callback
 };
 
+
 } // anonymous namespace
 
 // static
@@ -272,15 +295,23 @@ void Object_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->children_changed = &children_changed_callback;
   klass->focus_event = &focus_event_callback;
   klass->property_change = &property_change_callback;
   klass->state_change = &state_change_callback;
   klass->visible_data_changed = &visible_data_changed_callback;
   klass->active_descendant_changed = &active_descendant_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Object_Class::children_changed_callback(AtkObject* self, guint p0, gpointer p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -293,15 +324,19 @@ void Object_Class::children_changed_callback(AtkObject* self, guint p0, gpointer
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_children_changed(p0, p1);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -314,7 +349,6 @@ void Object_Class::children_changed_callback(AtkObject* self, guint p0, gpointer
       (*base->children_changed)(self, p0, p1);
   }
 }
-
 void Object_Class::focus_event_callback(AtkObject* self, gboolean p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -327,16 +361,20 @@ void Object_Class::focus_event_callback(AtkObject* self, gboolean p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_focus_event(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -349,7 +387,6 @@ void Object_Class::focus_event_callback(AtkObject* self, gboolean p0)
       (*base->focus_event)(self, p0);
   }
 }
-
 void Object_Class::property_change_callback(AtkObject* self, AtkPropertyValues* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -362,15 +399,19 @@ void Object_Class::property_change_callback(AtkObject* self, AtkPropertyValues*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_property_change(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -383,7 +424,6 @@ void Object_Class::property_change_callback(AtkObject* self, AtkPropertyValues*
       (*base->property_change)(self, p0);
   }
 }
-
 void Object_Class::state_change_callback(AtkObject* self, const gchar* p0, gboolean p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -396,17 +436,21 @@ void Object_Class::state_change_callback(AtkObject* self, const gchar* p0, gbool
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_state_change(Glib::convert_const_gchar_ptr_to_ustring(p0)
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -419,7 +463,6 @@ void Object_Class::state_change_callback(AtkObject* self, const gchar* p0, gbool
       (*base->state_change)(self, p0, p1);
   }
 }
-
 void Object_Class::visible_data_changed_callback(AtkObject* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -432,15 +475,19 @@ void Object_Class::visible_data_changed_callback(AtkObject* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_visible_data_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -453,7 +500,6 @@ void Object_Class::visible_data_changed_callback(AtkObject* self)
       (*base->visible_data_changed)(self);
   }
 }
-
 void Object_Class::active_descendant_changed_callback(AtkObject* self, gpointer* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -466,16 +512,20 @@ void Object_Class::active_descendant_changed_callback(AtkObject* self, gpointer*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_active_descendant_changed(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -488,6 +538,7 @@ void Object_Class::active_descendant_changed_callback(AtkObject* self, gpointer*
       (*base->active_descendant_changed)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 /* The implementation: */
@@ -539,10 +590,10 @@ Glib::RefPtr<Atk::Object> Object::get_parent()
 {
 
   Glib::RefPtr<Atk::Object> retvalue = Glib::wrap(atk_object_get_parent(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 int Object::get_n_accessible_children() const
@@ -559,10 +610,10 @@ Glib::RefPtr<RelationSet> Object::get_relation_set()
 {
 
   Glib::RefPtr<RelationSet> retvalue = Glib::wrap(atk_object_ref_relation_set(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Role Object::get_role() const
@@ -582,27 +633,27 @@ int Object::get_index_in_parent()
 
 void Object::set_name(const Glib::ustring& name)
 {
-  atk_object_set_name(gobj(), name.c_str());
+atk_object_set_name(gobj(), name.c_str()); 
 }
 
 void Object::set_description(const Glib::ustring& description)
 {
-  atk_object_set_description(gobj(), description.c_str());
+atk_object_set_description(gobj(), description.c_str()); 
 }
 
 void Object::set_parent(const Glib::RefPtr<Atk::Object>& parent)
 {
-  atk_object_set_parent(gobj(), Glib::unwrap(parent));
+atk_object_set_parent(gobj(), Glib::unwrap(parent)); 
 }
 
 void Object::set_role(Role role)
 {
-  atk_object_set_role(gobj(), ((AtkRole)(role)));
+atk_object_set_role(gobj(), ((AtkRole)(role))); 
 }
 
 void Object::notify_state_change(State state, bool value)
 {
-  atk_object_notify_state_change(gobj(), state, static_cast<int>(value));
+atk_object_notify_state_change(gobj(), state, static_cast<int>(value)); 
 }
 
 bool Object::add_relationship(RelationType relationship, const Glib::RefPtr<Object>& target)
@@ -621,153 +672,207 @@ Glib::SignalProxy2< void,guint,gpointer > Object::signal_children_changed()
   return Glib::SignalProxy2< void,guint,gpointer >(this, &Object_signal_children_changed_info);
 }
 
+
 Glib::SignalProxy1< void,bool > Object::signal_focus_event()
 {
   return Glib::SignalProxy1< void,bool >(this, &Object_signal_focus_event_info);
 }
 
+
 Glib::SignalProxy1< void,AtkPropertyValues* > Object::signal_property_change()
 {
   return Glib::SignalProxy1< void,AtkPropertyValues* >(this, &Object_signal_property_change_info);
 }
 
+
 Glib::SignalProxy2< void,const Glib::ustring&,bool > Object::signal_state_change()
 {
   return Glib::SignalProxy2< void,const Glib::ustring&,bool >(this, &Object_signal_state_change_info);
 }
 
+
 Glib::SignalProxy0< void > Object::signal_visible_data_changed()
 {
   return Glib::SignalProxy0< void >(this, &Object_signal_visible_data_changed_info);
 }
 
+
 Glib::SignalProxy1< void,void** > Object::signal_active_descendant_changed()
 {
   return Glib::SignalProxy1< void,void** >(this, &Object_signal_active_descendant_changed_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Object::property_accessible_name() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "accessible-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Object::property_accessible_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "accessible-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Object::property_accessible_description() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "accessible-description");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Object::property_accessible_description() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "accessible-description");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Atk::Object> > Object::property_accessible_parent() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Atk::Object> >(this, "accessible-parent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> > Object::property_accessible_parent() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> >(this, "accessible-parent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> Object::property_accessible_value() 
 {
   return Glib::PropertyProxy<double>(this, "accessible-value");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> Object::property_accessible_value() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "accessible-value");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Object::property_accessible_role() 
 {
   return Glib::PropertyProxy<int>(this, "accessible-role");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Object::property_accessible_role() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "accessible-role");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Object::property_accessible_component_layer() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "accessible-component-layer");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Object::property_accessible_component_mdi_zorder() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "accessible-component-mdi-zorder");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Object::property_accessible_table_caption() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "accessible-table-caption");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Object::property_accessible_table_caption() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "accessible-table-caption");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Object::property_accessible_table_column_description() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "accessible-table-column-description");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Object::property_accessible_table_column_description() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "accessible-table-column-description");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Atk::Object> > Object::property_accessible_table_column_header() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Atk::Object> >(this, "accessible-table-column-header");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> > Object::property_accessible_table_column_header() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> >(this, "accessible-table-column-header");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Object::property_accessible_table_row_description() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "accessible-table-row-description");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Object::property_accessible_table_row_description() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "accessible-table-row-description");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Atk::Object> > Object::property_accessible_table_row_header() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Atk::Object> >(this, "accessible-table-row-header");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> > Object::property_accessible_table_row_header() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> >(this, "accessible-table-row-header");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Atk::Object> > Object::property_accessible_table_summary() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Atk::Object> >(this, "accessible-table-summary");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> > Object::property_accessible_table_summary() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> >(this, "accessible-table-summary");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Atk::Object::on_children_changed(guint change_index, gpointer changed_child)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -777,7 +882,6 @@ void Atk::Object::on_children_changed(guint change_index, gpointer changed_child
   if(base && base->children_changed)
     (*base->children_changed)(gobj(),change_index,changed_child);
 }
-
 void Atk::Object::on_focus_event(bool focus_in)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -787,7 +891,6 @@ void Atk::Object::on_focus_event(bool focus_in)
   if(base && base->focus_event)
     (*base->focus_event)(gobj(),static_cast<int>(focus_in));
 }
-
 void Atk::Object::on_property_change(AtkPropertyValues* values)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -797,7 +900,6 @@ void Atk::Object::on_property_change(AtkPropertyValues* values)
   if(base && base->property_change)
     (*base->property_change)(gobj(),values);
 }
-
 void Atk::Object::on_state_change(const Glib::ustring& name, bool state_set)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -807,7 +909,6 @@ void Atk::Object::on_state_change(const Glib::ustring& name, bool state_set)
   if(base && base->state_change)
     (*base->state_change)(gobj(),name.c_str(),static_cast<int>(state_set));
 }
-
 void Atk::Object::on_visible_data_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -817,7 +918,6 @@ void Atk::Object::on_visible_data_changed()
   if(base && base->visible_data_changed)
     (*base->visible_data_changed)(gobj());
 }
-
 void Atk::Object::on_active_descendant_changed(void** child)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -827,6 +927,10 @@ void Atk::Object::on_active_descendant_changed(void** child)
   if(base && base->active_descendant_changed)
     (*base->active_descendant_changed)(gobj(),child);
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/object.h b/libs/gtkmm2/atk/atkmm/object.h
index 047cb2a254..5b2431b57a 100644
--- a/libs/gtkmm2/atk/atkmm/object.h
+++ b/libs/gtkmm2/atk/atkmm/object.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_OBJECT_H
 #define _ATKMM_OBJECT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -320,32 +321,65 @@ public:
   bool remove_relationship(RelationType relationship, const Glib::RefPtr<Object>& target);
 
   
+/**
+   * @par Prototype:
+   * <tt>void %children_changed(guint change_index, gpointer changed_child)</tt>
+   */
+
   Glib::SignalProxy2< void,guint,gpointer > signal_children_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %focus_event(bool focus_in)</tt>
+   */
+
   Glib::SignalProxy1< void,bool > signal_focus_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %property_change(AtkPropertyValues* values)</tt>
+   */
+
   Glib::SignalProxy1< void,AtkPropertyValues* > signal_property_change();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %state_change(const Glib::ustring& name, bool state_set)</tt>
+   */
+
   Glib::SignalProxy2< void,const Glib::ustring&,bool > signal_state_change();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %visible_data_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_visible_data_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %active_descendant_changed(void** child)</tt>
+   */
+
   Glib::SignalProxy1< void,void** > signal_active_descendant_changed();
 
 
-  /** Object instance's name formatted for assistive technology access.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Object instance's name formatted for assistive technology access.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_accessible_name() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Object instance's name formatted for assistive technology access.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -353,15 +387,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_accessible_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Description of an object
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Description of an object
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_accessible_description() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Description of an object
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -369,15 +407,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_accessible_description() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Is used to notify that the parent has changed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Is used to notify that the parent has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Atk::Object> > property_accessible_parent() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Is used to notify that the parent has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -385,15 +427,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> > property_accessible_parent() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Is used to notify that the value has changed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Is used to notify that the value has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_accessible_value() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Is used to notify that the value has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -401,15 +447,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_accessible_value() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The accessible role of this object.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The accessible role of this object.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_accessible_role() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The accessible role of this object.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -417,33 +467,41 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_accessible_role() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The accessible layer of this object.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The accessible layer of this object.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_accessible_component_layer() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The accessible MDI value of this object.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The accessible MDI value of this object.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_accessible_component_mdi_zorder() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** Is used to notify that the table caption has changed; this property should not be used. accessible-table-caption-object should be used instead.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Is used to notify that the table caption has changed; this property should not be used. accessible-table-caption-object should be used instead.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_accessible_table_caption() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Is used to notify that the table caption has changed; this property should not be used. accessible-table-caption-object should be used instead.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -451,15 +509,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_accessible_table_caption() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Is used to notify that the table column description has changed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Is used to notify that the table column description has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_accessible_table_column_description() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Is used to notify that the table column description has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -467,15 +529,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_accessible_table_column_description() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Is used to notify that the table column header has changed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Is used to notify that the table column header has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Atk::Object> > property_accessible_table_column_header() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Is used to notify that the table column header has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -483,15 +549,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> > property_accessible_table_column_header() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Is used to notify that the table row description has changed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Is used to notify that the table row description has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_accessible_table_row_description() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Is used to notify that the table row description has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -499,15 +569,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_accessible_table_row_description() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Is used to notify that the table row header has changed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Is used to notify that the table row header has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Atk::Object> > property_accessible_table_row_header() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Is used to notify that the table row header has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -515,15 +589,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> > property_accessible_table_row_header() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Is used to notify that the table summary has changed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Is used to notify that the table summary has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Atk::Object> > property_accessible_table_summary() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Is used to notify that the table summary has changed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -531,23 +609,30 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> > property_accessible_table_summary() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_children_changed(guint change_index, gpointer changed_child);
   virtual void on_focus_event(bool focus_in);
   virtual void on_property_change(AtkPropertyValues* values);
   virtual void on_state_change(const Glib::ustring& name, bool state_set);
   virtual void on_visible_data_changed();
   virtual void on_active_descendant_changed(void** child);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/atk/atkmm/objectaccessible.cc b/libs/gtkmm2/atk/atkmm/objectaccessible.cc
index da4136bef7..265180b830 100644
--- a/libs/gtkmm2/atk/atkmm/objectaccessible.cc
+++ b/libs/gtkmm2/atk/atkmm/objectaccessible.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/objectaccessible.h>
 #include <atkmm/private/objectaccessible_p.h>
 
@@ -26,7 +27,6 @@
  */
 
 #include <atk/atkgobjectaccessible.h>
-
 namespace
 {
 } // anonymous namespace
@@ -75,8 +75,19 @@ void ObjectAccessible_Class::class_init_function(void* g_class, void* class_data
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* ObjectAccessible_Class::wrap_new(GObject* object)
 {
@@ -123,20 +134,15 @@ Glib::RefPtr<Glib::Object> ObjectAccessible::get_object()
 {
 
   Glib::RefPtr<Glib::Object> retvalue = Glib::wrap(atk_gobject_accessible_get_object(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Glib::Object> ObjectAccessible::get_object() const
 {
-
-  Glib::RefPtr<const Glib::Object> retvalue = Glib::wrap(atk_gobject_accessible_get_object(const_cast<AtkGObjectAccessible*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<ObjectAccessible*>(this)->get_object();
 }
 
 Glib::RefPtr<Atk::Object> ObjectAccessible::for_object(const Glib::RefPtr<Glib::Object>& obj)
@@ -149,6 +155,7 @@ Glib::RefPtr<Atk::Object> ObjectAccessible::for_object(const Glib::RefPtr<Glib::
   return retvalue;
 }
 
+
 Glib::RefPtr<const Atk::Object> ObjectAccessible::for_object(const Glib::RefPtr<const Glib::Object>& obj)
 {
 
@@ -160,6 +167,13 @@ Glib::RefPtr<const Atk::Object> ObjectAccessible::for_object(const Glib::RefPtr<
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Atk
 
 
diff --git a/libs/gtkmm2/atk/atkmm/objectaccessible.h b/libs/gtkmm2/atk/atkmm/objectaccessible.h
index d266f9a97e..f3ed6f5b9c 100644
--- a/libs/gtkmm2/atk/atkmm/objectaccessible.h
+++ b/libs/gtkmm2/atk/atkmm/objectaccessible.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_OBJECTACCESSIBLE_H
 #define _ATKMM_OBJECTACCESSIBLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -118,11 +119,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/atk/atkmm/private/action_p.h b/libs/gtkmm2/atk/atkmm/private/action_p.h
index bb3c5afa09..9372291a66 100644
--- a/libs/gtkmm2/atk/atkmm/private/action_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/action_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_ACTION_P_H
 #define _ATKMM_ACTION_P_H
+
+
 #include <glibmm/private/interface_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,21 +29,26 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static gboolean do_action_vfunc_callback(AtkAction* self, gint i);
   static gint get_n_actions_vfunc_callback(AtkAction* self);
   static const gchar* get_description_vfunc_callback(AtkAction* self, gint i);
   static const gchar* get_name_vfunc_callback(AtkAction* self, gint i);
   static const gchar* get_keybinding_vfunc_callback(AtkAction* self, gint i);
   static gboolean set_description_vfunc_callback(AtkAction* self, gint i, const gchar* desc);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_ACTION_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/component_p.h b/libs/gtkmm2/atk/atkmm/private/component_p.h
index 010df9e92f..7526cdcb68 100644
--- a/libs/gtkmm2/atk/atkmm/private/component_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/component_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_COMPONENT_P_H
 #define _ATKMM_COMPONENT_P_H
+
+
 #include <atk/atkcomponent.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,11 +29,14 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static guint add_focus_handler_vfunc_callback(AtkComponent* self, AtkFocusHandler handler);
   static gboolean contains_vfunc_callback(AtkComponent* self, gint x, gint y, AtkCoordType coord_type);
   static AtkObject* ref_accessible_at_point_vfunc_callback(AtkComponent* self, gint x, gint y, AtkCoordType coord_type);
@@ -45,10 +50,12 @@ protected:
   static gboolean set_extents_vfunc_callback(AtkComponent* self, gint x, gint y, gint width, gint height, AtkCoordType coord_type);
   static gboolean set_position_vfunc_callback(AtkComponent* self, gint x, gint y, AtkCoordType coord_type);
   static gboolean set_size_vfunc_callback(AtkComponent* self, gint width, gint height);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_COMPONENT_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/document_p.h b/libs/gtkmm2/atk/atkmm/private/document_p.h
index 01115486b5..387a5822e7 100644
--- a/libs/gtkmm2/atk/atkmm/private/document_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/document_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_DOCUMENT_P_H
 #define _ATKMM_DOCUMENT_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,17 +29,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static const gchar* get_document_type_vfunc_callback(AtkDocument* self);
   static gpointer get_document_vfunc_callback(AtkDocument* self);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_DOCUMENT_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/editabletext_p.h b/libs/gtkmm2/atk/atkmm/private/editabletext_p.h
index fb5004ed1d..e812f68489 100644
--- a/libs/gtkmm2/atk/atkmm/private/editabletext_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/editabletext_p.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_EDITABLETEXT_P_H
 #define _ATKMM_EDITABLETEXT_P_H
 
+
 #include <glibmm/private/interface_p.h>
 
 namespace Atk
@@ -26,11 +27,14 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static gboolean set_run_attributes_vfunc_callback(AtkEditableText* self, AtkAttributeSet* attrib_set, gint start_offset, gint end_offset);
   static void set_text_contents_vfunc_callback(AtkEditableText* self, const gchar* string);
   static void insert_text_vfunc_callback(AtkEditableText* self, const gchar* string, gint length, gint* position);
@@ -38,10 +42,12 @@ protected:
   static void cut_text_vfunc_callback(AtkEditableText* self, gint start_pos, gint end_pos);
   static void delete_text_vfunc_callback(AtkEditableText* self, gint start_pos, gint end_pos);
   static void paste_text_vfunc_callback(AtkEditableText* self, gint position);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_EDITABLETEXT_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/hyperlink_p.h b/libs/gtkmm2/atk/atkmm/private/hyperlink_p.h
index a5d9e61275..b4b57fc745 100644
--- a/libs/gtkmm2/atk/atkmm/private/hyperlink_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/hyperlink_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_HYPERLINK_P_H
 #define _ATKMM_HYPERLINK_P_H
+
+
 #include <glibmm/private/object_p.h>
 #include <atk/atkobject.h>
 
@@ -31,12 +33,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void link_activated_callback(AtkHyperlink* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static gchar* get_uri_vfunc_callback(AtkHyperlink* self, gint i);
   static AtkObject* get_object_vfunc_callback(AtkHyperlink* self, gint i);
   static gint get_end_index_vfunc_callback(AtkHyperlink* self);
@@ -45,10 +50,12 @@ protected:
   static gint get_n_anchors_vfunc_callback(AtkHyperlink* self);
   static guint link_state_vfunc_callback(AtkHyperlink* self);
   static gboolean is_selected_link_vfunc_callback(AtkHyperlink* self);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_HYPERLINK_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/hypertext_p.h b/libs/gtkmm2/atk/atkmm/private/hypertext_p.h
index 79eaad32c5..cf6ec7a240 100644
--- a/libs/gtkmm2/atk/atkmm/private/hypertext_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/hypertext_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_HYPERTEXT_P_H
 #define _ATKMM_HYPERTEXT_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,19 +29,24 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void link_selected_callback(AtkHypertext* self, gint p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static AtkHyperlink* get_link_vfunc_callback(AtkHypertext* self, gint link_index);
   static gint get_n_links_vfunc_callback(AtkHypertext* self);
   static gint get_link_index_vfunc_callback(AtkHypertext* self, gint char_index);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_HYPERTEXT_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/image_p.h b/libs/gtkmm2/atk/atkmm/private/image_p.h
index b2e8d327ca..f7275ba0c9 100644
--- a/libs/gtkmm2/atk/atkmm/private/image_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/image_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_IMAGE_P_H
 #define _ATKMM_IMAGE_P_H
+
+
 #include <atk/atkimage.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,19 +29,24 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static gboolean set_image_description_vfunc_callback(AtkImage* self, const gchar* description);
   static const gchar* get_image_description_vfunc_callback(AtkImage* self);
   static void get_image_position_vfunc_callback(AtkImage* self, gint* x, gint* y, AtkCoordType coord_type);
   static void get_image_size_vfunc_callback(AtkImage* self, gint* width, gint* height);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_IMAGE_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/implementor_p.h b/libs/gtkmm2/atk/atkmm/private/implementor_p.h
index 7c5fc8804f..70359d4122 100644
--- a/libs/gtkmm2/atk/atkmm/private/implementor_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/implementor_p.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_IMPLEMENTOR_P_H
 #define _ATKMM_IMPLEMENTOR_P_H
 
+
 #include <glibmm/private/interface_p.h>
 
 namespace Atk
@@ -26,16 +27,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static AtkObject* ref_accessible_vfunc_callback(AtkImplementor* self);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_IMPLEMENTOR_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/noopobject_p.h b/libs/gtkmm2/atk/atkmm/private/noopobject_p.h
index afa515b316..54b1f81709 100644
--- a/libs/gtkmm2/atk/atkmm/private/noopobject_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/noopobject_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_NOOPOBJECT_P_H
 #define _ATKMM_NOOPOBJECT_P_H
+
+
 #include <atkmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_NOOPOBJECT_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/object_p.h b/libs/gtkmm2/atk/atkmm/private/object_p.h
index f65e8f8c08..8af90b1c95 100644
--- a/libs/gtkmm2/atk/atkmm/private/object_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/object_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_OBJECT_P_H
 #define _ATKMM_OBJECT_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,6 +32,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -39,12 +42,16 @@ protected:
   static void state_change_callback(AtkObject* self, const gchar* p0, gboolean p1);
   static void visible_data_changed_callback(AtkObject* self);
   static void active_descendant_changed_callback(AtkObject* self, gpointer* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_OBJECT_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/objectaccessible_p.h b/libs/gtkmm2/atk/atkmm/private/objectaccessible_p.h
index b94c1320e5..37be5dd403 100644
--- a/libs/gtkmm2/atk/atkmm/private/objectaccessible_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/objectaccessible_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_OBJECTACCESSIBLE_P_H
 #define _ATKMM_OBJECTACCESSIBLE_P_H
+
+
 #include <atkmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_OBJECTACCESSIBLE_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/relation_p.h b/libs/gtkmm2/atk/atkmm/private/relation_p.h
index 63513db828..075b012730 100644
--- a/libs/gtkmm2/atk/atkmm/private/relation_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/relation_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_RELATION_P_H
 #define _ATKMM_RELATION_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_RELATION_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/relationset_p.h b/libs/gtkmm2/atk/atkmm/private/relationset_p.h
index 8d3787e6e6..719ba5607e 100644
--- a/libs/gtkmm2/atk/atkmm/private/relationset_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/relationset_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_RELATIONSET_P_H
 #define _ATKMM_RELATIONSET_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_RELATIONSET_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/selection_p.h b/libs/gtkmm2/atk/atkmm/private/selection_p.h
index dd5f27702a..11956c38fc 100644
--- a/libs/gtkmm2/atk/atkmm/private/selection_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/selection_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_SELECTION_P_H
 #define _ATKMM_SELECTION_P_H
+
+
 #include <atk/atkobject.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,12 +29,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void selection_changed_callback(AtkSelection* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static gboolean add_selection_vfunc_callback(AtkSelection* self, gint i);
   static gboolean clear_selection_vfunc_callback(AtkSelection* self);
   static AtkObject* ref_selection_vfunc_callback(AtkSelection* self, gint i);
@@ -40,10 +45,12 @@ protected:
   static gboolean is_child_selected_vfunc_callback(AtkSelection* self, gint i);
   static gboolean remove_selection_vfunc_callback(AtkSelection* self, gint i);
   static gboolean select_all_selection_vfunc_callback(AtkSelection* self);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_SELECTION_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/stateset_p.h b/libs/gtkmm2/atk/atkmm/private/stateset_p.h
index 51dd352ec0..8d6691c0d2 100644
--- a/libs/gtkmm2/atk/atkmm/private/stateset_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/stateset_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_STATESET_P_H
 #define _ATKMM_STATESET_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_STATESET_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/streamablecontent_p.h b/libs/gtkmm2/atk/atkmm/private/streamablecontent_p.h
index 7c22e8c8ec..acc2aa6dbe 100644
--- a/libs/gtkmm2/atk/atkmm/private/streamablecontent_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/streamablecontent_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_STREAMABLECONTENT_P_H
 #define _ATKMM_STREAMABLECONTENT_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,18 +29,23 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static int get_n_mime_types_vfunc_callback(AtkStreamableContent* self);
   static const gchar* get_mime_type_vfunc_callback(AtkStreamableContent* self, gint i);
   static GIOChannel* get_stream_vfunc_callback(AtkStreamableContent* self, const gchar* mime_type);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_STREAMABLECONTENT_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/table_p.h b/libs/gtkmm2/atk/atkmm/private/table_p.h
index 5516bb05c9..6d8d3d1cac 100644
--- a/libs/gtkmm2/atk/atkmm/private/table_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/table_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _ATKMM_TABLE_P_H
 #define _ATKMM_TABLE_P_H
+
+
 #include <atk/atkobject.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,6 +29,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -37,8 +40,10 @@ protected:
   static void row_reordered_callback(AtkTable* self);
   static void column_reordered_callback(AtkTable* self);
   static void model_changed_callback(AtkTable* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static AtkObject* ref_at_vfunc_callback(AtkTable* self, gint row, gint column);
   static gint get_index_at_vfunc_callback(AtkTable* self, gint row, gint column);
   static gint get_column_at_index_vfunc_callback(AtkTable* self, gint index_);
@@ -68,10 +73,12 @@ protected:
   static gboolean remove_column_selection_vfunc_callback(AtkTable* self, gint column);
   static gint get_selected_columns_vfunc_callback(AtkTable* self, gint** selected);
   static gint get_selected_rows_vfunc_callback(AtkTable* self, gint** selected);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_TABLE_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/text_p.h b/libs/gtkmm2/atk/atkmm/private/text_p.h
index 3ccc748965..8888776aca 100644
--- a/libs/gtkmm2/atk/atkmm/private/text_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/text_p.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_TEXT_P_H
 #define _ATKMM_TEXT_P_H
 
+
 #include <glibmm/private/interface_p.h>
 
 namespace Atk
@@ -26,6 +27,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -33,8 +35,10 @@ protected:
   static void text_caret_moved_callback(AtkText* self, gint p0);
   static void text_selection_changed_callback(AtkText* self);
   static void text_attributes_changed_callback(AtkText* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static gchar* get_text_vfunc_callback(AtkText* self, gint start_offset, gint end_offset);
   static gunichar get_character_at_offset_vfunc_callback(AtkText* self, gint offset);
   static gchar* get_text_after_offset_vfunc_callback(AtkText* self, gint offset, AtkTextBoundary boundary_type, gint* start_offset, gint* end_offset);
@@ -52,10 +56,12 @@ protected:
   static gboolean remove_selection_vfunc_callback(AtkText* self, gint selection_num);
   static gboolean set_selection_vfunc_callback(AtkText* self, gint selection_num, gint start_offset, gint end_offset);
   static gboolean set_caret_offset_vfunc_callback(AtkText* self, gint offset);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_TEXT_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/private/value_p.h b/libs/gtkmm2/atk/atkmm/private/value_p.h
index f712e3cd70..00fcb81ae8 100644
--- a/libs/gtkmm2/atk/atkmm/private/value_p.h
+++ b/libs/gtkmm2/atk/atkmm/private/value_p.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_VALUE_P_H
 #define _ATKMM_VALUE_P_H
 
+
 #include <glibmm/private/interface_p.h>
 
 namespace Atk
@@ -26,19 +27,24 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void get_current_value_vfunc_callback(AtkValue* self, GValue* value);
   static void get_maximum_value_vfunc_callback(AtkValue* self, GValue* value);
   static void get_minimum_value_vfunc_callback(AtkValue* self, GValue* value);
   static gboolean set_current_value_vfunc_callback(AtkValue* self, const GValue* value);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Atk
 
+
 #endif /* _ATKMM_VALUE_P_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/relation.cc b/libs/gtkmm2/atk/atkmm/relation.cc
index 94c3fe2d48..e56df0ee10 100644
--- a/libs/gtkmm2/atk/atkmm/relation.cc
+++ b/libs/gtkmm2/atk/atkmm/relation.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/relation.h>
 #include <atkmm/private/relation_p.h>
 
@@ -113,8 +114,19 @@ void Relation_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Relation_Class::wrap_new(GObject* object)
 {
@@ -168,10 +180,17 @@ RelationType Relation::get_relation_type() const
 
 void Relation::add_target(const Glib::RefPtr<Atk::Object>& target)
 {
-  atk_relation_add_target(gobj(), Glib::unwrap(target));
+atk_relation_add_target(gobj(), Glib::unwrap(target)); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Atk
 
 
diff --git a/libs/gtkmm2/atk/atkmm/relation.h b/libs/gtkmm2/atk/atkmm/relation.h
index 683b938947..f0b1fe2f44 100644
--- a/libs/gtkmm2/atk/atkmm/relation.h
+++ b/libs/gtkmm2/atk/atkmm/relation.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_RELATION_H
 #define _ATKMM_RELATION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -153,6 +154,12 @@ public:
   Glib::ArrayHandle< Glib::RefPtr<const Atk::Object> > get_target() const;
   
   
+  /** Adds the specified AtkObject to the target for the relation, if it is
+   * not already present.
+   * 
+   * Since: 1.9
+   * @param target An Atk::Object.
+   */
   void add_target(const Glib::RefPtr<Atk::Object>& target);
 
 
@@ -160,11 +167,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/atk/atkmm/relationset.cc b/libs/gtkmm2/atk/atkmm/relationset.cc
index 2060639bc1..3638f4ece1 100644
--- a/libs/gtkmm2/atk/atkmm/relationset.cc
+++ b/libs/gtkmm2/atk/atkmm/relationset.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/relationset.h>
 #include <atkmm/private/relationset_p.h>
 
@@ -75,8 +76,19 @@ void RelationSet_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* RelationSet_Class::wrap_new(GObject* object)
 {
@@ -137,12 +149,12 @@ bool RelationSet::set_contains(RelationType relationship)
 
 void RelationSet::set_remove(const Glib::RefPtr<Relation>& relation)
 {
-  atk_relation_set_remove(gobj(), Glib::unwrap(relation));
+atk_relation_set_remove(gobj(), Glib::unwrap(relation)); 
 }
 
 void RelationSet::set_add(const Glib::RefPtr<Relation>& relation)
 {
-  atk_relation_set_add(gobj(), Glib::unwrap(relation));
+atk_relation_set_add(gobj(), Glib::unwrap(relation)); 
 }
 
 int RelationSet::get_n_relations() const
@@ -154,28 +166,35 @@ Glib::RefPtr<Relation> RelationSet::get_relation(gint i)
 {
 
   Glib::RefPtr<Relation> retvalue = Glib::wrap(atk_relation_set_get_relation(gobj(), i));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<Relation> RelationSet::get_relation(RelationType relationship)
 {
 
   Glib::RefPtr<Relation> retvalue = Glib::wrap(atk_relation_set_get_relation_by_type(gobj(), ((AtkRelationType)(relationship))));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 void RelationSet::add_relation_by_type(RelationType relationship, const Glib::RefPtr<Atk::Object>& target)
 {
-  atk_relation_set_add_relation_by_type(gobj(), ((AtkRelationType)(relationship)), Glib::unwrap(target));
+atk_relation_set_add_relation_by_type(gobj(), ((AtkRelationType)(relationship)), Glib::unwrap(target)); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Atk
 
 
diff --git a/libs/gtkmm2/atk/atkmm/relationset.h b/libs/gtkmm2/atk/atkmm/relationset.h
index 3702083fa5..a2a52c2fac 100644
--- a/libs/gtkmm2/atk/atkmm/relationset.h
+++ b/libs/gtkmm2/atk/atkmm/relationset.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_RELATIONSET_H
 #define _ATKMM_RELATIONSET_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -137,6 +138,15 @@ public:
   Glib::RefPtr<Relation> get_relation(RelationType relationship);
   
   
+  /** Add a new relation of the specified type with the specified target to 
+   * the current relation set if the relation set does not contain a relation
+   * of that type. If it is does contain a relation of that typea the target
+   * is added to the relation.
+   * 
+   * Since: 1.9
+   * @param relationship An Atk::RelationType.
+   * @param target An Atk::Object.
+   */
   void add_relation_by_type(RelationType relationship, const Glib::RefPtr<Atk::Object>& target);
 
 
@@ -144,11 +154,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/atk/atkmm/selection.cc b/libs/gtkmm2/atk/atkmm/selection.cc
index 95c6a0a60a..ed5fb629e7 100644
--- a/libs/gtkmm2/atk/atkmm/selection.cc
+++ b/libs/gtkmm2/atk/atkmm/selection.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/selection.h>
 #include <atkmm/private/selection_p.h>
 
@@ -30,13 +31,15 @@
 namespace
 {
 
-const Glib::SignalProxyInfo Selection_signal_selection_changed_info =
+
+static const Glib::SignalProxyInfo Selection_signal_selection_changed_info =
 {
   "selection_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -81,6 +84,7 @@ void Selection_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->add_selection = &add_selection_vfunc_callback;
   klass->clear_selection = &clear_selection_vfunc_callback;
   klass->ref_selection = &ref_selection_vfunc_callback;
@@ -88,9 +92,14 @@ void Selection_Class::iface_init_function(void* g_iface, void*)
   klass->is_child_selected = &is_child_selected_vfunc_callback;
   klass->remove_selection = &remove_selection_vfunc_callback;
   klass->select_all_selection = &select_all_selection_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->selection_changed = &selection_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 gboolean Selection_Class::add_selection_vfunc_callback(AtkSelection* self, gint i)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -103,16 +112,20 @@ gboolean Selection_Class::add_selection_vfunc_callback(AtkSelection* self, gint
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->add_selection_vfunc(i
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -129,7 +142,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Selection_Class::clear_selection_vfunc_callback(AtkSelection* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -142,15 +154,19 @@ gboolean Selection_Class::clear_selection_vfunc_callback(AtkSelection* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->clear_selection_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -167,7 +183,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 AtkObject* Selection_Class::ref_selection_vfunc_callback(AtkSelection* self, gint i)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -180,16 +195,20 @@ AtkObject* Selection_Class::ref_selection_vfunc_callback(AtkSelection* self, gin
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap_copy(obj->get_selection_vfunc(i
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -206,7 +225,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkObject* RType;
   return RType();
 }
-
 gint Selection_Class::get_selection_count_vfunc_callback(AtkSelection* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -219,15 +237,19 @@ gint Selection_Class::get_selection_count_vfunc_callback(AtkSelection* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_selection_count_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -244,7 +266,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gboolean Selection_Class::is_child_selected_vfunc_callback(AtkSelection* self, gint i)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -257,16 +278,20 @@ gboolean Selection_Class::is_child_selected_vfunc_callback(AtkSelection* self, g
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->is_child_selected_vfunc(i
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -283,7 +308,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Selection_Class::remove_selection_vfunc_callback(AtkSelection* self, gint i)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -296,16 +320,20 @@ gboolean Selection_Class::remove_selection_vfunc_callback(AtkSelection* self, gi
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->remove_selection_vfunc(i
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -322,7 +350,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Selection_Class::select_all_selection_vfunc_callback(AtkSelection* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -335,15 +362,19 @@ gboolean Selection_Class::select_all_selection_vfunc_callback(AtkSelection* self
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->select_all_selection_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -360,8 +391,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Selection_Class::selection_changed_callback(AtkSelection* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -374,15 +406,19 @@ void Selection_Class::selection_changed_callback(AtkSelection* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_selection_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -396,6 +432,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->selection_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Selection_Class::wrap_new(GObject* object)
@@ -480,6 +517,7 @@ Glib::SignalProxy0< void > Selection::signal_selection_changed()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Atk::Selection::on_selection_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -490,8 +528,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->selection_changed)
     (*base->selection_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 bool Atk::Selection::add_selection_vfunc(int i) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -505,7 +544,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Selection::clear_selection_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -519,7 +557,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 Glib::RefPtr<Atk::Object> Atk::Selection::get_selection_vfunc(int i) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -533,7 +570,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef Glib::RefPtr<Atk::Object> RType;
   return RType();
 }
-
 int Atk::Selection::get_selection_count_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -547,7 +583,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 bool Atk::Selection::is_child_selected_vfunc(int i) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -561,7 +596,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Selection::remove_selection_vfunc(int i) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -575,7 +609,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Selection::select_all_selection_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -589,6 +622,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/selection.h b/libs/gtkmm2/atk/atkmm/selection.h
index 62185ed0d9..eaf17896a9 100644
--- a/libs/gtkmm2/atk/atkmm/selection.h
+++ b/libs/gtkmm2/atk/atkmm/selection.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_SELECTION_H
 #define _ATKMM_SELECTION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -163,29 +164,60 @@ public:
   bool select_all_selection();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %selection_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_selection_changed();
 
 
 protected:
-    virtual bool add_selection_vfunc(int i);
-    virtual bool clear_selection_vfunc();
-    virtual Glib::RefPtr<Atk::Object> get_selection_vfunc(int i);
-    virtual int get_selection_count_vfunc() const;
-    virtual bool is_child_selected_vfunc(int i) const;
-    virtual bool remove_selection_vfunc(int i);
-    virtual bool select_all_selection_vfunc();
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool add_selection_vfunc(int i);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool clear_selection_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Atk::Object> get_selection_vfunc(int i);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_selection_count_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool is_child_selected_vfunc(int i) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool remove_selection_vfunc(int i);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool select_all_selection_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_selection_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -204,5 +236,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_SELECTION_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/stateset.cc b/libs/gtkmm2/atk/atkmm/stateset.cc
index 6feb4d6ee3..bb8d7745fa 100644
--- a/libs/gtkmm2/atk/atkmm/stateset.cc
+++ b/libs/gtkmm2/atk/atkmm/stateset.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/stateset.h>
 #include <atkmm/private/stateset_p.h>
 
@@ -99,8 +100,19 @@ void StateSet_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* StateSet_Class::wrap_new(GObject* object)
 {
@@ -166,7 +178,7 @@ bool StateSet::add_state(Atk::StateType type)
 
 void StateSet::clear_states()
 {
-  atk_state_set_clear_states(gobj());
+atk_state_set_clear_states(gobj()); 
 }
 
 bool StateSet::contains_state(Atk::StateType type)
@@ -195,6 +207,13 @@ Glib::RefPtr<StateSet> StateSet::xor_sets(const Glib::RefPtr<StateSet>& compare_
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Atk
 
 
diff --git a/libs/gtkmm2/atk/atkmm/stateset.h b/libs/gtkmm2/atk/atkmm/stateset.h
index f3e8f70504..559e702cc4 100644
--- a/libs/gtkmm2/atk/atkmm/stateset.h
+++ b/libs/gtkmm2/atk/atkmm/stateset.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_STATESET_H
 #define _ATKMM_STATESET_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -76,6 +77,7 @@ enum StateType
   STATE_MANAGES_DESCENDANTS,
   STATE_INDETERMINATE,
   STATE_TRUNCATED,
+  STATE_REQUIRED,
   STATE_LAST_DEFINED
 };
 
@@ -220,11 +222,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/atk/atkmm/streamablecontent.cc b/libs/gtkmm2/atk/atkmm/streamablecontent.cc
index 13916f861d..8c10a6b13d 100644
--- a/libs/gtkmm2/atk/atkmm/streamablecontent.cc
+++ b/libs/gtkmm2/atk/atkmm/streamablecontent.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/streamablecontent.h>
 #include <atkmm/private/streamablecontent_p.h>
 
@@ -80,11 +81,17 @@ void StreamableContent_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->get_n_mime_types = &get_n_mime_types_vfunc_callback;
   klass->get_mime_type = &get_mime_type_vfunc_callback;
   klass->get_stream = &get_stream_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 int StreamableContent_Class::get_n_mime_types_vfunc_callback(AtkStreamableContent* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -97,15 +104,19 @@ int StreamableContent_Class::get_n_mime_types_vfunc_callback(AtkStreamableConten
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_n_mime_types_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -122,7 +133,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef int RType;
   return RType();
 }
-
 const gchar* StreamableContent_Class::get_mime_type_vfunc_callback(AtkStreamableContent* self, gint i)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -135,16 +145,20 @@ const gchar* StreamableContent_Class::get_mime_type_vfunc_callback(AtkStreamable
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_mime_type_vfunc(i
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -161,7 +175,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef const gchar* RType;
   return RType();
 }
-
 GIOChannel* StreamableContent_Class::get_stream_vfunc_callback(AtkStreamableContent* self, const gchar* mime_type)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -174,16 +187,20 @@ GIOChannel* StreamableContent_Class::get_stream_vfunc_callback(AtkStreamableCont
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_stream_vfunc(Glib::convert_const_gchar_ptr_to_ustring(mime_type)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -200,6 +217,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef GIOChannel* RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* StreamableContent_Class::wrap_new(GObject* object)
@@ -258,6 +279,10 @@ Glib::RefPtr<Glib::IOChannel> StreamableContent::get_stream(const Glib::ustring&
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 int Atk::StreamableContent::get_n_mime_types_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -271,7 +296,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 const gchar* Atk::StreamableContent::get_mime_type_vfunc(int i) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -285,7 +309,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef const gchar* RType;
   return RType();
 }
-
 GIOChannel* Atk::StreamableContent::get_stream_vfunc(const Glib::ustring& mime_type) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -299,6 +322,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef GIOChannel* RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/streamablecontent.h b/libs/gtkmm2/atk/atkmm/streamablecontent.h
index 698aaef86b..fe93cf72cb 100644
--- a/libs/gtkmm2/atk/atkmm/streamablecontent.h
+++ b/libs/gtkmm2/atk/atkmm/streamablecontent.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_STREAMABLECONTENT_H
 #define _ATKMM_STREAMABLECONTENT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -117,20 +118,34 @@ public:
   Glib::RefPtr<Glib::IOChannel> get_stream(const Glib::ustring& mime_type);
 
 protected:
-    virtual int get_n_mime_types_vfunc() const;
-    virtual const gchar* get_mime_type_vfunc(int i) const;
-    virtual GIOChannel* get_stream_vfunc(const Glib::ustring& mime_type);                                                   
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_n_mime_types_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual const gchar* get_mime_type_vfunc(int i) const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual GIOChannel* get_stream_vfunc(const Glib::ustring& mime_type);
+#endif //GLIBMM_VFUNCS_ENABLED
+                                                   
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -149,5 +164,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_STREAMABLECONTENT_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/table.cc b/libs/gtkmm2/atk/atkmm/table.cc
index 335fb55ece..c03cca5ac3 100644
--- a/libs/gtkmm2/atk/atkmm/table.cc
+++ b/libs/gtkmm2/atk/atkmm/table.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/table.h>
 #include <atkmm/private/table_p.h>
 
@@ -52,7 +53,8 @@ Glib::ArrayHandle<int> Table::get_selected_rows() const
 namespace
 {
 
-void Table_signal_row_inserted_callback(AtkTable* self, gint p0,gint p1,void* data)
+
+static void Table_signal_row_inserted_callback(AtkTable* self, gint p0,gint p1,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,int,int > SlotType;
@@ -60,21 +62,25 @@ void Table_signal_row_inserted_callback(AtkTable* self, gint p0,gint p1,void* da
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Table_signal_row_inserted_info =
+static const Glib::SignalProxyInfo Table_signal_row_inserted_info =
 {
   "row_inserted",
   (GCallback) &Table_signal_row_inserted_callback,
@@ -82,7 +88,7 @@ const Glib::SignalProxyInfo Table_signal_row_inserted_info =
 };
 
 
-void Table_signal_column_inserted_callback(AtkTable* self, gint p0,gint p1,void* data)
+static void Table_signal_column_inserted_callback(AtkTable* self, gint p0,gint p1,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,int,int > SlotType;
@@ -90,21 +96,25 @@ void Table_signal_column_inserted_callback(AtkTable* self, gint p0,gint p1,void*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Table_signal_column_inserted_info =
+static const Glib::SignalProxyInfo Table_signal_column_inserted_info =
 {
   "column_inserted",
   (GCallback) &Table_signal_column_inserted_callback,
@@ -112,7 +122,7 @@ const Glib::SignalProxyInfo Table_signal_column_inserted_info =
 };
 
 
-void Table_signal_row_deleted_callback(AtkTable* self, gint p0,gint p1,void* data)
+static void Table_signal_row_deleted_callback(AtkTable* self, gint p0,gint p1,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,int,int > SlotType;
@@ -120,21 +130,25 @@ void Table_signal_row_deleted_callback(AtkTable* self, gint p0,gint p1,void* dat
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Table_signal_row_deleted_info =
+static const Glib::SignalProxyInfo Table_signal_row_deleted_info =
 {
   "row_deleted",
   (GCallback) &Table_signal_row_deleted_callback,
@@ -142,7 +156,7 @@ const Glib::SignalProxyInfo Table_signal_row_deleted_info =
 };
 
 
-void Table_signal_column_deleted_callback(AtkTable* self, gint p0,gint p1,void* data)
+static void Table_signal_column_deleted_callback(AtkTable* self, gint p0,gint p1,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,int,int > SlotType;
@@ -150,21 +164,25 @@ void Table_signal_column_deleted_callback(AtkTable* self, gint p0,gint p1,void*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Table_signal_column_deleted_info =
+static const Glib::SignalProxyInfo Table_signal_column_deleted_info =
 {
   "column_deleted",
   (GCallback) &Table_signal_column_deleted_callback,
@@ -172,7 +190,7 @@ const Glib::SignalProxyInfo Table_signal_column_deleted_info =
 };
 
 
-const Glib::SignalProxyInfo Table_signal_row_reordered_info =
+static const Glib::SignalProxyInfo Table_signal_row_reordered_info =
 {
   "row_reordered",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -180,7 +198,7 @@ const Glib::SignalProxyInfo Table_signal_row_reordered_info =
 };
 
 
-const Glib::SignalProxyInfo Table_signal_column_reordered_info =
+static const Glib::SignalProxyInfo Table_signal_column_reordered_info =
 {
   "column_reordered",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -188,13 +206,14 @@ const Glib::SignalProxyInfo Table_signal_column_reordered_info =
 };
 
 
-const Glib::SignalProxyInfo Table_signal_model_changed_info =
+static const Glib::SignalProxyInfo Table_signal_model_changed_info =
 {
   "model_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -239,6 +258,7 @@ void Table_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->ref_at = &ref_at_vfunc_callback;
   klass->get_index_at = &get_index_at_vfunc_callback;
   klass->get_column_at_index = &get_column_at_index_vfunc_callback;
@@ -268,6 +288,9 @@ void Table_Class::iface_init_function(void* g_iface, void*)
   klass->remove_column_selection = &remove_column_selection_vfunc_callback;
   klass->get_selected_columns = &get_selected_columns_vfunc_callback;
   klass->get_selected_rows = &get_selected_rows_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->row_inserted = &row_inserted_callback;
   klass->column_inserted = &column_inserted_callback;
   klass->row_deleted = &row_deleted_callback;
@@ -275,8 +298,10 @@ void Table_Class::iface_init_function(void* g_iface, void*)
   klass->row_reordered = &row_reordered_callback;
   klass->column_reordered = &column_reordered_callback;
   klass->model_changed = &model_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 AtkObject* Table_Class::ref_at_vfunc_callback(AtkTable* self, gint row, gint column)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -289,17 +314,21 @@ AtkObject* Table_Class::ref_at_vfunc_callback(AtkTable* self, gint row, gint col
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap_copy(obj->get_at_vfunc(row
 , column
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -316,7 +345,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkObject* RType;
   return RType();
 }
-
 gint Table_Class::get_index_at_vfunc_callback(AtkTable* self, gint row, gint column)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -329,17 +357,21 @@ gint Table_Class::get_index_at_vfunc_callback(AtkTable* self, gint row, gint col
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_index_at_vfunc(row
 , column
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -356,7 +388,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gint Table_Class::get_column_at_index_vfunc_callback(AtkTable* self, gint index_)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -369,16 +400,20 @@ gint Table_Class::get_column_at_index_vfunc_callback(AtkTable* self, gint index_
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_column_at_index_vfunc(index_
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -395,7 +430,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gint Table_Class::get_row_at_index_vfunc_callback(AtkTable* self, gint index_)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -408,16 +442,20 @@ gint Table_Class::get_row_at_index_vfunc_callback(AtkTable* self, gint index_)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_row_at_index_vfunc(index_
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -434,7 +472,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gint Table_Class::get_n_columns_vfunc_callback(AtkTable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -447,15 +484,19 @@ gint Table_Class::get_n_columns_vfunc_callback(AtkTable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_n_columns_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -472,7 +513,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gint Table_Class::get_n_rows_vfunc_callback(AtkTable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -485,15 +525,19 @@ gint Table_Class::get_n_rows_vfunc_callback(AtkTable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_n_rows_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -510,7 +554,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gint Table_Class::get_column_extent_at_vfunc_callback(AtkTable* self, gint row, gint column)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -523,17 +566,21 @@ gint Table_Class::get_column_extent_at_vfunc_callback(AtkTable* self, gint row,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_column_extent_at_vfunc(row
 , column
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -550,7 +597,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gint Table_Class::get_row_extent_at_vfunc_callback(AtkTable* self, gint row, gint column)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -563,17 +609,21 @@ gint Table_Class::get_row_extent_at_vfunc_callback(AtkTable* self, gint row, gin
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_row_extent_at_vfunc(row
 , column
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -590,7 +640,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 AtkObject* Table_Class::get_caption_vfunc_callback(AtkTable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -603,15 +652,19 @@ AtkObject* Table_Class::get_caption_vfunc_callback(AtkTable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->get_caption_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -628,7 +681,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkObject* RType;
   return RType();
 }
-
 const gchar* Table_Class::get_column_description_vfunc_callback(AtkTable* self, gint column)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -641,16 +693,20 @@ const gchar* Table_Class::get_column_description_vfunc_callback(AtkTable* self,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_column_description_vfunc(column
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -667,7 +723,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef const gchar* RType;
   return RType();
 }
-
 AtkObject* Table_Class::get_column_header_vfunc_callback(AtkTable* self, gint column)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -680,16 +735,20 @@ AtkObject* Table_Class::get_column_header_vfunc_callback(AtkTable* self, gint co
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->get_column_header_vfunc(column
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -706,7 +765,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkObject* RType;
   return RType();
 }
-
 const gchar* Table_Class::get_row_description_vfunc_callback(AtkTable* self, gint row)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -719,16 +777,20 @@ const gchar* Table_Class::get_row_description_vfunc_callback(AtkTable* self, gin
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_row_description_vfunc(row
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -745,7 +807,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef const gchar* RType;
   return RType();
 }
-
 AtkObject* Table_Class::get_row_header_vfunc_callback(AtkTable* self, gint row)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -758,16 +819,20 @@ AtkObject* Table_Class::get_row_header_vfunc_callback(AtkTable* self, gint row)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->get_row_header_vfunc(row
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -784,7 +849,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkObject* RType;
   return RType();
 }
-
 AtkObject* Table_Class::get_summary_vfunc_callback(AtkTable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -797,15 +861,19 @@ AtkObject* Table_Class::get_summary_vfunc_callback(AtkTable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->get_summary_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -822,7 +890,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkObject* RType;
   return RType();
 }
-
 void Table_Class::set_caption_vfunc_callback(AtkTable* self, AtkObject* caption)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -835,16 +902,20 @@ void Table_Class::set_caption_vfunc_callback(AtkTable* self, AtkObject* caption)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_caption_vfunc(Glib::wrap(caption, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -858,7 +929,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_caption)(self, caption);
   }
 }
-
 void Table_Class::set_column_description_vfunc_callback(AtkTable* self, gint column, const gchar* description)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -871,17 +941,21 @@ void Table_Class::set_column_description_vfunc_callback(AtkTable* self, gint col
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_column_description_vfunc(column
 , description
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -895,7 +969,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_column_description)(self, column, description);
   }
 }
-
 void Table_Class::set_column_header_vfunc_callback(AtkTable* self, gint column, AtkObject* header)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -908,17 +981,21 @@ void Table_Class::set_column_header_vfunc_callback(AtkTable* self, gint column,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_column_header_vfunc(column
 , Glib::wrap(header, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -932,7 +1009,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_column_header)(self, column, header);
   }
 }
-
 void Table_Class::set_row_description_vfunc_callback(AtkTable* self, gint row, const gchar* description)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -945,17 +1021,21 @@ void Table_Class::set_row_description_vfunc_callback(AtkTable* self, gint row, c
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_row_description_vfunc(row
 , description
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -969,7 +1049,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_row_description)(self, row, description);
   }
 }
-
 void Table_Class::set_row_header_vfunc_callback(AtkTable* self, gint row, AtkObject* header)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -982,17 +1061,21 @@ void Table_Class::set_row_header_vfunc_callback(AtkTable* self, gint row, AtkObj
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_row_header_vfunc(row
 , Glib::wrap(header, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1006,7 +1089,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_row_header)(self, row, header);
   }
 }
-
 void Table_Class::set_summary_vfunc_callback(AtkTable* self, AtkObject* accessible)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1019,16 +1101,20 @@ void Table_Class::set_summary_vfunc_callback(AtkTable* self, AtkObject* accessib
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_summary_vfunc(Glib::wrap(accessible, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1042,7 +1128,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_summary)(self, accessible);
   }
 }
-
 gboolean Table_Class::is_column_selected_vfunc_callback(AtkTable* self, gint column)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1055,16 +1140,20 @@ gboolean Table_Class::is_column_selected_vfunc_callback(AtkTable* self, gint col
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->is_column_selected_vfunc(column
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1081,7 +1170,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Table_Class::is_row_selected_vfunc_callback(AtkTable* self, gint row)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1094,16 +1182,20 @@ gboolean Table_Class::is_row_selected_vfunc_callback(AtkTable* self, gint row)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->is_row_selected_vfunc(row
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1120,7 +1212,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Table_Class::is_selected_vfunc_callback(AtkTable* self, gint row, gint column)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1133,17 +1224,21 @@ gboolean Table_Class::is_selected_vfunc_callback(AtkTable* self, gint row, gint
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->is_selected_vfunc(row
 , column
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1160,7 +1255,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Table_Class::add_row_selection_vfunc_callback(AtkTable* self, gint row)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1173,16 +1267,20 @@ gboolean Table_Class::add_row_selection_vfunc_callback(AtkTable* self, gint row)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->add_row_selection_vfunc(row
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1199,7 +1297,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Table_Class::remove_row_selection_vfunc_callback(AtkTable* self, gint row)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1212,16 +1309,20 @@ gboolean Table_Class::remove_row_selection_vfunc_callback(AtkTable* self, gint r
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->remove_row_selection_vfunc(row
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1238,7 +1339,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Table_Class::add_column_selection_vfunc_callback(AtkTable* self, gint column)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1251,16 +1351,20 @@ gboolean Table_Class::add_column_selection_vfunc_callback(AtkTable* self, gint c
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->add_column_selection_vfunc(column
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1277,7 +1381,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Table_Class::remove_column_selection_vfunc_callback(AtkTable* self, gint column)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1290,16 +1393,20 @@ gboolean Table_Class::remove_column_selection_vfunc_callback(AtkTable* self, gin
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->remove_column_selection_vfunc(column
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1316,7 +1423,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gint Table_Class::get_selected_columns_vfunc_callback(AtkTable* self, gint** selected)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1329,16 +1435,20 @@ gint Table_Class::get_selected_columns_vfunc_callback(AtkTable* self, gint** sel
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_selected_columns_vfunc(selected
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1355,7 +1465,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gint Table_Class::get_selected_rows_vfunc_callback(AtkTable* self, gint** selected)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1368,16 +1477,20 @@ gint Table_Class::get_selected_rows_vfunc_callback(AtkTable* self, gint** select
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_selected_rows_vfunc(selected
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1394,8 +1507,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Table_Class::row_inserted_callback(AtkTable* self, gint p0, gint p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1408,17 +1522,21 @@ void Table_Class::row_inserted_callback(AtkTable* self, gint p0, gint p1)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_row_inserted(p0
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1432,7 +1550,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->row_inserted)(self, p0, p1);
   }
 }
-
 void Table_Class::column_inserted_callback(AtkTable* self, gint p0, gint p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1445,17 +1562,21 @@ void Table_Class::column_inserted_callback(AtkTable* self, gint p0, gint p1)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_column_inserted(p0
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1469,7 +1590,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->column_inserted)(self, p0, p1);
   }
 }
-
 void Table_Class::row_deleted_callback(AtkTable* self, gint p0, gint p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1482,17 +1602,21 @@ void Table_Class::row_deleted_callback(AtkTable* self, gint p0, gint p1)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_row_deleted(p0
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1506,7 +1630,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->row_deleted)(self, p0, p1);
   }
 }
-
 void Table_Class::column_deleted_callback(AtkTable* self, gint p0, gint p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1519,17 +1642,21 @@ void Table_Class::column_deleted_callback(AtkTable* self, gint p0, gint p1)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_column_deleted(p0
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1543,7 +1670,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->column_deleted)(self, p0, p1);
   }
 }
-
 void Table_Class::row_reordered_callback(AtkTable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1556,15 +1682,19 @@ void Table_Class::row_reordered_callback(AtkTable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_row_reordered();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1578,7 +1708,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->row_reordered)(self);
   }
 }
-
 void Table_Class::column_reordered_callback(AtkTable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1591,15 +1720,19 @@ void Table_Class::column_reordered_callback(AtkTable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_column_reordered();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1613,7 +1746,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->column_reordered)(self);
   }
 }
-
 void Table_Class::model_changed_callback(AtkTable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1626,15 +1758,19 @@ void Table_Class::model_changed_callback(AtkTable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_model_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1648,6 +1784,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->model_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Table_Class::wrap_new(GObject* object)
@@ -1734,20 +1871,15 @@ Glib::RefPtr<Atk::Object> Table::get_caption()
 {
 
   Glib::RefPtr<Atk::Object> retvalue = Glib::wrap(atk_table_get_caption(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Atk::Object> Table::get_caption() const
 {
-
-  Glib::RefPtr<const Atk::Object> retvalue = Glib::wrap(atk_table_get_caption(const_cast<AtkTable*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Table*>(this)->get_caption();
 }
 
 Glib::ustring Table::get_column_description(int column) const
@@ -1759,20 +1891,15 @@ Glib::RefPtr<Atk::Object> Table::get_column_header(int column)
 {
 
   Glib::RefPtr<Atk::Object> retvalue = Glib::wrap(atk_table_get_column_header(gobj(), column));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Atk::Object> Table::get_column_header(int column) const
 {
-
-  Glib::RefPtr<const Atk::Object> retvalue = Glib::wrap(atk_table_get_column_header(const_cast<AtkTable*>(gobj()), column));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Table*>(this)->get_column_header(column);
 }
 
 Glib::ustring Table::get_row_description(int row) const
@@ -1784,70 +1911,60 @@ Glib::RefPtr<Atk::Object> Table::get_row_header(int row)
 {
 
   Glib::RefPtr<Atk::Object> retvalue = Glib::wrap(atk_table_get_row_header(gobj(), row));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Atk::Object> Table::get_row_header(int row) const
 {
-
-  Glib::RefPtr<const Atk::Object> retvalue = Glib::wrap(atk_table_get_row_header(const_cast<AtkTable*>(gobj()), row));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Table*>(this)->get_row_header(row);
 }
 
 Glib::RefPtr<Atk::Object> Table::get_summary()
 {
 
   Glib::RefPtr<Atk::Object> retvalue = Glib::wrap(atk_table_get_summary(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Atk::Object> Table::get_summary() const
 {
-
-  Glib::RefPtr<const Atk::Object> retvalue = Glib::wrap(atk_table_get_summary(const_cast<AtkTable*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Table*>(this)->get_summary();
 }
 
 void Table::set_caption(const Glib::RefPtr<Atk::Object>& caption)
 {
-  atk_table_set_caption(gobj(), Glib::unwrap(caption));
+atk_table_set_caption(gobj(), Glib::unwrap(caption)); 
 }
 
 void Table::set_column_description(int column, const Glib::ustring& description)
 {
-  atk_table_set_column_description(gobj(), column, description.c_str());
+atk_table_set_column_description(gobj(), column, description.c_str()); 
 }
 
 void Table::set_column_header(int column, const Glib::RefPtr<Atk::Object>& header)
 {
-  atk_table_set_column_header(gobj(), column, Glib::unwrap(header));
+atk_table_set_column_header(gobj(), column, Glib::unwrap(header)); 
 }
 
 void Table::set_row_description(int row, const Glib::ustring& description)
 {
-  atk_table_set_row_description(gobj(), row, description.c_str());
+atk_table_set_row_description(gobj(), row, description.c_str()); 
 }
 
 void Table::set_row_header(int row, const Glib::RefPtr<Atk::Object>& header)
 {
-  atk_table_set_row_header(gobj(), row, Glib::unwrap(header));
+atk_table_set_row_header(gobj(), row, Glib::unwrap(header)); 
 }
 
 void Table::set_summary(const Glib::RefPtr<Atk::Object>& accessible)
 {
-  atk_table_set_summary(gobj(), Glib::unwrap(accessible));
+atk_table_set_summary(gobj(), Glib::unwrap(accessible)); 
 }
 
 bool Table::is_column_selected(int column) const
@@ -1891,37 +2008,44 @@ Glib::SignalProxy2< void,int,int > Table::signal_row_inserted()
   return Glib::SignalProxy2< void,int,int >(this, &Table_signal_row_inserted_info);
 }
 
+
 Glib::SignalProxy2< void,int,int > Table::signal_column_inserted()
 {
   return Glib::SignalProxy2< void,int,int >(this, &Table_signal_column_inserted_info);
 }
 
+
 Glib::SignalProxy2< void,int,int > Table::signal_row_deleted()
 {
   return Glib::SignalProxy2< void,int,int >(this, &Table_signal_row_deleted_info);
 }
 
+
 Glib::SignalProxy2< void,int,int > Table::signal_column_deleted()
 {
   return Glib::SignalProxy2< void,int,int >(this, &Table_signal_column_deleted_info);
 }
 
+
 Glib::SignalProxy0< void > Table::signal_row_reordered()
 {
   return Glib::SignalProxy0< void >(this, &Table_signal_row_reordered_info);
 }
 
+
 Glib::SignalProxy0< void > Table::signal_column_reordered()
 {
   return Glib::SignalProxy0< void >(this, &Table_signal_column_reordered_info);
 }
 
+
 Glib::SignalProxy0< void > Table::signal_model_changed()
 {
   return Glib::SignalProxy0< void >(this, &Table_signal_model_changed_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Atk::Table::on_row_inserted(int row, int num_inserted)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1932,7 +2056,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->row_inserted)
     (*base->row_inserted)(gobj(),row,num_inserted);
 }
-
 void Atk::Table::on_column_inserted(int column, int num_inserted)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1943,7 +2066,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->column_inserted)
     (*base->column_inserted)(gobj(),column,num_inserted);
 }
-
 void Atk::Table::on_row_deleted(int row, int num_deleted)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1954,7 +2076,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->row_deleted)
     (*base->row_deleted)(gobj(),row,num_deleted);
 }
-
 void Atk::Table::on_column_deleted(int column, int num_deleted)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1965,7 +2086,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->column_deleted)
     (*base->column_deleted)(gobj(),column,num_deleted);
 }
-
 void Atk::Table::on_row_reordered()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1976,7 +2096,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->row_reordered)
     (*base->row_reordered)(gobj());
 }
-
 void Atk::Table::on_column_reordered()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1987,7 +2106,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->column_reordered)
     (*base->column_reordered)(gobj());
 }
-
 void Atk::Table::on_model_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1998,8 +2116,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->model_changed)
     (*base->model_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 Glib::RefPtr<Atk::Object> Atk::Table::get_at_vfunc(int row, int column) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2013,7 +2132,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef Glib::RefPtr<Atk::Object> RType;
   return RType();
 }
-
 int Atk::Table::get_index_at_vfunc(int row, int column) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2027,7 +2145,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 int Atk::Table::get_column_at_index_vfunc(int index) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2041,7 +2158,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 int Atk::Table::get_row_at_index_vfunc(int index) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2055,7 +2171,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 int Atk::Table::get_n_columns_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2069,7 +2184,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 int Atk::Table::get_n_rows_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2083,7 +2197,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 int Atk::Table::get_column_extent_at_vfunc(int row, int column) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2097,7 +2210,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 int Atk::Table::get_row_extent_at_vfunc(int row, int column) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2111,7 +2223,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 Glib::RefPtr<Atk::Object> Atk::Table::get_caption_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2120,12 +2231,11 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
 )  );
 
   if(base && base->get_caption)
-    return Glib::wrap((*base->get_caption)(gobj()));
+    return Glib::wrap((*base->get_caption)(gobj()), true);
 
   typedef Glib::RefPtr<Atk::Object> RType;
   return RType();
 }
-
 const char* Atk::Table::get_column_description_vfunc(int column) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2139,7 +2249,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef const char* RType;
   return RType();
 }
-
 Glib::RefPtr<Atk::Object> Atk::Table::get_column_header_vfunc(int column) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2148,12 +2257,11 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
 )  );
 
   if(base && base->get_column_header)
-    return Glib::wrap((*base->get_column_header)(gobj(),column));
+    return Glib::wrap((*base->get_column_header)(gobj(),column), true);
 
   typedef Glib::RefPtr<Atk::Object> RType;
   return RType();
 }
-
 const char* Atk::Table::get_row_description_vfunc(int row) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2167,7 +2275,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef const char* RType;
   return RType();
 }
-
 Glib::RefPtr<Atk::Object> Atk::Table::get_row_header_vfunc(int row) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2176,12 +2283,11 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
 )  );
 
   if(base && base->get_row_header)
-    return Glib::wrap((*base->get_row_header)(gobj(),row));
+    return Glib::wrap((*base->get_row_header)(gobj(),row), true);
 
   typedef Glib::RefPtr<Atk::Object> RType;
   return RType();
 }
-
 Glib::RefPtr<Atk::Object> Atk::Table::get_summary_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2190,12 +2296,11 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
 )  );
 
   if(base && base->get_summary)
-    return Glib::wrap((*base->get_summary)(gobj()));
+    return Glib::wrap((*base->get_summary)(gobj()), true);
 
   typedef Glib::RefPtr<Atk::Object> RType;
   return RType();
 }
-
 void Atk::Table::set_caption_vfunc(const Glib::RefPtr<Atk::Object>& caption) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2206,7 +2311,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_caption)
     (*base->set_caption)(gobj(),Glib::unwrap(caption));
 }
-
 void Atk::Table::set_column_description_vfunc(int column, const char* description) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2217,7 +2321,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_column_description)
     (*base->set_column_description)(gobj(),column,description);
 }
-
 void Atk::Table::set_column_header_vfunc(int column, const Glib::RefPtr<Atk::Object>& header) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2228,7 +2331,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_column_header)
     (*base->set_column_header)(gobj(),column,Glib::unwrap(header));
 }
-
 void Atk::Table::set_row_description_vfunc(int row, const char* description) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2239,7 +2341,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_row_description)
     (*base->set_row_description)(gobj(),row,description);
 }
-
 void Atk::Table::set_row_header_vfunc(int row, const Glib::RefPtr<Atk::Object>& header) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2250,7 +2351,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_row_header)
     (*base->set_row_header)(gobj(),row,Glib::unwrap(header));
 }
-
 void Atk::Table::set_summary_vfunc(const Glib::RefPtr<Atk::Object>& accessible) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2261,7 +2361,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_summary)
     (*base->set_summary)(gobj(),Glib::unwrap(accessible));
 }
-
 bool Atk::Table::is_column_selected_vfunc(int column) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2275,7 +2374,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Table::is_row_selected_vfunc(int row) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2289,7 +2387,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Table::is_selected_vfunc(int row, int column) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2303,7 +2400,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Table::add_row_selection_vfunc(int row) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2317,7 +2413,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Table::remove_row_selection_vfunc(int row) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2331,7 +2426,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Table::add_column_selection_vfunc(int column) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2345,7 +2439,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Table::remove_column_selection_vfunc(int column) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2359,7 +2452,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 int Atk::Table::get_selected_columns_vfunc(int** selected) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2373,7 +2465,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 int Atk::Table::get_selected_rows_vfunc(int** selected) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2387,6 +2478,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/table.h b/libs/gtkmm2/atk/atkmm/table.h
index f1936afd49..c5b351f06a 100644
--- a/libs/gtkmm2/atk/atkmm/table.h
+++ b/libs/gtkmm2/atk/atkmm/table.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_TABLE_H
 #define _ATKMM_TABLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -336,68 +337,194 @@ public:
   bool remove_column_selection(int column);
 
   
+/**
+   * @par Prototype:
+   * <tt>void %row_inserted(int row, int num_inserted)</tt>
+   */
+
   Glib::SignalProxy2< void,int,int > signal_row_inserted();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %column_inserted(int column, int num_inserted)</tt>
+   */
+
   Glib::SignalProxy2< void,int,int > signal_column_inserted();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %row_deleted(int row, int num_deleted)</tt>
+   */
+
   Glib::SignalProxy2< void,int,int > signal_row_deleted();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %column_deleted(int column, int num_deleted)</tt>
+   */
+
   Glib::SignalProxy2< void,int,int > signal_column_deleted();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %row_reordered()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_row_reordered();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %column_reordered()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_column_reordered();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %model_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_model_changed();
 
 
 protected:
-    virtual Glib::RefPtr<Atk::Object> get_at_vfunc(int row, int column);
-    virtual int get_index_at_vfunc(int row, int column) const;
-    virtual int get_column_at_index_vfunc(int index) const;
-    virtual int get_row_at_index_vfunc(int index) const;
-    virtual int get_n_columns_vfunc() const;
-    virtual int get_n_rows_vfunc() const;
-    virtual int get_column_extent_at_vfunc(int row, int column) const;
-    virtual int get_row_extent_at_vfunc(int row, int column) const;
-    virtual Glib::RefPtr<Atk::Object> get_caption_vfunc();
-    virtual const char* get_column_description_vfunc(int column) const;
-    virtual Glib::RefPtr<Atk::Object> get_column_header_vfunc(int column);
-    virtual const char* get_row_description_vfunc(int row) const;
-    virtual Glib::RefPtr<Atk::Object> get_row_header_vfunc(int row);
-    virtual Glib::RefPtr<Atk::Object> get_summary_vfunc();
-    virtual void set_caption_vfunc(const Glib::RefPtr<Atk::Object>& caption);
-    virtual void set_column_description_vfunc(int column, const char* description);
-    virtual void set_column_header_vfunc(int column, const Glib::RefPtr<Atk::Object>& header);
-    virtual void set_row_description_vfunc(int row, const char* description);
-    virtual void set_row_header_vfunc(int row, const Glib::RefPtr<Atk::Object>& header);
-    virtual void set_summary_vfunc(const Glib::RefPtr<Atk::Object>& accessible);
-    virtual bool is_column_selected_vfunc(int column) const;
-    virtual bool is_row_selected_vfunc(int row) const;
-    virtual bool is_selected_vfunc(int row, int column) const;
-    virtual bool add_row_selection_vfunc(int row);
-    virtual bool remove_row_selection_vfunc(int row);
-    virtual bool add_column_selection_vfunc(int column);
-    virtual bool remove_column_selection_vfunc(int column);
-    virtual int get_selected_columns_vfunc(int** selected) const;
-    virtual int get_selected_rows_vfunc(int** selected) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Atk::Object> get_at_vfunc(int row, int column);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_index_at_vfunc(int row, int column) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_column_at_index_vfunc(int index) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_row_at_index_vfunc(int index) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_n_columns_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_n_rows_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_column_extent_at_vfunc(int row, int column) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_row_extent_at_vfunc(int row, int column) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Atk::Object> get_caption_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual const char* get_column_description_vfunc(int column) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Atk::Object> get_column_header_vfunc(int column);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual const char* get_row_description_vfunc(int row) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Atk::Object> get_row_header_vfunc(int row);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Atk::Object> get_summary_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_caption_vfunc(const Glib::RefPtr<Atk::Object>& caption);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_column_description_vfunc(int column, const char* description);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_column_header_vfunc(int column, const Glib::RefPtr<Atk::Object>& header);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_row_description_vfunc(int row, const char* description);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_row_header_vfunc(int row, const Glib::RefPtr<Atk::Object>& header);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_summary_vfunc(const Glib::RefPtr<Atk::Object>& accessible);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool is_column_selected_vfunc(int column) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool is_row_selected_vfunc(int row) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool is_selected_vfunc(int row, int column) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool add_row_selection_vfunc(int row);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool remove_row_selection_vfunc(int row);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool add_column_selection_vfunc(int column);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool remove_column_selection_vfunc(int column);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_selected_columns_vfunc(int** selected) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_selected_rows_vfunc(int** selected) const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_row_inserted(int row, int num_inserted);
   virtual void on_column_inserted(int column, int num_inserted);
   virtual void on_row_deleted(int row, int num_deleted);
@@ -405,6 +532,7 @@ protected:
   virtual void on_row_reordered();
   virtual void on_column_reordered();
   virtual void on_model_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -423,5 +551,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_TABLE_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/text.cc b/libs/gtkmm2/atk/atkmm/text.cc
index af101a5117..1212ce18ff 100644
--- a/libs/gtkmm2/atk/atkmm/text.cc
+++ b/libs/gtkmm2/atk/atkmm/text.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/text.h>
 #include <atkmm/private/text_p.h>
 
@@ -119,7 +120,8 @@ Glib::ustring TextAttribute::get_value(TextAttribute attribute, int index)
 namespace
 {
 
-void Text_signal_text_changed_callback(AtkText* self, gint p0,gint p1,void* data)
+
+static void Text_signal_text_changed_callback(AtkText* self, gint p0,gint p1,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,int,int > SlotType;
@@ -127,21 +129,25 @@ void Text_signal_text_changed_callback(AtkText* self, gint p0,gint p1,void* data
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Text_signal_text_changed_info =
+static const Glib::SignalProxyInfo Text_signal_text_changed_info =
 {
   "text_changed",
   (GCallback) &Text_signal_text_changed_callback,
@@ -149,7 +155,7 @@ const Glib::SignalProxyInfo Text_signal_text_changed_info =
 };
 
 
-void Text_signal_text_caret_moved_callback(AtkText* self, gint p0,void* data)
+static void Text_signal_text_caret_moved_callback(AtkText* self, gint p0,void* data)
 {
   using namespace Atk;
   typedef sigc::slot< void,int > SlotType;
@@ -157,20 +163,24 @@ void Text_signal_text_caret_moved_callback(AtkText* self, gint p0,void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Text_signal_text_caret_moved_info =
+static const Glib::SignalProxyInfo Text_signal_text_caret_moved_info =
 {
   "text_caret_moved",
   (GCallback) &Text_signal_text_caret_moved_callback,
@@ -178,7 +188,7 @@ const Glib::SignalProxyInfo Text_signal_text_caret_moved_info =
 };
 
 
-const Glib::SignalProxyInfo Text_signal_text_selection_changed_info =
+static const Glib::SignalProxyInfo Text_signal_text_selection_changed_info =
 {
   "text_selection_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -186,13 +196,14 @@ const Glib::SignalProxyInfo Text_signal_text_selection_changed_info =
 };
 
 
-const Glib::SignalProxyInfo Text_signal_text_attributes_changed_info =
+static const Glib::SignalProxyInfo Text_signal_text_attributes_changed_info =
 {
   "text_attributes_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -200,16 +211,16 @@ namespace Atk
 {
 
 
-Glib::ustring Attribute::get_name() const
+ Glib::ustring Attribute::get_name() const
 {
   return Glib::convert_const_gchar_ptr_to_ustring(gobj()->name);
 }
-
-Glib::ustring Attribute::get_value() const
+ 
+ Glib::ustring Attribute::get_value() const
 {
   return Glib::convert_const_gchar_ptr_to_ustring(gobj()->value);
 }
-
+ 
 
 } // namespace Atk
 
@@ -273,6 +284,7 @@ void Text_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->get_text = &get_text_vfunc_callback;
   klass->get_character_at_offset = &get_character_at_offset_vfunc_callback;
   klass->get_text_after_offset = &get_text_after_offset_vfunc_callback;
@@ -290,12 +302,17 @@ void Text_Class::iface_init_function(void* g_iface, void*)
   klass->remove_selection = &remove_selection_vfunc_callback;
   klass->set_selection = &set_selection_vfunc_callback;
   klass->set_caret_offset = &set_caret_offset_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->text_changed = &text_changed_callback;
   klass->text_caret_moved = &text_caret_moved_callback;
   klass->text_selection_changed = &text_selection_changed_callback;
   klass->text_attributes_changed = &text_attributes_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 gchar* Text_Class::get_text_vfunc_callback(AtkText* self, gint start_offset, gint end_offset)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -308,17 +325,21 @@ gchar* Text_Class::get_text_vfunc_callback(AtkText* self, gint start_offset, gin
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return g_strdup((obj->get_text_vfunc(start_offset
 , end_offset
 )).c_str());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -335,7 +356,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gchar* RType;
   return RType();
 }
-
 gunichar Text_Class::get_character_at_offset_vfunc_callback(AtkText* self, gint offset)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -348,16 +368,20 @@ gunichar Text_Class::get_character_at_offset_vfunc_callback(AtkText* self, gint
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_character_at_offset_vfunc(offset
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -374,7 +398,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gunichar RType;
   return RType();
 }
-
 gchar* Text_Class::get_text_after_offset_vfunc_callback(AtkText* self, gint offset, AtkTextBoundary boundary_type, gint* start_offset, gint* end_offset)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -387,19 +410,23 @@ gchar* Text_Class::get_text_after_offset_vfunc_callback(AtkText* self, gint offs
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return g_strdup((obj->get_text_after_offset_vfunc(offset
 , ((TextBoundary)(boundary_type))
 , *(start_offset)
 , *(end_offset)
 )).c_str());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -416,7 +443,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gchar* RType;
   return RType();
 }
-
 gchar* Text_Class::get_text_at_offset_vfunc_callback(AtkText* self, gint offset, AtkTextBoundary boundary_type, gint* start_offset, gint* end_offset)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -429,19 +455,23 @@ gchar* Text_Class::get_text_at_offset_vfunc_callback(AtkText* self, gint offset,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return g_strdup((obj->get_text_at_offset_vfunc(offset
 , ((TextBoundary)(boundary_type))
 , *(start_offset)
 , *(end_offset)
 )).c_str());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -458,7 +488,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gchar* RType;
   return RType();
 }
-
 gchar* Text_Class::get_text_before_offset_vfunc_callback(AtkText* self, gint offset, AtkTextBoundary boundary_type, gint* start_offset, gint* end_offset)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -471,19 +500,23 @@ gchar* Text_Class::get_text_before_offset_vfunc_callback(AtkText* self, gint off
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return g_strdup((obj->get_text_before_offset_vfunc(offset
 , ((TextBoundary)(boundary_type))
 , *(start_offset)
 , *(end_offset)
 )).c_str());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -500,7 +533,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gchar* RType;
   return RType();
 }
-
 gint Text_Class::get_caret_offset_vfunc_callback(AtkText* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -513,15 +545,19 @@ gint Text_Class::get_caret_offset_vfunc_callback(AtkText* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_caret_offset_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -538,7 +574,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 void Text_Class::get_character_extents_vfunc_callback(AtkText* self, gint offset, gint* x, gint* y, gint* width, gint* height, AtkCoordType coords)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -551,8 +586,10 @@ void Text_Class::get_character_extents_vfunc_callback(AtkText* self, gint offset
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_character_extents_vfunc(offset
 , *(x)
@@ -561,11 +598,13 @@ void Text_Class::get_character_extents_vfunc_callback(AtkText* self, gint offset
 , *(height)
 , ((CoordType)(coords))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -579,7 +618,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->get_character_extents)(self, offset, x, y, width, height, coords);
   }
 }
-
 AtkAttributeSet* Text_Class::get_run_attributes_vfunc_callback(AtkText* self, gint offset, gint* start_offset, gint* end_offset)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -592,18 +630,22 @@ AtkAttributeSet* Text_Class::get_run_attributes_vfunc_callback(AtkText* self, gi
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_run_attributes_vfunc(offset
 , *(start_offset)
 , *(end_offset)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -620,7 +662,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkAttributeSet* RType;
   return RType();
 }
-
 AtkAttributeSet* Text_Class::get_default_attributes_vfunc_callback(AtkText* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -633,15 +674,19 @@ AtkAttributeSet* Text_Class::get_default_attributes_vfunc_callback(AtkText* self
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_default_attributes_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -658,7 +703,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef AtkAttributeSet* RType;
   return RType();
 }
-
 gint Text_Class::get_character_count_vfunc_callback(AtkText* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -671,15 +715,19 @@ gint Text_Class::get_character_count_vfunc_callback(AtkText* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_character_count_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -696,7 +744,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gint Text_Class::get_offset_at_point_vfunc_callback(AtkText* self, gint x, gint y, AtkCoordType coords)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -709,18 +756,22 @@ gint Text_Class::get_offset_at_point_vfunc_callback(AtkText* self, gint x, gint
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_offset_at_point_vfunc(x
 , y
 , ((CoordType)(coords))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -737,7 +788,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gint Text_Class::get_n_selections_vfunc_callback(AtkText* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -750,15 +800,19 @@ gint Text_Class::get_n_selections_vfunc_callback(AtkText* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_n_selections_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -775,7 +829,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 gchar* Text_Class::get_selection_vfunc_callback(AtkText* self, gint selection_num, gint* start_offset, gint* end_offset)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -788,18 +841,22 @@ gchar* Text_Class::get_selection_vfunc_callback(AtkText* self, gint selection_nu
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return g_strdup((obj->get_selection_vfunc(selection_num
 , *(start_offset)
 , *(end_offset)
 )).c_str());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -816,7 +873,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gchar* RType;
   return RType();
 }
-
 gboolean Text_Class::add_selection_vfunc_callback(AtkText* self, gint start_offset, gint end_offset)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -829,17 +885,21 @@ gboolean Text_Class::add_selection_vfunc_callback(AtkText* self, gint start_offs
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->add_selection_vfunc(start_offset
 , end_offset
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -856,7 +916,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Text_Class::remove_selection_vfunc_callback(AtkText* self, gint selection_num)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -869,16 +928,20 @@ gboolean Text_Class::remove_selection_vfunc_callback(AtkText* self, gint selecti
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->remove_selection_vfunc(selection_num
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -895,7 +958,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Text_Class::set_selection_vfunc_callback(AtkText* self, gint selection_num, gint start_offset, gint end_offset)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -908,18 +970,22 @@ gboolean Text_Class::set_selection_vfunc_callback(AtkText* self, gint selection_
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->set_selection_vfunc(selection_num
 , start_offset
 , end_offset
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -936,7 +1002,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Text_Class::set_caret_offset_vfunc_callback(AtkText* self, gint offset)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -949,16 +1014,20 @@ gboolean Text_Class::set_caret_offset_vfunc_callback(AtkText* self, gint offset)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->set_caret_offset_vfunc(offset
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -975,8 +1044,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Text_Class::text_changed_callback(AtkText* self, gint p0, gint p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -989,17 +1059,21 @@ void Text_Class::text_changed_callback(AtkText* self, gint p0, gint p1)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_text_changed(p0
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1013,7 +1087,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->text_changed)(self, p0, p1);
   }
 }
-
 void Text_Class::text_caret_moved_callback(AtkText* self, gint p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1026,16 +1099,20 @@ void Text_Class::text_caret_moved_callback(AtkText* self, gint p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_text_caret_moved(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1049,7 +1126,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->text_caret_moved)(self, p0);
   }
 }
-
 void Text_Class::text_selection_changed_callback(AtkText* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1062,15 +1138,19 @@ void Text_Class::text_selection_changed_callback(AtkText* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_text_selection_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1084,7 +1164,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->text_selection_changed)(self);
   }
 }
-
 void Text_Class::text_attributes_changed_callback(AtkText* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1097,15 +1176,19 @@ void Text_Class::text_attributes_changed_callback(AtkText* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_text_attributes_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1119,6 +1202,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->text_attributes_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Text_Class::wrap_new(GObject* object)
@@ -1192,7 +1276,7 @@ int Text::get_caret_offset() const
 
 void Text::get_character_extents(int offset, int& x, int& y, int& width, int& height, CoordType coords) const
 {
-  atk_text_get_character_extents(const_cast<AtkText*>(gobj()), offset, &x, &y, &width, &height, ((AtkCoordType)(coords)));
+atk_text_get_character_extents(const_cast<AtkText*>(gobj()), offset, &x, &y, &width, &height, ((AtkCoordType)(coords))); 
 }
 
 AttributeSet Text::get_run_attributes(int offset, int& start_offset, int& end_offset) const
@@ -1247,7 +1331,7 @@ bool Text::set_caret_offset(int offset)
 
 void Text::get_range_extents(int start_offset, int end_offset, CoordType coord_type, Rectangle& rect)
 {
-  atk_text_get_range_extents(gobj(), start_offset, end_offset, ((AtkCoordType)(coord_type)), &(rect));
+atk_text_get_range_extents(gobj(), start_offset, end_offset, ((AtkCoordType)(coord_type)), &(rect)); 
 }
 
 AtkTextRange** Text::get_bounded_ranges(const Rectangle& rect, CoordType coord_type, TextClipType x_clip_type, TextClipType y_clip_type)
@@ -1261,22 +1345,26 @@ Glib::SignalProxy2< void,int,int > Text::signal_text_changed()
   return Glib::SignalProxy2< void,int,int >(this, &Text_signal_text_changed_info);
 }
 
+
 Glib::SignalProxy1< void,int > Text::signal_text_caret_moved()
 {
   return Glib::SignalProxy1< void,int >(this, &Text_signal_text_caret_moved_info);
 }
 
+
 Glib::SignalProxy0< void > Text::signal_text_selection_changed()
 {
   return Glib::SignalProxy0< void >(this, &Text_signal_text_selection_changed_info);
 }
 
+
 Glib::SignalProxy0< void > Text::signal_text_attributes_changed()
 {
   return Glib::SignalProxy0< void >(this, &Text_signal_text_attributes_changed_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Atk::Text::on_text_changed(int position, int length)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1287,7 +1375,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->text_changed)
     (*base->text_changed)(gobj(),position,length);
 }
-
 void Atk::Text::on_text_caret_moved(int location)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1298,7 +1385,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->text_caret_moved)
     (*base->text_caret_moved)(gobj(),location);
 }
-
 void Atk::Text::on_text_selection_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1309,7 +1395,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->text_selection_changed)
     (*base->text_selection_changed)(gobj());
 }
-
 void Atk::Text::on_text_attributes_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1320,8 +1405,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->text_attributes_changed)
     (*base->text_attributes_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 Glib::ustring Atk::Text::get_text_vfunc(int start_offset, int end_offset) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1335,7 +1421,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef Glib::ustring RType;
   return RType();
 }
-
 gunichar Atk::Text::get_character_at_offset_vfunc(int offset) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1349,7 +1434,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef gunichar RType;
   return RType();
 }
-
 Glib::ustring Atk::Text::get_text_after_offset_vfunc(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1363,7 +1447,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef Glib::ustring RType;
   return RType();
 }
-
 Glib::ustring Atk::Text::get_text_at_offset_vfunc(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1377,7 +1460,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef Glib::ustring RType;
   return RType();
 }
-
 Glib::ustring Atk::Text::get_text_before_offset_vfunc(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1391,7 +1473,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef Glib::ustring RType;
   return RType();
 }
-
 int Atk::Text::get_caret_offset_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1405,7 +1486,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 void Atk::Text::get_character_extents_vfunc(int offset, int& x, int& y, int& width, int& height, CoordType coords) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1416,7 +1496,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->get_character_extents)
     (*base->get_character_extents)(const_cast<AtkText*>(gobj()),offset,&x,&y,&width,&height,((AtkCoordType)(coords)));
 }
-
 AtkAttributeSet* Atk::Text::get_run_attributes_vfunc(int offset, int& start_offset, int& end_offset) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1430,7 +1509,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef AtkAttributeSet* RType;
   return RType();
 }
-
 AtkAttributeSet* Atk::Text::get_default_attributes_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1444,7 +1522,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef AtkAttributeSet* RType;
   return RType();
 }
-
 int Atk::Text::get_character_count_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1458,7 +1535,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 int Atk::Text::get_offset_at_point_vfunc(int x, int y, CoordType coords) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1472,7 +1548,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 int Atk::Text::get_n_selections_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1486,7 +1561,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 Glib::ustring Atk::Text::get_selection_vfunc(int selection_num, int& start_offset, int& end_offset) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1500,7 +1574,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef Glib::ustring RType;
   return RType();
 }
-
 bool Atk::Text::add_selection_vfunc(int start_offset, int end_offset) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1514,7 +1587,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Text::remove_selection_vfunc(int selection_num) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1528,7 +1600,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Text::set_selection_vfunc(int selection_num, int start_offset, int end_offset) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1542,7 +1613,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Atk::Text::set_caret_offset_vfunc(int offset) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1556,6 +1626,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/text.h b/libs/gtkmm2/atk/atkmm/text.h
index 86dee7ee39..01d10f4658 100644
--- a/libs/gtkmm2/atk/atkmm/text.h
+++ b/libs/gtkmm2/atk/atkmm/text.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_TEXT_H
 #define _ATKMM_TEXT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -62,9 +63,9 @@ public:
 
   void swap(Attribute& other);
 
-  Glib::ustring get_name() const;
-  Glib::ustring get_value() const;
-
+   Glib::ustring get_name() const;
+    Glib::ustring get_value() const;
+ 
   /// Provides access to the underlying C GObject.
   AtkAttribute*       gobj()       { return &gobject_; }
 
@@ -374,7 +375,8 @@ public:
    * @param offset Position.
    * @param boundary_type An Atk::TextBoundary.
    * @param start_offset The start offset of the returned string.
-   * @param end_offset The end offset of the returned string.
+   * @param end_offset The offset of the first character after the 
+   * returned substring.
    * @return The text after @a offset  bounded by the specified @a boundary_type .
    */
   Glib::ustring get_text_after_offset(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const;
@@ -426,7 +428,8 @@ public:
    * @param offset Position.
    * @param boundary_type An Atk::TextBoundary.
    * @param start_offset The start offset of the returned string.
-   * @param end_offset The end offset of the returned string.
+   * @param end_offset The offset of the first character after the 
+   * returned substring.
    * @return The text at @a offset  bounded by the specified @a boundary_type .
    */
   Glib::ustring get_text_at_offset(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const;
@@ -476,7 +479,8 @@ public:
    * @param offset Position.
    * @param boundary_type An Atk::TextBoundary.
    * @param start_offset The start offset of the returned string.
-   * @param end_offset The end offset of the returned string.
+   * @param end_offset The offset of the first character after the 
+   * returned substring.
    * @return The text before @a offset  bounded by the specified @a boundary_type .
    */
   Glib::ustring get_text_before_offset(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const;
@@ -549,14 +553,15 @@ public:
    * of the text region is assigned the number 0, etc.  Note that adding,
    * moving or deleting a selected region can change the numbering.
    * @param start_offset Passes back the start position of the selected region.
-   * @param end_offset Passes back the end position of the selected region.
+   * @param end_offset Passes back the end position of (e.g. offset immediately past) 
+   * the selected region.
    * @return The selected text.
    */
   Glib::ustring get_selection(int selection_num, int& start_offset, int& end_offset) const;
   
   /** Adds a selection bounded by the specified offsets.
    * @param start_offset The start position of the selected region.
-   * @param end_offset The end position of the selected region.
+   * @param end_offset The offset of the first character after the selected region.
    * @return <tt>true</tt> if success, <tt>false</tt> otherwise.
    */
   bool add_selection(int start_offset, int end_offset);
@@ -578,7 +583,8 @@ public:
    * of the text region is assigned the number 0, etc.  Note that adding,
    * moving or deleting a selected region can change the numbering.
    * @param start_offset The new start position of the selection.
-   * @param end_offset The new end position of the selection.
+   * @param end_offset The new end position of (e.g. offset immediately past) 
+   * the selection.
    * @return <tt>true</tt> if success, <tt>false</tt> otherwise.
    */
   bool set_selection(int selection_num, int start_offset, int end_offset);
@@ -616,38 +622,109 @@ public:
                                                  TextClipType x_clip_type, TextClipType y_clip_type);
                                                            
 
+/**
+   * @par Prototype:
+   * <tt>void %text_changed(int position, int length)</tt>
+   */
+
   Glib::SignalProxy2< void,int,int > signal_text_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %text_caret_moved(int location)</tt>
+   */
+
   Glib::SignalProxy1< void,int > signal_text_caret_moved();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %text_selection_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_text_selection_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %text_attributes_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_text_attributes_changed();
 
 
 protected:
  
 
-    virtual Glib::ustring get_text_vfunc(int start_offset, int end_offset) const;
-    virtual gunichar get_character_at_offset_vfunc(int offset) const;
-    virtual Glib::ustring get_text_after_offset_vfunc(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const;
-    virtual Glib::ustring get_text_at_offset_vfunc(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const;
-    virtual Glib::ustring get_text_before_offset_vfunc(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const;
-    virtual int get_caret_offset_vfunc() const;
-    virtual void get_character_extents_vfunc(int offset, int& x, int& y, int& width, int& height, CoordType coords) const;
-    virtual AtkAttributeSet* get_run_attributes_vfunc(int offset, int& start_offset, int& end_offset) const;
-    virtual AtkAttributeSet* get_default_attributes_vfunc() const;
-    virtual int get_character_count_vfunc() const;
-    virtual int get_offset_at_point_vfunc(int x, int y, CoordType coords) const;
-    virtual int get_n_selections_vfunc() const;
-    virtual Glib::ustring get_selection_vfunc(int selection_num, int& start_offset, int& end_offset) const;
-    virtual bool add_selection_vfunc(int start_offset, int end_offset);
-    virtual bool remove_selection_vfunc(int selection_num);
-    virtual bool set_selection_vfunc(int selection_num, int start_offset, int end_offset);
-    virtual bool set_caret_offset_vfunc(int offset);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::ustring get_text_vfunc(int start_offset, int end_offset) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual gunichar get_character_at_offset_vfunc(int offset) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::ustring get_text_after_offset_vfunc(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::ustring get_text_at_offset_vfunc(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::ustring get_text_before_offset_vfunc(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_caret_offset_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_character_extents_vfunc(int offset, int& x, int& y, int& width, int& height, CoordType coords) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual AtkAttributeSet* get_run_attributes_vfunc(int offset, int& start_offset, int& end_offset) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual AtkAttributeSet* get_default_attributes_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_character_count_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_offset_at_point_vfunc(int x, int y, CoordType coords) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_n_selections_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::ustring get_selection_vfunc(int selection_num, int& start_offset, int& end_offset) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool add_selection_vfunc(int start_offset, int end_offset);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool remove_selection_vfunc(int selection_num);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool set_selection_vfunc(int selection_num, int start_offset, int end_offset);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool set_caret_offset_vfunc(int offset);
+#endif //GLIBMM_VFUNCS_ENABLED
+
   
   //TODO: Add get_range_extents(), and get_bounded_ranges() vfuncs when we can break ABI.
 
@@ -656,15 +733,21 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_text_changed(int position, int length);
   virtual void on_text_caret_moved(int location);
   virtual void on_text_selection_changed();
   virtual void on_text_attributes_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -683,5 +766,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_TEXT_H */
 
diff --git a/libs/gtkmm2/atk/atkmm/value.cc b/libs/gtkmm2/atk/atkmm/value.cc
index eeff7dfd2f..3a92b2df12 100644
--- a/libs/gtkmm2/atk/atkmm/value.cc
+++ b/libs/gtkmm2/atk/atkmm/value.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <atkmm/value.h>
 #include <atkmm/private/value_p.h>
 
@@ -72,12 +73,18 @@ void Value_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->get_current_value = &get_current_value_vfunc_callback;
   klass->get_maximum_value = &get_maximum_value_vfunc_callback;
   klass->get_minimum_value = &get_minimum_value_vfunc_callback;
   klass->set_current_value = &set_current_value_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Value_Class::get_current_value_vfunc_callback(AtkValue* self, GValue* value)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -90,16 +97,20 @@ void Value_Class::get_current_value_vfunc_callback(AtkValue* self, GValue* value
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_current_value_vfunc(*reinterpret_cast<Glib::ValueBase*>(value)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -113,7 +124,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->get_current_value)(self, value);
   }
 }
-
 void Value_Class::get_maximum_value_vfunc_callback(AtkValue* self, GValue* value)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -126,16 +136,20 @@ void Value_Class::get_maximum_value_vfunc_callback(AtkValue* self, GValue* value
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_maximum_value_vfunc(*reinterpret_cast<Glib::ValueBase*>(value)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -149,7 +163,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->get_maximum_value)(self, value);
   }
 }
-
 void Value_Class::get_minimum_value_vfunc_callback(AtkValue* self, GValue* value)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -162,16 +175,20 @@ void Value_Class::get_minimum_value_vfunc_callback(AtkValue* self, GValue* value
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_minimum_value_vfunc(*reinterpret_cast<Glib::ValueBase*>(value)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -185,7 +202,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->get_minimum_value)(self, value);
   }
 }
-
 gboolean Value_Class::set_current_value_vfunc_callback(AtkValue* self, const GValue* value)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -198,16 +214,20 @@ gboolean Value_Class::set_current_value_vfunc_callback(AtkValue* self, const GVa
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->set_current_value_vfunc(*reinterpret_cast<const Glib::ValueBase*>(value)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -224,6 +244,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Value_Class::wrap_new(GObject* object)
@@ -268,17 +292,17 @@ GType Value::get_base_type()
 
 void Value::get_current_value(Glib::ValueBase& value) const
 {
-  atk_value_get_current_value(const_cast<AtkValue*>(gobj()), (value).gobj());
+atk_value_get_current_value(const_cast<AtkValue*>(gobj()), (value).gobj()); 
 }
 
 void Value::get_maximum_value(Glib::ValueBase& value) const
 {
-  atk_value_get_maximum_value(const_cast<AtkValue*>(gobj()), (value).gobj());
+atk_value_get_maximum_value(const_cast<AtkValue*>(gobj()), (value).gobj()); 
 }
 
 void Value::get_minimum_value(Glib::ValueBase& value) const
 {
-  atk_value_get_minimum_value(const_cast<AtkValue*>(gobj()), (value).gobj());
+atk_value_get_minimum_value(const_cast<AtkValue*>(gobj()), (value).gobj()); 
 }
 
 bool Value::set_current_value(const Glib::ValueBase& value)
@@ -287,6 +311,10 @@ bool Value::set_current_value(const Glib::ValueBase& value)
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Atk::Value::get_current_value_vfunc(Glib::ValueBase& value) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -297,7 +325,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->get_current_value)
     (*base->get_current_value)(const_cast<AtkValue*>(gobj()),(value).gobj());
 }
-
 void Atk::Value::get_maximum_value_vfunc(Glib::ValueBase& value) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -308,7 +335,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->get_maximum_value)
     (*base->get_maximum_value)(const_cast<AtkValue*>(gobj()),(value).gobj());
 }
-
 void Atk::Value::get_minimum_value_vfunc(Glib::ValueBase& value) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -319,7 +345,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->get_minimum_value)
     (*base->get_minimum_value)(const_cast<AtkValue*>(gobj()),(value).gobj());
 }
-
 bool Atk::Value::set_current_value_vfunc(const Glib::ValueBase& value) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -333,6 +358,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Atk
diff --git a/libs/gtkmm2/atk/atkmm/value.h b/libs/gtkmm2/atk/atkmm/value.h
index 25615dd92e..92f2e487fd 100644
--- a/libs/gtkmm2/atk/atkmm/value.h
+++ b/libs/gtkmm2/atk/atkmm/value.h
@@ -3,6 +3,7 @@
 #ifndef _ATKMM_VALUE_H
 #define _ATKMM_VALUE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -120,21 +121,38 @@ public:
   bool set_current_value(const Glib::ValueBase& value);
 
 protected:
-    virtual void get_current_value_vfunc(Glib::ValueBase& value) const;
-    virtual void get_maximum_value_vfunc(Glib::ValueBase& value) const;
-    virtual void get_minimum_value_vfunc(Glib::ValueBase& value) const;
-    virtual bool set_current_value_vfunc(const Glib::ValueBase& value);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_current_value_vfunc(Glib::ValueBase& value) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_maximum_value_vfunc(Glib::ValueBase& value) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_minimum_value_vfunc(Glib::ValueBase& value) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool set_current_value_vfunc(const Glib::ValueBase& value);
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -153,5 +171,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _ATKMM_VALUE_H */
 
diff --git a/libs/gtkmm2/gdk/SConscript b/libs/gtkmm2/gdk/SConscript
index 6ea5c7cfef..5f86edb043 100644
--- a/libs/gtkmm2/gdk/SConscript
+++ b/libs/gtkmm2/gdk/SConscript
@@ -8,8 +8,8 @@ gdkmm2_files = glob.glob('gdkmm/*.cc')
 
 Import('env libraries install_prefix')
 gdkmm2 = env.Copy()
-gdkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm']])
-gdkmm2.Append(CXXFLAGS="-Ilibs/gtkmm2/gtk")
+gdkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['cairomm']])
+gdkmm2.Append(CXXFLAGS=["-Ilibs/gtkmm2/gtk", "-DGLIBMM_EXCEPTIONS_ENABLED"])
 
 libgdkmm2 = gdkmm2.SharedLibrary('gdkmm2', gdkmm2_files)
 Default(libgdkmm2)
diff --git a/libs/gtkmm2/gdk/gdkmm/bitmap.cc b/libs/gtkmm2/gdk/gdkmm/bitmap.cc
index 27063537a6..d50b48945e 100644
--- a/libs/gtkmm2/gdk/gdkmm/bitmap.cc
+++ b/libs/gtkmm2/gdk/gdkmm/bitmap.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/bitmap.h>
 #include <gdkmm/private/bitmap_p.h>
 
diff --git a/libs/gtkmm2/gdk/gdkmm/bitmap.h b/libs/gtkmm2/gdk/gdkmm/bitmap.h
index 57dc9fb087..4f6728e721 100644
--- a/libs/gtkmm2/gdk/gdkmm/bitmap.h
+++ b/libs/gtkmm2/gdk/gdkmm/bitmap.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_BITMAP_H
 #define _GDKMM_BITMAP_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
diff --git a/libs/gtkmm2/gdk/gdkmm/color.cc b/libs/gtkmm2/gdk/gdkmm/color.cc
index 06c8e70cf5..1d95cff54e 100644
--- a/libs/gtkmm2/gdk/gdkmm/color.cc
+++ b/libs/gtkmm2/gdk/gdkmm/color.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/color.h>
 #include <gdkmm/private/color_p.h>
 
@@ -151,10 +152,14 @@ bool Color::set(const Glib::ustring& value)
   return gdk_color_parse(value.c_str(), gobj());
 }
 
+#ifndef GDKMM_DISABLE_DEPRECATED
+
 bool Color::parse(const Glib::ustring& spec)
 {
   return set(spec);
 }
+#endif // GDKMM_DISABLE_DEPRECATED
+
 
 gushort Color::get_red() const
 {
diff --git a/libs/gtkmm2/gdk/gdkmm/color.h b/libs/gtkmm2/gdk/gdkmm/color.h
index c40ff67f25..167152d1fa 100644
--- a/libs/gtkmm2/gdk/gdkmm/color.h
+++ b/libs/gtkmm2/gdk/gdkmm/color.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_COLOR_H
 #define _GDKMM_COLOR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -126,12 +127,14 @@ public:
   */
   bool set(const Glib::ustring& value);
 
-  #ifndef GDKMM_DEPRECATED
+  #ifndef GDKMM_DISABLE_DEPRECATED
+
   /** 
    * @deprecated See set().
    */
   bool parse(const Glib::ustring& spec);
-  #endif //GDKMM_DEPRECATED
+  #endif // GDKMM_DISABLE_DEPRECATED
+
 
   /** Get the red component of the color.
    * @result The red component of the color.
@@ -270,5 +273,6 @@ class Value<Gdk::Color> : public Glib::Value_Boxed<Gdk::Color>
 
 } // namespace Glib
 
+
 #endif /* _GDKMM_COLOR_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/colormap.cc b/libs/gtkmm2/gdk/gdkmm/colormap.cc
index af2d64aec1..64670009b3 100644
--- a/libs/gtkmm2/gdk/gdkmm/colormap.cc
+++ b/libs/gtkmm2/gdk/gdkmm/colormap.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/colormap.h>
 #include <gdkmm/private/colormap_p.h>
 
@@ -34,7 +35,26 @@ Colormap::Colormap(const Glib::RefPtr<Visual>& visual, bool allocate)
 : Glib::Object( G_OBJECT( gdk_colormap_new(visual->gobj(), (gboolean)allocate) ) )
   {}
 
-} /* namespace Gdk */
+#ifndef GDKMM_DISABLE_DEPRECATED
+
+int Colormap::alloc_colors(ArrayHandle_Color& colors, int ncolors, bool writeable, bool best_match, Glib::ArrayHandle<bool>& success)
+{
+  return gdk_colormap_alloc_colors(gobj(), const_cast<GdkColor*>(colors.data()), ncolors, static_cast<int>(writeable), static_cast<int>(best_match), (gboolean*)(success.data()));
+}
+
+void Colormap::free_colors(Color& colors, int ncolors)
+{
+  gdk_colormap_free_colors(gobj(), (colors).gobj(), ncolors);
+}
+#endif // GDKMM_DISABLE_DEPRECATED
+
+
+void Colormap::free_color(Color& color)
+{
+  gdk_colormap_free_colors(gobj(), color.gobj(), 1);
+}
+
+} // namespace Gdk
 
 
 namespace
@@ -85,8 +105,19 @@ void Colormap_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Colormap_Class::wrap_new(GObject* object)
 {
@@ -143,65 +174,53 @@ Glib::RefPtr<Colormap> Colormap::get_system()
   return retvalue;
 }
 
-int Colormap::alloc_colors(ArrayHandle_Color& colors, int ncolors, bool writeable, bool best_match, Glib::ArrayHandle<bool>& success)
-{
-  return gdk_colormap_alloc_colors(gobj(), const_cast<GdkColor*>(colors.data()), ncolors, static_cast<int>(writeable), static_cast<int>(best_match), (gboolean*)(success.data()));
-}
 
 bool Colormap::alloc_color(Color& color, bool writeable, bool best_match)
 {
   return gdk_colormap_alloc_color(gobj(), (color).gobj(), static_cast<int>(writeable), static_cast<int>(best_match));
 }
 
-void Colormap::free_colors(Color& colors, int ncolors)
-{
-  gdk_colormap_free_colors(gobj(), (colors).gobj(), ncolors);
-}
-
 void Colormap::query_color(gulong pixel, Color& result)
 {
-  gdk_colormap_query_color(gobj(), pixel, (result).gobj());
+gdk_colormap_query_color(gobj(), pixel, (result).gobj()); 
 }
 
 Glib::RefPtr<Visual> Colormap::get_visual()
 {
 
   Glib::RefPtr<Visual> retvalue = Glib::wrap(gdk_colormap_get_visual(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Visual> Colormap::get_visual() const
 {
-
-  Glib::RefPtr<const Visual> retvalue = Glib::wrap(gdk_colormap_get_visual(const_cast<GdkColormap*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Colormap*>(this)->get_visual();
 }
 
 Glib::RefPtr<Screen> Colormap::get_screen()
 {
 
   Glib::RefPtr<Screen> retvalue = Glib::wrap(gdk_colormap_get_screen(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Screen> Colormap::get_screen() const
 {
+  return const_cast<Colormap*>(this)->get_screen();
+}
 
-  Glib::RefPtr<const Screen> retvalue = Glib::wrap(gdk_colormap_get_screen(const_cast<GdkColormap*>(gobj())));
 
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
-}
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gdk
diff --git a/libs/gtkmm2/gdk/gdkmm/colormap.h b/libs/gtkmm2/gdk/gdkmm/colormap.h
index 5f73acbf59..2d2a4cd92e 100644
--- a/libs/gtkmm2/gdk/gdkmm/colormap.h
+++ b/libs/gtkmm2/gdk/gdkmm/colormap.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_COLORMAP_H
 #define _GDKMM_COLORMAP_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -114,27 +115,18 @@ public:
 
   //_WRAP_METHOD(void change(int ncolors), gdk_colormap_change)
 
-  // Both 'GdkColor* colors' and 'gboolean* success' are _array_ output arguments.
- 
+  #ifndef GDKMM_DISABLE_DEPRECATED
 
-  /** Allocates colors from a colormap.
-   * @param colors The color values to allocate. On return, the pixel
-   * values for allocated colors will be filled in.
-   * @param ncolors The number of colors in @a colors .
-   * @param writeable If <tt>true</tt>, the colors are allocated writeable
-   * (their values can later be changed using gdk_color_change()).
-   * Writeable colors cannot be shared between applications.
-   * @param best_match If <tt>true</tt>, GDK will attempt to do matching against
-   * existing colors if the colors cannot be allocated as requested.
-   * @param success An array of length @a ncolors . On return, this
-   * indicates whether the corresponding color in @a colors  was
-   * successfully allocated or not.
-   * @return The number of colors that were not successfully 
-   * allocated.
-   */
+  ///@deprecated Use alloc_color().
   int alloc_colors(ArrayHandle_Color& colors, int ncolors, bool writeable, bool best_match, Glib::ArrayHandle<bool>& success);
+  
 
+  ///@deprecated Use free_color()
+  void free_colors(Color& colors, int ncolors);
   
+  #endif // GDKMM_DISABLE_DEPRECATED
+
+
   /** Allocates a single color from a colormap.
    * @param color The color to allocate. On return the
    * &lt;structfield&gt;pixel&lt;/structfield&gt; field will be
@@ -147,12 +139,8 @@ public:
    * @return <tt>true</tt> if the allocation succeeded.
    */
   bool alloc_color(Color& color, bool writeable = false, bool best_match = true);
-  
-  /** Frees previously allocated colors.
-   * @param colors The colors to free.
-   * @param ncolors The number of colors in @a colors .
-   */
-  void free_colors(Color& colors, int ncolors);
+  void free_color(Color& color);
+
   
   /** Locates the RGB color in @a colormap  corresponding to the given
    * hardware pixel @a pixel . @a pixel  must be a valid pixel in the
@@ -184,14 +172,14 @@ public:
   /** Gets the screen for which this colormap was created.
    * @return The screen for which this colormap was created.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Screen> get_screen();
   
   /** Gets the screen for which this colormap was created.
    * @return The screen for which this colormap was created.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Screen> get_screen() const;
   
@@ -200,11 +188,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/cursor.cc b/libs/gtkmm2/gdk/gdkmm/cursor.cc
index 1a8e639472..0f449a6108 100644
--- a/libs/gtkmm2/gdk/gdkmm/cursor.cc
+++ b/libs/gtkmm2/gdk/gdkmm/cursor.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/cursor.h>
 #include <gdkmm/private/cursor_p.h>
 
@@ -54,7 +55,12 @@ Cursor::Cursor(const Glib::RefPtr<Display>& display, CursorType cursor_type)
 Cursor::Cursor(const Glib::RefPtr<Display>& display, const Glib::RefPtr<Pixbuf>& pixbuf, int x, int y)
 {
   gobject_ = gdk_cursor_new_from_pixbuf(display->gobj(), pixbuf->gobj(), x, y);
-}          
+}
+
+Cursor::Cursor(const Glib::RefPtr<Display>& display, const Glib::ustring& name)
+{
+  gobject_ = gdk_cursor_new_from_name(display->gobj(), name.c_str());
+}      
 
 } //namespace Gdk
 
@@ -139,20 +145,25 @@ Glib::RefPtr<Display> Cursor::get_display()
 {
 
   Glib::RefPtr<Display> retvalue = Glib::wrap(gdk_cursor_get_display(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Display> Cursor::get_display() const
 {
+  return const_cast<Cursor*>(this)->get_display();
+}
 
-  Glib::RefPtr<const Display> retvalue = Glib::wrap(gdk_cursor_get_display(const_cast<GdkCursor*>(gobj())));
+Glib::RefPtr<Gdk::Pixbuf> Cursor::get_image()
+{
+  return Glib::wrap(gdk_cursor_get_image(gobj()));
+}
 
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+Glib::RefPtr<const Gdk::Pixbuf> Cursor::get_image() const
+{
+  return const_cast<Cursor*>(this)->get_image();
 }
 
 
diff --git a/libs/gtkmm2/gdk/gdkmm/cursor.h b/libs/gtkmm2/gdk/gdkmm/cursor.h
index 59ab2f827f..19b6d6054b 100644
--- a/libs/gtkmm2/gdk/gdkmm/cursor.h
+++ b/libs/gtkmm2/gdk/gdkmm/cursor.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_CURSOR_H
 #define _GDKMM_CURSOR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -195,22 +196,46 @@ public:
          int x, int y);
   explicit Cursor(const Glib::RefPtr<Display>& display, CursorType cursor_type);
   Cursor(const Glib::RefPtr<Display>& display, const Glib::RefPtr<Pixbuf>& pixbuf, int x, int y);
+  explicit Cursor(const Glib::RefPtr<Display>& display, const Glib::ustring& name);
 
   
   /** Returns the display on which the Gdk::Cursor is defined.
    * @return The Gdk::Display associated to @a cursor 
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Display> get_display();
   
   /** Returns the display on which the Gdk::Cursor is defined.
    * @return The Gdk::Display associated to @a cursor 
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Display> get_display() const;
 
+  
+  /** Returns a Gdk::Pixbuf with the image used to display the cursor.
+   * 
+   * Note that depending on the capabilities of the windowing system and 
+   * on the cursor, GDK may not be able to obtain the image data. In this 
+   * case, <tt>0</tt> is returned.
+   * @return A Gdk::Pixbuf representing @a cursor , or <tt>0</tt>
+   * 
+   * @newin2p8.
+   */
+  Glib::RefPtr<Gdk::Pixbuf> get_image();
+  
+  /** Returns a Gdk::Pixbuf with the image used to display the cursor.
+   * 
+   * Note that depending on the capabilities of the windowing system and 
+   * on the cursor, GDK may not be able to obtain the image data. In this 
+   * case, <tt>0</tt> is returned.
+   * @return A Gdk::Pixbuf representing @a cursor , or <tt>0</tt>
+   * 
+   * @newin2p8.
+   */
+  Glib::RefPtr<const Gdk::Pixbuf> get_image() const;
+
 
 };
 
@@ -247,5 +272,6 @@ class Value<Gdk::Cursor> : public Glib::Value_Boxed<Gdk::Cursor>
 
 } // namespace Glib
 
+
 #endif /* _GDKMM_CURSOR_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/device.cc b/libs/gtkmm2/gdk/gdkmm/device.cc
index 78d223a363..5d29021169 100644
--- a/libs/gtkmm2/gdk/gdkmm/device.cc
+++ b/libs/gtkmm2/gdk/gdkmm/device.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/device.h>
 #include <gdkmm/private/device_p.h>
 
@@ -92,8 +93,19 @@ void Device_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Device_Class::wrap_new(GObject* object)
 {
@@ -145,7 +157,7 @@ Device::Device()
 
 void Device::set_source(InputSource source)
 {
-  gdk_device_set_source(gobj(), ((GdkInputSource)(source)));
+gdk_device_set_source(gobj(), ((GdkInputSource)(source))); 
 }
 
 bool Device::set_mode(InputMode mode)
@@ -155,17 +167,17 @@ bool Device::set_mode(InputMode mode)
 
 void Device::set_key(guint index_, guint keyval, ModifierType modifiers)
 {
-  gdk_device_set_key(gobj(), index_, keyval, ((GdkModifierType)(modifiers)));
+gdk_device_set_key(gobj(), index_, keyval, ((GdkModifierType)(modifiers))); 
 }
 
 void Device::set_axis_use(guint index_, AxisUse use)
 {
-  gdk_device_set_axis_use(gobj(), index_, ((GdkAxisUse)(use)));
+gdk_device_set_axis_use(gobj(), index_, ((GdkAxisUse)(use))); 
 }
 
 void Device::get_state(const Glib::RefPtr<Window>& window, double& axes, ModifierType& mask)
 {
-  gdk_device_get_state(gobj(), Glib::unwrap(window), &(axes), ((GdkModifierType*) &(mask)));
+gdk_device_get_state(gobj(), Glib::unwrap(window), &(axes), ((GdkModifierType*) &(mask))); 
 }
 
 bool Device::get_history(const Glib::RefPtr<Window>& window, guint32 start, guint32 stop, GdkTimeCoord**& events, int& n_events)
@@ -178,25 +190,32 @@ bool Device::get_axis(double& axes, AxisUse use, double& value) const
   return gdk_device_get_axis(const_cast<GdkDevice*>(gobj()), &(axes), ((GdkAxisUse)(use)), &(value));
 }
 
-Glib::ustring Device::get_name() const
+ Glib::ustring Device::get_name() const
 {
   return Glib::convert_const_gchar_ptr_to_ustring(gobj()->name);
 }
-
-InputSource Device::get_source() const
+ 
+ InputSource Device::get_source() const
 {
   return ((InputSource)(gobj()->source));
 }
-
-InputMode Device::get_mode() const
+ 
+ InputMode Device::get_mode() const
 {
   return ((InputMode)(gobj()->mode));
 }
-
-bool Device::get_has_cursor() const
+ 
+ bool Device::get_has_cursor() const
 {
   return gobj()->has_cursor;
 }
+ 
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gdk
diff --git a/libs/gtkmm2/gdk/gdkmm/device.h b/libs/gtkmm2/gdk/gdkmm/device.h
index c3146c0010..2453396d73 100644
--- a/libs/gtkmm2/gdk/gdkmm/device.h
+++ b/libs/gtkmm2/gdk/gdkmm/device.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_DEVICE_H
 #define _GDKMM_DEVICE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -198,23 +199,23 @@ public:
   /** Gets the name of this device.
    * @result The name of this device.
    */
-  Glib::ustring get_name() const;
-  
+   Glib::ustring get_name() const;
+   
   /** Gets the type of this device.
    * @result The type of this device.
    */
-  InputSource get_source() const;
-
+   InputSource get_source() const;
+ 
   /** Gets the mode of this device.
    * @result The mode of this device.
    */
-  InputMode get_mode() const;
-    
+   InputMode get_mode() const;
+     
   /** Discover whether the pointer follows device motion.
    * @result true if the pointer follows device motion.
    */
-  bool get_has_cursor() const;
-
+   bool get_has_cursor() const;
+ 
   //TODO: Add suitable accessor for the information in these fields. For now, people must use gobj() and access them directly.
   //gint num_axes	the length of the axes array.
   //GdkDeviceAxis *axes	an array of GdkDeviceAxis, describing the axes of this device.
@@ -227,11 +228,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/display.cc b/libs/gtkmm2/gdk/gdkmm/display.cc
index ff3f528fff..fe4318c328 100644
--- a/libs/gtkmm2/gdk/gdkmm/display.cc
+++ b/libs/gtkmm2/gdk/gdkmm/display.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/display.h>
 #include <gdkmm/private/display_p.h>
 
@@ -121,7 +122,8 @@ GdkDisplayPointerHooks*  Display::unset_pointer_hooks()
 namespace
 {
 
-void Display_signal_closed_callback(GdkDisplay* self, gboolean p0,void* data)
+
+static void Display_signal_closed_callback(GdkDisplay* self, gboolean p0,void* data)
 {
   using namespace Gdk;
   typedef sigc::slot< void,bool > SlotType;
@@ -129,26 +131,31 @@ void Display_signal_closed_callback(GdkDisplay* self, gboolean p0,void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Display_signal_closed_info =
+static const Glib::SignalProxyInfo Display_signal_closed_info =
 {
   "closed",
   (GCallback) &Display_signal_closed_callback,
   (GCallback) &Display_signal_closed_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -195,10 +202,18 @@ void Display_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->closed = &closed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Display_Class::closed_callback(GdkDisplay* self, gboolean p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -211,16 +226,20 @@ void Display_Class::closed_callback(GdkDisplay* self, gboolean p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_closed(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -233,6 +252,7 @@ void Display_Class::closed_callback(GdkDisplay* self, gboolean p0)
       (*base->closed)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Display_Class::wrap_new(GObject* object)
@@ -293,6 +313,7 @@ Glib::RefPtr<Display> Display::open(const Glib::ustring& display_name)
   return retvalue;
 }
 
+
 Glib::ustring Display::get_name() const
 {
   return Glib::convert_const_gchar_ptr_to_ustring(gdk_display_get_name(const_cast<GdkDisplay*>(gobj())));
@@ -307,50 +328,40 @@ Glib::RefPtr<Screen> Display::get_screen(int screen_num)
 {
 
   Glib::RefPtr<Screen> retvalue = Glib::wrap(gdk_display_get_screen(gobj(), screen_num));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Screen> Display::get_screen(int screen_num) const
 {
-
-  Glib::RefPtr<const Screen> retvalue = Glib::wrap(gdk_display_get_screen(const_cast<GdkDisplay*>(gobj()), screen_num));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Display*>(this)->get_screen(screen_num);
 }
 
 Glib::RefPtr<Screen> Display::get_default_screen()
 {
 
   Glib::RefPtr<Screen> retvalue = Glib::wrap(gdk_display_get_default_screen(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Screen> Display::get_default_screen() const
 {
-
-  Glib::RefPtr<const Screen> retvalue = Glib::wrap(gdk_display_get_default_screen(const_cast<GdkDisplay*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Display*>(this)->get_default_screen();
 }
 
 void Display::pointer_ungrab(guint32 timestamp)
 {
-  gdk_display_pointer_ungrab(gobj(), timestamp);
+gdk_display_pointer_ungrab(gobj(), timestamp); 
 }
 
 void Display::keyboard_ungrab(guint32 timestamp)
 {
-  gdk_display_keyboard_ungrab(gobj(), timestamp);
+gdk_display_keyboard_ungrab(gobj(), timestamp); 
 }
 
 bool Display::pointer_is_grabbed() const
@@ -360,27 +371,27 @@ bool Display::pointer_is_grabbed() const
 
 void Display::beep()
 {
-  gdk_display_beep(gobj());
+gdk_display_beep(gobj()); 
 }
 
 void Display::sync()
 {
-  gdk_display_sync(gobj());
+gdk_display_sync(gobj()); 
 }
 
 void Display::close()
 {
-  gdk_display_close(gobj());
+gdk_display_close(gobj()); 
 }
 
 Glib::ListHandle< Glib::RefPtr<Device> > Display::list_devices()
 {
-  return Glib::ListHandle< Glib::RefPtr<Device> >(gdk_display_list_devices(gobj()), Glib::OWNERSHIP_DEEP);
+  return Glib::ListHandle< Glib::RefPtr<Device> >(gdk_display_list_devices(gobj()), Glib::OWNERSHIP_NONE);
 }
 
 Glib::ListHandle< Glib::RefPtr<const Device> > Display::list_devices() const
 {
-  return Glib::ListHandle< Glib::RefPtr<const Device> >(gdk_display_list_devices(const_cast<GdkDisplay*>(gobj())), Glib::OWNERSHIP_DEEP);
+  return Glib::ListHandle< Glib::RefPtr<const Device> >(gdk_display_list_devices(const_cast<GdkDisplay*>(gobj())), Glib::OWNERSHIP_NONE);
 }
 
 GdkEvent* Display::get_event()
@@ -390,7 +401,7 @@ GdkEvent* Display::get_event()
 
 const GdkEvent* Display::get_event() const
 {
-  return (const GdkEvent*)(gdk_display_get_event(const_cast<GdkDisplay*>(gobj())));
+  return const_cast<Display*>(this)->get_event();
 }
 
 GdkEvent* Display::peek_event()
@@ -400,27 +411,27 @@ GdkEvent* Display::peek_event()
 
 GdkEvent* Display::peek_event() const
 {
-  return gdk_display_peek_event(const_cast<GdkDisplay*>(gobj()));
+  return const_cast<Display*>(this)->peek_event();
 }
 
 void Display::put_event(GdkEvent* event)
 {
-  gdk_display_put_event(gobj(), event);
+gdk_display_put_event(gobj(), event); 
 }
 
 void Display::add_client_message_filter(Glib::ustring& message_type, GdkFilterFunc func, gpointer data)
 {
-  gdk_display_add_client_message_filter(gobj(), Gdk::AtomString::to_c_type(message_type), func, data);
+gdk_display_add_client_message_filter(gobj(), Gdk::AtomString::to_c_type(message_type), func, data); 
 }
 
 void Display::set_double_click_time(guint msec)
 {
-  gdk_display_set_double_click_time(gobj(), msec);
+gdk_display_set_double_click_time(gobj(), msec); 
 }
 
 void Display::set_double_click_distance(guint distance)
 {
-  gdk_display_set_double_click_distance(gobj(), distance);
+gdk_display_set_double_click_distance(gobj(), distance); 
 }
 
 Glib::RefPtr<Display> Display::get_default()
@@ -433,44 +444,45 @@ Glib::RefPtr<Display> Display::get_default()
   return retvalue;
 }
 
+
 Glib::RefPtr<Device> Display::get_core_pointer()
 {
 
   Glib::RefPtr<Device> retvalue = Glib::wrap(gdk_display_get_core_pointer(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Device> Display::get_core_pointer() const
 {
 
   Glib::RefPtr<const Device> retvalue = Glib::wrap(gdk_display_get_core_pointer(const_cast<GdkDisplay*>(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<Window> Display::get_window_at_pointer(int& win_x, int& win_y)
 {
 
   Glib::RefPtr<Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_display_get_window_at_pointer(gobj(), &win_x, &win_y)));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Window> Display::get_window_at_pointer(int& win_x, int& win_y) const
 {
+  return const_cast<Display*>(this)->get_window_at_pointer(win_x, win_y);
+}
 
-  Glib::RefPtr<const Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_display_get_window_at_pointer(const_cast<GdkDisplay*>(gobj()), &win_x, &win_y)));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+void Display::warp_pointer(const Glib::RefPtr<Screen>& screen, int x, int y)
+{
+gdk_display_warp_pointer(gobj(), Glib::unwrap(screen), x, y); 
 }
 
 GdkDisplayPointerHooks* Display::set_pointer_hooks(const GdkDisplayPointerHooks* new_hooks)
@@ -488,6 +500,7 @@ Glib::RefPtr<Display> Display::open_default_libgtk_only()
   return retvalue;
 }
 
+
 guint32 Display::get_drag_protocol(guint32 xid, GdkDragProtocol& protocol)
 {
   return gdk_drag_get_protocol_for_display(gobj(), xid, &(protocol));
@@ -500,7 +513,7 @@ GdkKeymap* Display::get_keymap()
 
 const GdkKeymap* Display::get_keymap() const
 {
-  return gdk_keymap_get_for_display(const_cast<GdkDisplay*>(gobj()));
+  return const_cast<Display*>(this)->get_keymap();
 }
 
 Glib::RefPtr<Pixmap> Display::lookup_pixmap(NativeWindow anid)
@@ -510,12 +523,12 @@ Glib::RefPtr<Pixmap> Display::lookup_pixmap(NativeWindow anid)
 
 Glib::RefPtr<const Pixmap> Display::lookup_pixmap(NativeWindow anid) const
 {
-  return Glib::wrap((GdkPixmapObject*)(gdk_pixmap_lookup_for_display(const_cast<GdkDisplay*>(gobj()), (GdkNativeWindow)(anid))));
+  return const_cast<Display*>(this)->lookup_pixmap(anid);
 }
 
 void Display::flush()
 {
-  gdk_display_flush(gobj());
+gdk_display_flush(gobj()); 
 }
 
 bool Display::supports_cursor_alpha() const
@@ -535,27 +548,22 @@ guint Display::get_default_cursor_size() const
 
 void Display::get_maximal_cursor_size(guint& width, guint& height)
 {
-  gdk_display_get_maximal_cursor_size(gobj(), &(width), &(height));
+gdk_display_get_maximal_cursor_size(gobj(), &(width), &(height)); 
 }
 
 Glib::RefPtr<Window> Display::get_default_group()
 {
 
   Glib::RefPtr<Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_display_get_default_group(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Window> Display::get_default_group() const
 {
-
-  Glib::RefPtr<const Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_display_get_default_group(const_cast<GdkDisplay*>(gobj()))));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Display*>(this)->get_default_group();
 }
 
 bool Display::supports_selection_notification() const
@@ -580,6 +588,7 @@ Glib::SignalProxy1< void,bool > Display::signal_closed()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gdk::Display::on_closed(bool is_error)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -589,6 +598,10 @@ void Gdk::Display::on_closed(bool is_error)
   if(base && base->closed)
     (*base->closed)(gobj(),static_cast<int>(is_error));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gdk
diff --git a/libs/gtkmm2/gdk/gdkmm/display.h b/libs/gtkmm2/gdk/gdkmm/display.h
index 238025599a..e99910af21 100644
--- a/libs/gtkmm2/gdk/gdkmm/display.h
+++ b/libs/gtkmm2/gdk/gdkmm/display.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_DISPLAY_H
 #define _GDKMM_DISPLAY_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -106,7 +107,7 @@ public:
   
   /** Opens a display.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param display_name The name of the display to open.
    * @return A Gdk::Display, or <tt>0</tt> if the display
    * could not be opened.
@@ -118,7 +119,7 @@ public:
    * @return A string representing the display name. This string is owned
    * by GDK and should not be modified or freed.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::ustring get_name() const;
 
@@ -126,7 +127,7 @@ public:
   /** Gets the number of screen managed by the @a display .
    * @return Number of screens.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   int get_n_screens() const;
   
@@ -134,7 +135,7 @@ public:
    * @param screen_num The screen number.
    * @return The Gdk::Screen object
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Screen> get_screen(int screen_num);
   
@@ -142,7 +143,7 @@ public:
    * @param screen_num The screen number.
    * @return The Gdk::Screen object
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Screen> get_screen(int screen_num) const;
   
@@ -150,28 +151,28 @@ public:
   /** Get the default Gdk::Screen for @a display .
    * @return The default Gdk::Screen object for @a display 
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Screen> get_default_screen();
   
   /** Get the default Gdk::Screen for @a display .
    * @return The default Gdk::Screen object for @a display 
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Screen> get_default_screen() const;
   
   
   /** Release any pointer grab.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param timestamp A timestap (e.g. GDK_CURRENT_TIME).
    */
   void pointer_ungrab(guint32 timestamp);
   
   /** Release any keyboard grab
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param timestamp A timestap (e.g Gdk::CURRENT_TIME).
    */
   void keyboard_ungrab(guint32 timestamp);
@@ -179,13 +180,13 @@ public:
   /** Test if the pointer is grabbed.
    * @return <tt>true</tt> if an active X pointer grab is in effect
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   bool pointer_is_grabbed() const;
   
   /** Emits a short beep on @a display 
    * 
-   * Since: 2.2
+   * @newin2p2
    */
   void beep();
   
@@ -199,14 +200,14 @@ public:
    * This is most useful for X11. On windowing systems where requests are
    * handled synchronously, this function will do nothing.
    * 
-   * Since: 2.2
+   * @newin2p2
    */
   void sync();
   
   /** Closes the connection to the windowing system for the given display,
    * and cleans up associated resources.
    * 
-   * Since: 2.2
+   * @newin2p2
    */
   void	close();
 
@@ -215,7 +216,7 @@ public:
    * The list is statically allocated and should not be freed.
    * @return A list of Gdk::Device
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::ListHandle< Glib::RefPtr<Device> > list_devices();
   
@@ -223,7 +224,7 @@ public:
    * The list is statically allocated and should not be freed.
    * @return A list of Gdk::Device
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::ListHandle< Glib::RefPtr<const Device> > list_devices() const;
   
@@ -235,7 +236,7 @@ public:
    * @return The next Gdk::Event to be processed, or <tt>0</tt> if no events
    * are pending. The returned Gdk::Event should be freed with gdk_event_free().
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   GdkEvent* get_event();
   
@@ -244,7 +245,7 @@ public:
    * @return The next Gdk::Event to be processed, or <tt>0</tt> if no events
    * are pending. The returned Gdk::Event should be freed with gdk_event_free().
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   const GdkEvent* get_event() const;
   
@@ -257,7 +258,7 @@ public:
    * if no events are in the queue. The returned Gdk::Event should be freed with
    * gdk_event_free().
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   GdkEvent* peek_event();
   
@@ -269,14 +270,14 @@ public:
    * if no events are in the queue. The returned Gdk::Event should be freed with
    * gdk_event_free().
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   GdkEvent* peek_event() const;
   
   /** Appends a copy of the given event onto the front of the event
    * queue for @a display .
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param event A Gdk::Event.
    */
   void put_event(GdkEvent* event);
@@ -286,7 +287,7 @@ public:
   
   /** Adds a filter to be called when X ClientMessage events are received.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param message_type The type of ClientMessage events to receive.
    * This will be checked against the @a message_type  field 
    * of the XClientMessage event struct.
@@ -301,7 +302,7 @@ public:
    * Applications should <em>not</em> set this, it is a global 
    * user-configured setting.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param msec Double click time in milliseconds (thousandths of a second).
    */
   void set_double_click_time(guint msec);
@@ -312,7 +313,7 @@ public:
    * Applications should <em>not</em> set this, it is a global 
    * user-configured setting.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param distance Distance in pixels.
    */
   void set_double_click_distance(guint distance);
@@ -326,7 +327,7 @@ public:
    * @return A Gdk::Display, or <tt>0</tt> if there is no default
    * display.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   static Glib::RefPtr<Display> get_default();
 
@@ -335,7 +336,7 @@ public:
    * @return The core pointer device; this is owned by the
    * display and should not be freed.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Device> get_core_pointer();
   
@@ -343,7 +344,7 @@ public:
    * @return The core pointer device; this is owned by the
    * display and should not be freed.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Device> get_core_pointer() const;
 
@@ -379,7 +380,7 @@ public:
    * @param win_y Return location for origin of the window under the pointer.
    * @return The window under the mouse pointer, or <tt>0</tt>
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Window> get_window_at_pointer(int& win_x, int& win_y);
   
@@ -391,7 +392,7 @@ public:
    * @param win_y Return location for origin of the window under the pointer.
    * @return The window under the mouse pointer, or <tt>0</tt>
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Window> get_window_at_pointer(int& win_x, int& win_y) const;
 
@@ -408,6 +409,26 @@ public:
    * @result The window underneath the mouse pointer.
    */
   Glib::RefPtr<const Window> get_window_at_pointer() const;
+  
+  
+  /** Warps the pointer of @a display  to the point @a x , @a y  on 
+   * the screen @a screen , unless the pointer is confined
+   * to a window by a grab, in which case it will be moved
+   * as far as allowed by the grab. Warping the pointer 
+   * creates events as if the user had moved the mouse 
+   * instantaneously to the destination.
+   * 
+   * Note that the pointer should normally be under the
+   * control of the user. This function was added to cover
+   * some rare use cases like keyboard navigation support
+   * for the color picker in the Gtk::ColorSelectionDialog.
+   * 
+   * @newin2p8
+   * @param screen The screen of @a display  to warp the pointer to.
+   * @param x The x coordinate of the destination.
+   * @param y The y coordinate of the destination.
+   */
+  void warp_pointer(const Glib::RefPtr<Screen>& screen, int x, int y);
 
   
   /** This function allows for hooking into the operation
@@ -415,11 +436,11 @@ public:
    * display. This is only useful for such low-level tools as an
    * event recorder. Applications should never have any
    * reason to use this facility.
+   * 
+   *  @a newin2p2 
    * @param new_hooks A table of pointers to functions for getting
    * quantities related to the current pointer position.
-   * @return The previous pointer hook table
-   * 
-   * Since: 2.2.
+   * @return The previous pointer hook table.
    */
   GdkDisplayPointerHooks* set_pointer_hooks(const GdkDisplayPointerHooks* new_hooks);
   GdkDisplayPointerHooks* unset_pointer_hooks();
@@ -438,7 +459,7 @@ public:
   
   /** Finds out the DND protocol supported by a window.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param xid The X id of the destination window.
    * @param protocol Location where the supported DND protocol is returned.
    * @return The X id of the window where the drop should happen. This 
@@ -452,7 +473,7 @@ public:
    * @return The Gdk::Keymap attached to @a display .
    * the Gdk::Keymap attached to @a display .
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   GdkKeymap* get_keymap();
   
@@ -460,7 +481,7 @@ public:
    * @return The Gdk::Keymap attached to @a display .
    * the Gdk::Keymap attached to @a display .
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   const GdkKeymap* get_keymap() const;
 
@@ -477,7 +498,7 @@ public:
    * @return The Gdk::Pixmap wrapper for the native pixmap,
    * or <tt>0</tt> if there is none.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Pixmap> lookup_pixmap(NativeWindow anid);
   
@@ -489,7 +510,7 @@ public:
    * @return The Gdk::Pixmap wrapper for the native pixmap,
    * or <tt>0</tt> if there is none.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Pixmap> lookup_pixmap(NativeWindow anid) const;
 
@@ -504,7 +525,7 @@ public:
    * This is most useful for X11. On windowing systems where requests are
    * handled synchronously, this function will do nothing.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void flush();
   
@@ -513,7 +534,7 @@ public:
    * alpha (i.e. a mask).
    * @return Whether cursors can have alpha channels.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool supports_cursor_alpha() const;
   
@@ -522,20 +543,20 @@ public:
    * and a background color.
    * @return Whether cursors can have multiple colors.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool supports_cursor_color() const;
   
   /** Returns the default size to use for cursors on @a display .
    * @return The default cursor size.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   guint get_default_cursor_size() const;
   
   /** Gets the maximal size to use for cursors on @a display .
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param width The return location for the maximal cursor width.
    * @param height The return location for the maximal cursor height.
    */
@@ -547,7 +568,7 @@ public:
    * See gdk_window_set_group().
    * @return The default group leader window for @a display 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<Window> get_default_group(); 
   
@@ -556,7 +577,7 @@ public:
    * See gdk_window_set_group().
    * @return The default group leader window for @a display 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<const Window> get_default_group() const;              
       
@@ -568,7 +589,7 @@ public:
    * @return Whether Gdk::EventOwnerChange events will 
    * be sent.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool supports_selection_notification() const;
   
@@ -579,7 +600,7 @@ public:
    * @return Whether Gdk::EventOwnerChange events will 
    * be sent.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool request_selection_notification(const Glib::ustring& selection);
 
@@ -590,7 +611,7 @@ public:
    * running.
    * @return <tt>true</tt> if the display supports clipboard persistance.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool supports_clipboard_persistence() const;
 
@@ -600,6 +621,17 @@ public:
   void store_clipboard(const Glib::RefPtr<Gdk::Window>& clipboard_window, guint32 time_, const Glib::StringArrayHandle& targets);
                                                      
   
+  /** The closed signal is emitted when the connection to the windowing
+   * system for this display is closed.
+   *
+   * @param is_error true if the display was closed due to an error
+   */  
+  
+/**
+   * @par Prototype:
+   * <tt>void %closed(bool is_error)</tt>
+   */
+
   Glib::SignalProxy1< void,bool > signal_closed();
 
 
@@ -607,12 +639,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_closed(bool is_error);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/displaymanager.cc b/libs/gtkmm2/gdk/gdkmm/displaymanager.cc
index 5edb22e506..3a2696788f 100644
--- a/libs/gtkmm2/gdk/gdkmm/displaymanager.cc
+++ b/libs/gtkmm2/gdk/gdkmm/displaymanager.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/displaymanager.h>
 #include <gdkmm/private/displaymanager_p.h>
 
@@ -36,7 +37,8 @@ namespace Gdk
 namespace
 {
 
-void DisplayManager_signal_display_opened_callback(GdkDisplayManager* self, GdkDisplay* p0,void* data)
+
+static void DisplayManager_signal_display_opened_callback(GdkDisplayManager* self, GdkDisplay* p0,void* data)
 {
   using namespace Gdk;
   typedef sigc::slot< void,const Glib::RefPtr<Display>& > SlotType;
@@ -44,26 +46,31 @@ void DisplayManager_signal_display_opened_callback(GdkDisplayManager* self, GdkD
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo DisplayManager_signal_display_opened_info =
+static const Glib::SignalProxyInfo DisplayManager_signal_display_opened_info =
 {
   "display-opened",
   (GCallback) &DisplayManager_signal_display_opened_callback,
   (GCallback) &DisplayManager_signal_display_opened_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -110,10 +117,18 @@ void DisplayManager_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->display_opened = &display_opened_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void DisplayManager_Class::display_opened_callback(GdkDisplayManager* self, GdkDisplay* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -126,16 +141,20 @@ void DisplayManager_Class::display_opened_callback(GdkDisplayManager* self, GdkD
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_display_opened(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -148,6 +167,7 @@ void DisplayManager_Class::display_opened_callback(GdkDisplayManager* self, GdkD
       (*base->display_opened)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* DisplayManager_Class::wrap_new(GObject* object)
@@ -201,29 +221,25 @@ Glib::RefPtr<DisplayManager> DisplayManager::get()
   return retvalue;
 }
 
+
 Glib::RefPtr<Display> DisplayManager::get_default_display()
 {
 
   Glib::RefPtr<Display> retvalue = Glib::wrap(gdk_display_manager_get_default_display(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Display> DisplayManager::get_default_display() const
 {
-
-  Glib::RefPtr<const Display> retvalue = Glib::wrap(gdk_display_manager_get_default_display(const_cast<GdkDisplayManager*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<DisplayManager*>(this)->get_default_display();
 }
 
 void DisplayManager::set_default_display(const Glib::RefPtr<Display>& display)
 {
-  gdk_display_manager_set_default_display(gobj(), Glib::unwrap(display));
+gdk_display_manager_set_default_display(gobj(), Glib::unwrap(display)); 
 }
 
 Glib::SListHandle< Glib::RefPtr<Display> > DisplayManager::list_displays()
@@ -238,17 +254,22 @@ Glib::SignalProxy1< void,const Glib::RefPtr<Display>& > DisplayManager::signal_d
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Display> > DisplayManager::property_default_display() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Display> >(this, "default-display");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Display> > DisplayManager::property_default_display() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Display> >(this, "default-display");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gdk::DisplayManager::on_display_opened(const Glib::RefPtr<Display>& display)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -258,6 +279,10 @@ void Gdk::DisplayManager::on_display_opened(const Glib::RefPtr<Display>& display
   if(base && base->display_opened)
     (*base->display_opened)(gobj(),Glib::unwrap(display));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gdk
diff --git a/libs/gtkmm2/gdk/gdkmm/displaymanager.h b/libs/gtkmm2/gdk/gdkmm/displaymanager.h
index fb223270d6..b15608b6f2 100644
--- a/libs/gtkmm2/gdk/gdkmm/displaymanager.h
+++ b/libs/gtkmm2/gdk/gdkmm/displaymanager.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_DISPLAYMANAGER_H
 #define _GDKMM_DISPLAYMANAGER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -99,7 +100,7 @@ public:
    * the global Gdk::DisplayManager singleton; gdk_parse_pargs(),
    * gdk_init(), or gdk_init_check() must have been called first.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   static Glib::RefPtr<DisplayManager> get();
   
@@ -107,7 +108,7 @@ public:
    * @return A Gdk::Display, or <tt>0</tt> if there is no default
    * display.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Display> get_default_display();
   
@@ -115,33 +116,37 @@ public:
    * @return A Gdk::Display, or <tt>0</tt> if there is no default
    * display.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Display> get_default_display() const;
 
   
   /** Sets @a display  as the default display.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param display A Gdk::Display.
    */
   void set_default_display(const Glib::RefPtr<Display>& display);
 
   
   /** List all currently open displays.
+   * 
+   *  @a newin2p2 
    * @return A list of Gdk::Display objects.
-   * Since: 2.2.
    */
   Glib::SListHandle< Glib::RefPtr<Display> > list_displays();
 
-  /** The default display for GDK.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The default display for GDK.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Display> > property_default_display() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The default display for GDK.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -149,8 +154,21 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Display> > property_default_display() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
   
+  /** The display_opened signal is emitted when a display is opened.
+   *
+   * @newin2p2
+   *
+   * @param display the opened display
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %display_opened(const Glib::RefPtr<Display>& display)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<Display>& > signal_display_opened();
 
 
@@ -158,12 +176,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_display_opened(const Glib::RefPtr<Display>& display);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/dragcontext.cc b/libs/gtkmm2/gdk/gdkmm/dragcontext.cc
index 3a2574fb72..1daebcd9de 100644
--- a/libs/gtkmm2/gdk/gdkmm/dragcontext.cc
+++ b/libs/gtkmm2/gdk/gdkmm/dragcontext.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/dragcontext.h>
 #include <gdkmm/private/dragcontext_p.h>
 
@@ -54,7 +55,7 @@ Glib::StringArrayHandle DragContext::get_targets() const
   GList* list = gobj()->targets;
   while(list)
   {
-    GdkAtom atom = (GdkAtom)list->data;
+    GdkAtom atom = GDK_POINTER_TO_ATOM(list->data);
     
     //Convert the atom to a string:
     gchar* const atom_name = gdk_atom_name(atom);
@@ -73,7 +74,6 @@ Glib::StringArrayHandle DragContext::get_targets() const
 
 } /* namespace Gdk */
 
-
 namespace
 {
 } // anonymous namespace
@@ -134,8 +134,19 @@ void DragContext_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* DragContext_Class::wrap_new(GObject* object)
 {
@@ -191,17 +202,17 @@ Glib::RefPtr<DragContext> DragContext::create()
 }
 void DragContext::drag_status(DragAction action, guint32 time)
 {
-  gdk_drag_status(gobj(), ((GdkDragAction)(action)), time);
+gdk_drag_status(gobj(), ((GdkDragAction)(action)), time); 
 }
 
 void DragContext::drop_reply(bool ok, guint32 time)
 {
-  gdk_drop_reply(gobj(), static_cast<int>(ok), time);
+gdk_drop_reply(gobj(), static_cast<int>(ok), time); 
 }
 
 void DragContext::drop_finish(bool success, guint32 time)
 {
-  gdk_drop_finish(gobj(), static_cast<int>(success), time);
+gdk_drop_finish(gobj(), static_cast<int>(success), time); 
 }
 
 Glib::ustring DragContext::get_selection() const
@@ -211,30 +222,35 @@ Glib::ustring DragContext::get_selection() const
 
 void DragContext::drag_finish(bool success, bool del, guint32 time)
 {
-  gtk_drag_finish(gobj(), static_cast<int>(success), static_cast<int>(del), time);
+gtk_drag_finish(gobj(), static_cast<int>(success), static_cast<int>(del), time); 
 }
 
 void DragContext::set_icon(const Glib::RefPtr<Gdk::Colormap>& colormap, const Glib::RefPtr<Gdk::Pixmap>& pixmap, const Glib::RefPtr<Gdk::Bitmap>& mask, int hot_x, int hot_y)
 {
-  gtk_drag_set_icon_pixmap(gobj(), Glib::unwrap(colormap), Glib::unwrap(pixmap), Glib::unwrap(mask), hot_x, hot_y);
+gtk_drag_set_icon_pixmap(gobj(), Glib::unwrap(colormap), Glib::unwrap(pixmap), Glib::unwrap(mask), hot_x, hot_y); 
 }
 
 void DragContext::set_icon(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, int hot_x, int hot_y)
 {
-  gtk_drag_set_icon_pixbuf(gobj(), Glib::unwrap(pixbuf), hot_x, hot_y);
+gtk_drag_set_icon_pixbuf(gobj(), Glib::unwrap(pixbuf), hot_x, hot_y); 
 }
 
 void DragContext::set_icon(const Glib::ustring& stock_id, int hot_x, int hot_y)
 {
-  gtk_drag_set_icon_stock(gobj(), stock_id.c_str(), hot_x, hot_y);
+gtk_drag_set_icon_stock(gobj(), stock_id.c_str(), hot_x, hot_y); 
+}
+
+void DragContext::set_icon_name(const Glib::ustring& name, int hot_x, int hot_y)
+{
+gtk_drag_set_icon_name(gobj(), name.c_str(), hot_x, hot_y); 
 }
 
 void DragContext::set_icon()
 {
-  gtk_drag_set_icon_default(gobj());
+gtk_drag_set_icon_default(gobj()); 
 }
 
-Glib::RefPtr<Window> DragContext::get_source_window()
+ Glib::RefPtr<Window> DragContext::get_source_window()
 {
   Glib::RefPtr<Window> ref_ptr(Glib::wrap((GdkWindowObject*)(gobj()->source_window)));
 
@@ -253,8 +269,8 @@ Glib::RefPtr<const Window> DragContext::get_source_window() const
 
   return ref_ptr;
 }
-
-Glib::RefPtr<Window> DragContext::get_destination_window()
+ 
+ Glib::RefPtr<Window> DragContext::get_destination_window()
 {
   Glib::RefPtr<Window> ref_ptr(Glib::wrap((GdkWindowObject*)(gobj()->dest_window)));
 
@@ -273,36 +289,43 @@ Glib::RefPtr<const Window> DragContext::get_destination_window() const
 
   return ref_ptr;
 }
-
-DragProtocol DragContext::get_protocol() const
+ 
+ DragProtocol DragContext::get_protocol() const
 {
   return ((DragProtocol)(gobj()->protocol));
 }
-
-bool DragContext::get_is_source() const
+ 
+ bool DragContext::get_is_source() const
 {
   return gobj()->is_source;
 }
-
-DragAction DragContext::get_actions() const
+ 
+ DragAction DragContext::get_actions() const
 {
   return ((DragAction)(gobj()->actions));
 }
-
-DragAction DragContext::get_suggested_action() const
+ 
+ DragAction DragContext::get_suggested_action() const
 {
   return ((DragAction)(gobj()->suggested_action));
 }
-
-DragAction DragContext::get_action() const
+ 
+ DragAction DragContext::get_action() const
 {
   return ((DragAction)(gobj()->action));
 }
-
-guint32 DragContext::get_start_time() const
+ 
+ guint32 DragContext::get_start_time() const
 {
   return gobj()->start_time;
 }
+ 
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gdk
diff --git a/libs/gtkmm2/gdk/gdkmm/dragcontext.h b/libs/gtkmm2/gdk/gdkmm/dragcontext.h
index 57507df105..b30d2f3715 100644
--- a/libs/gtkmm2/gdk/gdkmm/dragcontext.h
+++ b/libs/gtkmm2/gdk/gdkmm/dragcontext.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_DRAGCONTEXT_H
 #define _GDKMM_DRAGCONTEXT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -269,20 +270,22 @@ public:
   
   void set_icon(const Glib::ustring& stock_id, int hot_x, int hot_y);
   
+  void set_icon_name(const Glib::ustring& name, int hot_x, int hot_y);
+  
   void set_icon();
 
   /** Get the the source window of this drag.
    * @result the source window of this drag.
    */
-  Glib::RefPtr<Window> get_source_window();
+   Glib::RefPtr<Window> get_source_window();
   Glib::RefPtr<const Window> get_source_window() const;
-
+ 
   /** Get the the source window of this drag.
    * @result the source window of this drag.
    */
-  Glib::RefPtr<Window> get_destination_window();
+   Glib::RefPtr<Window> get_destination_window();
   Glib::RefPtr<const Window> get_destination_window() const;
-    
+     
   /** Get a list of targets offered by the source.
    * @result a list of targets offered by the source.
    */
@@ -291,33 +294,33 @@ public:
   /** Get the DND protocol which governs this drag.
    * @result the DND protocol which governs this drag.
    */
-  DragProtocol get_protocol() const;
-  
+   DragProtocol get_protocol() const;
+   
   /** Discover whether the context is used on the source side.
    * @result true if the context is used on the source side.
    */
-  bool get_is_source() const;
-
+   bool get_is_source() const;
+ 
   /** Get a bitmask of actions proposed by the source when the suggested_action is Gdk::ACTION_ASK
    * @result a bitmask of actions proposed by the source when the suggested_action is Gdk::ACTION_ASK
    */
-  DragAction get_actions() const;
-
+   DragAction get_actions() const;
+ 
   /** Get the action suggested by the source.
    * @result The action suggested by the source.
    */
-  DragAction get_suggested_action() const;
-
+   DragAction get_suggested_action() const;
+ 
   /** Get the action chosen by the destination.
    * @result the action chosen byt the destination.
    */
-  DragAction get_action() const;
-
+   DragAction get_action() const;
+ 
   /** Get a timestamp recording the start time of this drag.
    * @result a timestamp recording the start time of this drag.
    */
-  guint32 get_start_time() const;
-
+   guint32 get_start_time() const;
+ 
   
   /** Finds the destination window and DND protocol to use at the
    * given pointer position. 
@@ -325,7 +328,7 @@ public:
    * This function is called by the drag source to obtain the 
    *  @a dest_window  and @a protocol  parameters for gdk_drag_motion().
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param drag_window A window which may be at the pointer position, but
    * should be ignored, since it is put up by the drag source as an icon.
    * @param screen The screen where the destination window is sought.
@@ -342,11 +345,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/drawable.cc b/libs/gtkmm2/gdk/gdkmm/drawable.cc
index 58adc15cec..2a57382d36 100644
--- a/libs/gtkmm2/gdk/gdkmm/drawable.cc
+++ b/libs/gtkmm2/gdk/gdkmm/drawable.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/drawable.h>
 #include <gdkmm/private/drawable_p.h>
 
@@ -123,8 +124,19 @@ void Drawable_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Drawable_Class::wrap_new(GObject* object)
 {
@@ -180,7 +192,7 @@ Glib::RefPtr<Drawable> Drawable::create()
 }
 void Drawable::get_size(int& width, int& height)
 {
-  gdk_drawable_get_size(gobj(), &width, &height);
+gdk_drawable_get_size(gobj(), &width, &height); 
 }
 
 int Drawable::get_depth() const
@@ -190,92 +202,92 @@ int Drawable::get_depth() const
 
 void Drawable::set_colormap(const Glib::RefPtr<Colormap>& colormap)
 {
-  gdk_drawable_set_colormap(gobj(), Glib::unwrap(colormap));
+gdk_drawable_set_colormap(gobj(), Glib::unwrap(colormap)); 
 }
 
 Glib::RefPtr<Colormap> Drawable::get_colormap()
 {
 
   Glib::RefPtr<Colormap> retvalue = Glib::wrap(gdk_drawable_get_colormap(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<Visual> Drawable::get_visual()
 {
 
   Glib::RefPtr<Visual> retvalue = Glib::wrap(gdk_drawable_get_visual(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 void Drawable::draw_point(const Glib::RefPtr<const GC>& gc, int x, int y)
 {
-  gdk_draw_point(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y);
+gdk_draw_point(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y); 
 }
 
 void Drawable::draw_line(const Glib::RefPtr<const GC>& gc, int x1, int y1, int x2, int y2)
 {
-  gdk_draw_line(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x1, y1, x2, y2);
+gdk_draw_line(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x1, y1, x2, y2); 
 }
 
 void Drawable::draw_rectangle(const Glib::RefPtr<const GC>& gc, bool filled, int x, int y, int width, int height)
 {
-  gdk_draw_rectangle(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), static_cast<int>(filled), x, y, width, height);
+gdk_draw_rectangle(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), static_cast<int>(filled), x, y, width, height); 
 }
 
 void Drawable::draw_arc(const Glib::RefPtr<const GC>& gc, bool filled, int x, int y, int width, int height, int angle1, int angle2)
 {
-  gdk_draw_arc(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), static_cast<int>(filled), x, y, width, height, angle1, angle2);
+gdk_draw_arc(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), static_cast<int>(filled), x, y, width, height, angle1, angle2); 
 }
 
 void Drawable::draw_drawable(const Glib::RefPtr<const GC>& gc, const Glib::RefPtr<const Drawable>& src, int xsrc, int ysrc, int xdest, int ydest, int width, int height)
 {
-  gdk_draw_drawable(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), const_cast<GdkDrawable*>(Glib::unwrap<Drawable>(src)), xsrc, ysrc, xdest, ydest, width, height);
+gdk_draw_drawable(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), const_cast<GdkDrawable*>(Glib::unwrap<Drawable>(src)), xsrc, ysrc, xdest, ydest, width, height); 
 }
 
 void Drawable::draw_image(const Glib::RefPtr<const GC>& gc, const Glib::RefPtr<const Image>& image, int xsrc, int ysrc, int xdest, int ydest, int width, int height)
 {
-  gdk_draw_image(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), const_cast<GdkImage*>(Glib::unwrap<Image>(image)), xsrc, ysrc, xdest, ydest, width, height);
+gdk_draw_image(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), const_cast<GdkImage*>(Glib::unwrap<Image>(image)), xsrc, ysrc, xdest, ydest, width, height); 
 }
 
 void Drawable::draw_segments(const Glib::RefPtr<const GC>& gc, GdkSegment* segs, int nsegs)
 {
-  gdk_draw_segments(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), segs, nsegs);
+gdk_draw_segments(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), segs, nsegs); 
 }
 
 void Drawable::draw_glyphs(const Glib::RefPtr<const GC>& gc, const Glib::RefPtr<const Pango::Font>& font, int x, int y, const Pango::GlyphString& glyphs)
 {
-  gdk_draw_glyphs(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), const_cast<PangoFont*>(Glib::unwrap<Pango::Font>(font)), x, y, const_cast<PangoGlyphString*>(glyphs.gobj()));
+gdk_draw_glyphs(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), const_cast<PangoFont*>(Glib::unwrap<Pango::Font>(font)), x, y, const_cast<PangoGlyphString*>(glyphs.gobj())); 
 }
 
 void Drawable::draw_layout_line(const Glib::RefPtr<const GC>& gc, int x, int y, const Glib::RefPtr<const Pango::LayoutLine>& line)
 {
-  gdk_draw_layout_line(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, const_cast<PangoLayoutLine*>(Glib::unwrap<Pango::LayoutLine>(line)));
+gdk_draw_layout_line(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, const_cast<PangoLayoutLine*>(Glib::unwrap<Pango::LayoutLine>(line))); 
 }
 
 void Drawable::draw_layout_line(const Glib::RefPtr<const GC>& gc, int x, int y, const Glib::RefPtr<const Pango::LayoutLine>& line, const Color& foreground, const Color& background)
 {
-  gdk_draw_layout_line_with_colors(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, const_cast<PangoLayoutLine*>(Glib::unwrap<Pango::LayoutLine>(line)), (foreground).gobj(), (background).gobj());
+gdk_draw_layout_line_with_colors(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, const_cast<PangoLayoutLine*>(Glib::unwrap<Pango::LayoutLine>(line)), (foreground).gobj(), (background).gobj()); 
 }
 
 void Drawable::draw_layout(const Glib::RefPtr<const GC>& gc, int x, int y, const Glib::RefPtr<const Pango::Layout>& layout)
 {
-  gdk_draw_layout(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, const_cast<PangoLayout*>(Glib::unwrap<Pango::Layout>(layout)));
+gdk_draw_layout(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, const_cast<PangoLayout*>(Glib::unwrap<Pango::Layout>(layout))); 
 }
 
 void Drawable::draw_layout(const Glib::RefPtr<const GC>& gc, int x, int y, const Glib::RefPtr<const Pango::Layout>& layout, const Color& foreground, const Color& background)
 {
-  gdk_draw_layout_with_colors(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, const_cast<PangoLayout*>(Glib::unwrap<Pango::Layout>(layout)), (foreground).gobj(), (background).gobj());
+gdk_draw_layout_with_colors(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, const_cast<PangoLayout*>(Glib::unwrap<Pango::Layout>(layout)), (foreground).gobj(), (background).gobj()); 
 }
 
 void Drawable::draw_pixbuf(const Glib::RefPtr<const GC>& gc, const Glib::RefPtr<Pixbuf>& pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, RgbDither dither, int x_dither, int y_dither)
 {
-  gdk_draw_pixbuf(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), Glib::unwrap(pixbuf), src_x, src_y, dest_x, dest_y, width, height, ((GdkRgbDither)(dither)), x_dither, y_dither);
+gdk_draw_pixbuf(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), Glib::unwrap(pixbuf), src_x, src_y, dest_x, dest_y, width, height, ((GdkRgbDither)(dither)), x_dither, y_dither); 
 }
 
 Glib::RefPtr<Image> Drawable::get_image(int x, int y, int width, int height) const
@@ -295,75 +307,77 @@ Region Drawable::get_visible_region() const
 
 void Drawable::draw_rgb_image(const Glib::RefPtr<const GC>& gc, int x, int y, int width, int height, RgbDither dith, const guchar* rgb_buf, int rowstride)
 {
-  gdk_draw_rgb_image(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(rgb_buf), rowstride);
+gdk_draw_rgb_image(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(rgb_buf), rowstride); 
 }
 
 void Drawable::draw_rgb_image_dithalign(const Glib::RefPtr<const GC>& gc, int x, int y, int width, int height, RgbDither dith, const guchar* rgb_buf, int rowstride, int xdith, int ydith)
 {
-  gdk_draw_rgb_image_dithalign(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(rgb_buf), rowstride, xdith, ydith);
+gdk_draw_rgb_image_dithalign(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(rgb_buf), rowstride, xdith, ydith); 
 }
 
 void Drawable::draw_rgb_32_image(const Glib::RefPtr<const GC>& gc, int x, int y, int width, int height, RgbDither dith, const guchar* rgb_buf, int rowstride)
 {
-  gdk_draw_rgb_32_image(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(rgb_buf), rowstride);
+gdk_draw_rgb_32_image(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(rgb_buf), rowstride); 
 }
 
 void Drawable::draw_rgb_32_image_dithalign(const Glib::RefPtr<const GC>& gc, int x, int y, int width, int height, RgbDither dith, const guchar* buf, int rowstride, int xdith, int ydith)
 {
-  gdk_draw_rgb_32_image_dithalign(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(buf), rowstride, xdith, ydith);
+gdk_draw_rgb_32_image_dithalign(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(buf), rowstride, xdith, ydith); 
 }
 
 void Drawable::draw_gray_image(const Glib::RefPtr<const GC>& gc, int x, int y, int width, int height, RgbDither dith, const guchar* rgb_buf, int rowstride)
 {
-  gdk_draw_gray_image(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(rgb_buf), rowstride);
+gdk_draw_gray_image(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(rgb_buf), rowstride); 
 }
 
 void Drawable::draw_indexed_image(const Glib::RefPtr<const GC>& gc, int x, int y, int width, int height, RgbDither dith, const guchar* rgb_buf, int rowstride, const RgbCmap& cmap)
 {
-  gdk_draw_indexed_image(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(rgb_buf), rowstride, const_cast<GdkRgbCmap*>(cmap.gobj()));
+gdk_draw_indexed_image(gobj(), const_cast<GdkGC*>(Glib::unwrap<GC>(gc)), x, y, width, height, ((GdkRgbDither)(dith)), const_cast<guchar*>(rgb_buf), rowstride, const_cast<GdkRgbCmap*>(cmap.gobj())); 
 }
 
 Glib::RefPtr<Screen> Drawable::get_screen()
 {
 
   Glib::RefPtr<Screen> retvalue = Glib::wrap(gdk_drawable_get_screen(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Screen> Drawable::get_screen() const
 {
-
-  Glib::RefPtr<const Screen> retvalue = Glib::wrap(gdk_drawable_get_screen(const_cast<GdkDrawable*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Drawable*>(this)->get_screen();
 }
 
 Glib::RefPtr<Display> Drawable::get_display()
 {
 
   Glib::RefPtr<Display> retvalue = Glib::wrap(gdk_drawable_get_display(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Display> Drawable::get_display() const
 {
+  return const_cast<Drawable*>(this)->get_display();
+}
 
-  Glib::RefPtr<const Display> retvalue = Glib::wrap(gdk_drawable_get_display(const_cast<GdkDrawable*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+Cairo::RefPtr<Cairo::Context> Drawable::create_cairo_context()
+{
+  return Cairo::RefPtr<Cairo::Context>(new Cairo::Context(gdk_cairo_create(gobj()), true /* has_reference */));
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gdk
 
 
diff --git a/libs/gtkmm2/gdk/gdkmm/drawable.h b/libs/gtkmm2/gdk/gdkmm/drawable.h
index 6331e46ff2..ccf3310e57 100644
--- a/libs/gtkmm2/gdk/gdkmm/drawable.h
+++ b/libs/gtkmm2/gdk/gdkmm/drawable.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_DRAWABLE_H
 #define _GDKMM_DRAWABLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -36,6 +37,7 @@
 #include <gdkmm/region.h>
 #include <gdkmm/rgbcmap.h>
 #include <gdkmm/types.h>
+#include <cairomm/context.h>
 //#include <gdkmm/pixbuf.h>
 
 
@@ -95,7 +97,12 @@ class Pixbuf;
  *
  * To use a drawable, create a concrete Drawable of the type you wish to use
  * and a Gdk::GC (graphics context) for that Drawable.  With the GC you can
- * draw lines, text, arcs and such.
+ * draw lines, text, arcs and such. 
+ *
+ * An alternative is to create a Cairo::Context with get_cairo_context()
+ * while you handle the 'exposed' event of the drawable. For more about
+ * this, please see "Using cairo with GTK+" in the "Common questions" section
+ * of the GTK+ Reference Manual.
  */
 
 class Drawable : public Glib::Object
@@ -265,9 +272,9 @@ public:
    * colormap, or errors will result. (On X11, failure to match
    * visual/colormap results in a BadMatch error from the X server.)
    * A common cause of this problem is an attempt to draw a bitmap to
-   * a color drawable. The way to draw a bitmap is to set the
-   * bitmap as a clip mask on your Gdk::GC, then use gdk_draw_rectangle()
-   * to draw a rectangle clipped to the bitmap.
+   * a color drawable. The way to draw a bitmap is to set the bitmap as 
+   * the stipple on the Gdk::GC, set the fill mode to Gdk::STIPPLED, and 
+   * then draw the rectangle.
    * @param gc A Gdk::GC sharing the drawable's visual and colormap.
    * @param src The source Gdk::Drawable, which may be the same as @a drawable .
    * @param xsrc X position in @a src  of rectangle to draw.
@@ -402,7 +409,7 @@ public:
    * The clip mask of @a gc  is ignored, but clip rectangles and clip regions work
    * fine.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param gc A Gdk::GC, used for clipping, or <tt>0</tt>.
    * @param pixbuf A Gdk::Pixbuf.
    * @param src_x Source X coordinate within pixbuf.
@@ -428,8 +435,8 @@ public:
    * server-side drawable as a client-side Gdk::Image.  The format of a
    * Gdk::Image depends on the Gdk::Visual of the current display, which
    * makes manipulating Gdk::Image extremely difficult; therefore, in
-   * most cases you should use Gdk::Pixbuf::get_from_drawable() instead of
-   * this lower-level function. A Gdk::Pixbuf contains image data in a
+   * most cases you should use the Gdk::Pixbuf::create() method that takes a Gdk::Drawable, 
+   * instead of this lower-level function. A Gdk::Pixbuf contains image data in a
    * canonicalized RGB format, rather than a display-dependent format.
    * Of course, there's a convenience vs. speed tradeoff here, so you'll
    * want to think about what makes sense for your application.
@@ -543,14 +550,14 @@ public:
   /** Gets the Gdk::Screen associated with a Gdk::Drawable.
    * @return The Gdk::Screen associated with @a drawable 
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Screen> get_screen();
   
   /** Gets the Gdk::Screen associated with a Gdk::Drawable.
    * @return The Gdk::Screen associated with @a drawable 
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Screen> get_screen() const;
 
@@ -558,27 +565,41 @@ public:
   /** Gets the Gdk::Display associated with a Gdk::Drawable.
    * @return The Gdk::Display associated with @a drawable 
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Display> get_display();
   
   /** Gets the Gdk::Display associated with a Gdk::Drawable.
    * @return The Gdk::Display associated with @a drawable 
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Display> get_display() const;
 
+   
+  /** Creates a Cairo context for drawing to @a drawable .
+   * @return A newly created Cairo context.
+   * 
+   * @newin2p10.
+   */
+  Cairo::RefPtr<Cairo::Context> create_cairo_context();
+
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/event.cc b/libs/gtkmm2/gdk/gdkmm/event.cc
index e9a71e918c..14a1b4f272 100644
--- a/libs/gtkmm2/gdk/gdkmm/event.cc
+++ b/libs/gtkmm2/gdk/gdkmm/event.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/event.h>
 #include <gdkmm/private/event_p.h>
 
@@ -132,19 +133,22 @@ Event Event::get()
   return Event(gdk_event_get());
 }
 
+
 Event Event::peek()
 {
   return Event(gdk_event_peek());
 }
 
+
 Event Event::get_graphics_expose(const Glib::RefPtr<Window>& window)
 {
   return Event(gdk_event_get_graphics_expose(Glib::unwrap(window)));
 }
 
+
 void Event::put()
 {
-  gdk_event_put(gobj());
+gdk_event_put(gobj()); 
 }
 
 bool Event::events_pending()
@@ -152,6 +156,7 @@ bool Event::events_pending()
   return gdk_events_pending();
 }
 
+
 guint32 Event::get_time() const
 {
   return gdk_event_get_time(const_cast<GdkEvent*>(gobj()));
@@ -179,37 +184,34 @@ bool Event::get_axis(AxisUse axis_use, double& value) const
 
 void Event::set_show_events(bool show_events)
 {
-  gdk_set_show_events(static_cast<int>(show_events));
+gdk_set_show_events(static_cast<int>(show_events));
 }
 
+
 bool Event::get_show_events()
 {
   return gdk_get_show_events();
 }
 
+
 void Event::set_screen(const Glib::RefPtr<Screen>& screen)
 {
-  gdk_event_set_screen(gobj(), Glib::unwrap(screen));
+gdk_event_set_screen(gobj(), Glib::unwrap(screen)); 
 }
 
 Glib::RefPtr<Screen> Event::get_screen()
 {
 
   Glib::RefPtr<Screen> retvalue = Glib::wrap(gdk_event_get_screen(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Screen> Event::get_screen() const
 {
-
-  Glib::RefPtr<const Screen> retvalue = Glib::wrap(gdk_event_get_screen(const_cast<GdkEvent*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Event*>(this)->get_screen();
 }
 
 bool Event::send_client_message(NativeWindow winid)
diff --git a/libs/gtkmm2/gdk/gdkmm/event.h b/libs/gtkmm2/gdk/gdkmm/event.h
index 8d1095d46b..eecc131cf4 100644
--- a/libs/gtkmm2/gdk/gdkmm/event.h
+++ b/libs/gtkmm2/gdk/gdkmm/event.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_EVENT_H
 #define _GDKMM_EVENT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -88,7 +89,8 @@ enum EventType
   SCROLL,
   WINDOW_STATE,
   SETTING,
-  OWNER_CHANGE
+  OWNER_CHANGE,
+  GRAB_BROKEN
 };
 
 } // namespace Gdk
@@ -316,7 +318,7 @@ public:
    * have been allocated by GTK+, for instance, by
    * gdk_event_copy().
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param screen A Gdk::Screen.
    */
   void set_screen(const Glib::RefPtr<Screen>& screen);
@@ -324,26 +326,26 @@ public:
   /** Returns the screen for the event. The screen is
    * typically the screen for <tt>event->any.window</tt>, but
    * for events such as mouse events, it is the screen
-   * where the the pointer was when the event occurs -
+   * where the pointer was when the event occurs -
    * that is, the screen which has the root window 
    * to which <tt>event->motion.x_root</tt> and
    * <tt>event->motion.y_root</tt> are relative.
    * @return The screen for the event
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Screen> get_screen();
   
   /** Returns the screen for the event. The screen is
    * typically the screen for <tt>event->any.window</tt>, but
    * for events such as mouse events, it is the screen
-   * where the the pointer was when the event occurs -
+   * where the pointer was when the event occurs -
    * that is, the screen which has the root window 
    * to which <tt>event->motion.x_root</tt> and
    * <tt>event->motion.y_root</tt> are relative.
    * @return The screen for the event
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Screen> get_screen() const;
 
@@ -394,5 +396,6 @@ class Value<Gdk::Event> : public Glib::Value_Boxed<Gdk::Event>
 
 } // namespace Glib
 
+
 #endif /* _GDKMM_EVENT_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/gc.cc b/libs/gtkmm2/gdk/gdkmm/gc.cc
index 456cad5f9e..eeddc82148 100644
--- a/libs/gtkmm2/gdk/gdkmm/gc.cc
+++ b/libs/gtkmm2/gdk/gdkmm/gc.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/gc.h>
 #include <gdkmm/private/gc_p.h>
 
@@ -136,8 +137,19 @@ void GC_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* GC_Class::wrap_new(GObject* object)
 {
@@ -197,128 +209,135 @@ Glib::RefPtr<GC> GC::create(const Glib::RefPtr<Drawable>& drawable)
 }
 void GC::set_foreground(const Color& color)
 {
-  gdk_gc_set_foreground(gobj(), (color).gobj());
+gdk_gc_set_foreground(gobj(), (color).gobj()); 
 }
 
 void GC::set_background(const Color& color)
 {
-  gdk_gc_set_background(gobj(), (color).gobj());
+gdk_gc_set_background(gobj(), (color).gobj()); 
 }
 
 void GC::set_function(Function function)
 {
-  gdk_gc_set_function(gobj(), ((GdkFunction)(function)));
+gdk_gc_set_function(gobj(), ((GdkFunction)(function))); 
 }
 
 void GC::set_fill(Fill fill)
 {
-  gdk_gc_set_fill(gobj(), ((GdkFill)(fill)));
+gdk_gc_set_fill(gobj(), ((GdkFill)(fill))); 
 }
 
 void GC::set_tile(const Glib::RefPtr<Pixmap>& tile)
 {
-  gdk_gc_set_tile(gobj(), Glib::unwrap(tile));
+gdk_gc_set_tile(gobj(), Glib::unwrap(tile)); 
 }
 
 void GC::set_stipple(const Glib::RefPtr<Pixmap>& stipple)
 {
-  gdk_gc_set_stipple(gobj(), Glib::unwrap(stipple));
+gdk_gc_set_stipple(gobj(), Glib::unwrap(stipple)); 
 }
 
 void GC::set_ts_origin(int x, int y)
 {
-  gdk_gc_set_ts_origin(gobj(), x, y);
+gdk_gc_set_ts_origin(gobj(), x, y); 
 }
 
 void GC::set_clip_origin(int x, int y)
 {
-  gdk_gc_set_clip_origin(gobj(), x, y);
+gdk_gc_set_clip_origin(gobj(), x, y); 
 }
 
 void GC::set_clip_mask(const Glib::RefPtr<Bitmap>& mask)
 {
-  gdk_gc_set_clip_mask(gobj(), Glib::unwrap(mask));
+gdk_gc_set_clip_mask(gobj(), Glib::unwrap(mask)); 
 }
 
 void GC::set_clip_rectangle(Rectangle& rectangle)
 {
-  gdk_gc_set_clip_rectangle(gobj(), (rectangle).gobj());
+gdk_gc_set_clip_rectangle(gobj(), (rectangle).gobj()); 
+}
+
+void GC::set_clip_rectangle(const Rectangle& rectangle)
+{
+gdk_gc_set_clip_rectangle(gobj(), const_cast<GdkRectangle*>(rectangle.gobj())); 
 }
 
 void GC::set_clip_region(const Region& region)
 {
-  gdk_gc_set_clip_region(gobj(), const_cast<GdkRegion*>((region).gobj()));
+gdk_gc_set_clip_region(gobj(), const_cast<GdkRegion*>((region).gobj())); 
 }
 
 void GC::set_subwindow(SubwindowMode mode)
 {
-  gdk_gc_set_subwindow(gobj(), ((GdkSubwindowMode)(mode)));
+gdk_gc_set_subwindow(gobj(), ((GdkSubwindowMode)(mode))); 
 }
 
 void GC::set_exposures(bool exposures)
 {
-  gdk_gc_set_exposures(gobj(), static_cast<int>(exposures));
+gdk_gc_set_exposures(gobj(), static_cast<int>(exposures)); 
 }
 
 void GC::set_line_attributes(int line_width, LineStyle line_style, CapStyle cap_style, JoinStyle join_style)
 {
-  gdk_gc_set_line_attributes(gobj(), line_width, ((GdkLineStyle)(line_style)), ((GdkCapStyle)(cap_style)), ((GdkJoinStyle)(join_style)));
+gdk_gc_set_line_attributes(gobj(), line_width, ((GdkLineStyle)(line_style)), ((GdkCapStyle)(cap_style)), ((GdkJoinStyle)(join_style))); 
 }
 
 void GC::set_dashes(int dash_offset, gint8* dash_list, int n)
 {
-  gdk_gc_set_dashes(gobj(), dash_offset, dash_list, n);
+gdk_gc_set_dashes(gobj(), dash_offset, dash_list, n); 
 }
 
 void GC::offset(int x_offset, int y_offset)
 {
-  gdk_gc_offset(gobj(), x_offset, y_offset);
+gdk_gc_offset(gobj(), x_offset, y_offset); 
 }
 
 void GC::set_colormap(const Glib::RefPtr<Colormap>& colormap)
 {
-  gdk_gc_set_colormap(gobj(), Glib::unwrap(colormap));
+gdk_gc_set_colormap(gobj(), Glib::unwrap(colormap)); 
 }
 
 Glib::RefPtr<Colormap> GC::get_colormap()
 {
 
   Glib::RefPtr<Colormap> retvalue = Glib::wrap(gdk_gc_get_colormap(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 void GC::set_rgb_fg_color(const Color& color)
 {
-  gdk_gc_set_rgb_fg_color(gobj(), (color).gobj());
+gdk_gc_set_rgb_fg_color(gobj(), (color).gobj()); 
 }
 
 void GC::set_rgb_bg_color(const Color& color)
 {
-  gdk_gc_set_rgb_bg_color(gobj(), (color).gobj());
+gdk_gc_set_rgb_bg_color(gobj(), (color).gobj()); 
 }
 
 Glib::RefPtr<Screen> GC::get_screen()
 {
 
   Glib::RefPtr<Screen> retvalue = Glib::wrap(gdk_gc_get_screen(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Screen> GC::get_screen() const
 {
+  return const_cast<GC*>(this)->get_screen();
+}
 
-  Glib::RefPtr<const Screen> retvalue = Glib::wrap(gdk_gc_get_screen(const_cast<GdkGC*>(gobj())));
 
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
-}
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gdk
diff --git a/libs/gtkmm2/gdk/gdkmm/gc.h b/libs/gtkmm2/gdk/gdkmm/gc.h
index 854995eee5..5c156d706e 100644
--- a/libs/gtkmm2/gdk/gdkmm/gc.h
+++ b/libs/gtkmm2/gdk/gdkmm/gc.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_GC_H
 #define _GDKMM_GC_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -469,6 +470,9 @@ public:
    * @param mask A bitmap.
    */
   void set_clip_mask(const Glib::RefPtr<Bitmap>& mask);
+
+  /** @deprecated Use set_clip_rectangle(const Rectangle& rectangle) instead.
+   */
   
   /** Sets the clip mask for a graphics context from a
    * rectangle. The clip mask is interpreted relative to the clip
@@ -477,6 +481,14 @@ public:
    */
   void set_clip_rectangle(Rectangle& rectangle);
   
+  /** Sets the clip mask for a graphics context from a
+   * rectangle. The clip mask is interpreted relative to the clip
+   * origin. (See set_clip_origin()).
+   * @param rectangle The rectangle to clip to.
+   */
+  void set_clip_rectangle(const Rectangle& rectangle);
+
+  
   /** Sets the clip mask for a graphics context from a region structure.
    * The clip mask is interpreted relative to the clip origin. (See
    * set_clip_origin()).
@@ -574,14 +586,14 @@ public:
   /** Gets the Gdk::Screen for which @a gc  was created
    * @return The Gdk::Screen for @a gc .
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Screen> get_screen();
   
   /** Gets the Gdk::Screen for which @a gc  was created
    * @return The Gdk::Screen for @a gc .
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Screen> get_screen() const;
 
@@ -590,11 +602,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/general.cc b/libs/gtkmm2/gdk/gdkmm/general.cc
index f07cce2b14..48729f95a8 100644
--- a/libs/gtkmm2/gdk/gdkmm/general.cc
+++ b/libs/gtkmm2/gdk/gdkmm/general.cc
@@ -50,5 +50,35 @@ void flush()
   gdk_flush();
 }
 
+namespace Cairo
+{
+
+void set_source_color(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Color& color)
+{
+  gdk_cairo_set_source_color(context->cobj(), const_cast<GdkColor*>(color.gobj()));
+}
+
+void set_source_pixbuf(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, double pixbuf_x, double pixbuf_y)
+{
+  gdk_cairo_set_source_pixbuf(context->cobj(), pixbuf->gobj(), pixbuf_x, pixbuf_y);
+}
+
+void set_source_pixmap(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixmap>& pixmap, double pixmap_x, double pixmap_y)
+{
+  gdk_cairo_set_source_pixmap(context->cobj(), pixmap->gobj(), pixmap_x, pixmap_y);
+}
+
+void rectangle(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Rectangle& rectangle)
+{
+  gdk_cairo_rectangle(context->cobj(), const_cast<GdkRectangle*>(rectangle.gobj()));
+}
+
+void region(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Region& region)
+{
+  gdk_cairo_region(context->cobj(), const_cast<GdkRegion*>(region.gobj()));
+}
+
+} //namespace Cairo
+
 } //namespace Gdk
 
diff --git a/libs/gtkmm2/gdk/gdkmm/general.h b/libs/gtkmm2/gdk/gdkmm/general.h
index 1d37ab0e3b..b5b6164a8d 100644
--- a/libs/gtkmm2/gdk/gdkmm/general.h
+++ b/libs/gtkmm2/gdk/gdkmm/general.h
@@ -20,6 +20,9 @@
 #ifndef _GDKMM_GENERAL_H
 #define _GDKMM_GENERAL_H
 
+#include <gdkmm/pixbuf.h>
+#include <cairomm/context.h>
+
 namespace Gdk
 {
 
@@ -31,6 +34,59 @@ int screen_height_mm();
 
 void flush();
 
+namespace Cairo
+{
+
+/** Sets the specified Gdk::Color as the source color of the Cairo context.
+ * @param @context The cairo context.
+ * @param color The color to use as the source color. 
+ *
+ * @newin2p10
+ */
+void set_source_color(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Color& color);
+
+/** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixbuf_x, pixbuf_y.
+ * @param @context The cairo context.
+ * @param pixbuf A Gdk::Pixbuf
+ * @param pixbuf_x X coordinate of location to place upper left corner of pixbuf.
+ * @param pixbuf_y Y coordinate of location to place upper left corner of pixbuf.
+ *
+ * @newin2p10
+ */
+void set_source_pixbuf(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, double pixbuf_x, double pixbuf_y);
+
+/** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixmap_x, pixmap_y.
+ * @param @context The cairo context.
+ * @param pixmap A Gdk::Pixmap
+ * @param pixmap_x X coordinate of location to place upper left corner of pixmap.
+ * @param pixmap_y Y coordinate of location to place upper left corner of pixmap.
+ *
+ * @newin2p10
+ */
+void set_source_pixmap(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr<Gdk::Pixmap>& pixmap, double pixmap_x, double pixmap_y);
+
+//TODO: Rename to add_rectangle_to_context_path and add_region_to_context_path(), and deprecate rectangle() and region()?
+
+/** Adds the given rectangle to the current path of the context.
+ *
+ * @param context A cairo context.
+ * @param rectangle A rectangle to add to the path of the context. 
+ *
+ * @newin2p10
+ */
+void rectangle(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Rectangle& rectangle);
+
+/** Adds the given region to the current path of the context.
+ *
+ * @param context A cairo context.
+ * @param region A region to add to the path of the context. 
+ *
+ * @newin2p10
+ */
+void region(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Region& region);
+
+} //namespace Cairo
+
 } //namespace Gdk
 
 #endif //_GDKMM_GENERAL_H
diff --git a/libs/gtkmm2/gdk/gdkmm/image.cc b/libs/gtkmm2/gdk/gdkmm/image.cc
index 787124f36f..0899ae0723 100644
--- a/libs/gtkmm2/gdk/gdkmm/image.cc
+++ b/libs/gtkmm2/gdk/gdkmm/image.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/image.h>
 #include <gdkmm/private/image_p.h>
 
@@ -91,8 +92,19 @@ void Image_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Image_Class::wrap_new(GObject* object)
 {
@@ -141,7 +153,7 @@ Glib::RefPtr<Image> Image::create(ImageType type, const Glib::RefPtr<Visual>& vi
 }
 void Image::put_pixel(int x, int y, guint32 pixel)
 {
-  gdk_image_put_pixel(gobj(), x, y, pixel);
+gdk_image_put_pixel(gobj(), x, y, pixel); 
 }
 
 guint32 Image::get_pixel(int x, int y) const
@@ -151,35 +163,30 @@ guint32 Image::get_pixel(int x, int y) const
 
 void Image::set_colormap(const Glib::RefPtr<Colormap>& colormap)
 {
-  gdk_image_set_colormap(gobj(), Glib::unwrap(colormap));
+gdk_image_set_colormap(gobj(), Glib::unwrap(colormap)); 
 }
 
 Glib::RefPtr<Colormap> Image::get_colormap()
 {
 
   Glib::RefPtr<Colormap> retvalue = Glib::wrap(gdk_image_get_colormap(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Colormap> Image::get_colormap() const
 {
-
-  Glib::RefPtr<const Colormap> retvalue = Glib::wrap(gdk_image_get_colormap(const_cast<GdkImage*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Image*>(this)->get_colormap();
 }
 
-ImageType Image::get_image_type() const
+ ImageType Image::get_image_type() const
 {
   return ((ImageType)(gobj()->type));
 }
-
-Glib::RefPtr<Visual> Image::get_visual()
+ 
+ Glib::RefPtr<Visual> Image::get_visual()
 {
   Glib::RefPtr<Visual> ref_ptr(Glib::wrap(gobj()->visual));
 
@@ -198,38 +205,38 @@ Glib::RefPtr<const Visual> Image::get_visual() const
 
   return ref_ptr;
 }
-
-ByteOrder Image::get_byte_order() const
+ 
+ ByteOrder Image::get_byte_order() const
 {
   return ((ByteOrder)(gobj()->byte_order));
 }
-
-int Image::get_width() const
+ 
+ int Image::get_width() const
 {
   return gobj()->width;
 }
-
-int Image::get_height() const
+ 
+ int Image::get_height() const
 {
   return gobj()->height;
 }
-
-guint16 Image::get_bpp() const
+ 
+ guint16 Image::get_bpp() const
 {
   return gobj()->bpp;
 }
-
-guint16 Image::get_bpl() const
+ 
+ guint16 Image::get_bpl() const
 {
   return gobj()->bpl;
 }
-
-guint16 Image::get_bits_per_pixel() const
+ 
+ guint16 Image::get_bits_per_pixel() const
 {
   return gobj()->bits_per_pixel;
 }
-
-void* Image::get_mem()
+ 
+ void* Image::get_mem()
 {
   return gobj()->mem;
 }
@@ -238,11 +245,18 @@ const void* Image::get_mem() const
 {
   return (const void*)(gobj()->mem);
 }
-
-void* Image::get_windowing_data() const
+ 
+ void* Image::get_windowing_data() const
 {
   return gobj()->windowing_data;
 }
+ 
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gdk
diff --git a/libs/gtkmm2/gdk/gdkmm/image.h b/libs/gtkmm2/gdk/gdkmm/image.h
index 7d5f8f6078..5b9fa7f33b 100644
--- a/libs/gtkmm2/gdk/gdkmm/image.h
+++ b/libs/gtkmm2/gdk/gdkmm/image.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_IMAGE_H
 #define _GDKMM_IMAGE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -150,12 +151,12 @@ public:
   static Glib::RefPtr<Image> create(ImageType type, const Glib::RefPtr<Visual>& visual, int width, int height);
 
 
-  //We ignore gdk_image_new_bitmap() because the documentation says that it is incredibly broken.
+  //We ignore gdk_image_new_bitmap() because the documentation says that it is deprecated.
   
 
   void put_pixel(int x, int y, guint32 pixel);
   
-  guint32 get_pixel(int	x, int	y) const;
+  guint32 get_pixel(int x, int y) const;
   
   /** Sets the colormap for the image to the given colormap.  Normally
    * there's no need to use this function, images are created with the
@@ -182,33 +183,39 @@ public:
    */
   Glib::RefPtr<const Colormap> get_colormap() const;
   
-  ImageType get_image_type() const;
-  Glib::RefPtr<Visual> get_visual();
+   ImageType get_image_type() const;
+    Glib::RefPtr<Visual> get_visual();
   Glib::RefPtr<const Visual> get_visual() const;
-  ByteOrder get_byte_order() const;
-  int get_width() const;
-  int get_height() const;
-  guint16 get_bpp() const;
-  guint16 get_bpl() const;
-  guint16 get_bits_per_pixel() const;
-
+    ByteOrder get_byte_order() const;
+    int get_width() const;
+    int get_height() const;
+    guint16 get_bpp() const;
+    guint16 get_bpl() const;
+    guint16 get_bits_per_pixel() const;
+ 
   //This memory block is not read-only, apparently:
-  void* get_mem();
+   void* get_mem();
   const void* get_mem() const;
-
+ 
   //TODO: This should be const really.
-  void* get_windowing_data() const;
-
+   void* get_windowing_data() const;
+ 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/pixbuf.cc b/libs/gtkmm2/gdk/gdkmm/pixbuf.cc
index 8a486d3cc9..4a97b5dac9 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixbuf.cc
+++ b/libs/gtkmm2/gdk/gdkmm/pixbuf.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/pixbuf.h>
 #include <gdkmm/private/pixbuf_p.h>
 
@@ -32,19 +33,23 @@
 namespace
 {
 
-void pixbuf_destroy_data_callback(guint8* pixels, void* user_data)
+static void pixbuf_destroy_data_callback(guint8* pixels, void* user_data)
 {
   Gdk::Pixbuf::SlotDestroyData *const slot = static_cast<Gdk::Pixbuf::SlotDestroyData*>(user_data);
   g_return_if_fail(slot != 0);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     (*slot)(pixels); // invoke callback
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   delete slot;
 }
@@ -75,28 +80,6 @@ Pixbuf::Pixbuf(const Glib::RefPtr<Drawable>& src,
       0, src->gobj(), cmap->gobj(), src_x, src_y, dest_x, dest_y, width, height))
 {}
 
-Glib::RefPtr<Pixbuf> Pixbuf::create_from_file(const std::string& filename)
-{
-  GError* error = 0;
-  GdkPixbuf *const pixbuf = gdk_pixbuf_new_from_file(filename.c_str(), &error);
-
-  if(error)
-    Glib::Error::throw_exception(error);
-
-  return Glib::wrap(pixbuf);
-}
-
-Glib::RefPtr<Pixbuf> Pixbuf::create_from_file(const std::string& filename, int width, int size, bool preserve_aspect_ratio)
-{
-  GError* error = 0;
-  GdkPixbuf *const pixbuf = gdk_pixbuf_new_from_file_at_scale(filename.c_str(), width, size, preserve_aspect_ratio, &error);
-  //gdk_pixbuf_new_from_file_at_size() just calls gdk_pixbuf_new_from_file_at_scale().
-
-  if(error)
-    Glib::Error::throw_exception(error);
-
-  return Glib::wrap(pixbuf);
-}
 
 Glib::RefPtr<Pixbuf> Pixbuf::create_from_data(const guint8* data, Colorspace colorspace,
                                               bool has_alpha, int bits_per_sample,
@@ -121,17 +104,6 @@ Glib::RefPtr<Pixbuf> Pixbuf::create_from_data(const guint8* data, Colorspace col
   return Glib::wrap(pixbuf);
 }
 
-Glib::RefPtr<Pixbuf> Pixbuf::create_from_inline(int data_length, const guint8* data, bool copy_pixels)
-{
-  GError* error = 0;
-  GdkPixbuf *const pixbuf = gdk_pixbuf_new_from_inline(data_length, data, copy_pixels, &error);
-
-  if(error)
-    Glib::Error::throw_exception(error);
-
-  return Glib::wrap(pixbuf);
-}
-
 void Pixbuf::render_pixmap_and_mask_for_colormap(const Glib::RefPtr<Colormap>& colormap,
                                                  Glib::RefPtr<Pixmap>& pixmap_return,
                                                  Glib::RefPtr<Bitmap>& mask_return,
@@ -160,45 +132,104 @@ void Pixbuf::render_pixmap_and_mask(Glib::RefPtr<Pixmap>& pixmap_return,
   mask_return   = Glib::RefPtr<Gdk::Bitmap>::cast_dynamic(Glib::wrap((GdkPixmapObject*) pBitmap));
 }
 
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void Pixbuf::save(const std::string& filename, const Glib::ustring& type)
+#else
+void Pixbuf::save(const std::string& filename, const Glib::ustring& type, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
 {
-  GError* error = 0;
-  gdk_pixbuf_savev(gobj(), filename.c_str(), type.c_str(), 0, 0, &error);
+  GError* gerror = 0;
+  gdk_pixbuf_savev(gobj(), filename.c_str(), type.c_str(), 0, 0, &gerror);
 
-  if(error)
-    Glib::Error::throw_exception(error);
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void Pixbuf::save(const std::string& filename, const Glib::ustring& type,
                   const Glib::StringArrayHandle& option_keys,
                   const Glib::StringArrayHandle& option_values)
+#else
+void Pixbuf::save(const std::string& filename, const Glib::ustring& type,
+                  const Glib::StringArrayHandle& option_keys,
+                  const Glib::StringArrayHandle& option_values, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
 {
-  GError* error = 0;
+  GError* gerror = 0;
 
   gdk_pixbuf_savev(
       gobj(), filename.c_str(), type.c_str(),
       const_cast<char**>(option_keys.data()), const_cast<char**>(option_values.data()),
-      &error);
+      &gerror);
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+}
+
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+void Pixbuf::save_to_buffer(gchar*& buffer, gsize& buffer_size,
+                            const Glib::ustring& type)
+#else
+void Pixbuf::save_to_buffer(gchar*& buffer, gsize& buffer_size,
+                            const Glib::ustring& type, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+
+  gdk_pixbuf_save_to_buffer(
+      gobj(), &buffer, &buffer_size,
+      type.c_str(),
+      &gerror, NULL);
 
-  if(error)
-    Glib::Error::throw_exception(error);
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void Pixbuf::save_to_buffer(gchar*& buffer, gsize& buffer_size,
                             const Glib::ustring& type,
                             const Glib::StringArrayHandle& option_keys,
                             const Glib::StringArrayHandle& option_values)
+#else
+void Pixbuf::save_to_buffer(gchar*& buffer, gsize& buffer_size,
+                            const Glib::ustring& type,
+                            const Glib::StringArrayHandle& option_keys,
+                            const Glib::StringArrayHandle& option_values, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
 {
-  GError* error = 0;
+  GError* gerror = 0;
 
   gdk_pixbuf_save_to_bufferv(
       gobj(), &buffer, &buffer_size,
       type.c_str(),
       const_cast<char**>(option_keys.data()), const_cast<char**>(option_values.data()),
-      &error);
+      &gerror);
 
-  if(error)
-    Glib::Error::throw_exception(error);
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
 Pixbuf::SListHandle_PixbufFormat Pixbuf::get_formats()
@@ -255,10 +286,18 @@ Gdk::PixbufError::Code Gdk::PixbufError::code() const
   return static_cast<Code>(Glib::Error::code());
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void Gdk::PixbufError::throw_func(GError* gobject)
 {
   throw Gdk::PixbufError(gobject);
 }
+#else
+//When not using exceptions, we just pass the Exception object around without throwing it:
+std::auto_ptr<Glib::Error> Gdk::PixbufError::throw_func(GError* gobject)
+{
+  return std::auto_ptr<Glib::Error>(new Gdk::PixbufError(gobject));
+}
+#endif //GLIBMM_EXCEPTIONS_ENABLED
 
 // static
 GType Glib::Value<Gdk::PixbufError::Code>::value_type()
@@ -310,8 +349,19 @@ void Pixbuf_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Pixbuf_Class::wrap_new(GObject* object)
 {
@@ -372,16 +422,82 @@ Glib::RefPtr<Pixbuf> Pixbuf::create(Colorspace colorspace, bool has_alpha, int b
   return Glib::wrap(gdk_pixbuf_new(((GdkColorspace)(colorspace)), static_cast<int>(has_alpha), bits_per_sample, width, height));
 }
 
+
 Glib::RefPtr<Pixbuf> Pixbuf::create_subpixbuf(const Glib::RefPtr<Pixbuf>& src_pixbuf, int src_x, int src_y, int width, int height)
 {
   return Glib::wrap(gdk_pixbuf_new_subpixbuf(Glib::unwrap(src_pixbuf), src_x, src_y, width, height));
 }
 
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+Glib::RefPtr<Pixbuf> Pixbuf::create_from_file(const std::string& filename)
+#else
+Glib::RefPtr<Pixbuf> Pixbuf::create_from_file(const std::string& filename, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  Glib::RefPtr<Pixbuf> retvalue = Glib::wrap(gdk_pixbuf_new_from_file(filename.c_str(), &(gerror)));
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
+  return retvalue;
+}
+
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+Glib::RefPtr<Pixbuf> Pixbuf::create_from_file(const std::string& filename, int width, int height, bool preserve_aspect_ratio)
+#else
+Glib::RefPtr<Pixbuf> Pixbuf::create_from_file(const std::string& filename, int width, int height, bool preserve_aspect_ratio, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  Glib::RefPtr<Pixbuf> retvalue = Glib::wrap(gdk_pixbuf_new_from_file_at_scale(filename.c_str(), width, height, static_cast<int>(preserve_aspect_ratio), &(gerror)));
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
+  return retvalue;
+}
+
+
 Glib::RefPtr<Pixbuf> Pixbuf::create_from_xpm_data(const char *const * data)
 {
   return Glib::wrap(gdk_pixbuf_new_from_xpm_data(const_cast<const char**>(data)));
 }
 
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+Glib::RefPtr<Pixbuf> Pixbuf::create_from_inline(int data_length, const guint8* data, bool copy_pixels)
+#else
+Glib::RefPtr<Pixbuf> Pixbuf::create_from_inline(int data_length, const guint8* data, bool copy_pixels, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  Glib::RefPtr<Pixbuf> retvalue = Glib::wrap(gdk_pixbuf_new_from_inline(data_length, data, static_cast<int>(copy_pixels), &(gerror)));
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
+  return retvalue;
+}
+
+
 Colorspace Pixbuf::get_colorspace() const
 {
   return ((Colorspace)(gdk_pixbuf_get_colorspace(const_cast<GdkPixbuf*>(gobj()))));
@@ -424,7 +540,7 @@ int Pixbuf::get_rowstride() const
 
 void Pixbuf::fill(guint32 pixel)
 {
-  gdk_pixbuf_fill(gobj(), pixel);
+gdk_pixbuf_fill(gobj(), pixel); 
 }
 
 Glib::RefPtr<Gdk::Pixbuf> Pixbuf::add_alpha(bool substitute_color, guint8 r, guint8 g, guint8 b) const
@@ -434,27 +550,27 @@ Glib::RefPtr<Gdk::Pixbuf> Pixbuf::add_alpha(bool substitute_color, guint8 r, gui
 
 void Pixbuf::copy_area(int src_x, int src_y, int width, int height, const Glib::RefPtr<Gdk::Pixbuf>& dest_pixbuf, int dest_x, int dest_y) const
 {
-  gdk_pixbuf_copy_area(const_cast<GdkPixbuf*>(gobj()), src_x, src_y, width, height, Glib::unwrap(dest_pixbuf), dest_x, dest_y);
+gdk_pixbuf_copy_area(const_cast<GdkPixbuf*>(gobj()), src_x, src_y, width, height, Glib::unwrap(dest_pixbuf), dest_x, dest_y); 
 }
 
 void Pixbuf::saturate_and_pixelate(const Glib::RefPtr<Gdk::Pixbuf>& dest, float saturation, bool pixelate) const
 {
-  gdk_pixbuf_saturate_and_pixelate(const_cast<GdkPixbuf*>(gobj()), Glib::unwrap(dest), saturation, static_cast<int>(pixelate));
+gdk_pixbuf_saturate_and_pixelate(const_cast<GdkPixbuf*>(gobj()), Glib::unwrap(dest), saturation, static_cast<int>(pixelate)); 
 }
 
 void Pixbuf::scale(const Glib::RefPtr<Gdk::Pixbuf>& dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, InterpType interp_type) const
 {
-  gdk_pixbuf_scale(const_cast<GdkPixbuf*>(gobj()), Glib::unwrap(dest), dest_x, dest_y, dest_width, dest_height, offset_x, offset_y, scale_x, scale_y, ((GdkInterpType)(interp_type)));
+gdk_pixbuf_scale(const_cast<GdkPixbuf*>(gobj()), Glib::unwrap(dest), dest_x, dest_y, dest_width, dest_height, offset_x, offset_y, scale_x, scale_y, ((GdkInterpType)(interp_type))); 
 }
 
 void Pixbuf::composite(const Glib::RefPtr<Gdk::Pixbuf>& dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, InterpType interp_type, int overall_alpha) const
 {
-  gdk_pixbuf_composite(const_cast<GdkPixbuf*>(gobj()), Glib::unwrap(dest), dest_x, dest_y, dest_width, dest_height, offset_x, offset_y, scale_x, scale_y, ((GdkInterpType)(interp_type)), overall_alpha);
+gdk_pixbuf_composite(const_cast<GdkPixbuf*>(gobj()), Glib::unwrap(dest), dest_x, dest_y, dest_width, dest_height, offset_x, offset_y, scale_x, scale_y, ((GdkInterpType)(interp_type)), overall_alpha); 
 }
 
 void Pixbuf::composite_color(const Glib::RefPtr<Gdk::Pixbuf>& dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, InterpType interp_type, int overall_alpha, int check_x, int check_y, int check_size, guint32 color1, guint32 color2) const
 {
-  gdk_pixbuf_composite_color(const_cast<GdkPixbuf*>(gobj()), Glib::unwrap(dest), dest_x, dest_y, dest_width, dest_height, offset_x, offset_y, scale_x, scale_y, ((GdkInterpType)(interp_type)), overall_alpha, check_x, check_y, check_size, color1, color2);
+gdk_pixbuf_composite_color(const_cast<GdkPixbuf*>(gobj()), Glib::unwrap(dest), dest_x, dest_y, dest_width, dest_height, offset_x, offset_y, scale_x, scale_y, ((GdkInterpType)(interp_type)), overall_alpha, check_x, check_y, check_size, color1, color2); 
 }
 
 Glib::RefPtr<Gdk::Pixbuf> Pixbuf::scale_simple(int dest_width, int dest_height, InterpType interp_type) const
@@ -479,17 +595,17 @@ Glib::RefPtr<Gdk::Pixbuf> Pixbuf::flip(bool horizontal) const
 
 void Pixbuf::render_threshold_alpha(const Glib::RefPtr<Gdk::Bitmap>& bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold)
 {
-  gdk_pixbuf_render_threshold_alpha(gobj(), Glib::unwrap(bitmap), src_x, src_y, dest_x, dest_y, width, height, alpha_threshold);
+gdk_pixbuf_render_threshold_alpha(gobj(), Glib::unwrap(bitmap), src_x, src_y, dest_x, dest_y, width, height, alpha_threshold); 
 }
 
 void Pixbuf::render_to_drawable(const Glib::RefPtr<Drawable>& drawable, const Glib::RefPtr<Gdk::GC>& gc, int src_x, int src_y, int dest_x, int dest_y, int width, int height, RgbDither dither, int x_dither, int y_dither)
 {
-  gdk_pixbuf_render_to_drawable(gobj(), Glib::unwrap(drawable), Glib::unwrap(gc), src_x, src_y, dest_x, dest_y, width, height, ((GdkRgbDither)(dither)), x_dither, y_dither);
+gdk_pixbuf_render_to_drawable(gobj(), Glib::unwrap(drawable), Glib::unwrap(gc), src_x, src_y, dest_x, dest_y, width, height, ((GdkRgbDither)(dither)), x_dither, y_dither); 
 }
 
 void Pixbuf::render_to_drawable_alpha(const Glib::RefPtr<Drawable>& drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height, PixbufAlphaMode alpha_mode, int alpha_threshold, RgbDither dither, int x_dither, int y_dither)
 {
-  gdk_pixbuf_render_to_drawable_alpha(gobj(), Glib::unwrap(drawable), src_x, src_y, dest_x, dest_y, width, height, ((GdkPixbufAlphaMode)(alpha_mode)), alpha_threshold, ((GdkRgbDither)(dither)), x_dither, y_dither);
+gdk_pixbuf_render_to_drawable_alpha(gobj(), Glib::unwrap(drawable), src_x, src_y, dest_x, dest_y, width, height, ((GdkPixbufAlphaMode)(alpha_mode)), alpha_threshold, ((GdkRgbDither)(dither)), x_dither, y_dither); 
 }
 
 Glib::ustring Pixbuf::get_option(const Glib::ustring& key) const
@@ -498,6 +614,13 @@ Glib::ustring Pixbuf::get_option(const Glib::ustring& key) const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gdk
 
 
diff --git a/libs/gtkmm2/gdk/gdkmm/pixbuf.h b/libs/gtkmm2/gdk/gdkmm/pixbuf.h
index 712020a8b1..fb4a066ef6 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixbuf.h
+++ b/libs/gtkmm2/gdk/gdkmm/pixbuf.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_PIXBUF_H
 #define _GDKMM_PIXBUF_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -191,7 +192,14 @@ public:
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 private:
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   static void throw_func(GError* gobject);
+#else
+  //When not using exceptions, we just pass the Exception object around without throwing it:
+  static std::auto_ptr<Glib::Error> throw_func(GError* gobject);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   friend void wrap_init(); // uses throw_func()
 #endif
 };
@@ -279,7 +287,7 @@ private:
   
 protected:
 
-  //TODO: Documente these, based on the docs for the C functions.
+  //TODO: Document these, based on the docs for the C functions.
   Pixbuf(const Glib::RefPtr<Drawable>& src, const Glib::RefPtr<Colormap>& cmap,
          int src_x, int src_y, int dest_x, int dest_y, int width, int height);
   Pixbuf(const Glib::RefPtr<Image>& src, const Glib::RefPtr<Colormap>& cmap,
@@ -342,7 +350,23 @@ public:
    * @throw Glib::FileError
    * @throw Gdk::PixbufError
    */
+  
+  /** Creates a new pixbuf by loading an image from a file.  The file format is
+   * detected automatically. If <tt>0</tt> is returned, then @a error  will be set.
+   * Possible errors are in the Gdk::PIXBUF_ERROR and G::FILE_ERROR domains.
+   * @param filename Name of file to load, in the GLib file name encoding.
+   * @param error Return location for an error.
+   * @return A newly-created pixbuf with a reference count of 1, or <tt>0</tt> if
+   * any of several error conditions occurred:  the file could not be opened,
+   * there was no loader for the file's format, there was not enough memory to
+   * allocate the image buffer, or the image file contained invalid data.
+   */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   static Glib::RefPtr<Pixbuf> create_from_file(const std::string& filename);
+#else
+  static Glib::RefPtr<Pixbuf> create_from_file(const std::string& filename, std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   
   /** Creates a new pixbuf by loading an image from a file. The file format is detected automatically.
    * The image will be scaled to fit in the requested size.
@@ -354,8 +378,38 @@ public:
    * @throw Glib::FileError
    * @throw Gdk::PixbufError
    */
-  static Glib::RefPtr<Pixbuf> create_from_file(const std::string& filename, int width, int height, bool preserve_aspect_ratio = true);
   
+  /** Creates a new pixbuf by loading an image from a file.  The file format is
+   * detected automatically. If <tt>0</tt> is returned, then @a error  will be set.
+   * Possible errors are in the Gdk::PIXBUF_ERROR and G::FILE_ERROR domains.
+   * The image will be scaled to fit in the requested size, optionally preserving
+   * the image's aspect ratio. 
+   * 
+   * When preserving the aspect ratio, a @a width  of -1 will cause the image
+   * to be scaled to the exact given height, and a @a height  of -1 will cause
+   * the image to be scaled to the exact given width. When not preserving
+   * aspect ratio, a @a width  or @a height  of -1 means to not scale the image 
+   * at all in that dimension. Negative values for @a width  and @a height  are 
+   * allowed since 2.8.
+   * @param filename Name of file to load, in the GLib file name encoding.
+   * @param width The width the image should have or -1 to not constrain the width.
+   * @param height The height the image should have or -1 to not constrain the height.
+   * @param preserve_aspect_ratio <tt>true</tt> to preserve the image's aspect ratio.
+   * @param error Return location for an error.
+   * @return A newly-created pixbuf with a reference count of 1, or <tt>0</tt> 
+   * if any of several error conditions occurred:  the file could not be opened,
+   * there was no loader for the file's format, there was not enough memory to
+   * allocate the image buffer, or the image file contained invalid data.
+   * 
+   * @newin2p6.
+   */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  static Glib::RefPtr<Pixbuf> create_from_file(const std::string& filename, int width, int height, bool preserve_aspect_ratio = true);
+#else
+  static Glib::RefPtr<Pixbuf> create_from_file(const std::string& filename, int width, int height, bool preserve_aspect_ratio, std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
+   //gdk_pixbuf_new_from_file_at_size() just calls gdk_pixbuf_new_from_file_at_scale().
 
   /** Creates a new Gdk::Pixbuf out of in-memory image data.
    * Currently only RGB images with 8 bits per sample are supported.
@@ -428,10 +482,55 @@ public:
    * to @a data for the resulting pixbuf.
    * @throw Gdk::PixbufError
    */
+  
+  /** Create a Gdk::Pixbuf from a flat representation that is suitable for
+   * storing as inline data in a program. This is useful if you want to
+   * ship a program with images, but don't want to depend on any
+   * external files.
+   * 
+   * GTK+ ships with a program called &lt;command&gt;gdk-pixbuf-csource&lt;/command&gt; 
+   * which allows for conversion of Gdk::Pixbufs into such a inline representation.
+   * In almost all cases, you should pass the &lt;option&gt;--raw&lt;/option&gt; flag to
+   * &lt;command&gt;gdk-pixbuf-csource&lt;/command&gt;. A sample invocation would be:
+   * 
+   * @code
+   * gdk-pixbuf-csource --raw --name=myimage_inline myimage.png
+   * @endcode
+   * 
+   * For the typical case where the inline pixbuf is read-only static data,
+   * you don't need to copy the pixel data unless you intend to write to
+   * it, so you can pass <tt>false</tt> for @a copy_pixels .  (If you pass 
+   * &lt;option&gt;--rle&lt;/option&gt; to &lt;command&gt;gdk-pixbuf-csource&lt;/command&gt;, a copy 
+   * will be made even if @a copy_pixels  is <tt>false</tt>, so using this option is 
+   * generally a bad idea.)
+   * 
+   * If you create a pixbuf from const inline data compiled into your
+   * program, it's probably safe to ignore errors and disable length checks, 
+   * since things will always succeed:
+   * @code
+   * pixbuf = gdk_pixbuf_new_from_inline (-1, myimage_inline, <tt>false</tt>, <tt>0</tt>);
+   * @endcode
+   * 
+   * For non-const inline data, you could get out of memory. For untrusted 
+   * inline data located at runtime, you could have corrupt inline data in 
+   * addition.
+   * @param data_length Length in bytes of the @a data  argument or -1 to 
+   * disable length checks.
+   * @param data Byte data containing a serialized Gdk::Pixdata structure.
+   * @param copy_pixels Whether to copy the pixel data, or use direct pointers
+   *  @a data  for the resulting pixbuf.
+   * @param error G::Error return location, may be <tt>0</tt> to ignore errors.
+   * @return A newly-created Gdk::Pixbuf structure with a reference,
+   * count of 1, or <tt>0</tt> if an error occurred.
+   */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   static Glib::RefPtr<Pixbuf> create_from_inline(int data_length, const guint8* data,
                                                  bool copy_pixels = false);
+#else
+  static Glib::RefPtr<Pixbuf> create_from_inline(int data_length, const guint8* data, bool copy_pixels, std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
 
-  
   /** Queries the color space of a pixbuf.
    * @return Color space.
    */
@@ -485,21 +584,56 @@ public:
    */
   void fill(guint32 pixel);
 
-  /** Save an image file.
+  /** Saves pixbuf to a file in format @a type. 
+   * By default, "jpeg", "png", "ico" and "bmp" are possible file formats to save in, but more formats may be installed.
+   * TThe list of all writable formats can be determined by using Gdk::Pixbuf::get_formats() with 
+   * Gdk::PixbufFormat::is_writable().
+   *
+   * @param filename The path of the file to be created.
+   * @param type The file type.
+   *
    * @throw Glib::FileError
    * @throw Gdk::PixbufError
    */
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   void save(const std::string& filename, const Glib::ustring& type);
+  #else
+  void save(const std::string& filename, const Glib::ustring& type, std::auto_ptr<Glib::Error>& error);
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
   
 
-  /** Save an image file.
+  /** Saves pixbuf to a file in format @a type. 
+   * By default, "jpeg", "png", "ico" and "bmp" are possible file formats to save in, but more formats may be installed.
+   * TThe list of all writable formats can be determined by using Gdk::Pixbuf::get_formats() with 
+   * Gdk::PixbufFormat::is_writable().
+   *
+   * The @a option_keys and @option_values, if not empty, should contain pairs of strings that modify the save parameters. 
+   * For example,  "quality", "100".
+   *
+   * Currently only a few parameters exist. JPEG images can be saved with a "quality" parameter; 
+   * its value should be in the range [0,100]. Text chunks can be attached to PNG images by specifying parameters of the 
+   * form "tEXt::key", where key is an ASCII string of length 1-79. The values are UTF-8 encoded strings. ICO images can be 
+   * saved in depth 16, 24, or 32, by using the "depth" parameter. When the ICO saver is given "x_hot" and "y_hot" 
+   * parameters, it produces a CUR instead of an ICO.  
+   *
+   * @param filename The path of the file to be created.
+   * @param type The file type.
+   * @param option_keys
+   * @param option_values
+   *
    * @throw Glib::FileError
    * @throw Gdk::PixbufError
    */
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   void save(const std::string& filename, const Glib::ustring& type,
             const Glib::StringArrayHandle& option_keys,
             const Glib::StringArrayHandle& option_values);
-  
+  #else
+  void save(const std::string& filename, const Glib::ustring& type,
+            const Glib::StringArrayHandle& option_keys,
+            const Glib::StringArrayHandle& option_values, std::auto_ptr<Glib::Error>& error);
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+
   
 /* TODO:
 typedef gboolean (*GdkPixbufSaveFunc)   (const gchar *buf,
@@ -524,10 +658,47 @@ gboolean gdk_pixbuf_save_to_callbackv   (GdkPixbuf  *pixbuf,
 
 */
 
+  /* Saves the pixbuf to a new buffer in format @a type.
+   * Note that the buffer is not nul-terminated and may contain embedded nulls.
+   * @see save().
+   *
+   * @param buffer This will be set to the address of a new buffer.
+   * @param size This will be set to the size of the @a buffer.
+   * @param type Currently "jpeg", "png", "ico" or "bmp".
+   *
+   * @throw Glib::FileError
+   * @throw Gdk::PixbufError
+   */
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  void save_to_buffer(gchar*& buffer, gsize& buffer_size,
+                      const Glib::ustring& type = "png");
+  #else
+  void save_to_buffer(gchar*& buffer, gsize& buffer_size,
+                      const Glib::ustring& type, std::auto_ptr<Glib::Error>& error);
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+                      
+  /* Saves the pixbuf to a new buffer in format @a type.
+   * Note that the buffer is not nul-terminated and may contain embedded nulls.
+   * @see save().
+   *
+   * @param buffer This will be set to the address of a new buffer.
+   * @param size This will be set to the size of the @a buffer.
+   * @param type Currently "jpeg", "png", "ico" or "bmp".
+   *
+   * @throw Glib::FileError
+   * @throw Gdk::PixbufError
+   */
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   void save_to_buffer(gchar*& buffer, gsize& buffer_size,
                       const Glib::ustring& type,
                       const Glib::StringArrayHandle& option_keys,
                       const Glib::StringArrayHandle& option_values);
+  #else
+  void save_to_buffer(gchar*& buffer, gsize& buffer_size,
+                      const Glib::ustring& type,
+                      const Glib::StringArrayHandle& option_keys,
+                      const Glib::StringArrayHandle& option_values, std::auto_ptr<Glib::Error>& error);
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
   
                                          
   /** Takes an existing pixbuf and adds an alpha channel to it.
@@ -732,7 +903,7 @@ gboolean gdk_pixbuf_save_to_callbackv   (GdkPixbuf  *pixbuf,
    * @param angle The angle to rotate by.
    * @return A new pixbuf
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::RefPtr<Gdk::Pixbuf> rotate_simple(PixbufRotation angle) const;
   
@@ -741,7 +912,7 @@ gboolean gdk_pixbuf_save_to_callbackv   (GdkPixbuf  *pixbuf,
    * @param horizontal <tt>true</tt> to flip horizontally, <tt>false</tt> to flip vertically.
    * @return A new pixbuf.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::RefPtr<Gdk::Pixbuf> flip(bool horizontal = true) const;
 
@@ -857,11 +1028,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufanimation.cc b/libs/gtkmm2/gdk/gdkmm/pixbufanimation.cc
index a558a55044..4f9421f301 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixbufanimation.cc
+++ b/libs/gtkmm2/gdk/gdkmm/pixbufanimation.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/pixbufanimation.h>
 #include <gdkmm/private/pixbufanimation_p.h>
 
@@ -87,8 +88,19 @@ void PixbufAnimation_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* PixbufAnimation_Class::wrap_new(GObject* object)
 {
@@ -150,23 +162,30 @@ Glib::RefPtr<Pixbuf> PixbufAnimation::get_static_image()
 {
 
   Glib::RefPtr<Pixbuf> retvalue = Glib::wrap(gdk_pixbuf_animation_get_static_image(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<PixbufAnimationIter> PixbufAnimation::get_iter(const GTimeVal* start_time)
 {
 
   Glib::RefPtr<PixbufAnimationIter> retvalue = Glib::wrap(gdk_pixbuf_animation_get_iter(gobj(), start_time));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gdk
 
 
diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufanimation.h b/libs/gtkmm2/gdk/gdkmm/pixbufanimation.h
index dd5afec672..c30d72eae0 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixbufanimation.h
+++ b/libs/gtkmm2/gdk/gdkmm/pixbufanimation.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_PIXBUFANIMATION_H
 #define _GDKMM_PIXBUFANIMATION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -167,11 +168,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.cc b/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.cc
index 60046e4eff..404a0317b9 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.cc
+++ b/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/pixbufanimationiter.h>
 #include <gdkmm/private/pixbufanimationiter_p.h>
 
@@ -74,8 +75,19 @@ void PixbufAnimationIter_Class::class_init_function(void* g_class, void* class_d
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* PixbufAnimationIter_Class::wrap_new(GObject* object)
 {
@@ -118,6 +130,13 @@ GType PixbufAnimationIter::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gdk
 
 
diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.h b/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.h
index ceba0da1e9..7223a4baec 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.h
+++ b/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_PIXBUFANIMATIONITER_H
 #define _GDKMM_PIXBUFANIMATIONITER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -93,11 +94,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufformat.cc b/libs/gtkmm2/gdk/gdkmm/pixbufformat.cc
index 63dc4c43a4..da97fac330 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixbufformat.cc
+++ b/libs/gtkmm2/gdk/gdkmm/pixbufformat.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/pixbufformat.h>
 #include <gdkmm/private/pixbufformat_p.h>
 
@@ -104,7 +105,7 @@ bool PixbufFormat::is_disabled() const
 
 void PixbufFormat::set_disabled(bool disabled)
 {
-  gdk_pixbuf_format_set_disabled(gobj(), static_cast<int>(disabled));
+gdk_pixbuf_format_set_disabled(gobj(), static_cast<int>(disabled)); 
 }
 
 Glib::ustring PixbufFormat::get_license() const
diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufformat.h b/libs/gtkmm2/gdk/gdkmm/pixbufformat.h
index b9adddf08d..bff60da222 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixbufformat.h
+++ b/libs/gtkmm2/gdk/gdkmm/pixbufformat.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_PIXBUFFORMAT_H
 #define _GDKMM_PIXBUFFORMAT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -58,14 +59,14 @@ public:
   /** Returns the name of the format.
    * @return The name of the format. 
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::ustring get_name() const;
   
   /** Returns a description of the format.
    * @return A description of the format.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::ustring get_description() const;
   
@@ -73,7 +74,7 @@ public:
    * @return A <tt>0</tt>-terminated array of mime types which must be freed with 
    * Glib::strfreev() when it is no longer needed.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::StringArrayHandle get_mime_types() const;
   
@@ -82,14 +83,14 @@ public:
    * @return A <tt>0</tt>-terminated array of filename extensions which must be
    * freed with Glib::strfreev() when it is no longer needed.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::StringArrayHandle get_extensions() const;
   
   /** Returns whether pixbufs can be saved in the given format.
    * @return Whether pixbufs can be saved in the given format.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   bool is_writable() const;
   
@@ -100,7 +101,7 @@ public:
    * resulting pixbuf to the desired size.
    * @return Whether this image format is scalable.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool is_scalable() const;
   
@@ -108,7 +109,7 @@ public:
    * gdk_pixbuf_format_set_disabled().
    * @return Whether this image format is disabled.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool is_disabled() const;
   
@@ -117,7 +118,7 @@ public:
    * images. Applications can use this to avoid using image loaders 
    * with an inappropriate license, see gdk_pixbuf_format_get_license().
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param disabled <tt>true</tt> to disable the format @a format .
    */
   void set_disabled(bool disabled = true);
@@ -128,7 +129,7 @@ public:
    * or "other" to indicate some other license.
    * @return A string describing the license of @a format . 
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring get_license() const;
 
diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufloader.cc b/libs/gtkmm2/gdk/gdkmm/pixbufloader.cc
index 41af07e520..cd0022326b 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixbufloader.cc
+++ b/libs/gtkmm2/gdk/gdkmm/pixbufloader.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/pixbufloader.h>
 #include <gdkmm/private/pixbufloader_p.h>
 
@@ -33,15 +34,15 @@ namespace
 /* We use this helper function in the constructor to be able to throw
  * before the base class' (Glib::Object) constructor is called.
  */
-GdkPixbufLoader* pixbuf_loader_create_with_type(const Glib::ustring& image_type, bool mime_type)
+static GdkPixbufLoader* pixbuf_loader_create_with_type(const Glib::ustring& image_type, bool mime_type)
 {
   GError* error = 0;
-  GdkPixbufLoader *const loader = 0;
-  
+  GdkPixbufLoader* loader = 0;
+
   if(mime_type)
-    gdk_pixbuf_loader_new_with_mime_type(image_type.c_str(), &error);
+    loader = gdk_pixbuf_loader_new_with_mime_type(image_type.c_str(), &error);
   else
-    gdk_pixbuf_loader_new_with_type(image_type.c_str(), &error);
+    loader = gdk_pixbuf_loader_new_with_type(image_type.c_str(), &error);
 
   if(error)
     Glib::Error::throw_exception(error);
@@ -61,31 +62,14 @@ PixbufLoader::PixbufLoader(const Glib::ustring& image_type, bool mime_type)
   Glib::Object((GObject*) pixbuf_loader_create_with_type(image_type, mime_type))
 {}
 
-void PixbufLoader::write(const guint8* buf, gsize count)
-{
-  GError* error = 0;
-  gdk_pixbuf_loader_write(gobj(), buf, count, &error);
-
-  if(error)
-    Glib::Error::throw_exception(error);
-}
-
-void PixbufLoader::close()
-{
-  GError* error = 0;
-  gdk_pixbuf_loader_close(gobj(), &error);
-
-  if(error)
-    Glib::Error::throw_exception(error);
-}
-
 } // namespace Gdk
 
 
 namespace
 {
 
-const Glib::SignalProxyInfo PixbufLoader_signal_area_prepared_info =
+
+static const Glib::SignalProxyInfo PixbufLoader_signal_area_prepared_info =
 {
   "area_prepared",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -93,7 +77,7 @@ const Glib::SignalProxyInfo PixbufLoader_signal_area_prepared_info =
 };
 
 
-void PixbufLoader_signal_area_updated_callback(GdkPixbufLoader* self, gint p0,gint p1,gint p2,gint p3,void* data)
+static void PixbufLoader_signal_area_updated_callback(GdkPixbufLoader* self, gint p0,gint p1,gint p2,gint p3,void* data)
 {
   using namespace Gdk;
   typedef sigc::slot< void,int,int,int,int > SlotType;
@@ -101,23 +85,27 @@ void PixbufLoader_signal_area_updated_callback(GdkPixbufLoader* self, gint p0,gi
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 , p1
 , p2
 , p3
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo PixbufLoader_signal_area_updated_info =
+static const Glib::SignalProxyInfo PixbufLoader_signal_area_updated_info =
 {
   "area_updated",
   (GCallback) &PixbufLoader_signal_area_updated_callback,
@@ -125,7 +113,7 @@ const Glib::SignalProxyInfo PixbufLoader_signal_area_updated_info =
 };
 
 
-const Glib::SignalProxyInfo PixbufLoader_signal_closed_info =
+static const Glib::SignalProxyInfo PixbufLoader_signal_closed_info =
 {
   "closed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -133,7 +121,7 @@ const Glib::SignalProxyInfo PixbufLoader_signal_closed_info =
 };
 
 
-void PixbufLoader_signal_size_prepared_callback(GdkPixbufLoader* self, gint p0,gint p1,void* data)
+static void PixbufLoader_signal_size_prepared_callback(GdkPixbufLoader* self, gint p0,gint p1,void* data)
 {
   using namespace Gdk;
   typedef sigc::slot< void,int,int > SlotType;
@@ -141,27 +129,32 @@ void PixbufLoader_signal_size_prepared_callback(GdkPixbufLoader* self, gint p0,g
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo PixbufLoader_signal_size_prepared_info =
+static const Glib::SignalProxyInfo PixbufLoader_signal_size_prepared_info =
 {
   "size_prepared",
   (GCallback) &PixbufLoader_signal_size_prepared_callback,
   (GCallback) &PixbufLoader_signal_size_prepared_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -208,12 +201,20 @@ void PixbufLoader_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->area_prepared = &area_prepared_callback;
   klass->area_updated = &area_updated_callback;
   klass->closed = &closed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void PixbufLoader_Class::area_prepared_callback(GdkPixbufLoader* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -226,15 +227,19 @@ void PixbufLoader_Class::area_prepared_callback(GdkPixbufLoader* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_area_prepared();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -247,7 +252,6 @@ void PixbufLoader_Class::area_prepared_callback(GdkPixbufLoader* self)
       (*base->area_prepared)(self);
   }
 }
-
 void PixbufLoader_Class::area_updated_callback(GdkPixbufLoader* self, gint p0, gint p1, gint p2, gint p3)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -260,19 +264,23 @@ void PixbufLoader_Class::area_updated_callback(GdkPixbufLoader* self, gint p0, g
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_area_updated(p0
 , p1
 , p2
 , p3
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -285,7 +293,6 @@ void PixbufLoader_Class::area_updated_callback(GdkPixbufLoader* self, gint p0, g
       (*base->area_updated)(self, p0, p1, p2, p3);
   }
 }
-
 void PixbufLoader_Class::closed_callback(GdkPixbufLoader* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -298,15 +305,19 @@ void PixbufLoader_Class::closed_callback(GdkPixbufLoader* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_closed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -319,6 +330,7 @@ void PixbufLoader_Class::closed_callback(GdkPixbufLoader* self)
       (*base->closed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* PixbufLoader_Class::wrap_new(GObject* object)
@@ -379,27 +391,65 @@ Glib::RefPtr<PixbufLoader> PixbufLoader::create(const Glib::ustring& image_type,
 }
 void PixbufLoader::set_size(int width, int height)
 {
-  gdk_pixbuf_loader_set_size(gobj(), width, height);
+gdk_pixbuf_loader_set_size(gobj(), width, height); 
+}
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+void PixbufLoader::write(const guint8* buf, gsize count)
+#else
+void PixbufLoader::write(const guint8* buf, gsize count, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  gdk_pixbuf_loader_write(gobj(), (buf), count, &(gerror));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
+
+}
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+void PixbufLoader::close()
+#else
+void PixbufLoader::close(std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  gdk_pixbuf_loader_close(gobj(), &(gerror));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
+
 }
 
 Glib::RefPtr<Gdk::Pixbuf> PixbufLoader::get_pixbuf()
 {
 
   Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gdk_pixbuf_loader_get_pixbuf(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<Gdk::PixbufAnimation> PixbufLoader::get_animation()
 {
 
   Glib::RefPtr<Gdk::PixbufAnimation> retvalue = Glib::wrap(gdk_pixbuf_loader_get_animation(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 PixbufFormat PixbufLoader::get_format() const
@@ -413,22 +463,26 @@ Glib::SignalProxy0< void > PixbufLoader::signal_area_prepared()
   return Glib::SignalProxy0< void >(this, &PixbufLoader_signal_area_prepared_info);
 }
 
+
 Glib::SignalProxy4< void,int,int,int,int > PixbufLoader::signal_area_updated()
 {
   return Glib::SignalProxy4< void,int,int,int,int >(this, &PixbufLoader_signal_area_updated_info);
 }
 
+
 Glib::SignalProxy0< void > PixbufLoader::signal_closed()
 {
   return Glib::SignalProxy0< void >(this, &PixbufLoader_signal_closed_info);
 }
 
+
 Glib::SignalProxy2< void,int,int > PixbufLoader::signal_size_prepared()
 {
   return Glib::SignalProxy2< void,int,int >(this, &PixbufLoader_signal_size_prepared_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gdk::PixbufLoader::on_area_prepared()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -438,7 +492,6 @@ void Gdk::PixbufLoader::on_area_prepared()
   if(base && base->area_prepared)
     (*base->area_prepared)(gobj());
 }
-
 void Gdk::PixbufLoader::on_area_updated(int x, int y, int width, int height)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -448,7 +501,6 @@ void Gdk::PixbufLoader::on_area_updated(int x, int y, int width, int height)
   if(base && base->area_updated)
     (*base->area_updated)(gobj(),x,y,width,height);
 }
-
 void Gdk::PixbufLoader::on_closed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -458,6 +510,10 @@ void Gdk::PixbufLoader::on_closed()
   if(base && base->closed)
     (*base->closed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gdk
diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufloader.h b/libs/gtkmm2/gdk/gdkmm/pixbufloader.h
index c89288740f..1df9791c95 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixbufloader.h
+++ b/libs/gtkmm2/gdk/gdkmm/pixbufloader.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_PIXBUFLOADER_H
 #define _GDKMM_PIXBUFLOADER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -106,12 +107,17 @@ protected:
    * and here:
    * http://www.freedesktop.org/Software/shared-mime-info
    *
+   * The list of non-mime-type image formats depends on what image loaders
+   * are installed, but typically "png", "jpeg", "gif", "tiff" and 
+   * "xpm" are among the supported formats. To obtain the full list of
+   * supported image formats, call PixbufFormat::get_name() on each 
+   * of the PixbufFormats returned by Gdk::Pixbuf::get_formats().
+   *
    * @param image_type Name of the image format to be loaded with the image.
    * @param mime_type If this is true then the image_type is a MIME type.
    * @throw Gdk::PixbufError
    */
   explicit PixbufLoader(const Glib::ustring& image_type, bool mime_type = false);
-  //TODO: What non-mime-types names are possible?
 
 public:
 
@@ -136,6 +142,12 @@ public:
    * and here:
    * http://www.freedesktop.org/Software/shared-mime-info
    *
+   * The list of non-mime-type image formats depends on what image loaders
+   * are installed, but typically "png", "jpeg", "gif", "tiff" and 
+   * "xpm" are among the supported formats. To obtain the full list of
+   * supported image formats, call PixbufFormat::get_name() on each 
+   * of the PixbufFormats returned by Gdk::Pixbuf::get_formats().
+   *
    * @param image_type Name of the image format to be loaded with the image.
    * @param mime_type If this is true then the image_type is a MIME type.
    * @throw Gdk::PixbufError
@@ -152,12 +164,13 @@ public:
    * Attempts to set the desired image size  are ignored after the 
    * emission of the ::size_prepared signal.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param width The desired width of the image being loaded.
    * @param height The desired height of the image being loaded.
    */
   void set_size(int width, int height);
-          
+
+ 
   /** Causes the pixbuf loader to parse the next @a count bytes of an image.
    * It will return if the data was loaded successfully, and throw an exception
    * if an error occurred. In the latter case, the loader will be closed, and
@@ -167,8 +180,25 @@ public:
    * @throw Gdk::PixbufError
    * @throw Glib::FileError
    */
-  void write(const guint8* buf, gsize count);
   
+  /** This will cause a pixbuf loader to parse the next @a count  bytes of
+   * an image.  It will return <tt>true</tt> if the data was loaded successfully,
+   * and <tt>false</tt> if an error occurred.  In the latter case, the loader
+   * will be closed, and will not accept further writes. If <tt>false</tt> is
+   * returned, @a error  will be set to an error from the Gdk::PIXBUF_ERROR
+   * or G::FILE_ERROR domains.
+   * @param buf Pointer to image data.
+   * @param count Length of the @a buf  buffer in bytes.
+   * @param error Return location for errors.
+   * @return <tt>true</tt> if the write was successful, or <tt>false</tt> if the loader
+   * cannot parse the buffer.
+   */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  void write(const guint8* buf, gsize count);
+#else
+  void write(const guint8* buf, gsize count, std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
 
   /** Informs a pixbuf loader that no further writes with PixbufLoader::write()
    * will occur, so that it can free its internal loading structures.  Also,
@@ -179,8 +209,26 @@ public:
    * @throw Gdk::PixbufError
    * @throw Glib::FileError
    */
-  void close();
   
+  /** Informs a pixbuf loader that no further writes with
+   * write() will occur, so that it can free its
+   * internal loading structures. Also, tries to parse any data that
+   * hasn't yet been parsed; if the remaining data is partial or
+   * corrupt, an error will be returned.  If <tt>false</tt> is returned, @a error 
+   * will be set to an error from the Gdk::PIXBUF_ERROR or G::FILE_ERROR
+   * domains. If you're just cancelling a load rather than expecting it
+   * to be finished, passing <tt>0</tt> for @a error  to ignore it is
+   * reasonable.
+   * @param error Return location for a G::Error, or <tt>0</tt> to ignore errors.
+   * @return <tt>true</tt> if all image data written so far was successfully
+   *             passed out via the update_area signal.
+   */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  void close();
+#else
+  void close(std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
 
   /** Queries the Gdk::Pixbuf that a pixbuf loader is currently creating.
    * In general it only makes sense to call this function after the
@@ -214,23 +262,74 @@ public:
    * @return A Gdk::PixbufFormat or <tt>0</tt>. The return value is owned 
    * by GdkPixbuf and should not be freed.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   PixbufFormat get_format() const;
 
+  /** This signal is emitted when the pixbuf loader has allocated the 
+   * pixbuf in the desired size.  After this signal is emitted, 
+   * applications can call get_pixbuf() to fetch 
+   * the partially-loaded pixbuf.
+   */ 
   
+/**
+   * @par Prototype:
+   * <tt>void %area_prepared()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_area_prepared();
 
+
+  /** This signal is emitted when a significant area of the image being
+   * loaded has been updated.  Normally it means that a complete
+   * scanline has been read in, but it could be a different area as
+   * well.  Applications can use this signal to know when to repaint
+   * areas of an image that is being loaded.
+   *
+   * @param X offset of upper-left corner of the updated area.
+   * @param y Y offset of upper-left corner of the updated area.
+   * @param width Width of updated area.
+   * @param height Height of updated area.
+   */
   
+/**
+   * @par Prototype:
+   * <tt>void %area_updated(int x, int y, int width, int height)</tt>
+   */
+
   Glib::SignalProxy4< void,int,int,int,int > signal_area_updated();
 
+
+  /** This signal is emitted when close() is called.
+   * It can be used by different parts of an application to receive
+   * notification when an image loader is closed by the code that
+   * drives it.
+   */
   
+/**
+   * @par Prototype:
+   * <tt>void %closed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_closed();
 
-  
+
   //We use no_default_handler for this, because we can not add a new vfunc to 2.5 without breaking ABI.
   //TODO: Remove no_default_handler when we do an ABI-break-with-parallel-install.
+  /** This signal is emitted when the pixbuf loader has been fed the
+   * initial amount of data that is required to figure out the size
+   * of the image that it will create.  Applications can call  
+   * set_size() in response to this signal to set
+   * the desired size to which the image should be scaled.
+   *
+   * @param width The original width of the image.
+   * @param height The original height of the image
+   */
   
+/**
+   * @par Prototype:
+   * <tt>void %size_prepared(int width, int height)</tt>
+   */
 
   Glib::SignalProxy2< void,int,int > signal_size_prepared();
 
@@ -239,14 +338,20 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_area_prepared();
   virtual void on_area_updated(int x, int y, int width, int height);
   virtual void on_closed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/pixmap.cc b/libs/gtkmm2/gdk/gdkmm/pixmap.cc
index a64cfb6aed..6dd0a8be83 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixmap.cc
+++ b/libs/gtkmm2/gdk/gdkmm/pixmap.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/pixmap.h>
 #include <gdkmm/private/pixmap_p.h>
 
@@ -256,8 +257,19 @@ void Pixmap_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 /* The implementation: */
 
@@ -315,6 +327,13 @@ Glib::RefPtr<Pixmap> Pixmap::create(const Glib::RefPtr<Display>& display, Native
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gdk
 
 
diff --git a/libs/gtkmm2/gdk/gdkmm/pixmap.h b/libs/gtkmm2/gdk/gdkmm/pixmap.h
index 6a7a1d978d..b544b063ee 100644
--- a/libs/gtkmm2/gdk/gdkmm/pixmap.h
+++ b/libs/gtkmm2/gdk/gdkmm/pixmap.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_PIXMAP_H
 #define _GDKMM_PIXMAP_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -175,11 +176,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/private/bitmap_p.h b/libs/gtkmm2/gdk/gdkmm/private/bitmap_p.h
index 13a2e31932..fc789f605c 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/bitmap_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/bitmap_p.h
@@ -2,6 +2,10 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_BITMAP_P_H
 #define _GDKMM_BITMAP_P_H
+
+
 #include <gdkmm/private/pixmap_p.h>
+
+
 #endif /* _GDKMM_BITMAP_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/color_p.h b/libs/gtkmm2/gdk/gdkmm/private/color_p.h
index 10e8370c05..1ba0df5e77 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/color_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/color_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_COLOR_P_H
 #define _GDKMM_COLOR_P_H
+
+
 #endif /* _GDKMM_COLOR_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/colormap_p.h b/libs/gtkmm2/gdk/gdkmm/private/colormap_p.h
index 3ceb776d16..ffdbf36a1f 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/colormap_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/colormap_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_COLORMAP_P_H
 #define _GDKMM_COLORMAP_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_COLORMAP_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/cursor_p.h b/libs/gtkmm2/gdk/gdkmm/private/cursor_p.h
index 5400e45e0a..75fab182b0 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/cursor_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/cursor_p.h
@@ -2,6 +2,10 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_CURSOR_P_H
 #define _GDKMM_CURSOR_P_H
+
+
 #include <glibmm/private/object_p.h>
+
+
 #endif /* _GDKMM_CURSOR_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/device_p.h b/libs/gtkmm2/gdk/gdkmm/private/device_p.h
index f19b9c8ccd..45f285566b 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/device_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/device_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_DEVICE_P_H
 #define _GDKMM_DEVICE_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_DEVICE_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/display_p.h b/libs/gtkmm2/gdk/gdkmm/private/display_p.h
index 0b5ba089e0..14c310c782 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/display_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/display_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_DISPLAY_P_H
 #define _GDKMM_DISPLAY_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void closed_callback(GdkDisplay* self, gboolean p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_DISPLAY_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/displaymanager_p.h b/libs/gtkmm2/gdk/gdkmm/private/displaymanager_p.h
index 25ff018c44..547ad83a47 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/displaymanager_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/displaymanager_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_DISPLAYMANAGER_P_H
 #define _GDKMM_DISPLAYMANAGER_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void display_opened_callback(GdkDisplayManager* self, GdkDisplay* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_DISPLAYMANAGER_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/dragcontext_p.h b/libs/gtkmm2/gdk/gdkmm/private/dragcontext_p.h
index 13dfd57ccc..6c851e81f6 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/dragcontext_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/dragcontext_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_DRAGCONTEXT_P_H
 #define _GDKMM_DRAGCONTEXT_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_DRAGCONTEXT_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/drawable_p.h b/libs/gtkmm2/gdk/gdkmm/private/drawable_p.h
index 59e22d083e..30d3187935 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/drawable_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/drawable_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_DRAWABLE_P_H
 #define _GDKMM_DRAWABLE_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_DRAWABLE_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/event_p.h b/libs/gtkmm2/gdk/gdkmm/private/event_p.h
index 999db9b7fc..df8fe3d0a3 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/event_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/event_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_EVENT_P_H
 #define _GDKMM_EVENT_P_H
+
+
 #endif /* _GDKMM_EVENT_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/gc_p.h b/libs/gtkmm2/gdk/gdkmm/private/gc_p.h
index 82725a3a1a..1631fc501d 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/gc_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/gc_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_GC_P_H
 #define _GDKMM_GC_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_GC_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/image_p.h b/libs/gtkmm2/gdk/gdkmm/private/image_p.h
index 2b6fe88d3d..4ebe7a763f 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/image_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/image_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_IMAGE_P_H
 #define _GDKMM_IMAGE_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_IMAGE_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/pixbuf_p.h b/libs/gtkmm2/gdk/gdkmm/private/pixbuf_p.h
index 659bd0d8d7..1d6de418bd 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/pixbuf_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/pixbuf_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_PIXBUF_P_H
 #define _GDKMM_PIXBUF_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_PIXBUF_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/pixbufanimation_p.h b/libs/gtkmm2/gdk/gdkmm/private/pixbufanimation_p.h
index ca03e440c2..a70ee93465 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/pixbufanimation_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/pixbufanimation_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_PIXBUFANIMATION_P_H
 #define _GDKMM_PIXBUFANIMATION_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_PIXBUFANIMATION_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/pixbufanimationiter_p.h b/libs/gtkmm2/gdk/gdkmm/private/pixbufanimationiter_p.h
index f7de22ffd8..259d5e222e 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/pixbufanimationiter_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/pixbufanimationiter_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_PIXBUFANIMATIONITER_P_H
 #define _GDKMM_PIXBUFANIMATIONITER_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_PIXBUFANIMATIONITER_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/pixbufformat_p.h b/libs/gtkmm2/gdk/gdkmm/private/pixbufformat_p.h
index 6a0b196620..4d104b942d 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/pixbufformat_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/pixbufformat_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_PIXBUFFORMAT_P_H
 #define _GDKMM_PIXBUFFORMAT_P_H
+
+
 #endif /* _GDKMM_PIXBUFFORMAT_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/pixbufloader_p.h b/libs/gtkmm2/gdk/gdkmm/private/pixbufloader_p.h
index 7bceceef72..7dfc5ac4eb 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/pixbufloader_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/pixbufloader_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_PIXBUFLOADER_P_H
 #define _GDKMM_PIXBUFLOADER_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,18 +32,23 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void area_prepared_callback(GdkPixbufLoader* self);
   static void area_updated_callback(GdkPixbufLoader* self, gint p0, gint p1, gint p2, gint p3);
   static void closed_callback(GdkPixbufLoader* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_PIXBUFLOADER_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/pixmap_p.h b/libs/gtkmm2/gdk/gdkmm/private/pixmap_p.h
index 149ed76a07..048297f37c 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/pixmap_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/pixmap_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_PIXMAP_P_H
 #define _GDKMM_PIXMAP_P_H
+
+
 #include <gdkmm/private/drawable_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_PIXMAP_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/rectangle_p.h b/libs/gtkmm2/gdk/gdkmm/private/rectangle_p.h
index 51088336bb..9b3f64ee94 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/rectangle_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/rectangle_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_RECTANGLE_P_H
 #define _GDKMM_RECTANGLE_P_H
+
+
 #endif /* _GDKMM_RECTANGLE_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/region_p.h b/libs/gtkmm2/gdk/gdkmm/private/region_p.h
index b0a7f8cdf2..4623ed285d 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/region_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/region_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_REGION_P_H
 #define _GDKMM_REGION_P_H
+
+
 #endif /* _GDKMM_REGION_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/rgbcmap_p.h b/libs/gtkmm2/gdk/gdkmm/private/rgbcmap_p.h
index d5845141c4..d290d5c492 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/rgbcmap_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/rgbcmap_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_RGBCMAP_P_H
 #define _GDKMM_RGBCMAP_P_H
+
+
 #endif /* _GDKMM_RGBCMAP_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/screen_p.h b/libs/gtkmm2/gdk/gdkmm/private/screen_p.h
index 9888f6c9db..320b05df0b 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/screen_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/screen_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_SCREEN_P_H
 #define _GDKMM_SCREEN_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void size_changed_callback(GdkScreen* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_SCREEN_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/types_p.h b/libs/gtkmm2/gdk/gdkmm/private/types_p.h
index 474d473ad8..701f260a38 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/types_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/types_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_TYPES_P_H
 #define _GDKMM_TYPES_P_H
+
+
 #endif /* _GDKMM_TYPES_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/visual_p.h b/libs/gtkmm2/gdk/gdkmm/private/visual_p.h
index b11005c9db..362fb1a62b 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/visual_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/visual_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_VISUAL_P_H
 #define _GDKMM_VISUAL_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_VISUAL_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/private/window_p.h b/libs/gtkmm2/gdk/gdkmm/private/window_p.h
index c9fc8a9e85..803c224d65 100644
--- a/libs/gtkmm2/gdk/gdkmm/private/window_p.h
+++ b/libs/gtkmm2/gdk/gdkmm/private/window_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GDKMM_WINDOW_P_H
 #define _GDKMM_WINDOW_P_H
+
+
 #include <gdkmm/private/drawable_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gdk
 
+
 #endif /* _GDKMM_WINDOW_P_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/rectangle.cc b/libs/gtkmm2/gdk/gdkmm/rectangle.cc
index a59a22bd75..89646a4e7c 100644
--- a/libs/gtkmm2/gdk/gdkmm/rectangle.cc
+++ b/libs/gtkmm2/gdk/gdkmm/rectangle.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/rectangle.h>
 #include <gdkmm/private/rectangle_p.h>
 
@@ -114,46 +115,46 @@ Rectangle::Rectangle(const GdkRectangle* gobject)
 }
 
 
-int Rectangle::get_x() const
+ int Rectangle::get_x() const
 {
   return gobj()->x;
 }
-
-void Rectangle::set_x(const int& value)
+ 
+ void Rectangle::set_x(const int& value)
 {
   gobj()->x = value;
 }
-
-int Rectangle::get_y() const
+ 
+ int Rectangle::get_y() const
 {
   return gobj()->y;
 }
-
-void Rectangle::set_y(const int& value)
+ 
+ void Rectangle::set_y(const int& value)
 {
   gobj()->y = value;
 }
-
-int Rectangle::get_width() const
+ 
+ int Rectangle::get_width() const
 {
   return gobj()->width;
 }
-
-void Rectangle::set_width(const int& value)
+ 
+ void Rectangle::set_width(const int& value)
 {
   gobj()->width = value;
 }
-
-int Rectangle::get_height() const
+ 
+ int Rectangle::get_height() const
 {
   return gobj()->height;
 }
-
-void Rectangle::set_height(const int& value)
+ 
+ void Rectangle::set_height(const int& value)
 {
   gobj()->height = value;
 }
-
+ 
 
 } // namespace Gdk
 
diff --git a/libs/gtkmm2/gdk/gdkmm/rectangle.h b/libs/gtkmm2/gdk/gdkmm/rectangle.h
index 5a92e1b22d..4444645657 100644
--- a/libs/gtkmm2/gdk/gdkmm/rectangle.h
+++ b/libs/gtkmm2/gdk/gdkmm/rectangle.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_RECTANGLE_H
 #define _GDKMM_RECTANGLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -71,15 +72,15 @@ public:
 
   bool has_zero_area() const;
 
-  int get_x() const;
-  void set_x(const int& value);
-  int get_y() const;
-  void set_y(const int& value);
-  int get_width() const;
-  void set_width(const int& value);
-  int get_height() const;
-  void set_height(const int& value);
-
+   int get_x() const;
+    void set_x(const int& value);
+    int get_y() const;
+    void set_y(const int& value);
+    int get_width() const;
+    void set_width(const int& value);
+    int get_height() const;
+    void set_height(const int& value);
+ 
 
 };
 
@@ -109,5 +110,6 @@ class Value<Gdk::Rectangle> : public Glib::Value_Boxed<Gdk::Rectangle>
 
 } // namespace Glib
 
+
 #endif /* _GDKMM_RECTANGLE_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/region.cc b/libs/gtkmm2/gdk/gdkmm/region.cc
index 7206c1e239..b83c9beea7 100644
--- a/libs/gtkmm2/gdk/gdkmm/region.cc
+++ b/libs/gtkmm2/gdk/gdkmm/region.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/region.h>
 #include <gdkmm/private/region_p.h>
 
@@ -151,7 +152,7 @@ GdkRegion* Region::gobj_copy() const
 
 void Region::get_clipbox(const Rectangle& rectangle)
 {
-  gdk_region_get_clipbox(gobj(), const_cast<GdkRectangle*>(rectangle.gobj()));
+gdk_region_get_clipbox(gobj(), const_cast<GdkRectangle*>(rectangle.gobj())); 
 }
 
 bool Region::empty()
@@ -171,42 +172,42 @@ OverlapType Region::rect_in(const Rectangle& rect)
 
 void Region::offset(int dx, int dy)
 {
-  gdk_region_offset(gobj(), dx, dy);
+gdk_region_offset(gobj(), dx, dy); 
 }
 
 void Region::shrink(int dx, int dy)
 {
-  gdk_region_shrink(gobj(), dx, dy);
+gdk_region_shrink(gobj(), dx, dy); 
 }
 
 void Region::union_with_rect(const Rectangle& rect)
 {
-  gdk_region_union_with_rect(gobj(), const_cast<GdkRectangle*>(rect.gobj()));
+gdk_region_union_with_rect(gobj(), const_cast<GdkRectangle*>(rect.gobj())); 
 }
 
 void Region::intersect(const Region& source2)
 {
-  gdk_region_intersect(gobj(), const_cast<GdkRegion*>((source2).gobj()));
+gdk_region_intersect(gobj(), const_cast<GdkRegion*>((source2).gobj())); 
 }
 
 void Region::union_(const Region& source2)
 {
-  gdk_region_union(gobj(), const_cast<GdkRegion*>((source2).gobj()));
+gdk_region_union(gobj(), const_cast<GdkRegion*>((source2).gobj())); 
 }
 
 void Region::subtract(const Region& source2)
 {
-  gdk_region_subtract(gobj(), const_cast<GdkRegion*>((source2).gobj()));
+gdk_region_subtract(gobj(), const_cast<GdkRegion*>((source2).gobj())); 
 }
 
 void Region::xor_(const Region& source2)
 {
-  gdk_region_xor(gobj(), const_cast<GdkRegion*>((source2).gobj()));
+gdk_region_xor(gobj(), const_cast<GdkRegion*>((source2).gobj())); 
 }
 
 void Region::spans_intersect_foreach(GdkSpan* spans, int n_spans, bool sorted, GdkSpanFunc function, gpointer data)
 {
-  gdk_region_spans_intersect_foreach(gobj(), spans, n_spans, static_cast<int>(sorted), function, data);
+gdk_region_spans_intersect_foreach(gobj(), spans, n_spans, static_cast<int>(sorted), function, data); 
 }
 
 
diff --git a/libs/gtkmm2/gdk/gdkmm/region.h b/libs/gtkmm2/gdk/gdkmm/region.h
index bcea009aa7..af0d2647f9 100644
--- a/libs/gtkmm2/gdk/gdkmm/region.h
+++ b/libs/gtkmm2/gdk/gdkmm/region.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_REGION_H
 #define _GDKMM_REGION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -230,5 +231,6 @@ Gdk::Region wrap(GdkRegion* object, bool take_copy = false);
 
 } // namespace Glib
 
+
 #endif /* _GDKMM_REGION_H */
 
diff --git a/libs/gtkmm2/gdk/gdkmm/rgbcmap.cc b/libs/gtkmm2/gdk/gdkmm/rgbcmap.cc
index 84a87d5439..a3ef2a99d8 100644
--- a/libs/gtkmm2/gdk/gdkmm/rgbcmap.cc
+++ b/libs/gtkmm2/gdk/gdkmm/rgbcmap.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/rgbcmap.h>
 #include <gdkmm/private/rgbcmap_p.h>
 
diff --git a/libs/gtkmm2/gdk/gdkmm/rgbcmap.h b/libs/gtkmm2/gdk/gdkmm/rgbcmap.h
index 0f01f1e619..a9a72a1366 100644
--- a/libs/gtkmm2/gdk/gdkmm/rgbcmap.h
+++ b/libs/gtkmm2/gdk/gdkmm/rgbcmap.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_RGBCMAP_H
 #define _GDKMM_RGBCMAP_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
diff --git a/libs/gtkmm2/gdk/gdkmm/screen.cc b/libs/gtkmm2/gdk/gdkmm/screen.cc
index 0b64a27a59..b41daef539 100644
--- a/libs/gtkmm2/gdk/gdkmm/screen.cc
+++ b/libs/gtkmm2/gdk/gdkmm/screen.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/screen.h>
 #include <gdkmm/private/screen_p.h>
 
@@ -40,13 +41,15 @@ namespace Gdk
 namespace
 {
 
-const Glib::SignalProxyInfo Screen_signal_size_changed_info =
+
+static const Glib::SignalProxyInfo Screen_signal_size_changed_info =
 {
   "size-changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -93,10 +96,18 @@ void Screen_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->size_changed = &size_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Screen_Class::size_changed_callback(GdkScreen* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -109,15 +120,19 @@ void Screen_Class::size_changed_callback(GdkScreen* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_size_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -130,6 +145,7 @@ void Screen_Class::size_changed_callback(GdkScreen* self)
       (*base->size_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Screen_Class::wrap_new(GObject* object)
@@ -177,145 +193,140 @@ Glib::RefPtr<Colormap> Screen::get_default_colormap()
 {
 
   Glib::RefPtr<Colormap> retvalue = Glib::wrap(gdk_screen_get_default_colormap(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Colormap> Screen::get_default_colormap() const
 {
-
-  Glib::RefPtr<const Colormap> retvalue = Glib::wrap(gdk_screen_get_default_colormap(const_cast<GdkScreen*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Screen*>(this)->get_default_colormap();
 }
 
 void Screen::set_default_colormap(const Glib::RefPtr<const Colormap>& colormap)
 {
-  gdk_screen_set_default_colormap(gobj(), const_cast<GdkColormap*>(Glib::unwrap<Colormap>(colormap)));
+gdk_screen_set_default_colormap(gobj(), const_cast<GdkColormap*>(Glib::unwrap<Colormap>(colormap))); 
 }
 
 Glib::RefPtr<Colormap> Screen::get_system_colormap()
 {
 
   Glib::RefPtr<Colormap> retvalue = Glib::wrap(gdk_screen_get_system_colormap(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Colormap> Screen::get_system_colormap() const
 {
-
-  Glib::RefPtr<const Colormap> retvalue = Glib::wrap(gdk_screen_get_system_colormap(const_cast<GdkScreen*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Screen*>(this)->get_system_colormap();
 }
 
 Glib::RefPtr<Visual> Screen::get_system_visual()
 {
 
   Glib::RefPtr<Visual> retvalue = Glib::wrap(gdk_screen_get_system_visual(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Visual> Screen::get_system_visual() const
 {
-
-  Glib::RefPtr<const Visual> retvalue = Glib::wrap(gdk_screen_get_system_visual(const_cast<GdkScreen*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Screen*>(this)->get_system_visual();
 }
 
 Glib::RefPtr<Colormap> Screen::get_rgb_colormap()
 {
 
   Glib::RefPtr<Colormap> retvalue = Glib::wrap(gdk_screen_get_rgb_colormap(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Colormap> Screen::get_rgb_colormap() const
 {
-
-  Glib::RefPtr<const Colormap> retvalue = Glib::wrap(gdk_screen_get_rgb_colormap(const_cast<GdkScreen*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Screen*>(this)->get_rgb_colormap();
 }
 
 Glib::RefPtr<Visual> Screen::get_rgb_visual()
 {
 
   Glib::RefPtr<Visual> retvalue = Glib::wrap(gdk_screen_get_rgb_visual(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Visual> Screen::get_rgb_visual() const
 {
+  return const_cast<Screen*>(this)->get_rgb_visual();
+}
 
-  Glib::RefPtr<const Visual> retvalue = Glib::wrap(gdk_screen_get_rgb_visual(const_cast<GdkScreen*>(gobj())));
+Glib::RefPtr<Colormap> Screen::get_rgba_colormap()
+{
 
+  Glib::RefPtr<Colormap> retvalue = Glib::wrap(gdk_screen_get_rgba_colormap(gobj()));
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
-Glib::RefPtr<Window> Screen::get_root_window()
+Glib::RefPtr<const Colormap> Screen::get_rgba_colormap() const
 {
+  return const_cast<Screen*>(this)->get_rgba_colormap();
+}
 
-  Glib::RefPtr<Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_screen_get_root_window(gobj())));
+Glib::RefPtr<Visual> Screen::get_rgba_visual()
+{
 
+  Glib::RefPtr<Visual> retvalue = Glib::wrap(gdk_screen_get_rgba_visual(gobj()));
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
-Glib::RefPtr<const Window> Screen::get_root_window() const
+Glib::RefPtr<const Visual> Screen::get_rgba_visual() const
 {
+  return const_cast<Screen*>(this)->get_rgba_visual();
+}
 
-  Glib::RefPtr<const Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_screen_get_root_window(const_cast<GdkScreen*>(gobj()))));
+Glib::RefPtr<Window> Screen::get_root_window()
+{
 
+  Glib::RefPtr<Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_screen_get_root_window(gobj())));
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
+}
+
+Glib::RefPtr<const Window> Screen::get_root_window() const
+{
+  return const_cast<Screen*>(this)->get_root_window();
 }
 
 Glib::RefPtr<Display> Screen::get_display()
 {
 
   Glib::RefPtr<Display> retvalue = Glib::wrap(gdk_screen_get_display(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Display> Screen::get_display() const
 {
-
-  Glib::RefPtr<const Display> retvalue = Glib::wrap(gdk_screen_get_display(const_cast<GdkScreen*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Screen*>(this)->get_display();
 }
 
 int Screen::get_number() const
@@ -365,7 +376,7 @@ int Screen::get_n_monitors() const
 
 void Screen::get_monitor_geometry(int monitor_num, Rectangle& dest) const
 {
-  gdk_screen_get_monitor_geometry(const_cast<GdkScreen*>(gobj()), monitor_num, (dest).gobj());
+gdk_screen_get_monitor_geometry(const_cast<GdkScreen*>(gobj()), monitor_num, (dest).gobj()); 
 }
 
 int Screen::get_monitor_at_point(int x, int y) const
@@ -380,7 +391,7 @@ int Screen::get_monitor_at_window(const Glib::RefPtr<Window>& window) const
 
 void Screen::broadcast_client_message(GdkEvent* event)
 {
-  gdk_screen_broadcast_client_message(gobj(), event);
+gdk_screen_broadcast_client_message(gobj(), event); 
 }
 
 Glib::RefPtr<Screen> Screen::get_default()
@@ -400,6 +411,7 @@ Glib::SignalProxy0< void > Screen::signal_size_changed()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gdk::Screen::on_size_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -409,6 +421,10 @@ void Gdk::Screen::on_size_changed()
   if(base && base->size_changed)
     (*base->size_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gdk
diff --git a/libs/gtkmm2/gdk/gdkmm/screen.h b/libs/gtkmm2/gdk/gdkmm/screen.h
index 29ae15d54f..5cdb4e744a 100644
--- a/libs/gtkmm2/gdk/gdkmm/screen.h
+++ b/libs/gtkmm2/gdk/gdkmm/screen.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_SCREEN_H
 #define _GDKMM_SCREEN_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -106,21 +107,21 @@ public:
   /** Gets the default colormap for @a screen .
    * @return The default Gdk::Colormap.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Colormap> get_default_colormap();
   
   /** Gets the default colormap for @a screen .
    * @return The default Gdk::Colormap.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Colormap> get_default_colormap() const;
 
   
   /** Sets the default @a colormap  for @a screen .
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param colormap A Gdk::Colormap.
    */
   void set_default_colormap(const Glib::RefPtr<const Colormap>& colormap);
@@ -128,14 +129,14 @@ public:
   /** Gets the system's default colormap for @a screen 
    * @return The default colormap for @a screen .
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Colormap> get_system_colormap();
   
   /** Gets the system's default colormap for @a screen 
    * @return The default colormap for @a screen .
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Colormap> get_system_colormap() const;
 
@@ -145,7 +146,7 @@ public:
    * The return value should not be freed.
    * @return The system visual
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Visual> get_system_visual();
   
@@ -154,7 +155,7 @@ public:
    * The return value should not be freed.
    * @return The system visual
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Visual> get_system_visual() const;
 
@@ -166,7 +167,7 @@ public:
    * call this function.
    * @return The preferred colormap
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Colormap> get_rgb_colormap();
   
@@ -177,7 +178,7 @@ public:
    * call this function.
    * @return The preferred colormap
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Colormap> get_rgb_colormap() const;
 
@@ -190,7 +191,7 @@ public:
    * drawables with any visual.
    * @return The Gdk::Visual chosen by GdkRGB.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Visual> get_rgb_visual();
   
@@ -202,22 +203,74 @@ public:
    * drawables with any visual.
    * @return The Gdk::Visual chosen by GdkRGB.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Visual> get_rgb_visual() const;
 
   
+  /** Gets a colormap to use for creating windows or pixmaps with an
+   * alpha channel. The windowing system on which GTK+ is running
+   * may not support this capability, in which case <tt>0</tt> will
+   * be returned. Even if a non-<tt>0</tt> value is returned, its
+   * possible that the window's alpha channel won't be honored
+   * when displaying the window on the screen: in particular, for
+   * X an appropriate windowing manager and compositing manager
+   * must be running to provide appropriate display.
+   * @return A colormap to use for windows with an alpha channel
+   * or <tt>0</tt> if the capability is not available.
+   * 
+   * @newin2p8.
+   */
+  Glib::RefPtr<Colormap> get_rgba_colormap();
+  
+  /** Gets a colormap to use for creating windows or pixmaps with an
+   * alpha channel. The windowing system on which GTK+ is running
+   * may not support this capability, in which case <tt>0</tt> will
+   * be returned. Even if a non-<tt>0</tt> value is returned, its
+   * possible that the window's alpha channel won't be honored
+   * when displaying the window on the screen: in particular, for
+   * X an appropriate windowing manager and compositing manager
+   * must be running to provide appropriate display.
+   * @return A colormap to use for windows with an alpha channel
+   * or <tt>0</tt> if the capability is not available.
+   * 
+   * @newin2p8.
+   */
+  Glib::RefPtr<const Colormap> get_rgba_colormap() const;
+
+  
+  /** Gets a visual to use for creating windows or pixmaps with an
+   * alpha channel. See the docs for get_rgba_colormap()
+   * for caveats.
+   * @return A visual to use for windows with an alpha channel
+   * or <tt>0</tt> if the capability is not available.
+   * 
+   * @newin2p8.
+   */
+  Glib::RefPtr<Visual> get_rgba_visual();
+  
+  /** Gets a visual to use for creating windows or pixmaps with an
+   * alpha channel. See the docs for get_rgba_colormap()
+   * for caveats.
+   * @return A visual to use for windows with an alpha channel
+   * or <tt>0</tt> if the capability is not available.
+   * 
+   * @newin2p8.
+   */
+  Glib::RefPtr<const Visual> get_rgba_visual() const;
+
+  
   /** Gets the root window of @a screen .
    * @return The root window
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Window> get_root_window();
   
   /** Gets the root window of @a screen .
    * @return The root window
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Window> get_root_window() const;
 
@@ -225,14 +278,14 @@ public:
   /** Gets the display to which the @a screen  belongs.
    * @return The display to which @a screen  belongs
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Display> get_display();
   
   /** Gets the display to which the @a screen  belongs.
    * @return The display to which @a screen  belongs
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Display> get_display() const;
 
@@ -241,37 +294,37 @@ public:
    * to which it belongs. (See get_display())
    * @return The index
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   int get_number() const;
   
   /** Gets the width of @a screen  in pixels
    * @return The width of @a screen  in pixels.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   int get_width() const;
   
   /** Gets the height of @a screen  in pixels
    * @return The height of @a screen  in pixels.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   int get_height() const;
   
   /** Gets the width of @a screen  in millimeters. 
    * Note that on some X servers this value will not be correct.
-   * @return The width of @a screen  in pixels.
+   * @return The width of @a screen  in millimeters.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   int get_width_mm() const;
   
   /** Returns the height of @a screen  in millimeters. 
    * Note that on some X servers this value will not be correct.
-   * @return The heigth of @a screen  in pixels.
+   * @return The heigth of @a screen  in millimeters.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   int get_height_mm() const;
 
@@ -280,26 +333,24 @@ public:
    * A visual describes a hardware image data format.
    * For example, a visual might support 24-bit color, or 8-bit color,
    * and might expect pixels to be in a certain format.
+   *  @a newin2p2 
    * @return A list of visuals.
-   * 
-   * Since: 2.2.
    */
   Glib::ListHandle< Glib::RefPtr<Visual> > list_visuals();
   
   /** Obtains a list of all toplevel windows known to GDK on the screen @a screen .
    * A toplevel window is a child of the root window (see
    * gdk_get_default_root_window()).
+   *  @a newin2p2 
    * @return List of toplevel windows.
-   * 
-   * Since: 2.2.
    */
   Glib::ListHandle< Glib::RefPtr<Window> > get_toplevel_windows();
   
   /** Determines the name to pass to Gdk::Display::open() to get
    * a Gdk::Display with this screen as the default screen.
-   * @return The name.
    * 
-   * Since: 2.2.
+   *  @a newin2p2 
+   * @return The name.
    */
   Glib::ustring make_display_name();
 
@@ -307,17 +358,17 @@ public:
   /** Returns the number of monitors which @a screen  consists of.
    * @return Number of monitors which @a screen  consists of.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   int get_n_monitors() const;
   
   /** Retrieves the Gdk::Rectangle representing the size and position of 
-   * the individual monitor within the the entire screen area.
+   * the individual monitor within the entire screen area.
    * 
    * Note that the size of the entire screen area can be retrieved via 
    * get_width() and get_height().
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param monitor_num The monitor number.
    * @param dest A Gdk::Rectangle to be filled with the monitor geometry.
    */
@@ -329,7 +380,7 @@ public:
    * @return The monitor number in which the point ( @a x , @a y ) lies, or
    * a monitor close to ( @a x , @a y ) if the point is not in any monitor.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   int get_monitor_at_point(int x, int y) const;
   
@@ -341,7 +392,7 @@ public:
    * the number of the monitor in which the largest area of the 
    * bounding rectangle of @a window  resides.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   int get_monitor_at_window(const Glib::RefPtr<Window>& window) const;
 
@@ -358,7 +409,7 @@ public:
    * GDK_WIN32_CLIENT_MESSAGE to all top-level windows. The amount of
    * data is limited to one long, i.e. four bytes.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param event The Gdk::Event.
    */
   void broadcast_client_message(GdkEvent* event);
@@ -368,7 +419,7 @@ public:
    * Gdk::Display::get_default()).
    * @return A Gdk::Screen, or <tt>0</tt> if there is no default display.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   static Glib::RefPtr<Screen> get_default();
 
@@ -376,6 +427,15 @@ public:
   bool get_setting(const Glib::ustring& name, ValueType& value) const;
   
 
+  /** The size_changed signal is emitted when the pixel width or 
+   * height of a screen changes.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %size_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_size_changed();
 
 
@@ -383,12 +443,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_size_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/types.cc b/libs/gtkmm2/gdk/gdkmm/types.cc
index e15170aadb..df14515999 100644
--- a/libs/gtkmm2/gdk/gdkmm/types.cc
+++ b/libs/gtkmm2/gdk/gdkmm/types.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/types.h>
 #include <gdkmm/private/types_p.h>
 
diff --git a/libs/gtkmm2/gdk/gdkmm/types.h b/libs/gtkmm2/gdk/gdkmm/types.h
index 1f0c0fafd4..60dd486794 100644
--- a/libs/gtkmm2/gdk/gdkmm/types.h
+++ b/libs/gtkmm2/gdk/gdkmm/types.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_TYPES_H
 #define _GDKMM_TYPES_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -328,7 +329,7 @@ inline bool operator==(const Point& lhs, const Point& rhs)
 inline bool operator!=(const Point& lhs, const Point& rhs)
   { return !lhs.equal(rhs); }
 
-
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 struct AtomStringTraits
 {
   typedef std::string CppType;
@@ -348,6 +349,7 @@ struct AtomStringTraits
 // we don't want it to look like we're calling a template trait, but
 // a utility function. -Bryan
 typedef AtomStringTraits AtomString;
+#endif //DOXYGEN_SHOULD_SKIP_THIS
 
 typedef Glib::ArrayHandle<std::string,AtomStringTraits> ArrayHandle_AtomString;
 
diff --git a/libs/gtkmm2/gdk/gdkmm/visual.cc b/libs/gtkmm2/gdk/gdkmm/visual.cc
index 4d4e84774c..4f77645a88 100644
--- a/libs/gtkmm2/gdk/gdkmm/visual.cc
+++ b/libs/gtkmm2/gdk/gdkmm/visual.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/visual.h>
 #include <gdkmm/private/visual_p.h>
 
@@ -89,8 +90,19 @@ void Visual_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Visual_Class::wrap_new(GObject* object)
 {
@@ -150,6 +162,7 @@ Glib::RefPtr<Visual> Visual::get_system()
   return retvalue;
 }
 
+
 Glib::RefPtr<Visual> Visual::get_best()
 {
 
@@ -160,6 +173,7 @@ Glib::RefPtr<Visual> Visual::get_best()
   return retvalue;
 }
 
+
 Glib::RefPtr<Visual> Visual::get_best(int depth)
 {
 
@@ -170,6 +184,7 @@ Glib::RefPtr<Visual> Visual::get_best(int depth)
   return retvalue;
 }
 
+
 Glib::RefPtr<Visual> Visual::get_best(VisualType visual_type)
 {
 
@@ -180,6 +195,7 @@ Glib::RefPtr<Visual> Visual::get_best(VisualType visual_type)
   return retvalue;
 }
 
+
 Glib::RefPtr<Visual> Visual::get_best(int depth, VisualType visual_type)
 {
 
@@ -190,35 +206,40 @@ Glib::RefPtr<Visual> Visual::get_best(int depth, VisualType visual_type)
   return retvalue;
 }
 
+
 int Visual::get_best_depth()
 {
   return gdk_visual_get_best_depth();
 }
 
+
 VisualType Visual::get_best_type()
 {
   return ((VisualType)(gdk_visual_get_best_type()));
 }
 
+
 Glib::RefPtr<Screen> Visual::get_screen()
 {
 
   Glib::RefPtr<Screen> retvalue = Glib::wrap(gdk_visual_get_screen(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Screen> Visual::get_screen() const
 {
+  return const_cast<Visual*>(this)->get_screen();
+}
 
-  Glib::RefPtr<const Screen> retvalue = Glib::wrap(gdk_visual_get_screen(const_cast<GdkVisual*>(gobj())));
 
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
-}
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gdk
diff --git a/libs/gtkmm2/gdk/gdkmm/visual.h b/libs/gtkmm2/gdk/gdkmm/visual.h
index 66f3cd5807..b170b4ce15 100644
--- a/libs/gtkmm2/gdk/gdkmm/visual.h
+++ b/libs/gtkmm2/gdk/gdkmm/visual.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_VISUAL_H
 #define _GDKMM_VISUAL_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -210,14 +211,14 @@ public:
   /** Gets the screen to which this visual belongs
    * @return The screen to which this visual belongs.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Screen> get_screen();
    
   /** Gets the screen to which this visual belongs
    * @return The screen to which this visual belongs.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Screen> get_screen() const;
 
@@ -226,11 +227,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmm/window.cc b/libs/gtkmm2/gdk/gdkmm/window.cc
index 9419c5b01b..90c72d1dc7 100644
--- a/libs/gtkmm2/gdk/gdkmm/window.cc
+++ b/libs/gtkmm2/gdk/gdkmm/window.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gdkmm/window.h>
 #include <gdkmm/private/window_p.h>
 
@@ -200,8 +201,19 @@ void Window_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Window_Class::wrap_new(GObject* object)
 {
@@ -255,117 +267,122 @@ WindowType Window::get_window_type() const
 
 void Window::show()
 {
-  gdk_window_show(gobj());
+gdk_window_show(gobj()); 
 }
 
 void Window::hide()
 {
-  gdk_window_hide(gobj());
+gdk_window_hide(gobj()); 
 }
 
 void Window::withdraw()
 {
-  gdk_window_withdraw(gobj());
+gdk_window_withdraw(gobj()); 
 }
 
 void Window::show_unraised()
 {
-  gdk_window_show_unraised(gobj());
+gdk_window_show_unraised(gobj()); 
 }
 
 void Window::move(int x, int y)
 {
-  gdk_window_move(gobj(), x, y);
+gdk_window_move(gobj(), x, y); 
 }
 
 void Window::resize(int width, int height)
 {
-  gdk_window_resize(gobj(), width, height);
+gdk_window_resize(gobj(), width, height); 
 }
 
 void Window::move_resize(int x, int y, int width, int height)
 {
-  gdk_window_move_resize(gobj(), x, y, width, height);
+gdk_window_move_resize(gobj(), x, y, width, height); 
 }
 
 void Window::reparent(const Glib::RefPtr<Window>& new_parent, int x, int y)
 {
-  gdk_window_reparent(gobj(), Glib::unwrap(new_parent), x, y);
+gdk_window_reparent(gobj(), Glib::unwrap(new_parent), x, y); 
 }
 
 void Window::clear()
 {
-  gdk_window_clear(gobj());
+gdk_window_clear(gobj()); 
 }
 
 void Window::clear_area(int x, int y, int width, int height)
 {
-  gdk_window_clear_area(gobj(), x, y, width, height);
+gdk_window_clear_area(gobj(), x, y, width, height); 
 }
 
 void Window::clear_area_e(int x, int y, int width, int height)
 {
-  gdk_window_clear_area_e(gobj(), x, y, width, height);
+gdk_window_clear_area_e(gobj(), x, y, width, height); 
 }
 
 void Window::raise()
 {
-  gdk_window_raise(gobj());
+gdk_window_raise(gobj()); 
 }
 
 void Window::lower()
 {
-  gdk_window_lower(gobj());
+gdk_window_lower(gobj()); 
 }
 
 void Window::focus(guint32 timestamp)
 {
-  gdk_window_focus(gobj(), timestamp);
+gdk_window_focus(gobj(), timestamp); 
 }
 
 void Window::set_user_data(gpointer user_data)
 {
-  gdk_window_set_user_data(gobj(), user_data);
+gdk_window_set_user_data(gobj(), user_data); 
 }
 
 void Window::set_override_redirect(bool override_redirect)
 {
-  gdk_window_set_override_redirect(gobj(), static_cast<int>(override_redirect));
+gdk_window_set_override_redirect(gobj(), static_cast<int>(override_redirect)); 
 }
 
 void Window::add_filter(GdkFilterFunc function, gpointer data)
 {
-  gdk_window_add_filter(gobj(), function, data);
+gdk_window_add_filter(gobj(), function, data); 
 }
 
 void Window::remove_filter(GdkFilterFunc function, gpointer data)
 {
-  gdk_window_remove_filter(gobj(), function, data);
+gdk_window_remove_filter(gobj(), function, data); 
 }
 
 void Window::scroll(int dx, int dy)
 {
-  gdk_window_scroll(gobj(), dx, dy);
+gdk_window_scroll(gobj(), dx, dy); 
+}
+
+void Window::move_region(const Region& region, int dx, int dy)
+{
+gdk_window_move_region(gobj(), const_cast<GdkRegion*>((region).gobj()), dx, dy); 
 }
 
 void Window::shape_combine_mask(const Glib::RefPtr<Bitmap>& mask, int x, int y)
 {
-  gdk_window_shape_combine_mask(gobj(), Glib::unwrap(mask), x, y);
+gdk_window_shape_combine_mask(gobj(), Glib::unwrap(mask), x, y); 
 }
 
 void Window::shape_combine_region(const Region& shape_region, int offset_x, int offset_y)
 {
-  gdk_window_shape_combine_region(gobj(), const_cast<GdkRegion*>((shape_region).gobj()), offset_x, offset_y);
+gdk_window_shape_combine_region(gobj(), const_cast<GdkRegion*>((shape_region).gobj()), offset_x, offset_y); 
 }
 
 void Window::set_child_shapes()
 {
-  gdk_window_set_child_shapes(gobj());
+gdk_window_set_child_shapes(gobj()); 
 }
 
 void Window::merge_child_shapes()
 {
-  gdk_window_merge_child_shapes(gobj());
+gdk_window_merge_child_shapes(gobj()); 
 }
 
 bool Window::is_visible() const
@@ -390,82 +407,83 @@ bool Window::set_static_gravities(bool use_static)
 
 void Window::set_type_hint(WindowTypeHint hint)
 {
-  gdk_window_set_type_hint(gobj(), ((GdkWindowTypeHint)(hint)));
+gdk_window_set_type_hint(gobj(), ((GdkWindowTypeHint)(hint))); 
 }
 
 void Window::set_modal_hint(bool modal)
 {
-  gdk_window_set_modal_hint(gobj(), static_cast<int>(modal));
+gdk_window_set_modal_hint(gobj(), static_cast<int>(modal)); 
 }
 
 void Window::set_geometry_hints(const Geometry& geometry, WindowHints geom_mask)
 {
-  gdk_window_set_geometry_hints(gobj(), const_cast<GdkGeometry*>(&(geometry)), ((GdkWindowHints)(geom_mask)));
+gdk_window_set_geometry_hints(gobj(), const_cast<GdkGeometry*>(&(geometry)), ((GdkWindowHints)(geom_mask))); 
 }
 
 void Window::set_sm_client_id(const Glib::ustring& sm_client_id)
 {
-  gdk_set_sm_client_id(sm_client_id.c_str());
+gdk_set_sm_client_id(sm_client_id.c_str());
 }
 
+
 void Window::begin_paint_rect(Rectangle& rectangle)
 {
-  gdk_window_begin_paint_rect(gobj(), (rectangle).gobj());
+gdk_window_begin_paint_rect(gobj(), (rectangle).gobj()); 
 }
 
 void Window::begin_paint_region(const Region& region)
 {
-  gdk_window_begin_paint_region(gobj(), const_cast<GdkRegion*>((region).gobj()));
+gdk_window_begin_paint_region(gobj(), const_cast<GdkRegion*>((region).gobj())); 
 }
 
 void Window::end_paint()
 {
-  gdk_window_end_paint(gobj());
+gdk_window_end_paint(gobj()); 
 }
 
 void Window::set_title(const Glib::ustring& title)
 {
-  gdk_window_set_title(gobj(), title.c_str());
+gdk_window_set_title(gobj(), title.c_str()); 
 }
 
 void Window::set_role(const Glib::ustring& role)
 {
-  gdk_window_set_role(gobj(), role.c_str());
+gdk_window_set_role(gobj(), role.c_str()); 
 }
 
 void Window::set_transient_for(const Glib::RefPtr<Window>& parent)
 {
-  gdk_window_set_transient_for(gobj(), Glib::unwrap(parent));
+gdk_window_set_transient_for(gobj(), Glib::unwrap(parent)); 
 }
 
 void Window::set_background(const Color& color)
 {
-  gdk_window_set_background(gobj(), (color).gobj());
+gdk_window_set_background(gobj(), (color).gobj()); 
 }
 
 void Window::set_back_pixmap(const Glib::RefPtr<Pixmap>& pixmap, bool parent_relative)
 {
-  gdk_window_set_back_pixmap(gobj(), Glib::unwrap(pixmap), static_cast<int>(parent_relative));
+gdk_window_set_back_pixmap(gobj(), Glib::unwrap(pixmap), static_cast<int>(parent_relative)); 
 }
 
 void Window::set_cursor(const Cursor& cursor)
 {
-  gdk_window_set_cursor(gobj(), (cursor).gobj_copy());
+gdk_window_set_cursor(gobj(), const_cast<GdkCursor*>((cursor).gobj())); 
 }
 
 void Window::get_user_data(gpointer* data)
 {
-  gdk_window_get_user_data(gobj(), data);
+gdk_window_get_user_data(gobj(), data); 
 }
 
 void Window::get_geometry(int& x, int& y, int& width, int& height, int& depth) const
 {
-  gdk_window_get_geometry(const_cast<GdkWindow*>(gobj()), &x, &y, &width, &height, &depth);
+gdk_window_get_geometry(const_cast<GdkWindow*>(gobj()), &x, &y, &width, &height, &depth); 
 }
 
 void Window::get_position(int& x, int& y) const
 {
-  gdk_window_get_position(const_cast<GdkWindow*>(gobj()), &x, &y);
+gdk_window_get_position(const_cast<GdkWindow*>(gobj()), &x, &y); 
 }
 
 int Window::get_origin(int& x, int& y) const
@@ -475,62 +493,52 @@ int Window::get_origin(int& x, int& y) const
 
 void Window::get_root_origin(int& x, int& y) const
 {
-  gdk_window_get_root_origin(const_cast<GdkWindow*>(gobj()), &x, &y);
+gdk_window_get_root_origin(const_cast<GdkWindow*>(gobj()), &x, &y); 
 }
 
 void Window::get_frame_extents(Rectangle& rect)
 {
-  gdk_window_get_frame_extents(gobj(), (rect).gobj());
+gdk_window_get_frame_extents(gobj(), (rect).gobj()); 
 }
 
 Glib::RefPtr<Window> Window::get_pointer(int& x, int& y, ModifierType& mask)
 {
 
   Glib::RefPtr<Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_window_get_pointer(gobj(), &x, &y, ((GdkModifierType*) &(mask)))));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<Window> Window::get_parent()
 {
 
   Glib::RefPtr<Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_window_get_parent(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Window> Window::get_parent() const
 {
-
-  Glib::RefPtr<const Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_window_get_parent(const_cast<GdkWindow*>(gobj()))));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Window*>(this)->get_parent();
 }
 
 Glib::RefPtr<Window> Window::get_toplevel()
 {
 
   Glib::RefPtr<Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_window_get_toplevel(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Window> Window::get_toplevel() const
 {
-
-  Glib::RefPtr<const Window> retvalue = Glib::wrap((GdkWindowObject*)(gdk_window_get_toplevel(const_cast<GdkWindow*>(gobj()))));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Window*>(this)->get_toplevel();
 }
 
 Glib::ListHandle< Glib::RefPtr<Window> > Window::get_children()
@@ -550,27 +558,27 @@ EventMask Window::get_events() const
 
 void Window::set_events(EventMask event_mask)
 {
-  gdk_window_set_events(gobj(), ((GdkEventMask)(event_mask)));
+gdk_window_set_events(gobj(), ((GdkEventMask)(event_mask))); 
 }
 
 void Window::set_icon_list(const Glib::ListHandle< Glib::RefPtr<Gdk::Pixbuf> >& pixbufs)
 {
-  gdk_window_set_icon_list(gobj(), pixbufs.data());
+gdk_window_set_icon_list(gobj(), pixbufs.data()); 
 }
 
 void Window::set_icon(const Glib::RefPtr<Window>& icon_window, const Glib::RefPtr<Pixmap>& pixmap, const Glib::RefPtr<Bitmap>& mask)
 {
-  gdk_window_set_icon(gobj(), Glib::unwrap(icon_window), Glib::unwrap(pixmap), Glib::unwrap(mask));
+gdk_window_set_icon(gobj(), Glib::unwrap(icon_window), Glib::unwrap(pixmap), Glib::unwrap(mask)); 
 }
 
 void Window::set_icon_name(const Glib::ustring& name)
 {
-  gdk_window_set_icon_name(gobj(), name.c_str());
+gdk_window_set_icon_name(gobj(), name.c_str()); 
 }
 
 void Window::set_group(const Glib::RefPtr<Window>& leader)
 {
-  gdk_window_set_group(gobj(), Glib::unwrap(leader));
+gdk_window_set_group(gobj(), Glib::unwrap(leader)); 
 }
 
 Glib::RefPtr<Window> Window::get_group()
@@ -580,12 +588,12 @@ Glib::RefPtr<Window> Window::get_group()
 
 Glib::RefPtr<const Window> Window::get_group() const
 {
-  return Glib::wrap((GdkWindowObject*)(gdk_window_get_group(const_cast<GdkWindow*>(gobj()))));
+  return const_cast<Window*>(this)->get_group();
 }
 
 void Window::set_decorations(WMDecoration decorations)
 {
-  gdk_window_set_decorations(gobj(), ((GdkWMDecoration)(decorations)));
+gdk_window_set_decorations(gobj(), ((GdkWMDecoration)(decorations))); 
 }
 
 bool Window::get_decorations(WMDecoration& decorations) const
@@ -595,7 +603,7 @@ bool Window::get_decorations(WMDecoration& decorations) const
 
 void Window::set_functions(WMFunction functions)
 {
-  gdk_window_set_functions(gobj(), ((GdkWMFunction)(functions)));
+gdk_window_set_functions(gobj(), ((GdkWMFunction)(functions))); 
 }
 
 Glib::ListHandle< Glib::RefPtr<Window> > Window::get_toplevels()
@@ -603,59 +611,60 @@ Glib::ListHandle< Glib::RefPtr<Window> > Window::get_toplevels()
   return Glib::ListHandle< Glib::RefPtr<Window> >(gdk_window_get_toplevels(), Glib::OWNERSHIP_SHALLOW);
 }
 
+
 void Window::iconify()
 {
-  gdk_window_iconify(gobj());
+gdk_window_iconify(gobj()); 
 }
 
 void Window::deiconify()
 {
-  gdk_window_deiconify(gobj());
+gdk_window_deiconify(gobj()); 
 }
 
 void Window::stick()
 {
-  gdk_window_stick(gobj());
+gdk_window_stick(gobj()); 
 }
 
 void Window::unstick()
 {
-  gdk_window_unstick(gobj());
+gdk_window_unstick(gobj()); 
 }
 
 void Window::maximize()
 {
-  gdk_window_maximize(gobj());
+gdk_window_maximize(gobj()); 
 }
 
 void Window::unmaximize()
 {
-  gdk_window_unmaximize(gobj());
+gdk_window_unmaximize(gobj()); 
 }
 
 void Window::register_dnd()
 {
-  gdk_window_register_dnd(gobj());
+gdk_window_register_dnd(gobj()); 
 }
 
 void Window::begin_resize_drag(WindowEdge edge, int button, int root_x, int root_y, guint32 timestamp)
 {
-  gdk_window_begin_resize_drag(gobj(), ((GdkWindowEdge)(edge)), button, root_x, root_y, timestamp);
+gdk_window_begin_resize_drag(gobj(), ((GdkWindowEdge)(edge)), button, root_x, root_y, timestamp); 
 }
 
 void Window::begin_move_drag(int button, int root_x, int root_y, guint32 timestamp)
 {
-  gdk_window_begin_move_drag(gobj(), button, root_x, root_y, timestamp);
+gdk_window_begin_move_drag(gobj(), button, root_x, root_y, timestamp); 
 }
 
 void Window::invalidate_rect(const Rectangle& rect, bool invalidate_children)
 {
-  gdk_window_invalidate_rect(gobj(), const_cast<GdkRectangle*>(rect.gobj()), static_cast<int>(invalidate_children));
+gdk_window_invalidate_rect(gobj(), const_cast<GdkRectangle*>(rect.gobj()), static_cast<int>(invalidate_children)); 
 }
 
 void Window::invalidate_region(const Region& region, bool invalidate_children)
 {
-  gdk_window_invalidate_region(gobj(), const_cast<GdkRegion*>((region).gobj()), static_cast<int>(invalidate_children));
+gdk_window_invalidate_region(gobj(), const_cast<GdkRegion*>((region).gobj()), static_cast<int>(invalidate_children)); 
 }
 
 Region Window::get_update_area()
@@ -665,74 +674,83 @@ Region Window::get_update_area()
 
 void Window::freeze_updates()
 {
-  gdk_window_freeze_updates(gobj());
+gdk_window_freeze_updates(gobj()); 
 }
 
 void Window::thaw_updates()
 {
-  gdk_window_thaw_updates(gobj());
+gdk_window_thaw_updates(gobj()); 
 }
 
 void Window::process_all_updates()
 {
-  gdk_window_process_all_updates();
+gdk_window_process_all_updates();
 }
 
+
 void Window::process_updates(bool update_children)
 {
-  gdk_window_process_updates(gobj(), static_cast<int>(update_children));
+gdk_window_process_updates(gobj(), static_cast<int>(update_children)); 
 }
 
 void Window::set_debug_updates(bool setting)
 {
-  gdk_window_set_debug_updates(static_cast<int>(setting));
+gdk_window_set_debug_updates(static_cast<int>(setting));
 }
 
+
 void Window::constrain_size(const Geometry& geometry, guint flags, int width, int height, int& new_width, int& new_height)
 {
-  gdk_window_constrain_size(const_cast<GdkGeometry*>(&(geometry)), flags, width, height, &new_width, &new_height);
+gdk_window_constrain_size(const_cast<GdkGeometry*>(&(geometry)), flags, width, height, &new_width, &new_height);
 }
 
+
 void Window::enable_synchronized_configure()
 {
-  gdk_window_enable_synchronized_configure(gobj());
+gdk_window_enable_synchronized_configure(gobj()); 
 }
 
 void Window::configure_finished()
 {
-  gdk_window_configure_finished(gobj());
+gdk_window_configure_finished(gobj()); 
 }
 
 void Window::set_skip_taskbar_hint(bool skips_taskbar)
 {
-  gdk_window_set_skip_taskbar_hint(gobj(), static_cast<int>(skips_taskbar));
+gdk_window_set_skip_taskbar_hint(gobj(), static_cast<int>(skips_taskbar)); 
 }
 
 void Window::set_skip_pager_hint(bool skips_pager)
 {
-  gdk_window_set_skip_pager_hint(gobj(), static_cast<int>(skips_pager));
+gdk_window_set_skip_pager_hint(gobj(), static_cast<int>(skips_pager)); 
+}
+
+void Window::set_urgency_hint(bool urgent)
+{
+gdk_window_set_urgency_hint(gobj(), static_cast<int>(urgent)); 
 }
 
 void Window::fullscreen()
 {
-  gdk_window_fullscreen(gobj());
+gdk_window_fullscreen(gobj()); 
 }
 
 void Window::unfullscreen()
 {
-  gdk_window_unfullscreen(gobj());
+gdk_window_unfullscreen(gobj()); 
 }
 
 GrabStatus Window::pointer_grab(bool owner_events, EventMask event_mask, const Glib::RefPtr<const Window>& confine_to, const Cursor& cursor, guint32 time_)
 {
-  return ((GrabStatus)(gdk_pointer_grab(gobj(), static_cast<int>(owner_events), ((GdkEventMask)(event_mask)), const_cast<GdkWindow*>(Glib::unwrap<Gdk::Window>(confine_to)), (cursor).gobj_copy(), time_)));
+  return ((GrabStatus)(gdk_pointer_grab(gobj(), static_cast<int>(owner_events), ((GdkEventMask)(event_mask)), const_cast<GdkWindow*>(Glib::unwrap<Gdk::Window>(confine_to)), const_cast<GdkCursor*>((cursor).gobj()), time_)));
 }
 
 void Window::pointer_ungrab(guint32 timestamp)
 {
-  gdk_pointer_ungrab(timestamp);
+gdk_pointer_ungrab(timestamp);
 }
 
+
 GrabStatus Window::keyboard_grab(bool owner_events, guint32 timestamp)
 {
   return ((GrabStatus)(gdk_keyboard_grab(gobj(), static_cast<int>(owner_events), timestamp)));
@@ -740,30 +758,38 @@ GrabStatus Window::keyboard_grab(bool owner_events, guint32 timestamp)
 
 void Window::keyboard_ungrab(guint32 timestamp)
 {
-  gdk_keyboard_ungrab(timestamp);
+gdk_keyboard_ungrab(timestamp);
 }
 
+
 void Window::set_keep_above(bool setting)
 {
-  gdk_window_set_keep_above(gobj(), static_cast<int>(setting));
+gdk_window_set_keep_above(gobj(), static_cast<int>(setting)); 
 }
 
 void Window::set_keep_below(bool setting)
 {
-  gdk_window_set_keep_below(gobj(), static_cast<int>(setting));
+gdk_window_set_keep_below(gobj(), static_cast<int>(setting)); 
 }
 
 void Window::set_accept_focus(bool accept_focus)
 {
-  gdk_window_set_accept_focus(gobj(), static_cast<int>(accept_focus));
+gdk_window_set_accept_focus(gobj(), static_cast<int>(accept_focus)); 
 }
 
 void Window::set_focus_on_map(bool focus_on_map)
 {
-  gdk_window_set_focus_on_map(gobj(), static_cast<int>(focus_on_map));
+gdk_window_set_focus_on_map(gobj(), static_cast<int>(focus_on_map)); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gdk
 
 
diff --git a/libs/gtkmm2/gdk/gdkmm/window.h b/libs/gtkmm2/gdk/gdkmm/window.h
index 7b8d9c614d..40acfafa32 100644
--- a/libs/gtkmm2/gdk/gdkmm/window.h
+++ b/libs/gtkmm2/gdk/gdkmm/window.h
@@ -3,6 +3,7 @@
 #ifndef _GDKMM_WINDOW_H
 #define _GDKMM_WINDOW_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -867,9 +868,8 @@ public:
    */
   void lower();
   
-  /** Sets keyboard focus to @a window . If @a window  is not onscreen this
-   * will not work. In most cases, gtk_window_present() should be used on
-   * a Gtk::Window, rather than calling this function.
+  /** Sets keyboard focus to @a window . In most cases, gtk_window_present() 
+   * should be used on a Gtk::Window, rather than calling this function.
    * @param timestamp Timestamp of the event triggering the window focus.
    */
   void focus(guint32 timestamp);
@@ -929,6 +929,20 @@ public:
    */
   void scroll(int dx, int dy);
   
+  /** Move the part of @a window  indicated by @a region  by @a dy  pixels in the Y 
+   * direction and @a dx  pixels in the X direction. The portions of @a region  
+   * that not covered by the new position of @a region  are invalidated.
+   * 
+   * Child windows are not moved.
+   * 
+   * @newin2p8
+   * @param region The Gdk::Region to move.
+   * @param dx Amount to move in the X direction.
+   * @param dy Amount to move in the Y direction.
+   */
+  void move_region(const Region& region, int dx, int dy);
+
+  
   /** Applies a shape mask to @a window . Pixels in @a window  corresponding to
    * set bits in the @a mask  will be visible; pixels in @a window 
    * corresponding to unset bits in the @a mask  will be transparent. This
@@ -1036,7 +1050,7 @@ public:
    * way.
    * 
    * You should only use this on windows for which you have
-   * previously called #gdk_window_set_transient_for()
+   * previously called gdk_window_set_transient_for()
    * @param modal <tt>true</tt> if the window is modal, <tt>false</tt> otherwise.
    */
   void set_modal_hint(bool modal = true);
@@ -1054,7 +1068,7 @@ public:
    * gdk_window_move_resize().
    * 
    * Note that on X11, this effect has no effect on windows
-   * of type GDK_WINDOW_TEMP or windows where override_redirect
+   * of type Gdk::WINDOW_TEMP or windows where override redirect
    * has been turned on via gdk_window_set_override_redirect()
    * since these windows are not resizable by the user.
    * 
@@ -1210,7 +1224,8 @@ public:
    * @param parent_relative Whether the tiling origin is at the origin of @a window 's parent.
    */
   void set_back_pixmap(const Glib::RefPtr<Pixmap>&pixmap, bool parent_relative);
-  
+
+ 
   /** Sets the mouse pointer for a Gdk::Window. 
    * To make the cursor invisible, use gdk_cursor_new_from_pixmap() to create
    * a cursor with no pixels in it.
@@ -1281,7 +1296,7 @@ public:
    * @return Not meaningful, ignore.
    */
   int get_origin(int& x, int& y) const;
-  //_WRAP_METHOD(bool get_deskrelative_origin(int& x, int& y), gdk_window_get_deskrelative_origin)
+  
   
   /** Obtains the top-left corner of the window manager frame in root
    * window coordinates.
@@ -1428,14 +1443,14 @@ public:
   /** Returns the group leader window for @a window . See gdk_window_set_group().
    * @return The group leader window for @a window 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<Window> get_group();
   
   /** Returns the group leader window for @a window . See gdk_window_set_group().
    * @return The group leader window for @a window 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<const Window> get_group() const;
 
@@ -1555,9 +1570,8 @@ public:
   /** Begins a window resize operation (for a toplevel window).
    * You might use this function to implement a "window resize grip," for
    * example; in fact Gtk::Statusbar uses it. The function works best
-   * with window managers that support the Extended Window Manager Hints spec
-   * (see http://www.freedesktop.org), but has a fallback implementation
-   * for other window managers.
+   * with window managers that support the Extended Window Manager Hints, but has a 
+   * fallback implementation for other window managers.
    * @param edge The edge or corner from which the drag is started.
    * @param button The button being used to drag.
    * @param root_x Root window X coordinate of mouse click that began the drag.
@@ -1569,8 +1583,8 @@ public:
   /** Begins a window move operation (for a toplevel window).  You might
    * use this function to implement a "window move grip," for
    * example. The function works best with window managers that support
-   * the Extended Window Manager Hints spec (see
-   * http://www.freedesktop.org), but has a fallback implementation for
+   * the Extended 
+   * Window Manager Hints, but has a fallback implementation for
    * other window managers.
    * @param button The button being used to drag.
    * @param root_x Root window X coordinate of mouse click that began the drag.
@@ -1700,7 +1714,7 @@ public:
    * On X, calling this function makes @a window  participate in the
    * _NET_WM_SYNC_REQUEST window manager protocol.
    * 
-   * Since: 2.6
+   * @newin2p6
    */
   void enable_synchronized_configure();
   
@@ -1710,10 +1724,10 @@ public:
    * application. GTK+ applications will automatically call this
    * function when appropriate.
    * 
-   * This function can only be called if gdk_window_use_configure()
+   * This function can only be called if gdk_window_enable_synchronized_configure()
    * was called previously.
    * 
-   * Since: 2.6
+   * @newin2p6
    */
   void configure_finished();
 
@@ -1721,11 +1735,11 @@ public:
   /** Toggles whether a window should appear in a task list or window
    * list. If a window's semantic type as specified with
    * gdk_window_set_type_hint() already fully describes the window, this
-   * function should NOT be called in addition, instead you should allow
-   * the window to be treated according to standard policy for its
-   * semantic type.
+   * function should <em>not</em> be called in addition, 
+   * instead you should allow the window to be treated according to 
+   * standard policy for its semantic type.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param skips_taskbar <tt>true</tt> to skip the taskbar.
    */
   void set_skip_taskbar_hint(bool skips_taskbar = true);
@@ -1734,16 +1748,26 @@ public:
    * switcher, or other desktop utility program that displays a small
    * thumbnail representation of the windows on the desktop). If a
    * window's semantic type as specified with gdk_window_set_type_hint()
-   * already fully describes the window, this function should NOT be
-   * called in addition, instead you should allow the window to be
-   * treated according to standard policy for its semantic type.
+   * already fully describes the window, this function should 
+   * <em>not</em> be called in addition, instead you should 
+   * allow the window to be treated according to standard policy for 
+   * its semantic type.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param skips_pager <tt>true</tt> to skip the pager.
    */
   void set_skip_pager_hint(bool skips_pager = true);
 
   
+  /** Toggles whether a window needs the user's
+   * urgent attention.
+   * 
+   * @newin2p8
+   * @param urgent <tt>true</tt> if the window is urgent.
+   */
+  void set_urgency_hint(bool urgent = true);
+
+  
   /** Moves the window into fullscreen mode. This means the
    * window covers the entire screen and is above any panels
    * or task bars.
@@ -1758,7 +1782,7 @@ public:
    * most standard window managers, and GDK makes a best effort to get
    * it to happen.
    * 
-   * Since: 2.2
+   * @newin2p2
    */
   void fullscreen();
   
@@ -1773,7 +1797,7 @@ public:
    * most standard window managers, and GDK makes a best effort to get
    * it to happen. 
    * 
-   * Since: 2.2
+   * @newin2p2
    */
   void unfullscreen();
 
@@ -1827,7 +1851,7 @@ public:
    * But it will happen with most standard window managers,
    * and GDK makes a best effort to get it to happen.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param setting Whether to keep @a window  above other windows.
    */
   void set_keep_above(bool setting = true);
@@ -1842,7 +1866,7 @@ public:
    * But it will happen with most standard window managers,
    * and GDK makes a best effort to get it to happen.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param setting Whether to keep @a window  below other windows.
    */
   void set_keep_below(bool setting = true);
@@ -1854,7 +1878,7 @@ public:
    * On X, it is the responsibility of the window manager to interpret this 
    * hint. ICCCM-compliant window manager usually respect it.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param accept_focus <tt>true</tt> if the window should receive input focus.
    */
   void set_accept_focus(bool accept_focus = true);
@@ -1869,7 +1893,7 @@ public:
    * this hint. %Window managers following the freedesktop.org window
    * manager extension specification should respect it.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param focus_on_map <tt>true</tt> if the window should receive input focus when mapped.
    */
   void set_focus_on_map(bool focus_on_map);
@@ -1879,11 +1903,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gdk/gdkmmconfig.h b/libs/gtkmm2/gdk/gdkmmconfig.h
index cbfb1a34da..26f39b4b3d 100644
--- a/libs/gtkmm2/gdk/gdkmmconfig.h
+++ b/libs/gtkmm2/gdk/gdkmmconfig.h
@@ -1,4 +1,4 @@
-/* gdk/gdkmmconfig.h.  Generated by configure.  */
+/* gdk/gdkmmconfig.h.  Generated from gdkmmconfig.h.in by configure.  */
 #ifndef _GDKMM_CONFIG_H
 #define _GDKMM_CONFIG_H 1
 
diff --git a/libs/gtkmm2/gtk/SConscript b/libs/gtkmm2/gtk/SConscript
index b4cd99f023..fe0fc610cf 100644
--- a/libs/gtkmm2/gtk/SConscript
+++ b/libs/gtkmm2/gtk/SConscript
@@ -8,7 +8,8 @@ gtkmm2_files = glob.glob('gtkmm/*.cc')
 
 Import('env libraries install_prefix')
 gtkmm2 = env.Copy()
-gtkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['atkmm'], libraries['gdkmm2'] ])
+gtkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['atkmm'], libraries['gdkmm2'], libraries['cairomm'], libraries['gtk2-unix-print'] ])
+gtkmm2.Append(CXXFLAGS = ['-DGLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED', '-DGLIBMM_PROPERTIES_ENABLED', '-DGLIBMM_EXCEPTIONS_ENABLED'])
 
 libgtkmm2 = gtkmm2.SharedLibrary('gtkmm2', gtkmm2_files)
 Default(libgtkmm2)
diff --git a/libs/gtkmm2/gtk/gtkmm.h b/libs/gtkmm2/gtk/gtkmm.h
index cb8411a3e3..91dc01ab0e 100644
--- a/libs/gtkmm2/gtk/gtkmm.h
+++ b/libs/gtkmm2/gtk/gtkmm.h
@@ -37,17 +37,21 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/alignment.h>
 #include <gtkmm/arrow.h>
 #include <gtkmm/aspectframe.h>
+#include <gtkmm/assistant.h>
 #include <gtkmm/base.h>
 #include <gtkmm/bin.h>
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
 #include <gtkmm/buttonbox.h>
+#include <gtkmm/cellview.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/checkmenuitem.h>
 #include <gtkmm/cellrenderer.h>
+#include <gtkmm/cellrendereraccel.h>
 #include <gtkmm/cellrenderercombo.h>
 #include <gtkmm/cellrendererpixbuf.h>
 #include <gtkmm/cellrendererprogress.h>
+#include <gtkmm/cellrendererspin.h>
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/cellrenderertoggle.h>
 #include <gtkmm/colorbutton.h>
@@ -81,6 +85,7 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/iconset.h>
 #include <gtkmm/iconfactory.h>
 #include <gtkmm/iconsource.h>
+#include <gtkmm/icontheme.h>
 #include <gtkmm/iconview.h>
 #include <gtkmm/image.h>
 #include <gtkmm/imagemenuitem.h>
@@ -89,7 +94,10 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/calendar.h>
 #include <gtkmm/invisible.h>
 #include <gtkmm/label.h>
+#include <gtkmm/layout.h>
 #include <gtkmm/liststore.h>
+#include <gtkmm/listviewtext.h>
+#include <gtkmm/linkbutton.h>
 #include <gtkmm/main.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/menu_elems.h>
@@ -102,12 +110,29 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/object.h>
 #include <gtkmm/optionmenu.h>
 #include <gtkmm/paned.h>
+#include <gtkmm/pagesetup.h>
+#include <gtkmm/pagesetupunixdialog.h>
+#include <gtkmm/papersize.h>
+#include <gtkmm/printcontext.h>
+#include <gtkmm/printer.h>
+#include <gtkmm/printjob.h>
+#include <gtkmm/printoperation.h>
+#include <gtkmm/printoperationpreview.h>
+#include <gtkmm/printsettings.h>
+#include <gtkmm/printunixdialog.h>
 #include <gtkmm/progressbar.h>
 #include <gtkmm/radioaction.h>
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/radiotoolbutton.h>
 #include <gtkmm/range.h>
+#include <gtkmm/recentchooser.h>
+#include <gtkmm/recentchooserdialog.h>
+#include <gtkmm/recentchoosermenu.h>
+#include <gtkmm/recentchooserwidget.h>
+#include <gtkmm/recentfilter.h>
+#include <gtkmm/recentinfo.h>
+#include <gtkmm/recentmanager.h>
 #include <gtkmm/ruler.h>
 #include <gtkmm/scale.h>
 #include <gtkmm/scrollbar.h>
@@ -119,11 +144,13 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/sizegroup.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/statusbar.h>
+#include <gtkmm/statusicon.h>
 #include <gtkmm/stock.h>
 #include <gtkmm/stockid.h>
 #include <gtkmm/stockitem.h>
 #include <gtkmm/style.h>
 #include <gtkmm/table.h>
+#include <gtkmm/tearoffmenuitem.h>
 #include <gtkmm/textbuffer.h>
 #include <gtkmm/textchildanchor.h>
 #include <gtkmm/textiter.h>
@@ -137,6 +164,7 @@ extern const int gtkmm_micro_version;
 #include <gtkmm/toolitem.h>
 #include <gtkmm/toolbutton.h>
 #include <gtkmm/toggletoolbutton.h>
+#include <gtkmm/menutoolbutton.h>
 #include <gtkmm/tooltips.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treemodelfilter.h>
diff --git a/libs/gtkmm2/gtk/gtkmm/aboutdialog.cc b/libs/gtkmm2/gtk/gtkmm/aboutdialog.cc
index 24b97e3b39..2ef8776d88 100644
--- a/libs/gtkmm2/gtk/gtkmm/aboutdialog.cc
+++ b/libs/gtkmm2/gtk/gtkmm/aboutdialog.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/aboutdialog.h>
 #include <gtkmm/private/aboutdialog_p.h>
 
@@ -29,54 +30,32 @@
 #include <gtk/gtklabel.h>
 
 
-namespace //anonymous
-{
-
-// This Signal Proxy allows the C++ coder to specify
-// a sigc::slot instead of a static function.
-class SignalProxy_ActivateLink
-{
-public:
-  typedef Gtk::AboutDialog::SlotActivateLink SlotType;
-
-  SignalProxy_ActivateLink(const SlotType& slot)
-  : slot_(slot) {}
-
-  ~SignalProxy_ActivateLink();
-
-  static void gtk_callback(GtkAboutDialog* about, const gchar* link, gpointer data);
-  static void gtk_callback_destroy(void* data);
-
-private:
-  SlotType slot_;
-};
-
-SignalProxy_ActivateLink::~SignalProxy_ActivateLink()
-{}
-
-void SignalProxy_ActivateLink::gtk_callback(GtkAboutDialog* about, const gchar* link, gpointer data)
+//We use a function instead of a static method, so we can make it static, so it is not exported.
+static void SignalProxy_ActivateLink_gtk_callback(GtkAboutDialog* about, const gchar* link, gpointer data)
 {
-  SignalProxy_ActivateLink *const self = static_cast<SignalProxy_ActivateLink*>(data);
+  Gtk::AboutDialog::SlotActivateLink* the_slot = static_cast<Gtk::AboutDialog::SlotActivateLink*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     Gtk::AboutDialog* pCppAbout = Glib::wrap(about);
-    (self->slot_)( *pCppAbout, Glib::convert_const_gchar_ptr_to_ustring(link) );
+    (*the_slot)( *pCppAbout, Glib::convert_const_gchar_ptr_to_ustring(link) );
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
-
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void SignalProxy_ActivateLink::gtk_callback_destroy(void* data)
+static void SignalProxy_ActivateLink_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_ActivateLink*>(data);
+  Gtk::AboutDialog::SlotActivateLink* the_slot = static_cast<Gtk::AboutDialog::SlotActivateLink*>(data);
+  delete the_slot;
 }
 
-} // anonymous namespace
-
 
 namespace Gtk
 {
@@ -84,27 +63,27 @@ namespace Gtk
 //static:
 void AboutDialog::set_email_hook(const SlotActivateLink& slot)
 {
-  // Create a signal proxy.  A pointer to this will be passed
+  // Create a copy of the slot object. A pointer to this will be passed
   // through the callback's data parameter.  It will be deleted
-  // when SignalProxy_ActivateLink::gtk_callback_destroy() is called.
-  SignalProxy_ActivateLink *const pSignalProxy = new SignalProxy_ActivateLink(slot);
+  // when SignalProxy_SlotForwardPage_gtk_callback_destroy() is called.
+  SlotActivateLink* slot_copy = new SlotActivateLink(slot);
 
   gtk_about_dialog_set_email_hook(
-      &SignalProxy_ActivateLink::gtk_callback, pSignalProxy,
-      &SignalProxy_ActivateLink::gtk_callback_destroy);
+      &SignalProxy_ActivateLink_gtk_callback, slot_copy,
+      &SignalProxy_ActivateLink_gtk_callback_destroy);
 }
   
 //static:
 void AboutDialog::set_url_hook(const SlotActivateLink& slot)
 {
-  // Create a signal proxy.  A pointer to this will be passed
+  // Create a copy of the slot object. A pointer to this will be passed
   // through the callback's data parameter.  It will be deleted
-  // when SignalProxy_ActivateLink::gtk_callback_destroy() is called.
-  SignalProxy_ActivateLink *const pSignalProxy = new SignalProxy_ActivateLink(slot);
+  // when SignalProxy_SlotForwardPage_gtk_callback_destroy() is called.
+  SlotActivateLink* slot_copy = new SlotActivateLink(slot);
 
   gtk_about_dialog_set_url_hook(
-      &SignalProxy_ActivateLink::gtk_callback, pSignalProxy,
-      &SignalProxy_ActivateLink::gtk_callback_destroy);
+      &SignalProxy_ActivateLink_gtk_callback, slot_copy,
+      &SignalProxy_ActivateLink_gtk_callback_destroy);
 } 
 
 } // namespace Gtk
@@ -156,8 +135,19 @@ void AboutDialog_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* AboutDialog_Class::wrap_new(GObject* o)
 {
@@ -212,7 +202,7 @@ Glib::ustring AboutDialog::get_name() const
 
 void AboutDialog::set_name(const Glib::ustring& name)
 {
-  gtk_about_dialog_set_name(gobj(), name.c_str());
+gtk_about_dialog_set_name(gobj(), name.c_str()); 
 }
 
 Glib::ustring AboutDialog::get_version() const
@@ -222,7 +212,7 @@ Glib::ustring AboutDialog::get_version() const
 
 void AboutDialog::set_version(const Glib::ustring& version)
 {
-  gtk_about_dialog_set_version(gobj(), version.c_str());
+gtk_about_dialog_set_version(gobj(), version.c_str()); 
 }
 
 Glib::ustring AboutDialog::get_copyright() const
@@ -232,7 +222,7 @@ Glib::ustring AboutDialog::get_copyright() const
 
 void AboutDialog::set_copyright(const Glib::ustring& copyright)
 {
-  gtk_about_dialog_set_copyright(gobj(), copyright.c_str());
+gtk_about_dialog_set_copyright(gobj(), copyright.c_str()); 
 }
 
 Glib::ustring AboutDialog::get_comments() const
@@ -242,7 +232,7 @@ Glib::ustring AboutDialog::get_comments() const
 
 void AboutDialog::set_comments(const Glib::ustring& comments)
 {
-  gtk_about_dialog_set_comments(gobj(), comments.c_str());
+gtk_about_dialog_set_comments(gobj(), comments.c_str()); 
 }
 
 Glib::ustring AboutDialog::get_license() const
@@ -252,7 +242,7 @@ Glib::ustring AboutDialog::get_license() const
 
 void AboutDialog::set_license(const Glib::ustring& license)
 {
-  gtk_about_dialog_set_license(gobj(), license.c_str());
+gtk_about_dialog_set_license(gobj(), license.c_str()); 
 }
 
 Glib::ustring AboutDialog::get_website() const
@@ -262,7 +252,7 @@ Glib::ustring AboutDialog::get_website() const
 
 void AboutDialog::set_website(const Glib::ustring& website)
 {
-  gtk_about_dialog_set_website(gobj(), website.c_str());
+gtk_about_dialog_set_website(gobj(), website.c_str()); 
 }
 
 Glib::ustring AboutDialog::get_website_label() const
@@ -272,7 +262,7 @@ Glib::ustring AboutDialog::get_website_label() const
 
 void AboutDialog::set_website_label(const Glib::ustring& website_label)
 {
-  gtk_about_dialog_set_website_label(gobj(), website_label.c_str());
+gtk_about_dialog_set_website_label(gobj(), website_label.c_str()); 
 }
 
 Glib::StringArrayHandle AboutDialog::get_authors() const
@@ -282,7 +272,7 @@ Glib::StringArrayHandle AboutDialog::get_authors() const
 
 void AboutDialog::set_authors(const Glib::StringArrayHandle& authors) const
 {
-  gtk_about_dialog_set_authors(const_cast<GtkAboutDialog*>(gobj()), const_cast<const gchar**>((authors).data()));
+gtk_about_dialog_set_authors(const_cast<GtkAboutDialog*>(gobj()), const_cast<const gchar**>((authors).data())); 
 }
 
 Glib::StringArrayHandle AboutDialog::get_documenters() const
@@ -292,7 +282,7 @@ Glib::StringArrayHandle AboutDialog::get_documenters() const
 
 void AboutDialog::set_documenters(const Glib::StringArrayHandle& documenters)
 {
-  gtk_about_dialog_set_documenters(gobj(), const_cast<const gchar**>((documenters).data()));
+gtk_about_dialog_set_documenters(gobj(), const_cast<const gchar**>((documenters).data())); 
 }
 
 Glib::StringArrayHandle AboutDialog::get_artists() const
@@ -302,7 +292,7 @@ Glib::StringArrayHandle AboutDialog::get_artists() const
 
 void AboutDialog::set_artists(const Glib::StringArrayHandle& artists)
 {
-  gtk_about_dialog_set_artists(gobj(), const_cast<const gchar**>((artists).data()));
+gtk_about_dialog_set_artists(gobj(), const_cast<const gchar**>((artists).data())); 
 }
 
 Glib::ustring AboutDialog::get_translator_credits() const
@@ -312,7 +302,7 @@ Glib::ustring AboutDialog::get_translator_credits() const
 
 void AboutDialog::set_translator_credits(const Glib::ustring& translator_credits)
 {
-  gtk_about_dialog_set_translator_credits(gobj(), translator_credits.c_str());
+gtk_about_dialog_set_translator_credits(gobj(), translator_credits.c_str()); 
 }
 
 Glib::RefPtr<Gdk::Pixbuf> AboutDialog::get_logo()
@@ -322,12 +312,12 @@ Glib::RefPtr<Gdk::Pixbuf> AboutDialog::get_logo()
 
 Glib::RefPtr<const Gdk::Pixbuf> AboutDialog::get_logo() const
 {
-  return Glib::wrap(gtk_about_dialog_get_logo(const_cast<GtkAboutDialog*>(gobj())));
+  return const_cast<AboutDialog*>(this)->get_logo();
 }
 
 void AboutDialog::set_logo(const Glib::RefPtr<Gdk::Pixbuf>& logo)
 {
-  gtk_about_dialog_set_logo(gobj(), Glib::unwrap(logo));
+gtk_about_dialog_set_logo(gobj(), Glib::unwrap(logo)); 
 }
 
 Glib::ustring AboutDialog::get_logo_icon_name() const
@@ -337,139 +327,222 @@ Glib::ustring AboutDialog::get_logo_icon_name() const
 
 void AboutDialog::set_logo_icon_name(const Glib::ustring& icon_name)
 {
-  gtk_about_dialog_set_logo_icon_name(gobj(), icon_name.c_str());
+gtk_about_dialog_set_logo_icon_name(gobj(), icon_name.c_str()); 
+}
+
+bool AboutDialog::get_wrap_license() const
+{
+  return gtk_about_dialog_get_wrap_license(const_cast<GtkAboutDialog*>(gobj()));
+}
+
+void AboutDialog::set_wrap_license(bool wrap_license)
+{
+gtk_about_dialog_set_wrap_license(gobj(), static_cast<int>(wrap_license)); 
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> AboutDialog::property_name() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> AboutDialog::property_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> AboutDialog::property_version() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "version");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> AboutDialog::property_version() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "version");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> AboutDialog::property_copyright() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "copyright");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> AboutDialog::property_copyright() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "copyright");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> AboutDialog::property_comments() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "comments");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> AboutDialog::property_comments() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "comments");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> AboutDialog::property_website() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "website");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> AboutDialog::property_website() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "website");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> AboutDialog::property_website_label() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "website-label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> AboutDialog::property_website_label() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "website-label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> AboutDialog::property_license() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "license");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> AboutDialog::property_license() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "license");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::StringArrayHandle> AboutDialog::property_authors() 
 {
   return Glib::PropertyProxy<Glib::StringArrayHandle>(this, "authors");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle> AboutDialog::property_authors() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle>(this, "authors");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::StringArrayHandle> AboutDialog::property_documenters() 
 {
   return Glib::PropertyProxy<Glib::StringArrayHandle>(this, "documenters");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle> AboutDialog::property_documenters() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle>(this, "documenters");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::StringArrayHandle> AboutDialog::property_translator_credits() 
 {
   return Glib::PropertyProxy<Glib::StringArrayHandle>(this, "translator-credits");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle> AboutDialog::property_translator_credits() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle>(this, "translator-credits");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::StringArrayHandle> AboutDialog::property_artists() 
 {
   return Glib::PropertyProxy<Glib::StringArrayHandle>(this, "artists");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle> AboutDialog::property_artists() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle>(this, "artists");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > AboutDialog::property_logo() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> >(this, "logo");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > AboutDialog::property_logo() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> >(this, "logo");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> AboutDialog::property_logo_icon_name() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "logo-icon-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> AboutDialog::property_logo_icon_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "logo-icon-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> AboutDialog::property_wrap_license() 
+{
+  return Glib::PropertyProxy<bool>(this, "wrap-license");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> AboutDialog::property_wrap_license() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "wrap-license");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/aboutdialog.h b/libs/gtkmm2/gtk/gtkmm/aboutdialog.h
index d36c8b2326..7e7a22b2af 100644
--- a/libs/gtkmm2/gtk/gtkmm/aboutdialog.h
+++ b/libs/gtkmm2/gtk/gtkmm/aboutdialog.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ABOUTDIALOG_H
 #define _GTKMM_ABOUTDIALOG_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -41,7 +42,16 @@ namespace Gtk
 namespace Gtk
 {
 
-/** TODO
+/** The AboutDialog offers a simple way to display information about a program like its logo, name, copyright, 
+ * website and license. It is also possible to give credits to the authors, documenters, translators and artists 
+ * who have worked on the program. An about dialog is typically opened when the user selects the About option 
+ * from the Help menu. All parts of the dialog are optional.
+ *
+ * About dialogs often contain links and email addresses. Gtk::AboutDialog supports this by offering global 
+ * hooks, which are called when the user clicks on a link or email address, see set_email_hook() and 
+ * set_url_hook(). Email addresses in the authors, documenters and artists properties are recognized by looking 
+ * for <user@host>, URLs are recognized by looking for http://url, with the URL extending to the next space, 
+ * tab or line break.
  *
  * @ingroup Dialogs
  */
@@ -89,11 +99,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -107,14 +123,14 @@ public:
    * @return The program name. The string is owned by the about
    * dialog and must not be modified.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring get_name() const;
   
   /** Sets the name to display in the about dialog. 
    * If this is not set, it defaults to Glib::get_application_name().
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param name The program name.
    */
   void set_name(const Glib::ustring& name);
@@ -123,13 +139,13 @@ public:
    * @return The version string. The string is owned by the about
    * dialog and must not be modified.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring get_version() const;
   
   /** Sets the version string to display in the about dialog.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param version The version string.
    */
   void set_version(const Glib::ustring& version);
@@ -138,14 +154,14 @@ public:
    * @return The copyright string. The string is owned by the about
    * dialog and must not be modified.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring get_copyright() const;
   
   /** Sets the copyright string to display in the about dialog.
    * This should be a short string of one or two lines. 
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param copyright The copyright string.
    */
   void set_copyright(const Glib::ustring& copyright);
@@ -154,7 +170,7 @@ public:
    * @return The comments. The string is owned by the about
    * dialog and must not be modified.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring get_comments() const;
   
@@ -162,7 +178,7 @@ public:
    * dialog. This should be a short string of one or
    * two lines.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param comments A comments string.
    */
   void set_comments(const Glib::ustring& comments);
@@ -171,7 +187,7 @@ public:
    * @return The license information. The string is owned by the about
    * dialog and must not be modified.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring get_license() const;
   
@@ -179,7 +195,7 @@ public:
    * license dialog. If @a license  is <tt>0</tt>, the license button is
    * hidden.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param license The license information or <tt>0</tt>.
    */
   void set_license(const Glib::ustring& license);
@@ -188,13 +204,13 @@ public:
    * @return The website URL. The string is owned by the about
    * dialog and must not be modified.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring get_website() const;
   
   /** Sets the URL to use for the website link.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param website A URL string starting with "http://".
    */
   void set_website(const Glib::ustring& website);
@@ -203,18 +219,18 @@ public:
    * @return The label used for the website link. The string is owned by the about
    * dialog and must not be modified.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring get_website_label() const;
   
   /** Sets the label to be used for the website link.
    * It defaults to the website URL.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param website_label The label used for the website link.
    */
   void set_website_label(const Glib::ustring& website_label);
-  
+
    
   /** Returns the string which are displayed in the authors tab
    * of the secondary credits dialog.
@@ -222,19 +238,19 @@ public:
    * the authors. The array is owned by the about dialog 
    * and must not be modified.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::StringArrayHandle get_authors() const;
-  
+
   
   /** Sets the strings which are displayed in the authors tab
    * of the secondary credits dialog. 
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param authors A <tt>0</tt>-terminated array of strings.
    */
   void set_authors(const Glib::StringArrayHandle& authors) const;
-  
+
   
   /** Returns the string which are displayed in the documenters 
    * tab of the secondary credits dialog.
@@ -242,15 +258,15 @@ public:
    * the documenters. The array is owned by the about dialog 
    * and must not be modified.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::StringArrayHandle get_documenters() const;
-  
+
    
   /** Sets the strings which are displayed in the documenters tab
    * of the secondary credits dialog. 
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param documenters A <tt>0</tt>-terminated array of strings.
    */
   void set_documenters(const Glib::StringArrayHandle& documenters);
@@ -261,14 +277,14 @@ public:
    * the artists. The array is owned by the about dialog 
    * and must not be modified.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::StringArrayHandle get_artists() const;
   
   /** Sets the strings which are displayed in the artists tab
    * of the secondary credits dialog. 
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param artists A <tt>0</tt>-terminated array of strings.
    */
   void set_artists(const Glib::StringArrayHandle& artists);
@@ -278,7 +294,7 @@ public:
    * @return The translator credits string. The string is
    * owned by the about dialog and must not be modified.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring get_translator_credits() const;
   
@@ -297,18 +313,18 @@ public:
    * since Gtk::AboutDialog will detect if "translator-credits" is untranslated
    * and hide the tab.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param translator_credits The translator credits.
    */
   void set_translator_credits(const Glib::ustring& translator_credits);
-  
+
   
   /** Returns the pixbuf displayed as logo in the about dialog.
    * @return The pixbuf displayed as logo. The pixbuf is
    * owned by the about dialog. If you want to keep a reference
    * to it, you have to call Glib::object_ref() on it.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::RefPtr<Gdk::Pixbuf> get_logo();
   
@@ -317,7 +333,7 @@ public:
    * owned by the about dialog. If you want to keep a reference
    * to it, you have to call Glib::object_ref() on it.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::RefPtr<const Gdk::Pixbuf> get_logo() const;
 
@@ -327,18 +343,18 @@ public:
    * window icon set with Gtk::Window::set_default_icon()
    * will be used.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param logo A Gdk::Pixbuf, or <tt>0</tt>.
    */
   void set_logo(const Glib::RefPtr<Gdk::Pixbuf>& logo);
-  
+
   
   /** Returns the icon name displayed as logo in the about dialog.
    * @return The icon name displayed as logo. The string is
-   * owned by the about dialog. If you want to keep a reference
+   * owned by the dialog. If you want to keep a reference
    * to it, you have to call Glib::strdup() on it.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring get_logo_icon_name() const;
   
@@ -347,31 +363,57 @@ public:
    * window icon set with Gtk::Window::set_default_icon()
    * will be used.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param icon_name An icon name, or <tt>0</tt>.
    */
   void set_logo_icon_name(const Glib::ustring& icon_name);
 
+  
+  /** Returns whether the license text in @a about  is 
+   * automatically wrapped.
+   * @return <tt>true</tt> if the license text is wrapped 
+   * 
+   * @newin2p8.
+   */
+  bool get_wrap_license() const;
+  
+  /** Sets whether the license text in @a about  is 
+   * automatically wrapped.
+   * 
+   * @newin2p8
+   * @param wrap_license Whether to wrap the license.
+   */
+  void set_wrap_license(bool wrap_license);
+
   /** For instance,
    * void on_activate_link_url(AboutDialog& about_dialog, const Glib::ustring& link);
    */
   typedef sigc::slot<void, AboutDialog& /* about_dialog */, const Glib::ustring& /* link */> SlotActivateLink;
-  
-  //TODO: Document these methods.
+
+  /** Installs a global callback to be called whenever the user activates an email link in an about dialog.
+   * @param slot A function or method to call when an email link is activated.
+   */
   static void set_email_hook(const SlotActivateLink& slot);
   
-  
+
+  /** Installs a global callback to be called whenever the user activates a URL link in an about dialog.
+   * @param slot A function or method to call when a URL link is activated.
+   */
   static void set_url_hook(const SlotActivateLink& slot);
   
-  
-  /** The name of the program. If this is not set
+
+//TODO: Deprecate this, because it conflicts with the property in GtkWidget, which will be deprecated in GTK+ 2.12.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The name of the program. If this is not set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_name() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The name of the program. If this is not set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -379,15 +421,20 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The version of the program.
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The version of the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_version() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The version of the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -395,15 +442,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_version() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Copyright information for the program.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Copyright information for the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_copyright() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Copyright information for the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -411,15 +462,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_copyright() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Comments about the program.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Comments about the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_comments() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Comments about the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -427,15 +482,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_comments() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The URL for the link to the website of the program.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The URL for the link to the website of the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_website() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The URL for the link to the website of the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -443,15 +502,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_website() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The label for the link to the website of the program. If this is not set
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The label for the link to the website of the program. If this is not set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_website_label() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The label for the link to the website of the program. If this is not set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -459,15 +522,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_website_label() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The license of the program.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The license of the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_license() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The license of the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -475,15 +542,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_license() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** List of authors of the program.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** List of authors of the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::StringArrayHandle> property_authors() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** List of authors of the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -491,15 +562,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle> property_authors() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** List of people documenting the program.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** List of people documenting the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::StringArrayHandle> property_documenters() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** List of people documenting the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -507,15 +582,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle> property_documenters() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Credits to the translators. This string should be marked as translatable.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Credits to the translators. This string should be marked as translatable.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::StringArrayHandle> property_translator_credits() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Credits to the translators. This string should be marked as translatable.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -523,15 +602,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle> property_translator_credits() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** List of people who have contributed artwork to the program.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** List of people who have contributed artwork to the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::StringArrayHandle> property_artists() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** List of people who have contributed artwork to the program.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -539,15 +622,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::StringArrayHandle> property_artists() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** A logo for the about box. If this is not set
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A logo for the about box. If this is not set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_logo() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A logo for the about box. If this is not set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -555,15 +642,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > property_logo() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** A named icon to use as the logo for the about box.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A named icon to use as the logo for the about box.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_logo_icon_name() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A named icon to use as the logo for the about box.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -571,6 +662,27 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_logo_icon_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+  
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to wrap the license text.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_wrap_license() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to wrap the license text.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_wrap_license() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
   
 
 };
@@ -586,6 +698,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::AboutDialog* wrap(GtkAboutDialog* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_ABOUTDIALOG_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/accelgroup.cc b/libs/gtkmm2/gtk/gtkmm/accelgroup.cc
index edb7170bf4..fcc972de58 100644
--- a/libs/gtkmm2/gtk/gtkmm/accelgroup.cc
+++ b/libs/gtkmm2/gtk/gtkmm/accelgroup.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/accelgroup.h>
 #include <gtkmm/private/accelgroup_p.h>
 
@@ -65,7 +66,8 @@ Gdk::ModifierType AccelGroup::get_default_mod_mask()
 namespace
 {
 
-gboolean AccelGroup_signal_accel_activate_callback(GtkAccelGroup* self, GObject* p0,guint p1,GdkModifierType p2,void* data)
+
+static gboolean AccelGroup_signal_accel_activate_callback(GtkAccelGroup* self, GObject* p0,guint p1,GdkModifierType p2,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,const Glib::RefPtr<Glib::Object>&,guint,Gdk::ModifierType > SlotType;
@@ -73,24 +75,28 @@ gboolean AccelGroup_signal_accel_activate_callback(GtkAccelGroup* self, GObject*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , p1, ((Gdk::ModifierType)(p2))
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean AccelGroup_signal_accel_activate_notify_callback(GtkAccelGroup* self, GObject* p0,guint p1,GdkModifierType p2, void* data)
+static gboolean AccelGroup_signal_accel_activate_notify_callback(GtkAccelGroup* self, GObject* p0,guint p1,GdkModifierType p2, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Glib::Object>&,guint,Gdk::ModifierType > SlotType;
@@ -98,24 +104,28 @@ gboolean AccelGroup_signal_accel_activate_notify_callback(GtkAccelGroup* self, G
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , p1, ((Gdk::ModifierType)(p2))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo AccelGroup_signal_accel_activate_info =
+static const Glib::SignalProxyInfo AccelGroup_signal_accel_activate_info =
 {
   "accel_activate",
   (GCallback) &AccelGroup_signal_accel_activate_callback,
@@ -123,7 +133,7 @@ const Glib::SignalProxyInfo AccelGroup_signal_accel_activate_info =
 };
 
 
-void AccelGroup_signal_accel_changed_callback(GtkAccelGroup* self, guint p0,GdkModifierType p1,GClosure* p2,void* data)
+static void AccelGroup_signal_accel_changed_callback(GtkAccelGroup* self, guint p0,GdkModifierType p1,GClosure* p2,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,guint,Gdk::ModifierType,GClosure* > SlotType;
@@ -131,26 +141,31 @@ void AccelGroup_signal_accel_changed_callback(GtkAccelGroup* self, guint p0,GdkM
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0, ((Gdk::ModifierType)(p1))
 , p2);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo AccelGroup_signal_accel_changed_info =
+static const Glib::SignalProxyInfo AccelGroup_signal_accel_changed_info =
 {
   "accel_changed",
   (GCallback) &AccelGroup_signal_accel_changed_callback,
   (GCallback) &AccelGroup_signal_accel_changed_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -197,10 +212,18 @@ void AccelGroup_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->accel_changed = &accel_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void AccelGroup_Class::accel_changed_callback(GtkAccelGroup* self, guint p0, GdkModifierType p1, GClosure* p2)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -213,16 +236,20 @@ void AccelGroup_Class::accel_changed_callback(GtkAccelGroup* self, guint p0, Gdk
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_accel_changed(p0, ((Gdk::ModifierType)(p1))
 , p2);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -235,6 +262,7 @@ void AccelGroup_Class::accel_changed_callback(GtkAccelGroup* self, guint p0, Gdk
       (*base->accel_changed)(self, p0, p1, p2);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* AccelGroup_Class::wrap_new(GObject* object)
@@ -291,12 +319,12 @@ Glib::RefPtr<AccelGroup> AccelGroup::create()
 }
 void AccelGroup::lock()
 {
-  gtk_accel_group_lock(gobj());
+gtk_accel_group_lock(gobj()); 
 }
 
 void AccelGroup::unlock()
 {
-  gtk_accel_group_unlock(gobj());
+gtk_accel_group_unlock(gobj()); 
 }
 
 bool AccelGroup::disconnect_key(guint accel_key, Gdk::ModifierType accel_mods)
@@ -309,6 +337,7 @@ Glib::ustring AccelGroup::get_label(guint accelerator_key, Gdk::ModifierType acc
   return Glib::convert_return_gchar_ptr_to_ustring(gtk_accelerator_get_label(accelerator_key, ((GdkModifierType)(accelerator_mods))));
 }
 
+
 bool AccelGroup::activate(GQuark accel_quark, const Glib::RefPtr<Glib::Object>& acceleratable, guint accel_key, Gdk::ModifierType accel_mods)
 {
   return gtk_accel_group_activate(gobj(), accel_quark, Glib::unwrap(acceleratable), accel_key, ((GdkModifierType)(accel_mods)));
@@ -325,12 +354,14 @@ Glib::SignalProxy3< bool,const Glib::RefPtr<Glib::Object>&,guint,Gdk::ModifierTy
   return Glib::SignalProxy3< bool,const Glib::RefPtr<Glib::Object>&,guint,Gdk::ModifierType >(this, &AccelGroup_signal_accel_activate_info);
 }
 
+
 Glib::SignalProxy3< void,guint,Gdk::ModifierType,GClosure* > AccelGroup::signal_accel_changed()
 {
   return Glib::SignalProxy3< void,guint,Gdk::ModifierType,GClosure* >(this, &AccelGroup_signal_accel_changed_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::AccelGroup::on_accel_changed(guint keyval, Gdk::ModifierType modifier, GClosure* accel_closure)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -340,6 +371,10 @@ void Gtk::AccelGroup::on_accel_changed(guint keyval, Gdk::ModifierType modifier,
   if(base && base->accel_changed)
     (*base->accel_changed)(gobj(),keyval,((GdkModifierType)(modifier)),accel_closure);
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/accelgroup.h b/libs/gtkmm2/gtk/gtkmm/accelgroup.h
index 1a6a8adc4d..62190dae65 100644
--- a/libs/gtkmm2/gtk/gtkmm/accelgroup.h
+++ b/libs/gtkmm2/gtk/gtkmm/accelgroup.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ACCELGROUP_H
 #define _GTKMM_ACCELGROUP_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -164,7 +165,7 @@ public:
    * @param accelerator_mods Accelerator modifier mask.
    * @return A newly-allocated string representing the accelerator.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   static Glib::ustring get_label(guint accelerator_key, Gdk::ModifierType accelerator_mods);
 
@@ -208,11 +209,20 @@ public:
 
   //TODO: Discover real parameter names:
   
+/**
+   * @par Prototype:
+   * <tt>bool %accel_activate(const Glib::RefPtr<Glib::Object>& object, guint param2, Gdk::ModifierType param3)</tt>
+   */
 
   Glib::SignalProxy3< bool,const Glib::RefPtr<Glib::Object>&,guint,Gdk::ModifierType > signal_accel_activate();
    
   //TODO: The C type is unpleasant:
+  //This has C docs, but it isn't worth mentioning them for such a useless signal. murrayc.
   
+/**
+   * @par Prototype:
+   * <tt>void %accel_changed(guint keyval, Gdk::ModifierType modifier, GClosure* accel_closure)</tt>
+   */
 
   Glib::SignalProxy3< void,guint,Gdk::ModifierType,GClosure* > signal_accel_changed();
 
@@ -221,12 +231,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_accel_changed(guint keyval, Gdk::ModifierType modifier, GClosure* accel_closure);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/accellabel.cc b/libs/gtkmm2/gtk/gtkmm/accellabel.cc
index d62bc75418..f884b7d606 100644
--- a/libs/gtkmm2/gtk/gtkmm/accellabel.cc
+++ b/libs/gtkmm2/gtk/gtkmm/accellabel.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/accellabel.h>
 #include <gtkmm/private/accellabel_p.h>
 
@@ -97,8 +98,19 @@ void AccelLabel_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* AccelLabel_Class::wrap_new(GObject* o)
 {
@@ -148,7 +160,7 @@ AccelLabel::AccelLabel()
 
 void AccelLabel::set_accel_widget(const Widget& accel_widget)
 {
-  gtk_accel_label_set_accel_widget(gobj(), const_cast<GtkWidget*>((accel_widget).gobj()));
+gtk_accel_label_set_accel_widget(gobj(), const_cast<GtkWidget*>((accel_widget).gobj())); 
 }
 
 Widget* AccelLabel::get_accel_widget()
@@ -158,7 +170,7 @@ Widget* AccelLabel::get_accel_widget()
 
 const Widget* AccelLabel::get_accel_widget() const
 {
-  return Glib::wrap(gtk_accel_label_get_accel_widget(const_cast<GtkAccelLabel*>(gobj())));
+  return const_cast<AccelLabel*>(this)->get_accel_widget();
 }
 
 guint AccelLabel::get_accel_width() const
@@ -172,15 +184,26 @@ bool AccelLabel::refetch()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::Widget*> AccelLabel::property_accel_widget() 
 {
   return Glib::PropertyProxy<Gtk::Widget*>(this, "accel-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::Widget*> AccelLabel::property_accel_widget() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::Widget*>(this, "accel-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/accellabel.h b/libs/gtkmm2/gtk/gtkmm/accellabel.h
index a4d6a32645..2c057671fa 100644
--- a/libs/gtkmm2/gtk/gtkmm/accellabel.h
+++ b/libs/gtkmm2/gtk/gtkmm/accellabel.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ACCELLABEL_H
 #define _GTKMM_ACCELLABEL_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -89,11 +90,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -147,14 +154,17 @@ public:
   bool refetch();
 
   //_WRAP_PROPERTY("accel-closure", Glib::Object) //GClosure
-  /** The widget to be monitored for accelerator changes.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The widget to be monitored for accelerator changes.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gtk::Widget*> property_accel_widget() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The widget to be monitored for accelerator changes.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -162,6 +172,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gtk::Widget*> property_accel_widget() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -177,6 +188,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::AccelLabel* wrap(GtkAccelLabel* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_ACCELLABEL_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/accelmap.cc b/libs/gtkmm2/gtk/gtkmm/accelmap.cc
index 1d87a7cd64..6b9c31c7fe 100644
--- a/libs/gtkmm2/gtk/gtkmm/accelmap.cc
+++ b/libs/gtkmm2/gtk/gtkmm/accelmap.cc
@@ -64,6 +64,24 @@ void unlock_path(const std::string& accel_path)
   gtk_accel_map_unlock_path(accel_path.c_str());
 }
 
+bool lookup_entry(const Glib::ustring& accel_path, Gtk::AccelKey& key)
+{
+  GtkAccelKey gkey = {GDK_VoidSymbol, GdkModifierType (0), 0};
+  const bool known = gtk_accel_map_lookup_entry(accel_path.c_str(), &gkey);
+
+  if(known)
+    key = AccelKey(gkey.accel_key, Gdk::ModifierType (gkey.accel_mods));
+  else
+    key = AccelKey(GDK_VoidSymbol, Gdk::ModifierType (0));
+
+  return known;
+}
+
+bool lookup_entry(const Glib::ustring& accel_path)
+{
+  return gtk_accel_map_lookup_entry(accel_path.c_str(), 0 /* "optional", according to the C docs. */);
+}
+
 } // namespace AccelMap
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/accelmap.h b/libs/gtkmm2/gtk/gtkmm/accelmap.h
index 00dd8b9a1f..03440b359d 100644
--- a/libs/gtkmm2/gtk/gtkmm/accelmap.h
+++ b/libs/gtkmm2/gtk/gtkmm/accelmap.h
@@ -26,6 +26,7 @@
 #include <string>
 
 #include <gdkmm/types.h>
+#include <gtkmm/accelkey.h>
 
 namespace Gtk
 {
@@ -107,8 +108,8 @@ void save(const std::string& filename);
  *
  * @param accel_path a valid accelerator path
  *
- * Since: 2.4
- **/
+ * @newin2p4
+ */
 void lock_path(const std::string& accel_path);
 
 /** Unlocks the given accelerator path. Refer to gtk_accel_map_lock_path()
@@ -116,10 +117,27 @@ void lock_path(const std::string& accel_path);
  *
  * @param accel_path a valid accelerator path
  *
- * Since: 2.4
- **/
+ * @newin2p4
+ */
 void unlock_path(const std::string& accel_path);
 
+/** Looks up the accelerator entry for accel_path.
+ * @param accel_path A valid accelerator path.
+ * @result true if accel_path is known, false otherwise
+ *
+ * @newin2p10
+ */
+bool lookup_entry (const Glib::ustring& accel_path);
+
+/** Looks up the accelerator entry for accel_path and fills in key.
+ * @param accel_path A valid accelerator path.
+ * @param key The accelerator key to be filled in.
+ * @result true if accel_path is known, false otherwise
+ *
+ * @newin2p10
+ */
+bool lookup_entry (const Glib::ustring& accel_path, Gtk::AccelKey& key);
+
 } // namespace AccelMap
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/action.cc b/libs/gtkmm2/gtk/gtkmm/action.cc
index 1504ee29c2..9ddf165d8e 100644
--- a/libs/gtkmm2/gtk/gtkmm/action.cc
+++ b/libs/gtkmm2/gtk/gtkmm/action.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/action.h>
 #include <gtkmm/private/action_p.h>
 
@@ -28,6 +29,9 @@
 #include <gtkmm/menuitem.h>
 #include <gtkmm/toolitem.h>
 #include <gtkmm/image.h>
+#include <gtkmm/widget.h>
+
+typedef Gtk::Action Action; 
 
 namespace Gtk
 {
@@ -51,9 +55,13 @@ Glib::RefPtr<Action> Action::create(const Glib::ustring& name, const Gtk::StockI
 
 void Action::set_tooltip(const Glib::ustring& tooltip)
 {
+#ifdef GLIBMM_PROPERTIES_ENABLED
   property_tooltip() = tooltip;
+#else
+  set_property("tooltip", tooltip);
+#endif
 }
-  
+
 
 } // namespace Gtk
 
@@ -61,13 +69,15 @@ void Action::set_tooltip(const Glib::ustring& tooltip)
 namespace
 {
 
-const Glib::SignalProxyInfo Action_signal_activate_info =
+
+static const Glib::SignalProxyInfo Action_signal_activate_info =
 {
   "activate",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -114,13 +124,19 @@ void Action_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->create_menu_item = &create_menu_item_vfunc_callback;
   klass->create_tool_item = &create_tool_item_vfunc_callback;
   klass->connect_proxy = &connect_proxy_vfunc_callback;
   klass->disconnect_proxy = &disconnect_proxy_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->activate = &activate_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 GtkWidget* Action_Class::create_menu_item_vfunc_callback(GtkAction* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -133,15 +149,19 @@ GtkWidget* Action_Class::create_menu_item_vfunc_callback(GtkAction* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return (GtkWidget*)Glib::unwrap(obj->create_menu_item_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -157,7 +177,6 @@ GtkWidget* Action_Class::create_menu_item_vfunc_callback(GtkAction* self)
   typedef GtkWidget* RType;
   return RType();
 }
-
 GtkWidget* Action_Class::create_tool_item_vfunc_callback(GtkAction* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -170,15 +189,19 @@ GtkWidget* Action_Class::create_tool_item_vfunc_callback(GtkAction* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return (GtkWidget*)Glib::unwrap(obj->create_tool_item_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -194,7 +217,6 @@ GtkWidget* Action_Class::create_tool_item_vfunc_callback(GtkAction* self)
   typedef GtkWidget* RType;
   return RType();
 }
-
 void Action_Class::connect_proxy_vfunc_callback(GtkAction* self, GtkWidget* proxy)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -207,16 +229,20 @@ void Action_Class::connect_proxy_vfunc_callback(GtkAction* self, GtkWidget* prox
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->connect_proxy_vfunc(Glib::wrap(proxy)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -229,7 +255,6 @@ void Action_Class::connect_proxy_vfunc_callback(GtkAction* self, GtkWidget* prox
       (*base->connect_proxy)(self, proxy);
   }
 }
-
 void Action_Class::disconnect_proxy_vfunc_callback(GtkAction* self, GtkWidget* proxy)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -242,16 +267,20 @@ void Action_Class::disconnect_proxy_vfunc_callback(GtkAction* self, GtkWidget* p
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->disconnect_proxy_vfunc(Glib::wrap(proxy)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -264,8 +293,9 @@ void Action_Class::disconnect_proxy_vfunc_callback(GtkAction* self, GtkWidget* p
       (*base->disconnect_proxy)(self, proxy);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Action_Class::activate_callback(GtkAction* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -278,15 +308,19 @@ void Action_Class::activate_callback(GtkAction* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_activate();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -299,6 +333,7 @@ void Action_Class::activate_callback(GtkAction* self)
       (*base->activate)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Action_Class::wrap_new(GObject* object)
@@ -370,7 +405,7 @@ bool Action::get_sensitive() const
 
 void Action::set_sensitive(bool sensitive)
 {
-  gtk_action_set_sensitive(gobj(), static_cast<int>(sensitive));
+gtk_action_set_sensitive(gobj(), static_cast<int>(sensitive)); 
 }
 
 bool Action::is_visible() const
@@ -385,12 +420,12 @@ bool Action::get_visible() const
 
 void Action::set_visible(bool visible)
 {
-  gtk_action_set_visible(gobj(), static_cast<int>(visible));
+gtk_action_set_visible(gobj(), static_cast<int>(visible)); 
 }
 
 void Action::activate()
 {
-  gtk_action_activate(gobj());
+gtk_action_activate(gobj()); 
 }
 
 Image* Action::create_icon(IconSize icon_size)
@@ -410,32 +445,32 @@ ToolItem* Action::create_tool_item()
 
 void Action::connect_proxy(Widget& proxy)
 {
-  gtk_action_connect_proxy(gobj(), (proxy).gobj());
+gtk_action_connect_proxy(gobj(), (proxy).gobj()); 
 }
 
 void Action::disconnect_proxy(Widget& proxy)
 {
-  gtk_action_disconnect_proxy(gobj(), (proxy).gobj());
+gtk_action_disconnect_proxy(gobj(), (proxy).gobj()); 
 }
 
 Glib::SListHandle<Widget*> Action::get_proxies()
 {
-  return Glib::SListHandle<Widget*>(gtk_action_get_proxies(gobj()), Glib::OWNERSHIP_SHALLOW);
+  return Glib::SListHandle<Widget*>(gtk_action_get_proxies(gobj()), Glib::OWNERSHIP_NONE);
 }
 
 Glib::SListHandle<const Widget*> Action::get_proxies() const
 {
-  return Glib::SListHandle<const Widget*>(gtk_action_get_proxies(const_cast<GtkAction*>(gobj())), Glib::OWNERSHIP_SHALLOW);
+  return Glib::SListHandle<const Widget*>(gtk_action_get_proxies(const_cast<GtkAction*>(gobj())), Glib::OWNERSHIP_NONE);
 }
 
 void Action::connect_accelerator()
 {
-  gtk_action_connect_accelerator(gobj());
+gtk_action_connect_accelerator(gobj()); 
 }
 
 void Action::disconnect_accelerator()
 {
-  gtk_action_disconnect_accelerator(gobj());
+gtk_action_disconnect_accelerator(gobj()); 
 }
 
 Glib::ustring Action::get_accel_path() const
@@ -445,22 +480,22 @@ Glib::ustring Action::get_accel_path() const
 
 void Action::set_accel_path(const Glib::ustring& accel_path)
 {
-  gtk_action_set_accel_path(gobj(), accel_path.c_str());
+gtk_action_set_accel_path(gobj(), accel_path.c_str()); 
 }
 
 void Action::set_accel_group(const Glib::RefPtr<AccelGroup>& accel_group)
 {
-  gtk_action_set_accel_group(gobj(), Glib::unwrap(accel_group));
+gtk_action_set_accel_group(gobj(), Glib::unwrap(accel_group)); 
 }
 
 void Action::block_activate_from(Widget& proxy)
 {
-  gtk_action_block_activate_from(gobj(), (proxy).gobj());
+gtk_action_block_activate_from(gobj(), (proxy).gobj()); 
 }
 
 void Action::unblock_activate_from(Widget& proxy)
 {
-  gtk_action_unblock_activate_from(gobj(), (proxy).gobj());
+gtk_action_unblock_activate_from(gobj(), (proxy).gobj()); 
 }
 
 
@@ -470,112 +505,155 @@ Glib::SignalProxy0< void > Action::signal_activate()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Action::property_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Action::property_label() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Action::property_label() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Action::property_short_label() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "short-label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Action::property_short_label() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "short-label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Action::property_tooltip() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "tooltip");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Action::property_tooltip() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "tooltip");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<StockID> Action::property_stock_id() 
 {
   return Glib::PropertyProxy<StockID>(this, "stock-id");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<StockID> Action::property_stock_id() const
 {
   return Glib::PropertyProxy_ReadOnly<StockID>(this, "stock-id");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Action::property_visible_horizontal() 
 {
   return Glib::PropertyProxy<bool>(this, "visible-horizontal");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Action::property_visible_horizontal() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "visible-horizontal");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Action::property_visible_vertical() 
 {
   return Glib::PropertyProxy<bool>(this, "visible-vertical");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Action::property_visible_vertical() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "visible-vertical");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Action::property_is_important() 
 {
   return Glib::PropertyProxy<bool>(this, "is-important");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Action::property_is_important() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "is-important");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Action::property_hide_if_empty() 
 {
   return Glib::PropertyProxy<bool>(this, "hide-if-empty");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Action::property_hide_if_empty() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "hide-if-empty");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Action::property_sensitive() 
 {
   return Glib::PropertyProxy<bool>(this, "sensitive");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Action::property_sensitive() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "sensitive");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Action::property_visible() 
 {
   return Glib::PropertyProxy<bool>(this, "visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Action::property_visible() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Action::on_activate()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -585,8 +663,9 @@ void Gtk::Action::on_activate()
   if(base && base->activate)
     (*base->activate)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 Widget* Gtk::Action::create_menu_item_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -599,7 +678,6 @@ Widget* Gtk::Action::create_menu_item_vfunc()
   typedef Widget* RType;
   return RType();
 }
-
 Widget* Gtk::Action::create_tool_item_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -612,7 +690,6 @@ Widget* Gtk::Action::create_tool_item_vfunc()
   typedef Widget* RType;
   return RType();
 }
-
 void Gtk::Action::connect_proxy_vfunc(Widget* proxy) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -622,7 +699,6 @@ void Gtk::Action::connect_proxy_vfunc(Widget* proxy)
   if(base && base->connect_proxy)
     (*base->connect_proxy)(gobj(),(GtkWidget*)Glib::unwrap(proxy));
 }
-
 void Gtk::Action::disconnect_proxy_vfunc(Widget* proxy) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -632,6 +708,7 @@ void Gtk::Action::disconnect_proxy_vfunc(Widget* proxy)
   if(base && base->disconnect_proxy)
     (*base->disconnect_proxy)(gobj(),(GtkWidget*)Glib::unwrap(proxy));
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/action.h b/libs/gtkmm2/gtk/gtkmm/action.h
index 6c319c769a..f1ba555efa 100644
--- a/libs/gtkmm2/gtk/gtkmm/action.h
+++ b/libs/gtkmm2/gtk/gtkmm/action.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ACTION_H
 #define _GTKMM_ACTION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -27,7 +28,7 @@
 #include <gtkmm/widget.h>
 #include <gtkmm/accelgroup.h>
 #include <gtkmm/stockid.h>
- 
+
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 typedef struct _GtkAction GtkAction;
@@ -106,7 +107,7 @@ public:
    * @return The name of the action. The string belongs to GTK+ and should not
    * be freed.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_name() const;
 
@@ -115,7 +116,7 @@ public:
    * @return <tt>true</tt> if the action and its associated action group 
    * are both sensitive.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool is_sensitive() const;
   
@@ -124,11 +125,10 @@ public:
    * for that.
    * @return <tt>true</tt> if the action itself is sensitive.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_sensitive() const;
 
-   //TODO: Just wrap gtk_action_set_sensitive() when they put it in GTK+.
    void set_tooltip(const Glib::ustring& tooltip);
 
   
@@ -137,17 +137,17 @@ public:
    * is_sensitive() 
    * for that.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param sensitive <tt>true</tt> to make the action sensitive.
    */
   void set_sensitive(bool sensitive = true);
-  
+
   
   /** Returns whether the action is effectively visible.
    * @return <tt>true</tt> if the action and its associated action group 
    * are both visible.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool is_visible() const;
   
@@ -156,7 +156,7 @@ public:
    * for that.
    * @return <tt>true</tt> if the action itself is visible.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_visible() const;
   
@@ -165,7 +165,7 @@ public:
    * is_visible() 
    * for that.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param visible <tt>true</tt> to make the action visible.
    */
   void set_visible(bool visible = true);
@@ -177,7 +177,7 @@ public:
    * 
    * It can also be used to manually activate an action.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void activate();
   
@@ -186,21 +186,21 @@ public:
    * @param icon_size The size of the icon that should be created.
    * @return A widget that displays the icon for this action.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Image* create_icon(IconSize icon_size);
   
   /** Creates a menu item widget that proxies for the given action.
    * @return A menu item connected to the action.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   MenuItem* create_menu_item();
   
   /** Creates a toolbar item widget that proxies for the given action.
    * @return A toolbar item connected to the action.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   ToolItem* create_tool_item();
   
@@ -212,7 +212,7 @@ public:
    * If the widget is already connected to an action, it is disconnected
    * first.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param proxy The proxy widget.
    */
   void connect_proxy(Widget& proxy);
@@ -220,16 +220,17 @@ public:
   /** Disconnects a proxy widget from an action.  
    * Does <em>not</em> destroy the widget, however.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param proxy The proxy widget.
    */
   void disconnect_proxy(Widget& proxy);
+
   
   /** Returns the proxy widgets for an action.
    * @return A G::SList of proxy widgets. The list is owned by the action and
    * must not be modified.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::SListHandle<Widget*> get_proxies();
   
@@ -237,9 +238,10 @@ public:
    * @return A G::SList of proxy widgets. The list is owned by the action and
    * must not be modified.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::SListHandle<const Widget*> get_proxies() const;
+
   
   /** Installs the accelerator for @a action  if @a action  has an
    * accel path and group. See set_accel_path() and 
@@ -250,20 +252,20 @@ public:
    * function has been called and doesn't remove the accelerator until
    * disconnect_accelerator() has been called as many times.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void connect_accelerator();
   
   /** Undoes the effect of one call to connect_accelerator().
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void disconnect_accelerator();
   
   
   /** Returns the accel path for this action.  
    * 
-   * Since: 2.6
+   * @newin2p6
    * @return The accel path for this action, or <tt>0</tt>
    * if none is set. The returned string is owned by GTK+
    * and must not be freed or modified.
@@ -273,6 +275,13 @@ public:
   /// For instance, void on_activate();
   typedef sigc::slot<void> SlotActivate;
   
+  /** The "activate" signal is emitted when the action is activated.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %activate()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_activate();
 
@@ -283,7 +292,7 @@ public:
    * with the action will have this accel path, so that their
    * accelerators are consistent.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param accel_path The accelerator path.
    */
   void set_accel_path(const Glib::ustring& accel_path);
@@ -291,28 +300,33 @@ public:
   /** Sets the Gtk::AccelGroup in which the accelerator for this action
    * will be installed.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param accel_group A Gtk::AccelGroup or <tt>0</tt>.
    */
   void set_accel_group(const Glib::RefPtr<AccelGroup>& accel_group);
 
-  /** A unique name for the action.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A unique name for the action.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The label used for menu items and buttons that activate this action.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The label used for menu items and buttons that activate this action.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_label() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The label used for menu items and buttons that activate this action.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -320,15 +334,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_label() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** A shorter label that may be used on toolbar buttons.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A shorter label that may be used on toolbar buttons.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_short_label() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A shorter label that may be used on toolbar buttons.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -336,15 +354,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_short_label() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** A tooltip for this action.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A tooltip for this action.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_tooltip() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A tooltip for this action.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -352,15 +374,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_tooltip() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The stock icon displayed in widgets representing this action.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The stock icon displayed in widgets representing this action.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<StockID> property_stock_id() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The stock icon displayed in widgets representing this action.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -368,15 +394,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<StockID> property_stock_id() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the toolbar item is visible when the toolbar is in a horizontal orientation.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the toolbar item is visible when the toolbar is in a horizontal orientation.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_visible_horizontal() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the toolbar item is visible when the toolbar is in a horizontal orientation.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -384,15 +414,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_visible_horizontal() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the toolbar item is visible when the toolbar is in a vertical orientation.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the toolbar item is visible when the toolbar is in a vertical orientation.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_visible_vertical() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the toolbar item is visible when the toolbar is in a vertical orientation.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -400,15 +434,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_visible_vertical() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the action is considered important. When TRUE
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the action is considered important. When TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_is_important() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the action is considered important. When TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -416,15 +454,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_is_important() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** When TRUE
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** When TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_hide_if_empty() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** When TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -432,15 +474,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_hide_if_empty() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the action is enabled.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the action is enabled.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_sensitive() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the action is enabled.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -448,15 +494,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_sensitive() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the action is visible.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the action is visible.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_visible() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the action is visible.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -464,6 +514,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_visible() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
@@ -475,7 +526,7 @@ protected:
    * 
    * This function is intended for use by action implementations.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param proxy A proxy widget.
    */
   void block_activate_from(Widget& proxy);
@@ -486,7 +537,7 @@ protected:
    * 
    * This function is intended for use by action implementations.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param proxy A proxy widget.
    */
   void unblock_activate_from(Widget& proxy);
@@ -494,22 +545,39 @@ protected:
 
 protected: 
   //Widget-creation routines:
-    virtual Widget* create_menu_item_vfunc();
-    virtual Widget* create_tool_item_vfunc();
-    virtual void connect_proxy_vfunc(Widget* proxy);
-    virtual void disconnect_proxy_vfunc(Widget* proxy);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Widget* create_menu_item_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Widget* create_tool_item_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void connect_proxy_vfunc(Widget* proxy);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void disconnect_proxy_vfunc(Widget* proxy);
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_activate();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/actiongroup.cc b/libs/gtkmm2/gtk/gtkmm/actiongroup.cc
index d539b9ab5e..9512eecac1 100644
--- a/libs/gtkmm2/gtk/gtkmm/actiongroup.cc
+++ b/libs/gtkmm2/gtk/gtkmm/actiongroup.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/actiongroup.h>
 #include <gtkmm/private/actiongroup_p.h>
 
@@ -53,9 +54,16 @@ void ActionGroup::add(const Glib::RefPtr<Action>& action, const AccelKey& accel_
     if(accel_path.empty())
     {
       //Copied from the gtk_action_group_add_action_with_accel() implementation:
-      accel_path =  "<Actions>/" + get_name() + "/" + action->property_name();
+
+      gchar* action_name = 0;
+      g_object_get(G_OBJECT(action->gobj()), "name", &action_name, static_cast<char*>(0));
+      if(action_name)
+      {
+        accel_path =  "<Actions>/" + get_name() + '/' + action_name;
+        g_free(action_name);
+      }
     }
-    
+
     AccelMap::add_entry(accel_path, key, mod);
 
     action->set_accel_path(accel_path);
@@ -109,7 +117,8 @@ void ActionGroup::add(const Glib::RefPtr<Action>& action, const AccelKey& accel_
 namespace
 {
 
-void ActionGroup_signal_connect_proxy_callback(GtkActionGroup* self, GtkAction* p0,GtkWidget* p1,void* data)
+
+static void ActionGroup_signal_connect_proxy_callback(GtkActionGroup* self, GtkAction* p0,GtkWidget* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Action>&,Widget* > SlotType;
@@ -117,21 +126,25 @@ void ActionGroup_signal_connect_proxy_callback(GtkActionGroup* self, GtkAction*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo ActionGroup_signal_connect_proxy_info =
+static const Glib::SignalProxyInfo ActionGroup_signal_connect_proxy_info =
 {
   "connect_proxy",
   (GCallback) &ActionGroup_signal_connect_proxy_callback,
@@ -139,7 +152,7 @@ const Glib::SignalProxyInfo ActionGroup_signal_connect_proxy_info =
 };
 
 
-void ActionGroup_signal_disconnect_proxy_callback(GtkActionGroup* self, GtkAction* p0,GtkWidget* p1,void* data)
+static void ActionGroup_signal_disconnect_proxy_callback(GtkActionGroup* self, GtkAction* p0,GtkWidget* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Action>&,Widget* > SlotType;
@@ -147,21 +160,25 @@ void ActionGroup_signal_disconnect_proxy_callback(GtkActionGroup* self, GtkActio
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo ActionGroup_signal_disconnect_proxy_info =
+static const Glib::SignalProxyInfo ActionGroup_signal_disconnect_proxy_info =
 {
   "disconnect_proxy",
   (GCallback) &ActionGroup_signal_disconnect_proxy_callback,
@@ -169,7 +186,7 @@ const Glib::SignalProxyInfo ActionGroup_signal_disconnect_proxy_info =
 };
 
 
-void ActionGroup_signal_pre_activate_callback(GtkActionGroup* self, GtkAction* p0,void* data)
+static void ActionGroup_signal_pre_activate_callback(GtkActionGroup* self, GtkAction* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Action>& > SlotType;
@@ -177,20 +194,24 @@ void ActionGroup_signal_pre_activate_callback(GtkActionGroup* self, GtkAction* p
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo ActionGroup_signal_pre_activate_info =
+static const Glib::SignalProxyInfo ActionGroup_signal_pre_activate_info =
 {
   "pre_activate",
   (GCallback) &ActionGroup_signal_pre_activate_callback,
@@ -198,7 +219,7 @@ const Glib::SignalProxyInfo ActionGroup_signal_pre_activate_info =
 };
 
 
-void ActionGroup_signal_post_activate_callback(GtkActionGroup* self, GtkAction* p0,void* data)
+static void ActionGroup_signal_post_activate_callback(GtkActionGroup* self, GtkAction* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Action>& > SlotType;
@@ -206,26 +227,31 @@ void ActionGroup_signal_post_activate_callback(GtkActionGroup* self, GtkAction*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo ActionGroup_signal_post_activate_info =
+static const Glib::SignalProxyInfo ActionGroup_signal_post_activate_info =
 {
   "post_activate",
   (GCallback) &ActionGroup_signal_post_activate_callback,
   (GCallback) &ActionGroup_signal_post_activate_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -272,8 +298,19 @@ void ActionGroup_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* ActionGroup_Class::wrap_new(GObject* object)
 {
@@ -339,7 +376,7 @@ bool ActionGroup::get_sensitive() const
 
 void ActionGroup::set_sensitive(bool sensitive)
 {
-  gtk_action_group_set_sensitive(gobj(), static_cast<int>(sensitive));
+gtk_action_group_set_sensitive(gobj(), static_cast<int>(sensitive)); 
 }
 
 bool ActionGroup::get_visible() const
@@ -349,27 +386,22 @@ bool ActionGroup::get_visible() const
 
 void ActionGroup::set_visible(bool visible)
 {
-  gtk_action_group_set_visible(gobj(), static_cast<int>(visible));
+gtk_action_group_set_visible(gobj(), static_cast<int>(visible)); 
 }
 
 Glib::RefPtr<Action> ActionGroup::get_action(const Glib::ustring& action_name)
 {
 
   Glib::RefPtr<Action> retvalue = Glib::wrap(gtk_action_group_get_action(gobj(), action_name.c_str()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Action> ActionGroup::get_action(const Glib::ustring& action_name) const
 {
-
-  Glib::RefPtr<const Action> retvalue = Glib::wrap(gtk_action_group_get_action(const_cast<GtkActionGroup*>(gobj()), action_name.c_str()));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<ActionGroup*>(this)->get_action(action_name);
 }
 
 Glib::ListHandle< Glib::RefPtr<Action> > ActionGroup::get_actions()
@@ -384,7 +416,7 @@ Glib::ListHandle< Glib::RefPtr<const Action> > ActionGroup::get_actions() const
 
 void ActionGroup::remove(const Glib::RefPtr<Action>& action)
 {
-  gtk_action_group_remove_action(gobj(), Glib::unwrap(action));
+gtk_action_group_remove_action(gobj(), Glib::unwrap(action)); 
 }
 
 Glib::ustring ActionGroup::translate_string(const Glib::ustring& str) const
@@ -398,22 +430,32 @@ Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* > ActionGroup::sign
   return Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* >(this, &ActionGroup_signal_connect_proxy_info);
 }
 
+
 Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* > ActionGroup::signal_disconnect_proxy()
 {
   return Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* >(this, &ActionGroup_signal_disconnect_proxy_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<Action>& > ActionGroup::signal_pre_activate()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<Action>& >(this, &ActionGroup_signal_pre_activate_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<Action>& > ActionGroup::signal_post_activate()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<Action>& >(this, &ActionGroup_signal_post_activate_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/actiongroup.h b/libs/gtkmm2/gtk/gtkmm/actiongroup.h
index 8db2b42e80..4416d6102e 100644
--- a/libs/gtkmm2/gtk/gtkmm/actiongroup.h
+++ b/libs/gtkmm2/gtk/gtkmm/actiongroup.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ACTIONGROUP_H
 #define _GTKMM_ACTIONGROUP_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -97,7 +98,7 @@ public:
   /** Gets the name of the action group.
    * @return The name of the action group.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_name() const;
 
@@ -108,13 +109,13 @@ public:
    * is sensitive.
    * @return <tt>true</tt> if the group is sensitive.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_sensitive() const;
   
   /** Changes the sensitivity of @a action_group 
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param sensitive New sensitivity.
    */
   void set_sensitive(bool sensitive = true);
@@ -125,13 +126,13 @@ public:
    * is visible.
    * @return <tt>true</tt> if the group is visible.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_visible() const;
   
   /** Changes the visible of @a action_group .
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param visible New visiblity.
    */
   void set_visible(bool visible = true);
@@ -141,7 +142,7 @@ public:
    * @param action_name The name of the action.
    * @return The action, or <tt>0</tt> if no action by that name exists
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<Action> get_action(const Glib::ustring& action_name);
   
@@ -149,7 +150,7 @@ public:
    * @param action_name The name of the action.
    * @return The action, or <tt>0</tt> if no action by that name exists
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<const Action> get_action(const Glib::ustring& action_name) const;
 
@@ -157,14 +158,14 @@ public:
   /** Lists the actions in the action group.
    * @return An allocated list of the action objects in the action group
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ListHandle< Glib::RefPtr<Action> > get_actions();
   
   /** Lists the actions in the action group.
    * @return An allocated list of the action objects in the action group
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ListHandle< Glib::RefPtr<const Action> > get_actions() const;
     
@@ -185,7 +186,7 @@ public:
   
   /** Removes an action object from the action group.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param action An action.
    */
   void remove(const Glib::RefPtr<Action>& action);
@@ -197,7 +198,7 @@ public:
    * @param string A string.
    * @return The translation of @a string 
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring translate_string(const Glib::ustring& str) const;
   
@@ -207,15 +208,80 @@ public:
   //These are also just C convenience methods that are useless unless you are using the other convenience methods:
   
 
+  /** The connect_proxy signal is emitted after connecting a proxy to 
+   * an action in the group. Note that the proxy may have been connected 
+   * to a different action before.
+   *
+   * This is intended for simple customizations for which a custom action
+   * class would be too clumsy, e.g. showing tooltips for menuitems in the
+   * statusbar.
+   *
+   * UIManager proxies the signal and provides global notification 
+   * just before any action is connected to a proxy, which is probably more
+   * convenient to use.
+   *
+   * @param action the action
+   * @param proxy the proxy
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %connect_proxy(const Glib::RefPtr<Action>& action, Widget* proxy)</tt>
+   */
+
   Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* > signal_connect_proxy();
 
   
+  /** The disconnect_proxy signal is emitted after disconnecting a proxy 
+   * from an action in the group. 
+   *
+   * UIManager proxies the signal and provides global notification 
+   * just before any action is connected to a proxy, which is probably more
+   * convenient to use.
+   *
+   * @param action the action
+   * @param proxy the proxy
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %disconnect_proxy(const Glib::RefPtr<Action>& action, Widget* proxy)</tt>
+   */
+
   Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* > signal_disconnect_proxy();
-             
+
+  
+  /** The pre_activate signal is emitted just before the @action in the
+   * action_group is activated
+   *
+   * This is intended for UIManager to proxy the signal and provide global
+   * notification just before any action is activated.
+   *
+   * @action the action
+   */          
   
+/**
+   * @par Prototype:
+   * <tt>void %pre_activate(const Glib::RefPtr<Action>& action)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<Action>& > signal_pre_activate();
- 
+
+  
+  /** The post_activate signal is emitted just after the @action in the
+   * @action_group is activated
+   *
+   * This is intended for UIManager to proxy the signal and provide global
+   * notification just after any action is activated.
+   *
+   * @param action the action
+   */ 
   
+/**
+   * @par Prototype:
+   * <tt>void %post_activate(const Glib::RefPtr<Action>& action)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<Action>& > signal_post_activate();
  
 
@@ -223,11 +289,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/adjustment.cc b/libs/gtkmm2/gtk/gtkmm/adjustment.cc
index 10b2e8815f..8be2188291 100644
--- a/libs/gtkmm2/gtk/gtkmm/adjustment.cc
+++ b/libs/gtkmm2/gtk/gtkmm/adjustment.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/adjustment.h>
 #include <gtkmm/private/adjustment_p.h>
 
@@ -29,22 +30,13 @@
 namespace Gtk
 {
 
-Adjustment::Adjustment(double value,
-      	               double lower, double upper,
-      	               double step_increment, double page_increment,
-      	               double page_size)
+//This is hand-coded so we can change the sequence of properties.
+//If we don't do this then the value is restricted to the initial values, ignoring the specified boundaries:
+Adjustment::Adjustment(double value, double lower, double upper, double step_increment, double page_increment, double page_size)
 :
   Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
-  Gtk::Object(Glib::ConstructParams(adjustment_class_.init(), (char*) 0))
+  Gtk::Object(Glib::ConstructParams(adjustment_class_.init(), "lower",lower,"upper",upper,"step_increment",step_increment,"page_increment",page_increment,"page_size",page_size,"value",value, (char*) 0))
 {
-  gobj()->lower = lower;
-  gobj()->upper = upper;
-  gobj()->step_increment = step_increment;
-  gobj()->page_increment = page_increment;
-  gobj()->page_size = page_size;
-  changed();
-
-  set_value(value);
 }
 
 void Adjustment::set_lower(double lower)
@@ -83,7 +75,8 @@ void Adjustment::set_page_size(double size)
 namespace
 {
 
-const Glib::SignalProxyInfo Adjustment_signal_changed_info =
+
+static const Glib::SignalProxyInfo Adjustment_signal_changed_info =
 {
   "changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -91,13 +84,14 @@ const Glib::SignalProxyInfo Adjustment_signal_changed_info =
 };
 
 
-const Glib::SignalProxyInfo Adjustment_signal_value_changed_info =
+static const Glib::SignalProxyInfo Adjustment_signal_value_changed_info =
 {
   "value_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -142,11 +136,19 @@ void Adjustment_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->changed = &changed_callback;
   klass->value_changed = &value_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Adjustment_Class::changed_callback(GtkAdjustment* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -159,15 +161,19 @@ void Adjustment_Class::changed_callback(GtkAdjustment* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -180,7 +186,6 @@ void Adjustment_Class::changed_callback(GtkAdjustment* self)
       (*base->changed)(self);
   }
 }
-
 void Adjustment_Class::value_changed_callback(GtkAdjustment* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -193,15 +198,19 @@ void Adjustment_Class::value_changed_callback(GtkAdjustment* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_value_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -214,6 +223,7 @@ void Adjustment_Class::value_changed_callback(GtkAdjustment* self)
       (*base->value_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Adjustment_Class::wrap_new(GObject* o)
@@ -257,22 +267,22 @@ GType Adjustment::get_base_type()
 
 void Adjustment::changed()
 {
-  gtk_adjustment_changed(gobj());
+gtk_adjustment_changed(gobj()); 
 }
 
 void Adjustment::value_changed()
 {
-  gtk_adjustment_value_changed(gobj());
+gtk_adjustment_value_changed(gobj()); 
 }
 
 void Adjustment::clamp_page(double lower, double upper)
 {
-  gtk_adjustment_clamp_page(gobj(), lower, upper);
+gtk_adjustment_clamp_page(gobj(), lower, upper); 
 }
 
 void Adjustment::set_value(double value)
 {
-  gtk_adjustment_set_value(gobj(), value);
+gtk_adjustment_set_value(gobj(), value); 
 }
 
 double Adjustment::get_value() const
@@ -280,43 +290,45 @@ double Adjustment::get_value() const
   return gtk_adjustment_get_value(const_cast<GtkAdjustment*>(gobj()));
 }
 
-double Adjustment::get_lower() const
+ double Adjustment::get_lower() const
 {
   return gobj()->lower;
 }
-
-double Adjustment::get_upper() const
+ 
+ double Adjustment::get_upper() const
 {
   return gobj()->upper;
 }
-
-double Adjustment::get_step_increment() const
+ 
+ double Adjustment::get_step_increment() const
 {
   return gobj()->step_increment;
 }
-
-double Adjustment::get_page_increment() const
+ 
+ double Adjustment::get_page_increment() const
 {
   return gobj()->page_increment;
 }
-
-double Adjustment::get_page_size() const
+ 
+ double Adjustment::get_page_size() const
 {
   return gobj()->page_size;
 }
-
+ 
 
 Glib::SignalProxy0< void > Adjustment::signal_changed()
 {
   return Glib::SignalProxy0< void >(this, &Adjustment_signal_changed_info);
 }
 
+
 Glib::SignalProxy0< void > Adjustment::signal_value_changed()
 {
   return Glib::SignalProxy0< void >(this, &Adjustment_signal_value_changed_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Adjustment::on_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -326,7 +338,6 @@ void Gtk::Adjustment::on_changed()
   if(base && base->changed)
     (*base->changed)(gobj());
 }
-
 void Gtk::Adjustment::on_value_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -336,6 +347,10 @@ void Gtk::Adjustment::on_value_changed()
   if(base && base->value_changed)
     (*base->value_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/adjustment.h b/libs/gtkmm2/gtk/gtkmm/adjustment.h
index 2c45297cb4..6a5a347552 100644
--- a/libs/gtkmm2/gtk/gtkmm/adjustment.h
+++ b/libs/gtkmm2/gtk/gtkmm/adjustment.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ADJUSTMENT_H
 #define _GTKMM_ADJUSTMENT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -100,13 +101,19 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_changed();
   virtual void on_value_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -125,12 +132,9 @@ public:
    * @param page_increment The page increment
    * @param page_size The page size
    */
-  Adjustment(double value,
-      	     double lower,  double upper,
-      	     double step_increment = 1, double page_increment = 10,
-      	     double page_size = 0);
+  Adjustment(double value, double lower, double upper, double step_increment = 1, double page_increment = 10, double page_size = 0);
+  
   
-
   /** Emits a "changed" signal from the Adjustment.  This is typically called by the owner of the Adjustment after it has changed any of the Adjustment fields other than the value.
    */
   void changed();
@@ -162,28 +166,28 @@ public:
   /** Retrieve the @a lower member variable.
    * @return The current value of @a lower.
    */
-  double get_lower() const;
-
+   double get_lower() const;
+ 
   /** Retrieve the @a upper member variable.
    * @return The current value of @a upper.
    */
-  double get_upper() const;
-
+   double get_upper() const;
+ 
   /** Retrieve the @a step_increment variable.
    * @return The current value of @a step_increment.
    */
-  double get_step_increment() const;
-
+   double get_step_increment() const;
+ 
   /** Retrieve the @a page_increment variable.
    * @return The current value of @a page_increment.
    */
-  double get_page_increment() const;
-
+   double get_page_increment() const;
+ 
   /** Retrieve the @a page_size variable.
    * @return The current value of @a page_size.
    */
-  double get_page_size() const;
-
+   double get_page_size() const;
+ 
   // TODO: This section needs changing. We must be able to set more at a time,
   // emitting "changed" signal only once.
   /** Sets the @a lower member variable
@@ -212,9 +216,19 @@ public:
   void set_page_size(double size);
 
   
+/**
+   * @par Prototype:
+   * <tt>void %changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %value_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_value_changed();
 
 
@@ -231,6 +245,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Adjustment* wrap(GtkAdjustment* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_ADJUSTMENT_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/alignment.cc b/libs/gtkmm2/gtk/gtkmm/alignment.cc
index 56f5c58726..59555cc32a 100644
--- a/libs/gtkmm2/gtk/gtkmm/alignment.cc
+++ b/libs/gtkmm2/gtk/gtkmm/alignment.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/alignment.h>
 #include <gtkmm/private/alignment_p.h>
 
@@ -80,8 +81,19 @@ void Alignment_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Alignment_Class::wrap_new(GObject* o)
 {
@@ -138,104 +150,143 @@ Alignment::Alignment(AlignmentEnum xalign, AlignmentEnum yalign, float xscale, f
 
 void Alignment::set(float xalign, float yalign, float xscale, float yscale)
 {
-  gtk_alignment_set(gobj(), xalign, yalign, xscale, yscale);
+gtk_alignment_set(gobj(), xalign, yalign, xscale, yscale); 
 }
 
 void Alignment::set(AlignmentEnum xalign, AlignmentEnum yalign, float xscale, float yscale)
 {
-  gtk_alignment_set(gobj(), _gtkmm_align_float_from_enum(xalign), _gtkmm_align_float_from_enum(yalign), xscale, yscale);
+gtk_alignment_set(gobj(), _gtkmm_align_float_from_enum(xalign), _gtkmm_align_float_from_enum(yalign), xscale, yscale); 
 }
 
 void Alignment::set_padding(guint padding_top, guint padding_bottom, guint padding_left, guint padding_right)
 {
-  gtk_alignment_set_padding(gobj(), padding_top, padding_bottom, padding_left, padding_right);
+gtk_alignment_set_padding(gobj(), padding_top, padding_bottom, padding_left, padding_right); 
 }
 
 void Alignment::get_padding(guint& padding_top, guint& padding_bottom, guint& padding_left, guint& padding_right)
 {
-  gtk_alignment_get_padding(gobj(), &(padding_top), &(padding_bottom), &(padding_left), &(padding_right));
+gtk_alignment_get_padding(gobj(), &(padding_top), &(padding_bottom), &(padding_left), &(padding_right)); 
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Alignment::property_xalign() 
 {
   return Glib::PropertyProxy<float>(this, "xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Alignment::property_xalign() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Alignment::property_yalign() 
 {
   return Glib::PropertyProxy<float>(this, "yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Alignment::property_yalign() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Alignment::property_xscale() 
 {
   return Glib::PropertyProxy<float>(this, "xscale");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Alignment::property_xscale() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "xscale");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Alignment::property_yscale() 
 {
   return Glib::PropertyProxy<float>(this, "yscale");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Alignment::property_yscale() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "yscale");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Alignment::property_top_padding() 
 {
   return Glib::PropertyProxy<guint>(this, "top-padding");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Alignment::property_top_padding() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "top-padding");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Alignment::property_bottom_padding() 
 {
   return Glib::PropertyProxy<guint>(this, "bottom-padding");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Alignment::property_bottom_padding() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "bottom-padding");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Alignment::property_left_padding() 
 {
   return Glib::PropertyProxy<guint>(this, "left-padding");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Alignment::property_left_padding() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "left-padding");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Alignment::property_right_padding() 
 {
   return Glib::PropertyProxy<guint>(this, "right-padding");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Alignment::property_right_padding() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "right-padding");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/alignment.h b/libs/gtkmm2/gtk/gtkmm/alignment.h
index 98130b9e2d..265d34709f 100644
--- a/libs/gtkmm2/gtk/gtkmm/alignment.h
+++ b/libs/gtkmm2/gtk/gtkmm/alignment.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ALIGNMENT_H
 #define _GTKMM_ALIGNMENT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -99,11 +100,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -150,7 +157,7 @@ public:
    * this can be used to indent the child widget towards the right by adding
    * padding on the left.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param padding_top The padding at the top of the widget.
    * @param padding_bottom The padding at the bottom of the widget.
    * @param padding_left The padding at the left of the widget.
@@ -161,7 +168,7 @@ public:
   /** Gets the padding on the different sides of the widget.
    * See set_padding().
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param padding_top Location to store the padding for the top of the widget, or <tt>0</tt>.
    * @param padding_bottom Location to store the padding for the bottom of the widget, or <tt>0</tt>.
    * @param padding_left Location to store the padding for the left of the widget, or <tt>0</tt>.
@@ -169,14 +176,17 @@ public:
    */
   void get_padding(guint& padding_top, guint& padding_bottom, guint& padding_left, guint& padding_right);
               
-  /** Horizontal position of child in available space. 0.0 is left aligned
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Horizontal position of child in available space. 0.0 is left aligned
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_xalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Horizontal position of child in available space. 0.0 is left aligned
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -184,15 +194,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_xalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Vertical position of child in available space. 0.0 is top aligned
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Vertical position of child in available space. 0.0 is top aligned
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_yalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Vertical position of child in available space. 0.0 is top aligned
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -200,15 +214,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_yalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If available horizontal space is bigger than needed for the child
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If available horizontal space is bigger than needed for the child
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_xscale() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If available horizontal space is bigger than needed for the child
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -216,15 +234,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_xscale() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If available vertical space is bigger than needed for the child
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If available vertical space is bigger than needed for the child
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_yscale() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If available vertical space is bigger than needed for the child
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -232,17 +254,21 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_yscale() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
   //New in GTK+ 2.4
-  /** The padding to insert at the top of the widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The padding to insert at the top of the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_top_padding() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The padding to insert at the top of the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -250,15 +276,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_top_padding() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The padding to insert at the bottom of the widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The padding to insert at the bottom of the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_bottom_padding() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The padding to insert at the bottom of the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -266,15 +296,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_bottom_padding() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The padding to insert at the left of the widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The padding to insert at the left of the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_left_padding() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The padding to insert at the left of the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -282,15 +316,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_left_padding() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The padding to insert at the right of the widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The padding to insert at the right of the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_right_padding() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The padding to insert at the right of the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -298,6 +336,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_right_padding() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -313,6 +352,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Alignment* wrap(GtkAlignment* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_ALIGNMENT_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/arrow.cc b/libs/gtkmm2/gtk/gtkmm/arrow.cc
index 681847cc02..a4a4f5b24f 100644
--- a/libs/gtkmm2/gtk/gtkmm/arrow.cc
+++ b/libs/gtkmm2/gtk/gtkmm/arrow.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/arrow.h>
 #include <gtkmm/private/arrow_p.h>
 
@@ -96,8 +97,19 @@ void Arrow_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Arrow_Class::wrap_new(GObject* o)
 {
@@ -147,29 +159,44 @@ Arrow::Arrow(ArrowType arrow_type, ShadowType shadow_type)
 
 void Arrow::set(ArrowType arrow_type, ShadowType shadow_type)
 {
-  gtk_arrow_set(gobj(), ((GtkArrowType)(arrow_type)), ((GtkShadowType)(shadow_type)));
+gtk_arrow_set(gobj(), ((GtkArrowType)(arrow_type)), ((GtkShadowType)(shadow_type))); 
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ArrowType> Arrow::property_arrow_type() 
 {
   return Glib::PropertyProxy<ArrowType>(this, "arrow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ArrowType> Arrow::property_arrow_type() const
 {
   return Glib::PropertyProxy_ReadOnly<ArrowType>(this, "arrow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ShadowType> Arrow::property_shadow_type() 
 {
   return Glib::PropertyProxy<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ShadowType> Arrow::property_shadow_type() const
 {
   return Glib::PropertyProxy_ReadOnly<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/arrow.h b/libs/gtkmm2/gtk/gtkmm/arrow.h
index f34a744d3e..8a6e3e15c1 100644
--- a/libs/gtkmm2/gtk/gtkmm/arrow.h
+++ b/libs/gtkmm2/gtk/gtkmm/arrow.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ARROW_H
 #define _GTKMM_ARROW_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -96,11 +97,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -125,14 +132,17 @@ public:
    */
   void set(ArrowType arrow_type, ShadowType shadow_type);
 
-  /** The direction the arrow should point.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The direction the arrow should point.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ArrowType> property_arrow_type() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The direction the arrow should point.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -140,15 +150,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ArrowType> property_arrow_type() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Appearance of the shadow surrounding the arrow.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Appearance of the shadow surrounding the arrow.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ShadowType> property_shadow_type() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Appearance of the shadow surrounding the arrow.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -156,6 +170,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ShadowType> property_shadow_type() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -172,6 +187,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Arrow* wrap(GtkArrow* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_ARROW_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/aspectframe.cc b/libs/gtkmm2/gtk/gtkmm/aspectframe.cc
index faf6a94286..84d97d7df3 100644
--- a/libs/gtkmm2/gtk/gtkmm/aspectframe.cc
+++ b/libs/gtkmm2/gtk/gtkmm/aspectframe.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/aspectframe.h>
 #include <gtkmm/private/aspectframe_p.h>
 
@@ -27,7 +28,6 @@
 
 #include <gtk/gtkaspectframe.h>
 
-
 namespace
 {
 } // anonymous namespace
@@ -74,8 +74,19 @@ void AspectFrame_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* AspectFrame_Class::wrap_new(GObject* o)
 {
@@ -132,54 +143,77 @@ AspectFrame::AspectFrame(const Glib::ustring& label, float xalign, float yalign,
 
 void AspectFrame::set(float xalign, float yalign, float ratio, bool obey_child)
 {
-  gtk_aspect_frame_set(gobj(), xalign, yalign, ratio, static_cast<int>(obey_child));
+gtk_aspect_frame_set(gobj(), xalign, yalign, ratio, static_cast<int>(obey_child)); 
 }
 
 void AspectFrame::set(AlignmentEnum xalign, AlignmentEnum yalign, float ratio, bool obey_child)
 {
-  gtk_aspect_frame_set(gobj(), _gtkmm_align_float_from_enum(xalign), _gtkmm_align_float_from_enum(yalign), ratio, static_cast<int>(obey_child));
+gtk_aspect_frame_set(gobj(), _gtkmm_align_float_from_enum(xalign), _gtkmm_align_float_from_enum(yalign), ratio, static_cast<int>(obey_child)); 
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> AspectFrame::property_xalign() 
 {
   return Glib::PropertyProxy<float>(this, "xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> AspectFrame::property_xalign() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> AspectFrame::property_yalign() 
 {
   return Glib::PropertyProxy<float>(this, "yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> AspectFrame::property_yalign() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> AspectFrame::property_ratio() 
 {
   return Glib::PropertyProxy<float>(this, "ratio");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> AspectFrame::property_ratio() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "ratio");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> AspectFrame::property_obey_child() 
 {
   return Glib::PropertyProxy<bool>(this, "obey-child");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> AspectFrame::property_obey_child() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "obey-child");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/aspectframe.h b/libs/gtkmm2/gtk/gtkmm/aspectframe.h
index 4687417211..3ec9dffed9 100644
--- a/libs/gtkmm2/gtk/gtkmm/aspectframe.h
+++ b/libs/gtkmm2/gtk/gtkmm/aspectframe.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ASPECTFRAME_H
 #define _GTKMM_ASPECTFRAME_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -95,11 +96,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -159,14 +166,17 @@ public:
   
   void set(AlignmentEnum xalign, AlignmentEnum yalign, float ratio, bool obey_child = true);
 
-  /** X alignment of the child.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** X alignment of the child.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_xalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** X alignment of the child.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -174,15 +184,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_xalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Y alignment of the child.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Y alignment of the child.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_yalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Y alignment of the child.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -190,15 +204,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_yalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Aspect ratio if obey_child is FALSE.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Aspect ratio if obey_child is FALSE.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_ratio() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Aspect ratio if obey_child is FALSE.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -206,15 +224,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_ratio() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Force aspect ratio to match that of the frame's child.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Force aspect ratio to match that of the frame's child.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_obey_child() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Force aspect ratio to match that of the frame's child.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -222,6 +244,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_obey_child() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -237,6 +260,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::AspectFrame* wrap(GtkAspectFrame* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_ASPECTFRAME_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/bin.cc b/libs/gtkmm2/gtk/gtkmm/bin.cc
index 2b58d2954c..e25a25c7fe 100644
--- a/libs/gtkmm2/gtk/gtkmm/bin.cc
+++ b/libs/gtkmm2/gtk/gtkmm/bin.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/bin.h>
 #include <gtkmm/private/bin_p.h>
 
@@ -177,8 +178,19 @@ void Bin_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Bin_Class::wrap_new(GObject* o)
 {
@@ -226,7 +238,7 @@ Bin::Bin()
 {
   }
 
-Widget* Bin::get_child()
+ Widget* Bin::get_child()
 {
   return Glib::wrap(gobj()->child);
 }
@@ -235,6 +247,13 @@ const Widget* Bin::get_child() const
 {
   return Glib::wrap(gobj()->child);
 }
+ 
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/bin.h b/libs/gtkmm2/gtk/gtkmm/bin.h
index 2100110f69..abeab46269 100644
--- a/libs/gtkmm2/gtk/gtkmm/bin.h
+++ b/libs/gtkmm2/gtk/gtkmm/bin.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_BIN_H
 #define _GTKMM_BIN_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -92,11 +93,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -109,9 +116,9 @@ public:
   // get_child() is a convenience function to get a c++ wrapper of
   // the contained widget. It may return NULL if such an item is not
   // available.
-  Widget* get_child();
+   Widget* get_child();
   const Widget* get_child() const;
-
+ 
   /** Remove the contained object
    * Since this can only hold one object it is not necessary to
    * specify which object to remove like other containers.
@@ -206,6 +213,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Bin* wrap(GtkBin* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_BIN_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/box.cc b/libs/gtkmm2/gtk/gtkmm/box.cc
index a67411b47b..2f6a0ba157 100644
--- a/libs/gtkmm2/gtk/gtkmm/box.cc
+++ b/libs/gtkmm2/gtk/gtkmm/box.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/box.h>
 #include <gtkmm/private/box_p.h>
 
@@ -175,8 +176,19 @@ void Box_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Box_Class::wrap_new(GObject* o)
 {
@@ -326,17 +338,17 @@ Box::Box()
 
 void Box::pack_start(Widget& child, bool expand, bool fill, guint padding)
 {
-  gtk_box_pack_start(gobj(), (child).gobj(), static_cast<int>(expand), static_cast<int>(fill), padding);
+gtk_box_pack_start(gobj(), (child).gobj(), static_cast<int>(expand), static_cast<int>(fill), padding); 
 }
 
 void Box::pack_end(Widget& child, bool expand, bool fill, guint padding)
 {
-  gtk_box_pack_end(gobj(), (child).gobj(), static_cast<int>(expand), static_cast<int>(fill), padding);
+gtk_box_pack_end(gobj(), (child).gobj(), static_cast<int>(expand), static_cast<int>(fill), padding); 
 }
 
 void Box::set_homogeneous(bool homogeneous)
 {
-  gtk_box_set_homogeneous(gobj(), static_cast<int>(homogeneous));
+gtk_box_set_homogeneous(gobj(), static_cast<int>(homogeneous)); 
 }
 
 bool Box::get_homogeneous() const
@@ -346,7 +358,7 @@ bool Box::get_homogeneous() const
 
 void Box::set_spacing(int spacing)
 {
-  gtk_box_set_spacing(gobj(), spacing);
+gtk_box_set_spacing(gobj(), spacing); 
 }
 
 int Box::get_spacing() const
@@ -356,29 +368,44 @@ int Box::get_spacing() const
 
 void Box::reorder_child(Widget& child, int pos)
 {
-  gtk_box_reorder_child(gobj(), (child).gobj(), pos);
+gtk_box_reorder_child(gobj(), (child).gobj(), pos); 
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Box::property_spacing() 
 {
   return Glib::PropertyProxy<int>(this, "spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Box::property_spacing() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Box::property_homogeneous() 
 {
   return Glib::PropertyProxy<bool>(this, "homogeneous");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Box::property_homogeneous() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "homogeneous");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
@@ -425,8 +452,19 @@ void VBox_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* VBox_Class::wrap_new(GObject* o)
 {
@@ -474,6 +512,13 @@ VBox::VBox(bool homogeneous, int spacing)
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
@@ -518,8 +563,19 @@ void HBox_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* HBox_Class::wrap_new(GObject* o)
 {
@@ -567,6 +623,13 @@ HBox::HBox(bool homogeneous, int spacing)
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/box.h b/libs/gtkmm2/gtk/gtkmm/box.h
index 3955273760..a3a0e69cdd 100644
--- a/libs/gtkmm2/gtk/gtkmm/box.h
+++ b/libs/gtkmm2/gtk/gtkmm/box.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_BOX_H
 #define _GTKMM_BOX_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -211,7 +212,8 @@ virtual void remove(Widget& w); //Implented as custom or by LIST_CONTAINER_REMOV
  * right side.  Use repeated calls to pack_start() to pack widgets into a
  * Gtk::Box from start to end. Use pack_end() to add widgets from end to start.
  * You may intersperse these calls and add widgets from both ends of the same
- * Gtk::Box.
+ * Gtk::Box. The last widget added with pack_start() will be placed just before
+ * the last widget added with pack_end()
  *
  * Because Gtk::Box is a Gtk::Container, you may also use Gtk::Container::add()
  * to insert widgets, and they will be packed as if with pack_start(). Use
@@ -268,11 +270,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -354,14 +362,17 @@ public:
    */
   const BoxList& children() const;
 
-  /** The amount of space between children.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The amount of space between children.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_spacing() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The amount of space between children.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -369,15 +380,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_spacing() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the children should all be the same size.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the children should all be the same size.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_homogeneous() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the children should all be the same size.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -385,6 +400,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_homogeneous() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
@@ -450,11 +466,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -531,11 +553,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -564,7 +592,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Box* wrap(GtkBox* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::VBox
@@ -573,7 +603,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::VBox* wrap(GtkVBox* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::HBox
@@ -582,6 +614,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::HBox* wrap(GtkHBox* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_BOX_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/button.cc b/libs/gtkmm2/gtk/gtkmm/button.cc
index 01a3265d8c..4c4bbd8230 100644
--- a/libs/gtkmm2/gtk/gtkmm/button.cc
+++ b/libs/gtkmm2/gtk/gtkmm/button.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/button.h>
 #include <gtkmm/private/button_p.h>
 
@@ -52,7 +53,8 @@ Button::Button(const StockID& stock_id)
 namespace
 {
 
-const Glib::SignalProxyInfo Button_signal_pressed_info =
+
+static const Glib::SignalProxyInfo Button_signal_pressed_info =
 {
   "pressed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -60,7 +62,7 @@ const Glib::SignalProxyInfo Button_signal_pressed_info =
 };
 
 
-const Glib::SignalProxyInfo Button_signal_released_info =
+static const Glib::SignalProxyInfo Button_signal_released_info =
 {
   "released",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -68,7 +70,7 @@ const Glib::SignalProxyInfo Button_signal_released_info =
 };
 
 
-const Glib::SignalProxyInfo Button_signal_clicked_info =
+static const Glib::SignalProxyInfo Button_signal_clicked_info =
 {
   "clicked",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -76,7 +78,7 @@ const Glib::SignalProxyInfo Button_signal_clicked_info =
 };
 
 
-const Glib::SignalProxyInfo Button_signal_enter_info =
+static const Glib::SignalProxyInfo Button_signal_enter_info =
 {
   "enter",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -84,7 +86,7 @@ const Glib::SignalProxyInfo Button_signal_enter_info =
 };
 
 
-const Glib::SignalProxyInfo Button_signal_leave_info =
+static const Glib::SignalProxyInfo Button_signal_leave_info =
 {
   "leave",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -92,13 +94,14 @@ const Glib::SignalProxyInfo Button_signal_leave_info =
 };
 
 
-const Glib::SignalProxyInfo Button_signal_activate_info =
+static const Glib::SignalProxyInfo Button_signal_activate_info =
 {
   "activate",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -143,15 +146,23 @@ void Button_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->pressed = &pressed_callback;
   klass->released = &released_callback;
   klass->clicked = &clicked_callback;
   klass->enter = &enter_callback;
   klass->leave = &leave_callback;
   klass->activate = &activate_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Button_Class::pressed_callback(GtkButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -164,15 +175,19 @@ void Button_Class::pressed_callback(GtkButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_pressed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -185,7 +200,6 @@ void Button_Class::pressed_callback(GtkButton* self)
       (*base->pressed)(self);
   }
 }
-
 void Button_Class::released_callback(GtkButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -198,15 +212,19 @@ void Button_Class::released_callback(GtkButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_released();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -219,7 +237,6 @@ void Button_Class::released_callback(GtkButton* self)
       (*base->released)(self);
   }
 }
-
 void Button_Class::clicked_callback(GtkButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -232,15 +249,19 @@ void Button_Class::clicked_callback(GtkButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_clicked();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -253,7 +274,6 @@ void Button_Class::clicked_callback(GtkButton* self)
       (*base->clicked)(self);
   }
 }
-
 void Button_Class::enter_callback(GtkButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -266,15 +286,19 @@ void Button_Class::enter_callback(GtkButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_enter();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -287,7 +311,6 @@ void Button_Class::enter_callback(GtkButton* self)
       (*base->enter)(self);
   }
 }
-
 void Button_Class::leave_callback(GtkButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -300,15 +323,19 @@ void Button_Class::leave_callback(GtkButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_leave();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -321,7 +348,6 @@ void Button_Class::leave_callback(GtkButton* self)
       (*base->leave)(self);
   }
 }
-
 void Button_Class::activate_callback(GtkButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -334,15 +360,19 @@ void Button_Class::activate_callback(GtkButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_activate();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -355,6 +385,7 @@ void Button_Class::activate_callback(GtkButton* self)
       (*base->activate)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Button_Class::wrap_new(GObject* o)
@@ -405,32 +436,32 @@ Button::Button()
 
 void Button::pressed()
 {
-  gtk_button_pressed(gobj());
+gtk_button_pressed(gobj()); 
 }
 
 void Button::released()
 {
-  gtk_button_released(gobj());
+gtk_button_released(gobj()); 
 }
 
 void Button::clicked()
 {
-  gtk_button_clicked(gobj());
+gtk_button_clicked(gobj()); 
 }
 
 void Button::enter()
 {
-  gtk_button_enter(gobj());
+gtk_button_enter(gobj()); 
 }
 
 void Button::leave()
 {
-  gtk_button_leave(gobj());
+gtk_button_leave(gobj()); 
 }
 
 void Button::set_relief(ReliefStyle newstyle)
 {
-  gtk_button_set_relief(gobj(), ((GtkReliefStyle)(newstyle)));
+gtk_button_set_relief(gobj(), ((GtkReliefStyle)(newstyle))); 
 }
 
 ReliefStyle Button::get_relief() const
@@ -440,7 +471,7 @@ ReliefStyle Button::get_relief() const
 
 void Button::set_label(const Glib::ustring& label)
 {
-  gtk_button_set_label(gobj(), label.c_str());
+gtk_button_set_label(gobj(), label.c_str()); 
 }
 
 Glib::ustring Button::get_label() const
@@ -450,7 +481,7 @@ Glib::ustring Button::get_label() const
 
 void Button::set_use_underline(bool use_underline)
 {
-  gtk_button_set_use_underline(gobj(), static_cast<int>(use_underline));
+gtk_button_set_use_underline(gobj(), static_cast<int>(use_underline)); 
 }
 
 bool Button::get_use_underline() const
@@ -460,7 +491,7 @@ bool Button::get_use_underline() const
 
 void Button::set_use_stock(bool use_stock)
 {
-  gtk_button_set_use_stock(gobj(), static_cast<int>(use_stock));
+gtk_button_set_use_stock(gobj(), static_cast<int>(use_stock)); 
 }
 
 bool Button::get_use_stock() const
@@ -470,7 +501,7 @@ bool Button::get_use_stock() const
 
 void Button::set_focus_on_click(bool focus_on_click)
 {
-  gtk_button_set_focus_on_click(gobj(), static_cast<int>(focus_on_click));
+gtk_button_set_focus_on_click(gobj(), static_cast<int>(focus_on_click)); 
 }
 
 bool Button::get_focus_on_click() const
@@ -480,17 +511,17 @@ bool Button::get_focus_on_click() const
 
 void Button::set_alignment(float xalign, float yalign)
 {
-  gtk_button_set_alignment(gobj(), xalign, yalign);
+gtk_button_set_alignment(gobj(), xalign, yalign); 
 }
 
 void Button::get_alignment(float& xalign, float& yalign)
 {
-  gtk_button_get_alignment(gobj(), &(xalign), &(yalign));
+gtk_button_get_alignment(gobj(), &(xalign), &(yalign)); 
 }
 
 void Button::set_image(Widget& image)
 {
-  gtk_button_set_image(gobj(), (image).gobj());
+gtk_button_set_image(gobj(), (image).gobj()); 
 }
 
 Widget* Button::get_image()
@@ -500,7 +531,17 @@ Widget* Button::get_image()
 
 const Widget* Button::get_image() const
 {
-  return Glib::wrap(gtk_button_get_image(const_cast<GtkButton*>(gobj())));
+  return const_cast<Button*>(this)->get_image();
+}
+
+void Button::set_image_position(PositionType position)
+{
+gtk_button_set_image_position(gobj(), ((GtkPositionType)(position))); 
+}
+
+PositionType Button::get_image_position() const
+{
+  return ((PositionType)(gtk_button_get_image_position(const_cast<GtkButton*>(gobj()))));
 }
 
 
@@ -509,113 +550,165 @@ Glib::SignalProxy0< void > Button::signal_pressed()
   return Glib::SignalProxy0< void >(this, &Button_signal_pressed_info);
 }
 
+
 Glib::SignalProxy0< void > Button::signal_released()
 {
   return Glib::SignalProxy0< void >(this, &Button_signal_released_info);
 }
 
+
 Glib::SignalProxy0< void > Button::signal_clicked()
 {
   return Glib::SignalProxy0< void >(this, &Button_signal_clicked_info);
 }
 
+
 Glib::SignalProxy0< void > Button::signal_enter()
 {
   return Glib::SignalProxy0< void >(this, &Button_signal_enter_info);
 }
 
+
 Glib::SignalProxy0< void > Button::signal_leave()
 {
   return Glib::SignalProxy0< void >(this, &Button_signal_leave_info);
 }
 
+
 Glib::SignalProxy0< void > Button::signal_activate()
 {
   return Glib::SignalProxy0< void >(this, &Button_signal_activate_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Button::property_label() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Button::property_label() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ReliefStyle> Button::property_relief() 
 {
   return Glib::PropertyProxy<ReliefStyle>(this, "relief");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ReliefStyle> Button::property_relief() const
 {
   return Glib::PropertyProxy_ReadOnly<ReliefStyle>(this, "relief");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Button::property_use_underline() 
 {
   return Glib::PropertyProxy<bool>(this, "use-underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Button::property_use_underline() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "use-underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Button::property_use_stock() 
 {
   return Glib::PropertyProxy<bool>(this, "use-stock");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Button::property_use_stock() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "use-stock");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Button::property_focus_on_click() 
 {
   return Glib::PropertyProxy<bool>(this, "focus-on-click");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Button::property_focus_on_click() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "focus-on-click");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Button::property_xalign() 
 {
   return Glib::PropertyProxy<float>(this, "xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Button::property_xalign() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Button::property_yalign() 
 {
   return Glib::PropertyProxy<float>(this, "yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Button::property_yalign() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::Widget*> Button::property_image() 
 {
   return Glib::PropertyProxy<Gtk::Widget*>(this, "image");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::Widget*> Button::property_image() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::Widget*>(this, "image");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<PositionType> Button::property_image_position() 
+{
+  return Glib::PropertyProxy<PositionType>(this, "image-position");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<PositionType> Button::property_image_position() const
+{
+  return Glib::PropertyProxy_ReadOnly<PositionType>(this, "image-position");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Button::on_pressed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -625,7 +718,6 @@ void Gtk::Button::on_pressed()
   if(base && base->pressed)
     (*base->pressed)(gobj());
 }
-
 void Gtk::Button::on_released()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -635,7 +727,6 @@ void Gtk::Button::on_released()
   if(base && base->released)
     (*base->released)(gobj());
 }
-
 void Gtk::Button::on_clicked()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -645,7 +736,6 @@ void Gtk::Button::on_clicked()
   if(base && base->clicked)
     (*base->clicked)(gobj());
 }
-
 void Gtk::Button::on_enter()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -655,7 +745,6 @@ void Gtk::Button::on_enter()
   if(base && base->enter)
     (*base->enter)(gobj());
 }
-
 void Gtk::Button::on_leave()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -665,7 +754,6 @@ void Gtk::Button::on_leave()
   if(base && base->leave)
     (*base->leave)(gobj());
 }
-
 void Gtk::Button::on_activate()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -675,6 +763,10 @@ void Gtk::Button::on_activate()
   if(base && base->activate)
     (*base->activate)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/button.h b/libs/gtkmm2/gtk/gtkmm/button.h
index 1ba9920a0f..990ede4163 100644
--- a/libs/gtkmm2/gtk/gtkmm/button.h
+++ b/libs/gtkmm2/gtk/gtkmm/button.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_BUTTON_H
 #define _GTKMM_BUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -95,17 +96,23 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_pressed();
   virtual void on_released();
   virtual void on_clicked();
   virtual void on_enter();
   virtual void on_leave();
   virtual void on_activate();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -122,7 +129,7 @@ public:
    * directly instead.
    */
   Button();
-  
+
 
   /** Simple Push Button with label.
    * Create a button with the given label inside. You won't be able
@@ -130,6 +137,11 @@ public:
    * in it
    */
   explicit Button(const Glib::ustring& label, bool mnemonic = false);
+
+  /** Creates a new Button containing the image and text from a stock item.
+   * Stock ids have identifiers like Gtk::Stock::OK and Gtk::Stock::APPLY.
+   * @param stock_id The stock item.
+   */
   explicit Button(const StockID& stock_id);
 
 
@@ -200,7 +212,7 @@ public:
    * you don't want the keyboard focus removed from the main area of the
    * application.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param focus_on_click Whether the button grabs focus when clicked with the mouse.
    */
   void set_focus_on_click(bool focus_on_click = true);
@@ -210,7 +222,7 @@ public:
    * @return <tt>true</tt> if the button grabs focus when it is clicked with
    * the mouse.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_focus_on_click() const;
 
@@ -218,7 +230,7 @@ public:
   /** Sets the alignment of the child. This property has no effect unless 
    * the child is a Gtk::Misc or a Gtk::Aligment.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param xalign The horizontal position of the child, 0.0 is left aligned, 
    * 1.0 is right aligned.
    * @param yalign The vertical position of the child, 0.0 is top aligned, 
@@ -228,7 +240,7 @@ public:
   
   /** Gets the alignment of the child in the button.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param xalign Return location for horizontal alignment.
    * @param yalign Return location for vertical alignment.
    */
@@ -236,57 +248,96 @@ public:
 
   
   /** Set the image of @a button  to the given widget. Note that
-   * it depends on the show-button-images setting whether the
-   * image will be displayed or not.
+   * it depends on the gtk-button-images setting whether the
+   * image will be displayed or not, you don't have to call
+   * Gtk::Widget::show() on @a image  yourself.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param image A widget to set as the image for the button.
    */
   void set_image(Widget& image);
   
   /** Gets the widget that is currenty set as the image of @a button .
-   * This may have been explicitly set by set_image()
-   * or constructed by new_from_stock().
+   *     This may have been explicitly set by set_image()
+   *     or specified as a stock item to the constructor.
    * 
-   * Since: 2.6
+   *     @a newin2p6 
    */
   Widget* get_image();
   
   /** Gets the widget that is currenty set as the image of @a button .
-   * This may have been explicitly set by set_image()
-   * or constructed by new_from_stock().
+   *     This may have been explicitly set by set_image()
+   *     or specified as a stock item to the constructor.
    * 
-   * Since: 2.6
+   *     @a newin2p6 
    */
   const Widget* get_image() const;
-   
+
   
+  void set_image_position(PositionType position);
+  
+  PositionType get_image_position() const;
+
+  
+/**
+   * @par Prototype:
+   * <tt>void %pressed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_pressed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %released()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_released();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %clicked()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_clicked();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %enter()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_enter();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %leave()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_leave();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %activate()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_activate();
 
 
-  /** Text of the label widget inside the button
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Text of the label widget inside the button
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_label() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Text of the label widget inside the button
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -294,15 +345,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_label() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The border relief style.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The border relief style.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ReliefStyle> property_relief() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The border relief style.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -310,15 +365,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ReliefStyle> property_relief() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If set
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_use_underline() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -326,15 +385,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_use_underline() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If set
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_use_stock() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -342,15 +405,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_use_stock() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the button grabs focus when it is clicked with the mouse.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the button grabs focus when it is clicked with the mouse.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_focus_on_click() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the button grabs focus when it is clicked with the mouse.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -358,15 +425,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_focus_on_click() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Horizontal position of child in available space. 0.0 is left aligned
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Horizontal position of child in available space. 0.0 is left aligned
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_xalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Horizontal position of child in available space. 0.0 is left aligned
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -374,15 +445,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_xalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Vertical position of child in available space. 0.0 is top aligned
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Vertical position of child in available space. 0.0 is top aligned
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_yalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Vertical position of child in available space. 0.0 is top aligned
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -390,15 +465,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_yalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Child widget to appear next to the button text.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Child widget to appear next to the button text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gtk::Widget*> property_image() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Child widget to appear next to the button text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -406,6 +485,27 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gtk::Widget*> property_image() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The position of the image relative to the text.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<PositionType> property_image_position() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The position of the image relative to the text.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<PositionType> property_image_position() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -427,6 +527,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Button* wrap(GtkButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_BUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/buttonbox.cc b/libs/gtkmm2/gtk/gtkmm/buttonbox.cc
index 7fe9bd53f6..72f0ad3f73 100644
--- a/libs/gtkmm2/gtk/gtkmm/buttonbox.cc
+++ b/libs/gtkmm2/gtk/gtkmm/buttonbox.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/private/buttonbox_p.h>
 
@@ -98,8 +99,19 @@ void ButtonBox_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* ButtonBox_Class::wrap_new(GObject* o)
 {
@@ -147,12 +159,12 @@ ButtonBoxStyle ButtonBox::get_layout() const
 
 void ButtonBox::set_layout(ButtonBoxStyle layout_style)
 {
-  gtk_button_box_set_layout(gobj(), ((GtkButtonBoxStyle)(layout_style)));
+gtk_button_box_set_layout(gobj(), ((GtkButtonBoxStyle)(layout_style))); 
 }
 
 void ButtonBox::set_child_secondary(Widget& child, bool is_secondary)
 {
-  gtk_button_box_set_child_secondary(gobj(), (child).gobj(), static_cast<int>(is_secondary));
+gtk_button_box_set_child_secondary(gobj(), (child).gobj(), static_cast<int>(is_secondary)); 
 }
 
 bool ButtonBox::get_child_secondary(const Gtk::Widget& child) const
@@ -160,56 +172,67 @@ bool ButtonBox::get_child_secondary(const Gtk::Widget& child) const
   return gtk_button_box_get_child_secondary(const_cast<GtkButtonBox*>(gobj()), const_cast<GtkWidget*>(child.gobj()));
 }
 
-int ButtonBox::get_child_min_width() const
+ int ButtonBox::get_child_min_width() const
 {
   return gobj()->child_min_width;
 }
-
-void ButtonBox::set_child_min_width(const int& value)
+ 
+ void ButtonBox::set_child_min_width(const int& value)
 {
   gobj()->child_min_width = value;
 }
-
-int ButtonBox::get_child_min_height() const
+ 
+ int ButtonBox::get_child_min_height() const
 {
   return gobj()->child_min_height;
 }
-
-void ButtonBox::set_child_min_height(const int& value)
+ 
+ void ButtonBox::set_child_min_height(const int& value)
 {
   gobj()->child_min_height = value;
 }
-
-int ButtonBox::get_child_ipadding_x() const
+ 
+ int ButtonBox::get_child_ipadding_x() const
 {
   return gobj()->child_ipad_x;
 }
-
-void ButtonBox::set_child_ipadding_x(const int& value)
+ 
+ void ButtonBox::set_child_ipadding_x(const int& value)
 {
   gobj()->child_ipad_x = value;
 }
-
-int ButtonBox::get_child_ipadding_y() const
+ 
+ int ButtonBox::get_child_ipadding_y() const
 {
   return gobj()->child_ipad_y;
 }
-
-void ButtonBox::set_child_ipadding_y(const int& value)
+ 
+ void ButtonBox::set_child_ipadding_y(const int& value)
 {
   gobj()->child_ipad_y = value;
 }
+ 
 
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ButtonBoxStyle> ButtonBox::property_layout_style() 
 {
   return Glib::PropertyProxy<ButtonBoxStyle>(this, "layout-style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ButtonBoxStyle> ButtonBox::property_layout_style() const
 {
   return Glib::PropertyProxy_ReadOnly<ButtonBoxStyle>(this, "layout-style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
@@ -256,8 +279,19 @@ void VButtonBox_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* VButtonBox_Class::wrap_new(GObject* o)
 {
@@ -298,6 +332,13 @@ GType VButtonBox::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
@@ -342,8 +383,19 @@ void HButtonBox_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* HButtonBox_Class::wrap_new(GObject* o)
 {
@@ -384,6 +436,13 @@ GType HButtonBox::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/buttonbox.h b/libs/gtkmm2/gtk/gtkmm/buttonbox.h
index 6f39c6aed9..7d0665f92b 100644
--- a/libs/gtkmm2/gtk/gtkmm/buttonbox.h
+++ b/libs/gtkmm2/gtk/gtkmm/buttonbox.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_BUTTONBOX_H
 #define _GTKMM_BUTTONBOX_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -111,11 +112,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -133,7 +140,7 @@ public:
    * 
    * This group appears after the other children if the style
    * is Gtk::BUTTONBOX_START, Gtk::BUTTONBOX_SPREAD or
-   * Gtk::BUTTONBOX_EDGE, and before the the other children if the style
+   * Gtk::BUTTONBOX_EDGE, and before the other children if the style
    * is Gtk::BUTTONBOX_END. For horizontal button boxes, the definition
    * of before/after depends on direction of the widget (see
    * Gtk::Widget::set_direction()). If the style is Gtk::BUTTONBOX_START
@@ -150,30 +157,33 @@ public:
    * @param child A child of @a widget .
    * @return Whether @a child  should appear in a secondary group of children.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_child_secondary(const Gtk::Widget& child) const;
 
-  int get_child_min_width() const;
-  void set_child_min_width(const int& value);
-
-  int get_child_min_height() const;
-  void set_child_min_height(const int& value);
-
-  int get_child_ipadding_x() const;
-  void set_child_ipadding_x(const int& value);
-
-  int get_child_ipadding_y() const;
-  void set_child_ipadding_y(const int& value);
-
-  /** How to layout the buttons in the box. Possible values are default
+   int get_child_min_width() const;
+    void set_child_min_width(const int& value);
+ 
+   int get_child_min_height() const;
+    void set_child_min_height(const int& value);
+ 
+   int get_child_ipadding_x() const;
+    void set_child_ipadding_x(const int& value);
+ 
+   int get_child_ipadding_y() const;
+    void set_child_ipadding_y(const int& value);
+ 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** How to layout the buttons in the box. Possible values are default
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ButtonBoxStyle> property_layout_style() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** How to layout the buttons in the box. Possible values are default
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -181,6 +191,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ButtonBoxStyle> property_layout_style() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -241,11 +252,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -312,11 +329,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -338,7 +361,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ButtonBox* wrap(GtkButtonBox* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::VButtonBox
@@ -347,7 +372,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::VButtonBox* wrap(GtkVButtonBox* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::HButtonBox
@@ -356,6 +383,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::HButtonBox* wrap(GtkHButtonBox* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_BUTTONBOX_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/calendar.cc b/libs/gtkmm2/gtk/gtkmm/calendar.cc
index 66add813c7..819d4229b9 100644
--- a/libs/gtkmm2/gtk/gtkmm/calendar.cc
+++ b/libs/gtkmm2/gtk/gtkmm/calendar.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/calendar.h>
 #include <gtkmm/private/calendar_p.h>
 
@@ -37,7 +38,8 @@ namespace Gtk
 namespace
 {
 
-const Glib::SignalProxyInfo Calendar_signal_month_changed_info =
+
+static const Glib::SignalProxyInfo Calendar_signal_month_changed_info =
 {
   "month_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -45,7 +47,7 @@ const Glib::SignalProxyInfo Calendar_signal_month_changed_info =
 };
 
 
-const Glib::SignalProxyInfo Calendar_signal_day_selected_info =
+static const Glib::SignalProxyInfo Calendar_signal_day_selected_info =
 {
   "day_selected",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -53,7 +55,7 @@ const Glib::SignalProxyInfo Calendar_signal_day_selected_info =
 };
 
 
-const Glib::SignalProxyInfo Calendar_signal_day_selected_double_click_info =
+static const Glib::SignalProxyInfo Calendar_signal_day_selected_double_click_info =
 {
   "day_selected_double_click",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -61,7 +63,7 @@ const Glib::SignalProxyInfo Calendar_signal_day_selected_double_click_info =
 };
 
 
-const Glib::SignalProxyInfo Calendar_signal_prev_month_info =
+static const Glib::SignalProxyInfo Calendar_signal_prev_month_info =
 {
   "prev_month",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -69,7 +71,7 @@ const Glib::SignalProxyInfo Calendar_signal_prev_month_info =
 };
 
 
-const Glib::SignalProxyInfo Calendar_signal_next_month_info =
+static const Glib::SignalProxyInfo Calendar_signal_next_month_info =
 {
   "next_month",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -77,7 +79,7 @@ const Glib::SignalProxyInfo Calendar_signal_next_month_info =
 };
 
 
-const Glib::SignalProxyInfo Calendar_signal_prev_year_info =
+static const Glib::SignalProxyInfo Calendar_signal_prev_year_info =
 {
   "prev_year",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -85,13 +87,14 @@ const Glib::SignalProxyInfo Calendar_signal_prev_year_info =
 };
 
 
-const Glib::SignalProxyInfo Calendar_signal_next_year_info =
+static const Glib::SignalProxyInfo Calendar_signal_next_year_info =
 {
   "next_year",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 // static
@@ -142,6 +145,10 @@ void Calendar_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->month_changed = &month_changed_callback;
   klass->day_selected = &day_selected_callback;
   klass->day_selected_double_click = &day_selected_double_click_callback;
@@ -149,9 +156,13 @@ void Calendar_Class::class_init_function(void* g_class, void* class_data)
   klass->next_month = &next_month_callback;
   klass->prev_year = &prev_year_callback;
   klass->next_year = &next_year_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Calendar_Class::month_changed_callback(GtkCalendar* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -164,15 +175,19 @@ void Calendar_Class::month_changed_callback(GtkCalendar* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_month_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -185,7 +200,6 @@ void Calendar_Class::month_changed_callback(GtkCalendar* self)
       (*base->month_changed)(self);
   }
 }
-
 void Calendar_Class::day_selected_callback(GtkCalendar* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -198,15 +212,19 @@ void Calendar_Class::day_selected_callback(GtkCalendar* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_day_selected();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -219,7 +237,6 @@ void Calendar_Class::day_selected_callback(GtkCalendar* self)
       (*base->day_selected)(self);
   }
 }
-
 void Calendar_Class::day_selected_double_click_callback(GtkCalendar* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -232,15 +249,19 @@ void Calendar_Class::day_selected_double_click_callback(GtkCalendar* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_day_selected_double_click();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -253,7 +274,6 @@ void Calendar_Class::day_selected_double_click_callback(GtkCalendar* self)
       (*base->day_selected_double_click)(self);
   }
 }
-
 void Calendar_Class::prev_month_callback(GtkCalendar* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -266,15 +286,19 @@ void Calendar_Class::prev_month_callback(GtkCalendar* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_prev_month();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -287,7 +311,6 @@ void Calendar_Class::prev_month_callback(GtkCalendar* self)
       (*base->prev_month)(self);
   }
 }
-
 void Calendar_Class::next_month_callback(GtkCalendar* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -300,15 +323,19 @@ void Calendar_Class::next_month_callback(GtkCalendar* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_next_month();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -321,7 +348,6 @@ void Calendar_Class::next_month_callback(GtkCalendar* self)
       (*base->next_month)(self);
   }
 }
-
 void Calendar_Class::prev_year_callback(GtkCalendar* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -334,15 +360,19 @@ void Calendar_Class::prev_year_callback(GtkCalendar* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_prev_year();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -355,7 +385,6 @@ void Calendar_Class::prev_year_callback(GtkCalendar* self)
       (*base->prev_year)(self);
   }
 }
-
 void Calendar_Class::next_year_callback(GtkCalendar* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -368,15 +397,19 @@ void Calendar_Class::next_year_callback(GtkCalendar* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_next_year();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -389,6 +422,7 @@ void Calendar_Class::next_year_callback(GtkCalendar* self)
       (*base->next_year)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Calendar_Class::wrap_new(GObject* o)
@@ -444,7 +478,7 @@ int Calendar::select_month(guint month, guint year)
 
 void Calendar::select_day(guint day)
 {
-  gtk_calendar_select_day(gobj(), day);
+gtk_calendar_select_day(gobj(), day); 
 }
 
 int Calendar::mark_day(guint day)
@@ -459,17 +493,21 @@ int Calendar::unmark_day(guint day)
 
 void Calendar::clear_marks()
 {
-  gtk_calendar_clear_marks(gobj());
+gtk_calendar_clear_marks(gobj()); 
 }
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void Calendar::display_options(CalendarDisplayOptions flags)
 {
-  gtk_calendar_display_options(gobj(), ((GtkCalendarDisplayOptions)(flags)));
+gtk_calendar_display_options(gobj(), ((GtkCalendarDisplayOptions)(flags))); 
 }
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
 void Calendar::set_display_options(CalendarDisplayOptions flags)
 {
-  gtk_calendar_set_display_options(gobj(), ((GtkCalendarDisplayOptions)(flags)));
+gtk_calendar_set_display_options(gobj(), ((GtkCalendarDisplayOptions)(flags))); 
 }
 
 CalendarDisplayOptions Calendar::get_display_options() const
@@ -479,17 +517,17 @@ CalendarDisplayOptions Calendar::get_display_options() const
 
 void Calendar::get_date(guint& year, guint& month, guint& day) const
 {
-  gtk_calendar_get_date(const_cast<GtkCalendar*>(gobj()), &(year), &(month), &(day));
+gtk_calendar_get_date(const_cast<GtkCalendar*>(gobj()), &(year), &(month), &(day)); 
 }
 
 void Calendar::freeze()
 {
-  gtk_calendar_freeze(gobj());
+gtk_calendar_freeze(gobj()); 
 }
 
 void Calendar::thaw()
 {
-  gtk_calendar_thaw(gobj());
+gtk_calendar_thaw(gobj()); 
 }
 
 
@@ -498,37 +536,44 @@ Glib::SignalProxy0< void > Calendar::signal_month_changed()
   return Glib::SignalProxy0< void >(this, &Calendar_signal_month_changed_info);
 }
 
+
 Glib::SignalProxy0< void > Calendar::signal_day_selected()
 {
   return Glib::SignalProxy0< void >(this, &Calendar_signal_day_selected_info);
 }
 
+
 Glib::SignalProxy0< void > Calendar::signal_day_selected_double_click()
 {
   return Glib::SignalProxy0< void >(this, &Calendar_signal_day_selected_double_click_info);
 }
 
+
 Glib::SignalProxy0< void > Calendar::signal_prev_month()
 {
   return Glib::SignalProxy0< void >(this, &Calendar_signal_prev_month_info);
 }
 
+
 Glib::SignalProxy0< void > Calendar::signal_next_month()
 {
   return Glib::SignalProxy0< void >(this, &Calendar_signal_next_month_info);
 }
 
+
 Glib::SignalProxy0< void > Calendar::signal_prev_year()
 {
   return Glib::SignalProxy0< void >(this, &Calendar_signal_prev_year_info);
 }
 
+
 Glib::SignalProxy0< void > Calendar::signal_next_year()
 {
   return Glib::SignalProxy0< void >(this, &Calendar_signal_next_year_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Calendar::on_month_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -538,7 +583,6 @@ void Gtk::Calendar::on_month_changed()
   if(base && base->month_changed)
     (*base->month_changed)(gobj());
 }
-
 void Gtk::Calendar::on_day_selected()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -548,7 +592,6 @@ void Gtk::Calendar::on_day_selected()
   if(base && base->day_selected)
     (*base->day_selected)(gobj());
 }
-
 void Gtk::Calendar::on_day_selected_double_click()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -558,7 +601,6 @@ void Gtk::Calendar::on_day_selected_double_click()
   if(base && base->day_selected_double_click)
     (*base->day_selected_double_click)(gobj());
 }
-
 void Gtk::Calendar::on_prev_month()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -568,7 +610,6 @@ void Gtk::Calendar::on_prev_month()
   if(base && base->prev_month)
     (*base->prev_month)(gobj());
 }
-
 void Gtk::Calendar::on_next_month()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -578,7 +619,6 @@ void Gtk::Calendar::on_next_month()
   if(base && base->next_month)
     (*base->next_month)(gobj());
 }
-
 void Gtk::Calendar::on_prev_year()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -588,7 +628,6 @@ void Gtk::Calendar::on_prev_year()
   if(base && base->prev_year)
     (*base->prev_year)(gobj());
 }
-
 void Gtk::Calendar::on_next_year()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -598,6 +637,10 @@ void Gtk::Calendar::on_next_year()
   if(base && base->next_year)
     (*base->next_year)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/calendar.h b/libs/gtkmm2/gtk/gtkmm/calendar.h
index a026c941e6..915ba1af21 100644
--- a/libs/gtkmm2/gtk/gtkmm/calendar.h
+++ b/libs/gtkmm2/gtk/gtkmm/calendar.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CALENDAR_H
 #define _GTKMM_CALENDAR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -175,11 +176,16 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_month_changed();
   virtual void on_day_selected();
   virtual void on_day_selected_double_click();
@@ -187,6 +193,7 @@ protected:
   virtual void on_next_month();
   virtual void on_prev_year();
   virtual void on_next_year();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -195,26 +202,51 @@ public:
   Calendar();
   
   
+  /** Shifts the calendar to a different month.
+   * @param month A month number between 0 and 11.
+   * @param year The year the month is in.
+   * @return <tt>true</tt>, always.
+   */
   int select_month(guint month, guint year);
   
+  /** Selects a day from the current month.
+   * @param day The day number between 1 and 31, or 0 to unselect 
+   * the currently selected day.
+   */
   void select_day(guint day);
   
+  /** Places a visual marker on a particular day.
+   * @param day The day number to mark between 1 and 31.
+   * @return <tt>true</tt>, always.
+   */
   int mark_day(guint day);
   
+  /** Removes the visual marker from a particular day.
+   * @param day The day number to unmark between 1 and 31.
+   * @return <tt>true</tt>, always.
+   */
   int unmark_day(guint day);
   
+  /** Remove all visual markers.
+   */
   void clear_marks();
 
-  #ifndef GTKMM_DISABLE_DEPRECATED
   
+#ifndef GTKMM_DISABLE_DEPRECATED
+
+  /** Sets display options (whether to display the heading and the month headings).
+   * 
+   * Deprecated: Use set_display_options() instead
+   * @param flags The display options to set.
+   */
   void display_options(CalendarDisplayOptions flags);
-  #endif //GTKMM_DISABLE_DEPRECATED
-  
-  
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
   /** Sets display options (whether to display the heading and the month  
    * headings).
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param flags The display options to set.
    */
   void set_display_options(CalendarDisplayOptions flags);
@@ -222,36 +254,82 @@ public:
   /** Returns the current display options of @a calendar .
    * @return The display options.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   CalendarDisplayOptions get_display_options() const;
 
   
+  /** Obtains the selected date from a Gtk::Calendar.
+   * @param year Location to store the year number, or <tt>0</tt>.
+   * @param month Location to store the month number (between 0 and 11), or <tt>0</tt>.
+   * @param day Location to store the day number (between 1 and 31), or <tt>0</tt>.
+   */
   void get_date(guint& year, guint& month, guint& day) const;
   
+  /** Does nothing. Previously locked the display of the calendar until
+   * it was thawed with thaw().
+   */
   void freeze();
   
+  /** Does nothing. Previously defrosted a calendar; all the changes made
+   * since the last freeze() were displayed.
+   */
   void thaw();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %month_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_month_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %day_selected()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_day_selected();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %day_selected_double_click()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_day_selected_double_click();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %prev_month()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_prev_month();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %next_month()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_next_month();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %prev_year()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_prev_year();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %next_year()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_next_year();
 
 
@@ -268,6 +346,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Calendar* wrap(GtkCalendar* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CALENDAR_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/celleditable.cc b/libs/gtkmm2/gtk/gtkmm/celleditable.cc
index 2f0d2a5b1b..a2013f9d5e 100644
--- a/libs/gtkmm2/gtk/gtkmm/celleditable.cc
+++ b/libs/gtkmm2/gtk/gtkmm/celleditable.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/celleditable.h>
 #include <gtkmm/private/celleditable_p.h>
 
@@ -29,7 +30,8 @@
 namespace
 {
 
-const Glib::SignalProxyInfo CellEditable_signal_editing_done_info =
+
+static const Glib::SignalProxyInfo CellEditable_signal_editing_done_info =
 {
   "editing_done",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -37,13 +39,14 @@ const Glib::SignalProxyInfo CellEditable_signal_editing_done_info =
 };
 
 
-const Glib::SignalProxyInfo CellEditable_signal_remove_widget_info =
+static const Glib::SignalProxyInfo CellEditable_signal_remove_widget_info =
 {
   "remove_widget",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -88,11 +91,17 @@ void CellEditable_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->start_editing = &start_editing_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->editing_done = &editing_done_callback;
   klass->remove_widget = &remove_widget_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void CellEditable_Class::start_editing_vfunc_callback(GtkCellEditable* self, GdkEvent* event)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -105,15 +114,19 @@ void CellEditable_Class::start_editing_vfunc_callback(GtkCellEditable* self, Gdk
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->start_editing_vfunc(event);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -127,8 +140,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->start_editing)(self, event);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void CellEditable_Class::editing_done_callback(GtkCellEditable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -141,15 +155,19 @@ void CellEditable_Class::editing_done_callback(GtkCellEditable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_editing_done();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -163,7 +181,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->editing_done)(self);
   }
 }
-
 void CellEditable_Class::remove_widget_callback(GtkCellEditable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -176,15 +193,19 @@ void CellEditable_Class::remove_widget_callback(GtkCellEditable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_remove_widget();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -198,6 +219,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->remove_widget)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* CellEditable_Class::wrap_new(GObject* object)
@@ -242,17 +264,17 @@ GType CellEditable::get_base_type()
 
 void CellEditable::start_editing(GdkEvent* event)
 {
-  gtk_cell_editable_start_editing(gobj(), event);
+gtk_cell_editable_start_editing(gobj(), event); 
 }
 
 void CellEditable::editing_done()
 {
-  gtk_cell_editable_editing_done(gobj());
+gtk_cell_editable_editing_done(gobj()); 
 }
 
 void CellEditable::remove_widget()
 {
-  gtk_cell_editable_remove_widget(gobj());
+gtk_cell_editable_remove_widget(gobj()); 
 }
 
 
@@ -261,12 +283,14 @@ Glib::SignalProxy0< void > CellEditable::signal_editing_done()
   return Glib::SignalProxy0< void >(this, &CellEditable_signal_editing_done_info);
 }
 
+
 Glib::SignalProxy0< void > CellEditable::signal_remove_widget()
 {
   return Glib::SignalProxy0< void >(this, &CellEditable_signal_remove_widget_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::CellEditable::on_editing_done()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -277,7 +301,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->editing_done)
     (*base->editing_done)(gobj());
 }
-
 void Gtk::CellEditable::on_remove_widget()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -288,8 +311,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->remove_widget)
     (*base->remove_widget)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::CellEditable::start_editing_vfunc(GdkEvent* event) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -300,6 +324,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->start_editing)
     (*base->start_editing)(gobj(),event);
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/celleditable.h b/libs/gtkmm2/gtk/gtkmm/celleditable.h
index 8d2bfdd6c5..065f9101da 100644
--- a/libs/gtkmm2/gtk/gtkmm/celleditable.h
+++ b/libs/gtkmm2/gtk/gtkmm/celleditable.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CELLEDITABLE_H
 #define _GTKMM_CELLEDITABLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -115,27 +116,45 @@ public:
   void remove_widget();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %editing_done()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_editing_done();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %remove_widget()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_remove_widget();
 
 
 protected:
-    virtual void start_editing_vfunc(GdkEvent* event);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void start_editing_vfunc(GdkEvent* event);
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_editing_done();
   virtual void on_remove_widget();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -154,5 +173,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_CELLEDITABLE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/celllayout.cc b/libs/gtkmm2/gtk/gtkmm/celllayout.cc
index 474dea3e5b..15f10eb85a 100644
--- a/libs/gtkmm2/gtk/gtkmm/celllayout.cc
+++ b/libs/gtkmm2/gtk/gtkmm/celllayout.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/celllayout.h>
 #include <gtkmm/private/celllayout_p.h>
 
@@ -26,75 +27,58 @@
 #include <gtk/gtkcelllayout.h>
 
 
-namespace //anonymous
-{
-
-// This Signal Proxy allows the C++ coder to specify
-// a sigc::slot instead of a static function.
-class SignalProxy_CellData
-{
-public:
-  typedef Gtk::CellLayout::SlotCellData SlotType;
-
-  SignalProxy_CellData(const SlotType& slot)
-  : slot_(slot) {}
-
-  ~SignalProxy_CellData();
-
-  static void gtk_callback(GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer data);
-  static void gtk_callback_destroy(void* data);
-
-private:
-  SlotType slot_;
-};
-
-SignalProxy_CellData::~SignalProxy_CellData()
-{}
-
-void SignalProxy_CellData::gtk_callback(GtkCellLayout* /* cell_layout */, GtkCellRenderer* /* cell */, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer data)
+static void SignalProxy_CellData_gtk_callback(GtkCellLayout* /* cell_layout */, GtkCellRenderer* /* cell */, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer data)
 {
-  SignalProxy_CellData *const self = static_cast<SignalProxy_CellData*>(data);
+  Gtk::CellLayout::SlotCellData* the_slot = static_cast<Gtk::CellLayout::SlotCellData*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     //We ignore the cell, because that was given as an argument to the connecting method, so the caller should know which one it is already.
     //And we ignore the tree_model because that can be obtained from the iter or from the CellLayout itself.
-    (self->slot_)(Gtk::TreeModel::const_iterator(tree_model, iter));
+    (*the_slot)(Gtk::TreeModel::const_iterator(tree_model, iter));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
-
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void SignalProxy_CellData::gtk_callback_destroy(void* data)
+static void SignalProxy_CellData_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_CellData*>(data);
+  delete static_cast<Gtk::CellLayout::SlotCellData*>(data);
 }
 
-} // anonymous namespace
-
-
 namespace Gtk
 {
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 void CellLayout::add_attribute(const Glib::PropertyProxy_Base& property, const TreeModelColumnBase& column)
 {
   gtk_cell_layout_add_attribute(gobj(),
       (GtkCellRenderer*) property.get_object()->gobj(), property.get_name(), column.index());
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+void CellLayout::add_attribute(CellRenderer& cell, const Glib::ustring& attribute, const TreeModelColumnBase& column)
+{
+  gtk_cell_layout_add_attribute(gobj(),
+      (GtkCellRenderer*) cell.gobj(), attribute.c_str(), column.index());
+}
 
 void CellLayout::set_cell_data_func(CellRenderer& cell, const SlotCellData& slot)
 {
-  // Create a signal proxy.  A pointer to this will be passed
+  // Create a copy of the slot object.  A pointer to this will be passed
   // through the callback's data parameter.  It will be deleted
-  // when SignalProxy_CellData::gtk_callback_destroy() is called.
-  SignalProxy_CellData *const pSignalProxy = new SignalProxy_CellData(slot);
+  // when SignalProxy_CellData_gtk_callback_destroy() is called.
+  SlotCellData* slot_copy = new SlotCellData(slot);
 
   gtk_cell_layout_set_cell_data_func(gobj(), cell.gobj(),
-      &SignalProxy_CellData::gtk_callback, pSignalProxy,
-      &SignalProxy_CellData::gtk_callback_destroy);
+      &SignalProxy_CellData_gtk_callback, slot_copy,
+      &SignalProxy_CellData_gtk_callback_destroy);
 }
   
 
@@ -147,14 +131,20 @@ void CellLayout_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->pack_start = &pack_start_vfunc_callback;
   klass->pack_end = &pack_end_vfunc_callback;
   klass->clear = &clear_vfunc_callback;
   klass->add_attribute = &add_attribute_vfunc_callback;
   klass->clear_attributes = &clear_attributes_vfunc_callback;
   klass->reorder = &reorder_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void CellLayout_Class::pack_start_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, gboolean expand)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -167,17 +157,21 @@ void CellLayout_Class::pack_start_vfunc_callback(GtkCellLayout* self, GtkCellRen
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->pack_start_vfunc(Glib::wrap(cell)
 , expand
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -191,7 +185,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->pack_start)(self, cell, expand);
   }
 }
-
 void CellLayout_Class::pack_end_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, gboolean expand)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -204,17 +197,21 @@ void CellLayout_Class::pack_end_vfunc_callback(GtkCellLayout* self, GtkCellRende
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->pack_end_vfunc(Glib::wrap(cell)
 , expand
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -228,7 +225,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->pack_end)(self, cell, expand);
   }
 }
-
 void CellLayout_Class::clear_vfunc_callback(GtkCellLayout* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -241,15 +237,19 @@ void CellLayout_Class::clear_vfunc_callback(GtkCellLayout* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->clear_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -263,7 +263,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->clear)(self);
   }
 }
-
 void CellLayout_Class::add_attribute_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, const gchar* attribute, gint column)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -276,18 +275,22 @@ void CellLayout_Class::add_attribute_vfunc_callback(GtkCellLayout* self, GtkCell
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->add_attribute_vfunc(Glib::wrap(cell)
 , Glib::convert_const_gchar_ptr_to_ustring(attribute)
 , column
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -301,7 +304,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->add_attribute)(self, cell, attribute, column);
   }
 }
-
 void CellLayout_Class::clear_attributes_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -314,16 +316,20 @@ void CellLayout_Class::clear_attributes_vfunc_callback(GtkCellLayout* self, GtkC
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->clear_attributes_vfunc(Glib::wrap(cell)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -337,7 +343,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->clear_attributes)(self, cell);
   }
 }
-
 void CellLayout_Class::reorder_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, gint position)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -350,17 +355,21 @@ void CellLayout_Class::reorder_vfunc_callback(GtkCellLayout* self, GtkCellRender
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->reorder_vfunc(Glib::wrap(cell)
 , position
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -374,6 +383,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->reorder)(self, cell, position);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* CellLayout_Class::wrap_new(GObject* object)
@@ -418,35 +431,39 @@ GType CellLayout::get_base_type()
 
 void CellLayout::pack_start(CellRenderer& cell, bool expand)
 {
-  gtk_cell_layout_pack_start(gobj(), (cell).gobj(), static_cast<int>(expand));
+gtk_cell_layout_pack_start(gobj(), (cell).gobj(), static_cast<int>(expand)); 
 }
 
 void CellLayout::pack_end(CellRenderer& cell, bool expand)
 {
-  gtk_cell_layout_pack_end(gobj(), (cell).gobj(), static_cast<int>(expand));
+gtk_cell_layout_pack_end(gobj(), (cell).gobj(), static_cast<int>(expand)); 
 }
 
 void CellLayout::clear()
 {
-  gtk_cell_layout_clear(gobj());
+gtk_cell_layout_clear(gobj()); 
 }
 
 void CellLayout::add_attribute(CellRenderer& cell, const Glib::ustring& attribute, int column)
 {
-  gtk_cell_layout_add_attribute(gobj(), (cell).gobj(), attribute.c_str(), column);
+gtk_cell_layout_add_attribute(gobj(), (cell).gobj(), attribute.c_str(), column); 
 }
 
 void CellLayout::clear_attributes(CellRenderer& cell)
 {
-  gtk_cell_layout_clear_attributes(gobj(), (cell).gobj());
+gtk_cell_layout_clear_attributes(gobj(), (cell).gobj()); 
 }
 
 void CellLayout::reorder(CellRenderer& cell, int position)
 {
-  gtk_cell_layout_reorder(gobj(), (cell).gobj(), position);
+gtk_cell_layout_reorder(gobj(), (cell).gobj(), position); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::CellLayout::pack_start_vfunc(CellRenderer* cell, bool expand) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -457,7 +474,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->pack_start)
     (*base->pack_start)(gobj(),(GtkCellRenderer*)Glib::unwrap(cell),static_cast<int>(expand));
 }
-
 void Gtk::CellLayout::pack_end_vfunc(CellRenderer* cell, bool expand) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -468,7 +484,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->pack_end)
     (*base->pack_end)(gobj(),(GtkCellRenderer*)Glib::unwrap(cell),static_cast<int>(expand));
 }
-
 void Gtk::CellLayout::clear_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -479,7 +494,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->clear)
     (*base->clear)(gobj());
 }
-
 void Gtk::CellLayout::add_attribute_vfunc(CellRenderer* cell, const Glib::ustring& attribute, int column) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -490,7 +504,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->add_attribute)
     (*base->add_attribute)(gobj(),(GtkCellRenderer*)Glib::unwrap(cell),attribute.c_str(),column);
 }
-
 void Gtk::CellLayout::clear_attributes_vfunc(CellRenderer* cell) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -501,7 +514,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->clear_attributes)
     (*base->clear_attributes)(gobj(),(GtkCellRenderer*)Glib::unwrap(cell));
 }
-
 void Gtk::CellLayout::reorder_vfunc(CellRenderer* cell, int position) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -512,6 +524,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->reorder)
     (*base->reorder)(gobj(),(GtkCellRenderer*)Glib::unwrap(cell),position);
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/celllayout.h b/libs/gtkmm2/gtk/gtkmm/celllayout.h
index 1fc7c8f6eb..7a2484621f 100644
--- a/libs/gtkmm2/gtk/gtkmm/celllayout.h
+++ b/libs/gtkmm2/gtk/gtkmm/celllayout.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CELLLAYOUT_H
 #define _GTKMM_CELLLAYOUT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -108,7 +109,9 @@ public:
    * then the @a cell  is allocated no more space than it needs. Any unused space
    * is divided evenly between cells for which @a expand  is <tt>true</tt>.
    * 
-   * Since: 2.4
+   * Note that reusing the same cell renderer is not supported. 
+   * 
+   * @newin2p4
    * @param cell A Gtk::CellRenderer.
    * @param expand <tt>true</tt> if @a cell  is to be given extra space allocated to @a cell_layout .
    */
@@ -118,7 +121,9 @@ public:
    *  @a cell  is allocated no more space than it needs. Any unused space is
    * divided evenly between cells for which @a expand  is <tt>true</tt>.
    * 
-   * Since: 2.4
+   * Note that reusing the same cell renderer is not supported. 
+   * 
+   * @newin2p4
    * @param cell A Gtk::CellRenderer.
    * @param expand <tt>true</tt> if @a cell  is to be given extra space allocated to @a cell_layout .
    */
@@ -127,10 +132,10 @@ public:
   /** Unsets all the mappings on all renderers on @a cell_layout  and
    * removes all renderers from @a cell_layout .
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void clear();
-  
+
    //I think this is just a convenience method, equivalent to clear() and multiple add_attribute()s. murrayc.
 
   
@@ -140,24 +145,29 @@ public:
    * of the model contains strings, you could have the "text" attribute of a
    * Gtk::CellRendererText get its values from column 2.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param cell A Gtk::CellRenderer.
    * @param attribute An attribute on the renderer.
    * @param column The column position on the model to get the attribute from.
    */
   void add_attribute(CellRenderer& cell, const Glib::ustring& attribute, int column);
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
   void add_attribute(const Glib::PropertyProxy_Base& property, const TreeModelColumnBase& column);
+#endif
 
-  //For instance, void on_cell_data(const TreeModel::const_iterator& iter)                                        
+  void add_attribute(CellRenderer& cell, const Glib::ustring& attribute, const TreeModelColumnBase& column);
+
+  //For instance, void on_cell_data(const TreeModel::const_iterator& iter)
   typedef sigc::slot<void, const TreeModel::const_iterator&> SlotCellData;
 
   void set_cell_data_func(CellRenderer& cell, const SlotCellData& slot);
   
-                                                                                  
+
   /** Clears all existing attributes previously set with
    * set_attributes().
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param cell A Gtk::CellRenderer to clear the attribute mapping on.
    */
   void clear_attributes(CellRenderer& cell);
@@ -166,31 +176,54 @@ public:
   /** Re-inserts @a cell  at @a position . Note that @a cell  has already to be packed
    * into @a cell_layout  for this to function properly.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param cell A Gtk::CellRenderer to reorder.
    * @param position New position to insert @a cell  at.
    */
   void reorder(CellRenderer& cell, int position);
 
 protected:
-    virtual void pack_start_vfunc(CellRenderer* cell, bool expand);
-    virtual void pack_end_vfunc(CellRenderer* cell, bool expand);
-    virtual void clear_vfunc();
-    virtual void add_attribute_vfunc(CellRenderer* cell, const Glib::ustring& attribute, int column);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void pack_start_vfunc(CellRenderer* cell, bool expand);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void pack_end_vfunc(CellRenderer* cell, bool expand);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void clear_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void add_attribute_vfunc(CellRenderer* cell, const Glib::ustring& attribute, int column);
+#endif //GLIBMM_VFUNCS_ENABLED
+
 //TODO:  _WRAP_VFUNC(void set_cell_data_func(CellRenderer* cell, GtkCellLayoutDataFunc func, gpointer func_data, GDestroyNotify destroy), set_cell_data_func)
-    virtual void clear_attributes_vfunc(CellRenderer* cell);
-    virtual void reorder_vfunc(CellRenderer* cell, int position);
-                                 
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void clear_attributes_vfunc(CellRenderer* cell);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void reorder_vfunc(CellRenderer* cell, int position);
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -205,7 +238,11 @@ void CellLayout::pack_start(const TreeModelColumn<T_ModelColumnType>& column, bo
   pack_start(*pCellRenderer, expand);
 
   //Make the renderer render the column:
+#ifdef GLIBMM_PROPERTIES_ENABLED
   add_attribute(pCellRenderer->_property_renderable(), column);
+#else
+  add_attribute(*pCellRenderer, pCellRenderer->_property_renderable(), column);
+#endif
 }
 
 } // namespace Gtk
@@ -222,5 +259,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_CELLLAYOUT_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderer.cc b/libs/gtkmm2/gtk/gtkmm/cellrenderer.cc
index 8cec8dc46f..8ce803d02e 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrenderer.cc
+++ b/libs/gtkmm2/gtk/gtkmm/cellrenderer.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/cellrenderer.h>
 #include <gtkmm/private/cellrenderer_p.h>
 
@@ -34,11 +35,19 @@ void CellRenderer::get_size(Widget& widget, int& x_offset, int& y_offset, int& w
   gtk_cell_renderer_get_size(const_cast<GtkCellRenderer*>(gobj()), widget.gobj(), 0, &x_offset, &y_offset, &width, &height);
 }
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_Base CellRenderer::_property_renderable()
 {
   g_assert_not_reached();
   return Glib::PropertyProxy<int>(0, 0); // shut up warnings
 }
+#else
+Glib::ustring CellRenderer::_property_renderable()
+{
+  g_assert_not_reached();
+  return Glib::ustring();
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 } // namespace Gtk
 
@@ -46,7 +55,8 @@ Glib::PropertyProxy_Base CellRenderer::_property_renderable()
 namespace
 {
 
-const Glib::SignalProxyInfo CellRenderer_signal_editing_canceled_info =
+
+static const Glib::SignalProxyInfo CellRenderer_signal_editing_canceled_info =
 {
   "editing_canceled",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -54,7 +64,7 @@ const Glib::SignalProxyInfo CellRenderer_signal_editing_canceled_info =
 };
 
 
-void CellRenderer_signal_editing_started_callback(GtkCellRenderer* self, GtkCellEditable* p0,const gchar* p1,void* data)
+static void CellRenderer_signal_editing_started_callback(GtkCellRenderer* self, GtkCellEditable* p0,const gchar* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,CellEditable*,const Glib::ustring& > SlotType;
@@ -62,27 +72,32 @@ void CellRenderer_signal_editing_started_callback(GtkCellRenderer* self, GtkCell
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(dynamic_cast<CellEditable*>(Glib::wrap_auto((GObject*)(p0), false))
 , Glib::convert_const_gchar_ptr_to_ustring(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo CellRenderer_signal_editing_started_info =
+static const Glib::SignalProxyInfo CellRenderer_signal_editing_started_info =
 {
   "editing_started",
   (GCallback) &CellRenderer_signal_editing_started_callback,
   (GCallback) &CellRenderer_signal_editing_started_callback
 };
 
+
 } // anonymous namespace
 
 // static
@@ -139,13 +154,19 @@ void CellRenderer_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->get_size = &get_size_vfunc_callback;
   klass->render = &render_vfunc_callback;
   klass->activate = &activate_vfunc_callback;
   klass->start_editing = &start_editing_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->editing_canceled = &editing_canceled_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void CellRenderer_Class::get_size_vfunc_callback(GtkCellRenderer* self, GtkWidget* widget, GdkRectangle* cell_area, gint* x_offset, gint* y_offset, gint* width, gint* height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -158,8 +179,10 @@ void CellRenderer_Class::get_size_vfunc_callback(GtkCellRenderer* self, GtkWidge
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_size_vfunc(*Glib::wrap(widget)
 , &Glib::wrap(cell_area)
@@ -168,11 +191,13 @@ void CellRenderer_Class::get_size_vfunc_callback(GtkCellRenderer* self, GtkWidge
 , width
 , height
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -185,7 +210,6 @@ void CellRenderer_Class::get_size_vfunc_callback(GtkCellRenderer* self, GtkWidge
       (*base->get_size)(self, widget, cell_area, x_offset, y_offset, width, height);
   }
 }
-
 void CellRenderer_Class::render_vfunc_callback(GtkCellRenderer* self, GdkDrawable* window, GtkWidget* widget, GdkRectangle* background_area, GdkRectangle* cell_area, GdkRectangle* expose_area, GtkCellRendererState flags)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -198,8 +222,10 @@ void CellRenderer_Class::render_vfunc_callback(GtkCellRenderer* self, GdkDrawabl
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->render_vfunc(Glib::wrap(window, true)
 , *Glib::wrap(widget)
@@ -208,11 +234,13 @@ void CellRenderer_Class::render_vfunc_callback(GtkCellRenderer* self, GdkDrawabl
 , Glib::wrap(expose_area)
 , ((CellRendererState)(flags))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -225,7 +253,6 @@ void CellRenderer_Class::render_vfunc_callback(GtkCellRenderer* self, GdkDrawabl
       (*base->render)(self, window, widget, background_area, cell_area, expose_area, flags);
   }
 }
-
 gboolean CellRenderer_Class::activate_vfunc_callback(GtkCellRenderer* self, GdkEvent* event, GtkWidget* widget, const gchar* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -238,8 +265,10 @@ gboolean CellRenderer_Class::activate_vfunc_callback(GtkCellRenderer* self, GdkE
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->activate_vfunc(event, *Glib::wrap(widget)
 , Glib::convert_const_gchar_ptr_to_ustring(path)
@@ -247,11 +276,13 @@ gboolean CellRenderer_Class::activate_vfunc_callback(GtkCellRenderer* self, GdkE
 , Glib::wrap(cell_area)
 , ((CellRendererState)(flags))
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -267,7 +298,6 @@ gboolean CellRenderer_Class::activate_vfunc_callback(GtkCellRenderer* self, GdkE
   typedef gboolean RType;
   return RType();
 }
-
 GtkCellEditable* CellRenderer_Class::start_editing_vfunc_callback(GtkCellRenderer* self, GdkEvent* event, GtkWidget* widget, const gchar* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -278,10 +308,12 @@ GtkCellEditable* CellRenderer_Class::start_editing_vfunc_callback(GtkCellRendere
   // generated classes can use this optimisation, which avoids the unnecessary
   // parameter conversions if there is no possibility of the virtual function
   // being overridden:
-  if(false) //obj && obj->is_derived_())
+  if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->start_editing_vfunc(event, *Glib::wrap(widget)
 , Glib::convert_const_gchar_ptr_to_ustring(path)
@@ -289,11 +321,13 @@ GtkCellEditable* CellRenderer_Class::start_editing_vfunc_callback(GtkCellRendere
 , Glib::wrap(cell_area)
 , ((CellRendererState)(flags))
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -309,8 +343,9 @@ GtkCellEditable* CellRenderer_Class::start_editing_vfunc_callback(GtkCellRendere
   typedef GtkCellEditable* RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void CellRenderer_Class::editing_canceled_callback(GtkCellRenderer* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -323,15 +358,19 @@ void CellRenderer_Class::editing_canceled_callback(GtkCellRenderer* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_editing_canceled();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -344,6 +383,7 @@ void CellRenderer_Class::editing_canceled_callback(GtkCellRenderer* self)
       (*base->editing_canceled)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* CellRenderer_Class::wrap_new(GObject* o)
@@ -387,12 +427,12 @@ GType CellRenderer::get_base_type()
 
 void CellRenderer::get_size(Widget& widget, const Gdk::Rectangle& cell_area, int& x_offset, int& y_offset, int& width, int& height) const
 {
-  gtk_cell_renderer_get_size(const_cast<GtkCellRenderer*>(gobj()), (widget).gobj(), const_cast<GdkRectangle*>(cell_area.gobj()), &x_offset, &y_offset, &width, &height);
+gtk_cell_renderer_get_size(const_cast<GtkCellRenderer*>(gobj()), (widget).gobj(), const_cast<GdkRectangle*>(cell_area.gobj()), &x_offset, &y_offset, &width, &height); 
 }
 
 void CellRenderer::render(const Glib::RefPtr<Gdk::Window>& window, Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, CellRendererState flags)
 {
-  gtk_cell_renderer_render(gobj(), Glib::unwrap(window), (widget).gobj(), const_cast<GdkRectangle*>(background_area.gobj()), const_cast<GdkRectangle*>(cell_area.gobj()), const_cast<GdkRectangle*>(expose_area.gobj()), ((GtkCellRendererState)(flags)));
+gtk_cell_renderer_render(gobj(), Glib::unwrap(window), (widget).gobj(), const_cast<GdkRectangle*>(background_area.gobj()), const_cast<GdkRectangle*>(cell_area.gobj()), const_cast<GdkRectangle*>(expose_area.gobj()), ((GtkCellRendererState)(flags))); 
 }
 
 bool CellRenderer::activate(GdkEvent* event, Widget& widget, const Glib::ustring& path, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, CellRendererState flags)
@@ -407,22 +447,26 @@ CellEditable* CellRenderer::start_editing(GdkEvent* event, Widget& widget, const
 
 void CellRenderer::set_fixed_size(int width, int height)
 {
-  gtk_cell_renderer_set_fixed_size(gobj(), width, height);
+gtk_cell_renderer_set_fixed_size(gobj(), width, height); 
 }
 
 void CellRenderer::get_fixed_size(int& width, int& height) const
 {
-  gtk_cell_renderer_get_fixed_size(const_cast<GtkCellRenderer*>(gobj()), &width, &height);
+gtk_cell_renderer_get_fixed_size(const_cast<GtkCellRenderer*>(gobj()), &width, &height); 
 }
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void CellRenderer::editing_canceled()
 {
-  gtk_cell_renderer_editing_canceled(gobj());
+gtk_cell_renderer_editing_canceled(gobj()); 
 }
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
 void CellRenderer::stop_editing(bool canceled)
 {
-  gtk_cell_renderer_stop_editing(gobj(), static_cast<int>(canceled));
+gtk_cell_renderer_stop_editing(gobj(), static_cast<int>(canceled)); 
 }
 
 CellRenderer::CellRenderer()
@@ -438,143 +482,204 @@ Glib::SignalProxy0< void > CellRenderer::signal_editing_canceled()
   return Glib::SignalProxy0< void >(this, &CellRenderer_signal_editing_canceled_info);
 }
 
+
 Glib::SignalProxy2< void,CellEditable*,const Glib::ustring& > CellRenderer::signal_editing_started()
 {
   return Glib::SignalProxy2< void,CellEditable*,const Glib::ustring& >(this, &CellRenderer_signal_editing_started_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<CellRendererMode> CellRenderer::property_mode() 
 {
   return Glib::PropertyProxy<CellRendererMode>(this, "mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<CellRendererMode> CellRenderer::property_mode() const
 {
   return Glib::PropertyProxy_ReadOnly<CellRendererMode>(this, "mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRenderer::property_visible() 
 {
   return Glib::PropertyProxy<bool>(this, "visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRenderer::property_visible() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> CellRenderer::property_sensitive() 
+{
+  return Glib::PropertyProxy<bool>(this, "sensitive");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> CellRenderer::property_sensitive() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "sensitive");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> CellRenderer::property_xalign() 
 {
   return Glib::PropertyProxy<float>(this, "xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> CellRenderer::property_xalign() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> CellRenderer::property_yalign() 
 {
   return Glib::PropertyProxy<float>(this, "yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> CellRenderer::property_yalign() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<unsigned int> CellRenderer::property_xpad() 
 {
   return Glib::PropertyProxy<unsigned int>(this, "xpad");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<unsigned int> CellRenderer::property_xpad() const
 {
   return Glib::PropertyProxy_ReadOnly<unsigned int>(this, "xpad");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<unsigned int> CellRenderer::property_ypad() 
 {
   return Glib::PropertyProxy<unsigned int>(this, "ypad");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<unsigned int> CellRenderer::property_ypad() const
 {
   return Glib::PropertyProxy_ReadOnly<unsigned int>(this, "ypad");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> CellRenderer::property_width() 
 {
   return Glib::PropertyProxy<int>(this, "width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> CellRenderer::property_width() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> CellRenderer::property_height() 
 {
   return Glib::PropertyProxy<int>(this, "height");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> CellRenderer::property_height() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "height");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRenderer::property_is_expander() 
 {
   return Glib::PropertyProxy<bool>(this, "is-expander");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRenderer::property_is_expander() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "is-expander");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRenderer::property_is_expanded() 
 {
   return Glib::PropertyProxy<bool>(this, "is-expanded");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRenderer::property_is_expanded() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "is-expanded");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_WriteOnly<Glib::ustring> CellRenderer::property_cell_background() 
 {
   return Glib::PropertyProxy_WriteOnly<Glib::ustring>(this, "cell-background");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
-Glib::PropertyProxy_ReadOnly<Glib::ustring> CellRenderer::property_cell_background() const
-{
-  return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "cell-background");
-}
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gdk::Color> CellRenderer::property_cell_background_gdk() 
 {
   return Glib::PropertyProxy<Gdk::Color>(this, "cell-background-gdk");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gdk::Color> CellRenderer::property_cell_background_gdk() const
 {
   return Glib::PropertyProxy_ReadOnly<Gdk::Color>(this, "cell-background-gdk");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRenderer::property_cell_background_set() 
 {
   return Glib::PropertyProxy<bool>(this, "cell-background-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRenderer::property_cell_background_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "cell-background-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::CellRenderer::on_editing_canceled()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -584,8 +689,9 @@ void Gtk::CellRenderer::on_editing_canceled()
   if(base && base->editing_canceled)
     (*base->editing_canceled)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::CellRenderer::get_size_vfunc(Widget& widget, const Gdk::Rectangle* cell_area, int* x_offset, int* y_offset, int* width, int* height) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -595,7 +701,6 @@ void Gtk::CellRenderer::get_size_vfunc(Widget& widget, const Gdk::Rectangle* cel
   if(base && base->get_size)
     (*base->get_size)(const_cast<GtkCellRenderer*>(gobj()),(widget).gobj(),Glib::unwrap(const_cast<Gdk::Rectangle*>(cell_area)),x_offset,y_offset,width,height);
 }
-
 void Gtk::CellRenderer::render_vfunc(const Glib::RefPtr<Gdk::Drawable>& window, Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, CellRendererState flags) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -605,7 +710,6 @@ void Gtk::CellRenderer::render_vfunc(const Glib::RefPtr<Gdk::Drawable>& window,
   if(base && base->render)
     (*base->render)(gobj(),Glib::unwrap(window),(widget).gobj(),const_cast<GdkRectangle*>(background_area.gobj()),const_cast<GdkRectangle*>(cell_area.gobj()),const_cast<GdkRectangle*>(expose_area.gobj()),((GtkCellRendererState)(flags)));
 }
-
 bool Gtk::CellRenderer::activate_vfunc(GdkEvent* event, Widget& widget, const Glib::ustring& path, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, CellRendererState flags) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -618,7 +722,6 @@ bool Gtk::CellRenderer::activate_vfunc(GdkEvent* event, Widget& widget, const Gl
   typedef bool RType;
   return RType();
 }
-
 CellEditable* Gtk::CellRenderer::start_editing_vfunc(GdkEvent* event, Widget& widget, const Glib::ustring& path, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, CellRendererState flags) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -631,6 +734,7 @@ CellEditable* Gtk::CellRenderer::start_editing_vfunc(GdkEvent* event, Widget& wi
   typedef CellEditable* RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderer.h b/libs/gtkmm2/gtk/gtkmm/cellrenderer.h
index 7c382c44c5..95a2d4e616 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrenderer.h
+++ b/libs/gtkmm2/gtk/gtkmm/cellrenderer.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CELLRENDERER_H
 #define _GTKMM_CELLRENDERER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -195,12 +196,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_editing_canceled();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -314,25 +321,28 @@ public:
    */
   void get_fixed_size(int& width, int& height) const;
 
-  //TODO: Mark as @deprecated: See stop_editing().
   
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /** Causes the cell renderer to emit the "editing-canceled" signal.  This
    * function is for use only by implementations of cell renderers that need to
    * notify the client program that an editing process was canceled and the
    * changes were not committed.
    * 
-   * Since: 2.4
+   * @newin2p4
    * Deprecated: Use stop_editing() instead
+   * @deprecated Use stop_editing().
    */
   void editing_canceled();
+#endif // GTKMM_DISABLE_DEPRECATED
+
 
-  
   /** Informs the cell renderer that the editing is stopped.
    * If @a canceled  is <tt>true</tt>, the cell renderer will emit the "editing-canceled" 
    * signal. This function should be called by cell renderer implementations 
    * in response to the "editing-done" signal of Gtk::CellEditable.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param canceled <tt>true</tt> if the editing has been canceled.
    */
   void stop_editing(bool canceled = false);
@@ -341,27 +351,68 @@ public:
    * For instance, property_text for CellRendererText, and property_active for CellRendererToggle
    * Needs to be overridden in derived classes.
    */
+#ifdef GLIBMM_PROPERTIES_ENABLED
   virtual Glib::PropertyProxy_Base _property_renderable();
+#else
+  virtual Glib::ustring _property_renderable();
+#endif
 
+  /** This signal is emitted when the user cancels the process of editing a
+   * cell.  For example, an editable cell renderer could be written to cancel
+   * editing when the user presses Escape. 
+   *
+   * @see editing_canceled() 
+   */
   
+/**
+   * @par Prototype:
+   * <tt>void %editing_canceled()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_editing_canceled();
 
   
   //We use no_default_handler for this, because we can not add a new vfunc to 2.5 without breaking ABI.
   //TODO: Remove no_default_handler when we do an ABI-break-with-parallel-install.
+  //TODO: Remove the warning in the documentation when we have fixed the inheritance of CellRendererCombo.
+  /** This signal gets emitted when a cell starts to be edited.
+   * The indended use of this signal is to do special setup
+   * on @a editable, e.g. adding an EntryCompletion or setting
+   * up additional columns in a ComboBox.
+   *
+   * Note that GTK+ doesn't guarantee that cell renderers will
+   * continue to use the same kind of widget for editing in future
+   * releases, therefore you should check the type of @a editable
+   * before doing any specific setup.
+   *
+   * Note that this signal does not work yet in gtkmm.
+   * See http://bugzilla.gnome.org/show_bug.cgi?id=301597
+   *
+   * @newin2p6
+   *
+   * @param editable the CellEditable.
+   * @param path the path identifying the edited cell.
+   */
   
+/**
+   * @par Prototype:
+   * <tt>void %editing_started(CellEditable* editable, const Glib::ustring& path)</tt>
+   */
 
   Glib::SignalProxy2< void,CellEditable*,const Glib::ustring& > signal_editing_started();
 
 
-  /** Editable mode of the CellRenderer.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Editable mode of the CellRenderer.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<CellRendererMode> property_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Editable mode of the CellRenderer.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -369,15 +420,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<CellRendererMode> property_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Display the cell.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Display the cell.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_visible() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Display the cell.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -385,15 +440,39 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_visible() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Display the cell sensitive.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_sensitive() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Display the cell sensitive.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_sensitive() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The x-align.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The x-align.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_xalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The x-align.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -401,15 +480,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_xalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The y-align.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The y-align.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_yalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The y-align.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -417,15 +500,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_yalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The xpad.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The xpad.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<unsigned int> property_xpad() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The xpad.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -433,15 +520,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<unsigned int> property_xpad() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The ypad.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The ypad.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<unsigned int> property_ypad() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The ypad.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -449,15 +540,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<unsigned int> property_ypad() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The fixed width.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The fixed width.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_width() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The fixed width.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -465,15 +560,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The fixed height.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The fixed height.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_height() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The fixed height.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -481,15 +580,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_height() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Row has children.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Row has children.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_is_expander() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Row has children.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -497,15 +600,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_is_expander() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Row is an expander row
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Row is an expander row
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_is_expanded() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Row is an expander row
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -513,31 +620,30 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_is_expanded() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Cell background color as a string.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Cell background color as a string.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_WriteOnly<Glib::ustring> property_cell_background() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Cell background color as a string.
-   *
-   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
-   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
-   * the value of the property changes.
-   */
-  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_cell_background() const;
 
-  /** Cell background color as a GdkColor.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Cell background color as a GdkColor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gdk::Color> property_cell_background_gdk() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Cell background color as a GdkColor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -545,15 +651,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gdk::Color> property_cell_background_gdk() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
  
-  /** Whether this tag affects the cell background color.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the cell background color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_cell_background_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the cell background color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -561,6 +671,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_cell_background_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
@@ -582,14 +693,24 @@ protected:
    * @param width Width needed to render a cell.
    * @param height Height needed to render a cell.
    **/
-    virtual void get_size_vfunc(Widget& widget, const Gdk::Rectangle* cell_area, int* x_offset, int* y_offset, int* width, int* height) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_size_vfunc(Widget& widget, const Gdk::Rectangle* cell_area, int* x_offset, int* y_offset, int* width, int* height) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
                   
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void render_vfunc(const Glib::RefPtr<Gdk::Drawable>& window, Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, CellRendererState flags);
+#endif //GLIBMM_VFUNCS_ENABLED
 
-    virtual void render_vfunc(const Glib::RefPtr<Gdk::Drawable>& window, Widget& widget, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, const Gdk::Rectangle& expose_area, CellRendererState flags);
 
-    virtual bool activate_vfunc(GdkEvent* event, Widget& widget, const Glib::ustring& path, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, CellRendererState flags);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool activate_vfunc(GdkEvent* event, Widget& widget, const Glib::ustring& path, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, CellRendererState flags);
+#endif //GLIBMM_VFUNCS_ENABLED
 
-    virtual CellEditable* start_editing_vfunc(GdkEvent* event, Widget& widget, const Glib::ustring& path, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, CellRendererState flags);
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual CellEditable* start_editing_vfunc(GdkEvent* event, Widget& widget, const Glib::ustring& path, const Gdk::Rectangle& background_area, const Gdk::Rectangle& cell_area, CellRendererState flags);
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 };
@@ -605,6 +726,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::CellRenderer* wrap(GtkCellRenderer* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CELLRENDERER_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.cc b/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.cc
index fc5a69c6bd..c100037431 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.cc
+++ b/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.cc
@@ -41,7 +41,26 @@ CellRenderer* generate_cellrenderer<bool>(bool editable)
   CellRendererToggle* pCellRenderer = new CellRendererToggle();
 
   //GTK+'s "activatable" really means "editable":
+#ifdef GLIBMM_PROPERTIES_ENABLED
   pCellRenderer->property_activatable() = editable;
+#else
+  pCellRenderer->set_property("activatable", editable);
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+  return pCellRenderer;
+}
+
+template<>
+CellRenderer* generate_cellrenderer<AccelKey>(bool editable)
+{
+  CellRendererAccel* pCellRenderer = new CellRendererAccel();
+
+  //GTK+'s "editable" really means "editable":
+#ifdef GLIBMM_PROPERTIES_ENABLED
+  pCellRenderer->property_editable() = editable;
+#else
+  pCellRenderer->set_property("editable", editable);
+#endif //GLIBMM_PROPERTIES_ENABLED
 
   return pCellRenderer;
 }
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.h b/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.h
index 309fba4b07..8c8cc2924a 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.h
+++ b/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.h
@@ -24,6 +24,7 @@
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/cellrendererpixbuf.h>
 #include <gtkmm/cellrenderertoggle.h>
+#include <gtkmm/cellrendereraccel.h>
 
 namespace Gtk
 {
@@ -38,7 +39,12 @@ CellRenderer* generate_cellrenderer(bool editable = false)
   CellRendererText* pCellRenderer = new CellRendererText(); //the default - template specializations will use other renderers.
   //CellRendererText can render both strings and numerical values.
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
   pCellRenderer->property_editable() = editable;
+#else
+  pCellRenderer->set_property("editable", editable);
+#endif
+
   return pCellRenderer;
 }
 
@@ -51,6 +57,9 @@ CellRenderer* generate_cellrenderer<bool>(bool editable);
 template<>
 CellRenderer* generate_cellrenderer< Glib::RefPtr<Gdk::Pixbuf> >(bool editable);
 
+template<>
+CellRenderer* generate_cellrenderer<AccelKey>(bool editable);
+
 #endif
 
 } //CellRenderer_Generation
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.cc b/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.cc
index 7570da7fa1..aa4771f28b 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.cc
+++ b/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/cellrenderercombo.h>
 #include <gtkmm/private/cellrenderercombo_p.h>
 
@@ -30,14 +31,20 @@
 namespace Gtk
 {
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_Base CellRendererCombo::_property_renderable()
 {
   return CellRendererText::_property_renderable();
 }
+#else
+Glib::ustring CellRendererCombo::_property_renderable()
+{
+  return CellRendererText::_property_renderable();
+}
+#endif //#ifdef GLIBMM_PROPERTIES_ENABLED
 
 } //namespace Gtk
 
-
 namespace
 {
 } // anonymous namespace
@@ -84,8 +91,19 @@ void CellRendererCombo_Class::class_init_function(void* g_class, void* class_dat
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* CellRendererCombo_Class::wrap_new(GObject* o)
 {
@@ -134,35 +152,54 @@ CellRendererCombo::CellRendererCombo()
   }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gtk::TreeModel> > CellRendererCombo::property_model() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gtk::TreeModel> >(this, "model");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gtk::TreeModel> > CellRendererCombo::property_model() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gtk::TreeModel> >(this, "model");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> CellRendererCombo::property_text_column() 
 {
   return Glib::PropertyProxy<int>(this, "text-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> CellRendererCombo::property_text_column() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "text-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererCombo::property_has_entry() 
 {
   return Glib::PropertyProxy<bool>(this, "has-entry");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererCombo::property_has_entry() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "has-entry");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.h b/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.h
index 7e158bd106..8dc0250e66 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.h
+++ b/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CELLRENDERERCOMBO_H
 #define _GTKMM_CELLRENDERERCOMBO_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -97,11 +98,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -110,14 +117,17 @@ public:
 
   CellRendererCombo();
 
-  /** The model containing the possible values for the combo box.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The model containing the possible values for the combo box.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gtk::TreeModel> > property_model() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The model containing the possible values for the combo box.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -125,15 +135,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gtk::TreeModel> > property_model() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** A column in the data source model to get the strings from.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A column in the data source model to get the strings from.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_text_column() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A column in the data source model to get the strings from.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -141,15 +155,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_text_column() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If FALSE
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If FALSE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_has_entry() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If FALSE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -157,9 +175,14 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_has_entry() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  virtual Glib::PropertyProxy_Base _property_renderable(); //override
+#ifdef GLIBMM_PROPERTIES_ENABLED
+  virtual Glib::PropertyProxy_Base _property_renderable();
+#else
+  virtual Glib::ustring _property_renderable();
+#endif
 
 
 };
@@ -175,6 +198,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::CellRendererCombo* wrap(GtkCellRendererCombo* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CELLRENDERERCOMBO_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.cc b/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.cc
index bbf363d011..82ab381c6c 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.cc
+++ b/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/cellrendererpixbuf.h>
 #include <gtkmm/private/cellrendererpixbuf_p.h>
 
@@ -29,14 +30,20 @@
 namespace Gtk
 {
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_Base CellRendererPixbuf::_property_renderable()
 {
   return property_pixbuf();
 }
+#else
+Glib::ustring CellRendererPixbuf::_property_renderable()
+{
+  return "pixbuf";
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 } //namespace Gtk
 
-
 namespace
 {
 } // anonymous namespace
@@ -83,8 +90,19 @@ void CellRendererPixbuf_Class::class_init_function(void* g_class, void* class_da
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* CellRendererPixbuf_Class::wrap_new(GObject* o)
 {
@@ -133,65 +151,96 @@ CellRendererPixbuf::CellRendererPixbuf()
   }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > CellRendererPixbuf::property_pixbuf() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> >(this, "pixbuf");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > CellRendererPixbuf::property_pixbuf() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> >(this, "pixbuf");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > CellRendererPixbuf::property_pixbuf_expander_open() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> >(this, "pixbuf-expander-open");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > CellRendererPixbuf::property_pixbuf_expander_open() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> >(this, "pixbuf-expander-open");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > CellRendererPixbuf::property_pixbuf_expander_closed() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> >(this, "pixbuf-expander-closed");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > CellRendererPixbuf::property_pixbuf_expander_closed() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> >(this, "pixbuf-expander-closed");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> CellRendererPixbuf::property_stock_id() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "stock-id");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> CellRendererPixbuf::property_stock_id() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "stock-id");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> CellRendererPixbuf::property_stock_size() 
 {
   return Glib::PropertyProxy<guint>(this, "stock-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> CellRendererPixbuf::property_stock_size() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "stock-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> CellRendererPixbuf::property_stock_detail() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "stock-detail");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> CellRendererPixbuf::property_stock_detail() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "stock-detail");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.h b/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.h
index 8380c76492..b9cb844d7d 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.h
+++ b/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CELLRENDERERPIXBUF_H
 #define _GTKMM_CELLRENDERERPIXBUF_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -95,11 +96,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -107,15 +114,18 @@ private:
 public:
 
   CellRendererPixbuf();
-  
-  /** The pixbuf to render.
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The pixbuf to render.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The pixbuf to render.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -123,15 +133,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Pixbuf for open expander.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Pixbuf for open expander.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_expander_open() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Pixbuf for open expander.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -139,15 +153,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_expander_open() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Pixbuf for closed expander.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Pixbuf for closed expander.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_expander_closed() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Pixbuf for closed expander.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -155,15 +173,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf_expander_closed() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The stock ID of the stock icon to render.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The stock ID of the stock icon to render.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_stock_id() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The stock ID of the stock icon to render.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -171,15 +193,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_stock_id() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The GtkIconSize value that specifies the size of the rendered icon.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The GtkIconSize value that specifies the size of the rendered icon.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_stock_size() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The GtkIconSize value that specifies the size of the rendered icon.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -187,15 +213,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_stock_size() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Render detail to pass to the theme engine.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Render detail to pass to the theme engine.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_stock_detail() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Render detail to pass to the theme engine.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -203,9 +233,14 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_stock_detail() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  virtual Glib::PropertyProxy_Base _property_renderable(); //override
+#ifdef GLIBMM_PROPERTIES_ENABLED
+  virtual Glib::PropertyProxy_Base _property_renderable();
+#else
+  virtual Glib::ustring _property_renderable();
+#endif
 
 
 };
@@ -221,6 +256,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::CellRendererPixbuf* wrap(GtkCellRendererPixbuf* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CELLRENDERERPIXBUF_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.cc b/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.cc
index e3f3b0ed4f..87795f7db1 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.cc
+++ b/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/cellrendererprogress.h>
 #include <gtkmm/private/cellrendererprogress_p.h>
 
@@ -30,10 +31,17 @@
 namespace Gtk
 {
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_Base CellRendererProgress::_property_renderable()
 {
   return _property_renderable();
 }
+#else
+Glib::ustring CellRendererProgress::_property_renderable()
+{
+  return _property_renderable();
+}
+#endif //#ifdef GLIBMM_PROPERTIES_ENABLED
 
 
 } // namespace Gtk
@@ -85,8 +93,19 @@ void CellRendererProgress_Class::class_init_function(void* g_class, void* class_
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* CellRendererProgress_Class::wrap_new(GObject* o)
 {
@@ -135,25 +154,40 @@ CellRendererProgress::CellRendererProgress()
   }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> CellRendererProgress::property_value() 
 {
   return Glib::PropertyProxy<int>(this, "value");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> CellRendererProgress::property_value() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "value");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> CellRendererProgress::property_text() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "text");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> CellRendererProgress::property_text() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "text");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.h b/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.h
index 7ad6132715..1316e177d5 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.h
+++ b/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CELLRENDERERPROGRESS_H
 #define _GTKMM_CELLRENDERERPROGRESS_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -86,11 +87,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -98,14 +105,17 @@ private:
 public:
   CellRendererProgress();
 
-  /** Value of the progress bar.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Value of the progress bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_value() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Value of the progress bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -113,15 +123,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_value() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Text on the progress bar.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Text on the progress bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_text() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Text on the progress bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -129,9 +143,14 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_text() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  
-  virtual Glib::PropertyProxy_Base _property_renderable(); //override
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+  virtual Glib::PropertyProxy_Base _property_renderable();
+#else
+  virtual Glib::ustring _property_renderable();
+#endif
 
 
 };
@@ -147,6 +166,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::CellRendererProgress* wrap(GtkCellRendererProgress* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CELLRENDERERPROGRESS_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderertext.cc b/libs/gtkmm2/gtk/gtkmm/cellrenderertext.cc
index 3ffd88a287..26cc8533f9 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrenderertext.cc
+++ b/libs/gtkmm2/gtk/gtkmm/cellrenderertext.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/private/cellrenderertext_p.h>
 
@@ -29,10 +30,17 @@
 namespace Gtk
 {
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_Base CellRendererText::_property_renderable()
 {
   return property_text();
 }
+#else
+Glib::ustring CellRendererText::_property_renderable()
+{
+  return "text";
+}
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 void CellRendererText::edited(const Glib::ustring& path, const Glib::ustring& new_text)
 {
@@ -45,7 +53,8 @@ void CellRendererText::edited(const Glib::ustring& path, const Glib::ustring& ne
 namespace
 {
 
-void CellRendererText_signal_edited_callback(GtkCellRendererText* self, const gchar* p0,const gchar* p1,void* data)
+
+static void CellRendererText_signal_edited_callback(GtkCellRendererText* self, const gchar* p0,const gchar* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::ustring&,const Glib::ustring& > SlotType;
@@ -53,27 +62,32 @@ void CellRendererText_signal_edited_callback(GtkCellRendererText* self, const gc
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::convert_const_gchar_ptr_to_ustring(p0)
 , Glib::convert_const_gchar_ptr_to_ustring(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo CellRendererText_signal_edited_info =
+static const Glib::SignalProxyInfo CellRendererText_signal_edited_info =
 {
   "edited",
   (GCallback) &CellRendererText_signal_edited_callback,
   (GCallback) &CellRendererText_signal_edited_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -118,10 +132,18 @@ void CellRendererText_Class::class_init_function(void* g_class, void* class_data
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->edited = &edited_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void CellRendererText_Class::edited_callback(GtkCellRendererText* self, const gchar* p0, const gchar* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -134,17 +156,21 @@ void CellRendererText_Class::edited_callback(GtkCellRendererText* self, const gc
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_edited(Glib::convert_const_gchar_ptr_to_ustring(p0)
 , Glib::convert_const_gchar_ptr_to_ustring(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -157,6 +183,7 @@ void CellRendererText_Class::edited_callback(GtkCellRendererText* self, const gc
       (*base->edited)(self, p0, p1);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* CellRendererText_Class::wrap_new(GObject* o)
@@ -207,7 +234,7 @@ CellRendererText::CellRendererText()
 
 void CellRendererText::set_fixed_height_from_font(int number_of_rows)
 {
-  gtk_cell_renderer_text_set_fixed_height_from_font(gobj(), number_of_rows);
+gtk_cell_renderer_text_set_fixed_height_from_font(gobj(), number_of_rows); 
 }
 
 
@@ -217,397 +244,589 @@ Glib::SignalProxy2< void,const Glib::ustring&,const Glib::ustring& > CellRendere
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> CellRendererText::property_text() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "text");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> CellRendererText::property_text() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "text");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_WriteOnly<Glib::ustring> CellRendererText::property_markup() 
 {
   return Glib::PropertyProxy_WriteOnly<Glib::ustring>(this, "markup");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
-Glib::PropertyProxy_ReadOnly<Glib::ustring> CellRendererText::property_markup() const
-{
-  return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "markup");
-}
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::AttrList> CellRendererText::property_attributes() 
 {
   return Glib::PropertyProxy<Pango::AttrList>(this, "attributes");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::AttrList> CellRendererText::property_attributes() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::AttrList>(this, "attributes");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_WriteOnly<Glib::ustring> CellRendererText::property_background() 
 {
   return Glib::PropertyProxy_WriteOnly<Glib::ustring>(this, "background");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
-Glib::PropertyProxy_ReadOnly<Glib::ustring> CellRendererText::property_background() const
-{
-  return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "background");
-}
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_WriteOnly<Glib::ustring> CellRendererText::property_foreground() 
 {
   return Glib::PropertyProxy_WriteOnly<Glib::ustring>(this, "foreground");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
-Glib::PropertyProxy_ReadOnly<Glib::ustring> CellRendererText::property_foreground() const
-{
-  return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "foreground");
-}
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gdk::Color> CellRendererText::property_background_gdk() 
 {
   return Glib::PropertyProxy<Gdk::Color>(this, "background-gdk");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gdk::Color> CellRendererText::property_background_gdk() const
 {
   return Glib::PropertyProxy_ReadOnly<Gdk::Color>(this, "background-gdk");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gdk::Color> CellRendererText::property_foreground_gdk() 
 {
   return Glib::PropertyProxy<Gdk::Color>(this, "foreground-gdk");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gdk::Color> CellRendererText::property_foreground_gdk() const
 {
   return Glib::PropertyProxy_ReadOnly<Gdk::Color>(this, "foreground-gdk");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> CellRendererText::property_font() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "font");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> CellRendererText::property_font() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "font");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::FontDescription> CellRendererText::property_font_desc() 
 {
   return Glib::PropertyProxy<Pango::FontDescription>(this, "font-desc");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::FontDescription> CellRendererText::property_font_desc() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::FontDescription>(this, "font-desc");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> CellRendererText::property_family() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "family");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> CellRendererText::property_family() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "family");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::Style> CellRendererText::property_style() 
 {
   return Glib::PropertyProxy<Pango::Style>(this, "style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::Style> CellRendererText::property_style() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::Style>(this, "style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::Variant> CellRendererText::property_variant() 
 {
   return Glib::PropertyProxy<Pango::Variant>(this, "variant");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::Variant> CellRendererText::property_variant() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::Variant>(this, "variant");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> CellRendererText::property_weight() 
 {
   return Glib::PropertyProxy<int>(this, "weight");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> CellRendererText::property_weight() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "weight");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::Stretch> CellRendererText::property_stretch() 
 {
   return Glib::PropertyProxy<Pango::Stretch>(this, "stretch");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::Stretch> CellRendererText::property_stretch() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::Stretch>(this, "stretch");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> CellRendererText::property_size() 
 {
   return Glib::PropertyProxy<int>(this, "size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> CellRendererText::property_size() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> CellRendererText::property_size_points() 
 {
   return Glib::PropertyProxy<double>(this, "size-points");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> CellRendererText::property_size_points() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "size-points");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> CellRendererText::property_scale() 
 {
   return Glib::PropertyProxy<double>(this, "scale");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> CellRendererText::property_scale() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "scale");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_editable() 
 {
   return Glib::PropertyProxy<bool>(this, "editable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_editable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "editable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_strikethrough() 
 {
   return Glib::PropertyProxy<bool>(this, "strikethrough");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_strikethrough() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "strikethrough");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::Underline> CellRendererText::property_underline() 
 {
   return Glib::PropertyProxy<Pango::Underline>(this, "underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::Underline> CellRendererText::property_underline() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::Underline>(this, "underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> CellRendererText::property_rise() 
 {
   return Glib::PropertyProxy<int>(this, "rise");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> CellRendererText::property_rise() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "rise");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> CellRendererText::property_language() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "language");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> CellRendererText::property_language() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "language");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<Pango::EllipsizeMode> CellRendererText::property_ellipsize() 
+{
+  return Glib::PropertyProxy<Pango::EllipsizeMode>(this, "ellipsize");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<Pango::EllipsizeMode> CellRendererText::property_ellipsize() const
+{
+  return Glib::PropertyProxy_ReadOnly<Pango::EllipsizeMode>(this, "ellipsize");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<int> CellRendererText::property_width_chars() 
+{
+  return Glib::PropertyProxy<int>(this, "width-chars");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<int> CellRendererText::property_width_chars() const
+{
+  return Glib::PropertyProxy_ReadOnly<int>(this, "width-chars");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<Pango::WrapMode> CellRendererText::property_wrap_mode() 
+{
+  return Glib::PropertyProxy<Pango::WrapMode>(this, "wrap-mode");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
-Glib::PropertyProxy<bool> CellRendererText::property_ellipsize() 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<Pango::WrapMode> CellRendererText::property_wrap_mode() const
 {
-  return Glib::PropertyProxy<bool>(this, "ellipsize");
+  return Glib::PropertyProxy_ReadOnly<Pango::WrapMode>(this, "wrap-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
-Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_ellipsize() const
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<int> CellRendererText::property_wrap_width() 
 {
-  return Glib::PropertyProxy_ReadOnly<bool>(this, "ellipsize");
+  return Glib::PropertyProxy<int>(this, "wrap-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<int> CellRendererText::property_wrap_width() const
+{
+  return Glib::PropertyProxy_ReadOnly<int>(this, "wrap-width");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<Pango::Alignment> CellRendererText::property_alignment() 
+{
+  return Glib::PropertyProxy<Pango::Alignment>(this, "alignment");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<Pango::Alignment> CellRendererText::property_alignment() const
+{
+  return Glib::PropertyProxy_ReadOnly<Pango::Alignment>(this, "alignment");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_background_set() 
 {
   return Glib::PropertyProxy<bool>(this, "background-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_background_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "background-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_foreground_set() 
 {
   return Glib::PropertyProxy<bool>(this, "foreground-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_foreground_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "foreground-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_family_set() 
 {
   return Glib::PropertyProxy<bool>(this, "family-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_family_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "family-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_style_set() 
 {
   return Glib::PropertyProxy<bool>(this, "style-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_style_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "style-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_variant_set() 
 {
   return Glib::PropertyProxy<bool>(this, "variant-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_variant_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "variant-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_weight_set() 
 {
   return Glib::PropertyProxy<bool>(this, "weight-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_weight_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "weight-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_stretch_set() 
 {
   return Glib::PropertyProxy<bool>(this, "stretch-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_stretch_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "stretch-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_size_set() 
 {
   return Glib::PropertyProxy<bool>(this, "size-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_size_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "size-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_scale_set() 
 {
   return Glib::PropertyProxy<bool>(this, "scale-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_scale_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "scale-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_editable_set() 
 {
   return Glib::PropertyProxy<bool>(this, "editable-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_editable_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "editable-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_strikethrough_set() 
 {
   return Glib::PropertyProxy<bool>(this, "strikethrough-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_strikethrough_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "strikethrough-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_underline_set() 
 {
   return Glib::PropertyProxy<bool>(this, "underline-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_underline_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "underline-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_rise_set() 
 {
   return Glib::PropertyProxy<bool>(this, "rise-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_rise_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "rise-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_language_set() 
 {
   return Glib::PropertyProxy<bool>(this, "language-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_language_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "language-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_ellipsize_set() 
 {
   return Glib::PropertyProxy<bool>(this, "ellipsize-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_ellipsize_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "ellipsize-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererText::property_single_paragraph_mode() 
 {
   return Glib::PropertyProxy<bool>(this, "single-paragraph-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererText::property_single_paragraph_mode() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "single-paragraph-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::CellRendererText::on_edited(const Glib::ustring& path, const Glib::ustring& new_text)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -617,6 +836,10 @@ void Gtk::CellRendererText::on_edited(const Glib::ustring& path, const Glib::ust
   if(base && base->edited)
     (*base->edited)(gobj(),path.c_str(),new_text.c_str());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderertext.h b/libs/gtkmm2/gtk/gtkmm/cellrenderertext.h
index 9135cdf83a..408a9e4774 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrenderertext.h
+++ b/libs/gtkmm2/gtk/gtkmm/cellrenderertext.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CELLRENDERERTEXT_H
 #define _GTKMM_CELLRENDERERTEXT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -88,12 +89,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_edited(const Glib::ustring& path, const Glib::ustring& new_text);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -114,17 +121,25 @@ public:
   void set_fixed_height_from_font(int number_of_rows);
 
   
+/**
+   * @par Prototype:
+   * <tt>void %edited(const Glib::ustring& path, const Glib::ustring& new_text)</tt>
+   */
+
   Glib::SignalProxy2< void,const Glib::ustring&,const Glib::ustring& > signal_edited();
 
 
-  /** Text to render.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Text to render.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_text() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Text to render.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -132,31 +147,30 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_text() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Marked up text to render.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Marked up text to render.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_WriteOnly<Glib::ustring> property_markup() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Marked up text to render.
-   *
-   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
-   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
-   * the value of the property changes.
-   */
-  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_markup() const;
 
-  /** A list of style attributes to apply to the text of the renderer.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A list of style attributes to apply to the text of the renderer.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::AttrList> property_attributes() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A list of style attributes to apply to the text of the renderer.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -164,47 +178,41 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::AttrList> property_attributes() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Background color as a string.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Background color as a string.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_WriteOnly<Glib::ustring> property_background() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Background color as a string.
-   *
-   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
-   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
-   * the value of the property changes.
-   */
-  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_background() const;
 
-  /** Foreground color as a string.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Foreground color as a string.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_WriteOnly<Glib::ustring> property_foreground() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Foreground color as a string.
-   *
-   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
-   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
-   * the value of the property changes.
-   */
-  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_foreground() const;
 
-  /** Background color as a GdkColor.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Background color as a GdkColor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gdk::Color> property_background_gdk() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Background color as a GdkColor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -212,15 +220,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gdk::Color> property_background_gdk() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Foreground color as a GdkColor.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Foreground color as a GdkColor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gdk::Color> property_foreground_gdk() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Foreground color as a GdkColor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -228,15 +240,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gdk::Color> property_foreground_gdk() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font description as a string.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font description as a string.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_font() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font description as a string.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -244,15 +260,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_font() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font description as a PangoFontDescription struct.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font description as a PangoFontDescription struct.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::FontDescription> property_font_desc() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font description as a PangoFontDescription struct.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -260,15 +280,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::FontDescription> property_font_desc() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Name of the font family
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Name of the font family
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_family() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Name of the font family
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -276,15 +300,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_family() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font style.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font style.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::Style> property_style() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font style.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -292,15 +320,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::Style> property_style() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font variant.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font variant.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::Variant> property_variant() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font variant.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -308,15 +340,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::Variant> property_variant() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font weight.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font weight.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_weight() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font weight.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -324,15 +360,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_weight() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font stretch.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font stretch.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::Stretch> property_stretch() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font stretch.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -340,15 +380,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::Stretch> property_stretch() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font size.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font size.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_size() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font size.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -356,15 +400,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_size() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font size in points.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font size in points.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_size_points() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font size in points.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -372,15 +420,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_size_points() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font scaling factor.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font scaling factor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_scale() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font scaling factor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -388,15 +440,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_scale() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the text can be modified by the user.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the text can be modified by the user.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_editable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the text can be modified by the user.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -404,15 +460,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_editable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether to strike through the text.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to strike through the text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_strikethrough() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether to strike through the text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -420,15 +480,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_strikethrough() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Style of underline for this text.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Style of underline for this text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::Underline> property_underline() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Style of underline for this text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -436,15 +500,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::Underline> property_underline() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Offset of text above the baseline (below the baseline if rise is negative).
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Offset of text above the baseline (below the baseline if rise is negative).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_rise() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Offset of text above the baseline (below the baseline if rise is negative).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -452,15 +520,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_rise() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The language this text is in
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The language this text is in
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_language() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The language this text is in
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -468,31 +540,119 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_language() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The preferred place to ellipsize the string
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The preferred place to ellipsize the string
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
-  Glib::PropertyProxy<bool> property_ellipsize() ;
+  Glib::PropertyProxy<Pango::EllipsizeMode> property_ellipsize() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The preferred place to ellipsize the string
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
-  Glib::PropertyProxy_ReadOnly<bool> property_ellipsize() const;
+  Glib::PropertyProxy_ReadOnly<Pango::EllipsizeMode> property_ellipsize() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The desired width of the label
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<int> property_width_chars() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the background color.
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The desired width of the label
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<int> property_width_chars() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** How to break the string into multiple lines
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<Pango::WrapMode> property_wrap_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** How to break the string into multiple lines
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<Pango::WrapMode> property_wrap_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The width at which the text is wrapped.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<int> property_wrap_width() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The width at which the text is wrapped.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<int> property_wrap_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** How to align the lines.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<Pango::Alignment> property_alignment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** How to align the lines.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<Pango::Alignment> property_alignment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the background color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_background_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the background color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -500,15 +660,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_background_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the foreground color.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the foreground color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_foreground_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the foreground color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -516,15 +680,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_foreground_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font family.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font family.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_family_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font family.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -532,15 +700,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_family_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font style.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font style.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_style_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font style.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -548,15 +720,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_style_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font variant.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font variant.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_variant_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font variant.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -564,15 +740,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_variant_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font weight.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font weight.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_weight_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font weight.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -580,15 +760,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_weight_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font stretch.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font stretch.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_stretch_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font stretch.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -596,15 +780,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_stretch_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font size.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font size.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_size_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font size.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -612,15 +800,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_size_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag scales the font size by a factor.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag scales the font size by a factor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_scale_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag scales the font size by a factor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -628,15 +820,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_scale_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects text editability.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects text editability.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_editable_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects text editability.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -644,15 +840,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_editable_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects strikethrough.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects strikethrough.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_strikethrough_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects strikethrough.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -660,15 +860,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_strikethrough_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects underlining.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects underlining.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_underline_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects underlining.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -676,15 +880,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_underline_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the rise.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the rise.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_rise_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the rise.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -692,15 +900,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_rise_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the language the text is rendered as.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the language the text is rendered as.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_language_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the language the text is rendered as.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -708,15 +920,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_language_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the ellipsize mode.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the ellipsize mode.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_ellipsize_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the ellipsize mode.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -724,15 +940,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_ellipsize_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether or not to keep all text in a single paragraph.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether or not to keep all text in a single paragraph.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_single_paragraph_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether or not to keep all text in a single paragraph.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -740,9 +960,14 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_single_paragraph_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  
-  virtual Glib::PropertyProxy_Base _property_renderable(); //override
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+  virtual Glib::PropertyProxy_Base _property_renderable();
+#else
+  virtual Glib::ustring _property_renderable();
+#endif
 
 protected:
   /** Emits the "edited" signal.
@@ -764,6 +989,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::CellRendererText* wrap(GtkCellRendererText* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CELLRENDERERTEXT_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.cc b/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.cc
index 023c5382dd..55742abf81 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.cc
+++ b/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/cellrenderertoggle.h>
 #include <gtkmm/private/cellrenderertoggle_p.h>
 
@@ -30,18 +31,25 @@
 namespace Gtk
 {
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_Base CellRendererToggle::_property_renderable()
 {
   return property_active();
 }
+#else
+Glib::ustring CellRendererToggle::_property_renderable()
+{
+  return "active";
+}
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 } //namespace Gtk
 
-
 namespace
 {
 
-void CellRendererToggle_signal_toggled_callback(GtkCellRendererToggle* self, const gchar* p0,void* data)
+
+static void CellRendererToggle_signal_toggled_callback(GtkCellRendererToggle* self, const gchar* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::ustring& > SlotType;
@@ -49,26 +57,31 @@ void CellRendererToggle_signal_toggled_callback(GtkCellRendererToggle* self, con
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::convert_const_gchar_ptr_to_ustring(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo CellRendererToggle_signal_toggled_info =
+static const Glib::SignalProxyInfo CellRendererToggle_signal_toggled_info =
 {
   "toggled",
   (GCallback) &CellRendererToggle_signal_toggled_callback,
   (GCallback) &CellRendererToggle_signal_toggled_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -113,10 +126,18 @@ void CellRendererToggle_Class::class_init_function(void* g_class, void* class_da
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->toggled = &toggled_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void CellRendererToggle_Class::toggled_callback(GtkCellRendererToggle* self, const gchar* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -129,16 +150,20 @@ void CellRendererToggle_Class::toggled_callback(GtkCellRendererToggle* self, con
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_toggled(Glib::convert_const_gchar_ptr_to_ustring(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -151,6 +176,7 @@ void CellRendererToggle_Class::toggled_callback(GtkCellRendererToggle* self, con
       (*base->toggled)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* CellRendererToggle_Class::wrap_new(GObject* o)
@@ -206,7 +232,7 @@ bool CellRendererToggle::get_radio() const
 
 void CellRendererToggle::set_radio(bool radio)
 {
-  gtk_cell_renderer_toggle_set_radio(gobj(), static_cast<int>(radio));
+gtk_cell_renderer_toggle_set_radio(gobj(), static_cast<int>(radio)); 
 }
 
 bool CellRendererToggle::get_active() const
@@ -216,7 +242,7 @@ bool CellRendererToggle::get_active() const
 
 void CellRendererToggle::set_active(bool setting)
 {
-  gtk_cell_renderer_toggle_set_active(gobj(), static_cast<int>(setting));
+gtk_cell_renderer_toggle_set_active(gobj(), static_cast<int>(setting)); 
 }
 
 
@@ -226,37 +252,64 @@ Glib::SignalProxy1< void,const Glib::ustring& > CellRendererToggle::signal_toggl
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererToggle::property_activatable() 
 {
   return Glib::PropertyProxy<bool>(this, "activatable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererToggle::property_activatable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "activatable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererToggle::property_active() 
 {
   return Glib::PropertyProxy<bool>(this, "active");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererToggle::property_active() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "active");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CellRendererToggle::property_radio() 
 {
   return Glib::PropertyProxy<bool>(this, "radio");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CellRendererToggle::property_radio() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "radio");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<int> CellRendererToggle::property_indicator_size() 
+{
+  return Glib::PropertyProxy<int>(this, "indicator-size");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<int> CellRendererToggle::property_indicator_size() const
+{
+  return Glib::PropertyProxy_ReadOnly<int>(this, "indicator-size");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::CellRendererToggle::on_toggled(const Glib::ustring& path)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -266,6 +319,10 @@ void Gtk::CellRendererToggle::on_toggled(const Glib::ustring& path)
   if(base && base->toggled)
     (*base->toggled)(gobj(),path.c_str());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.h b/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.h
index 293f4e7750..56f0d9df4f 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.h
+++ b/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CELLRENDERERTOGGLE_H
 #define _GTKMM_CELLRENDERERTOGGLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -90,12 +91,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_toggled(const Glib::ustring& path);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -105,7 +112,7 @@ public:
   CellRendererToggle();
   
 
-  /** Returns wether we're rendering radio toggles rather than checkboxes.
+  /** Returns whether we're rendering radio toggles rather than checkboxes.
    * @return <tt>true</tt> if we're rendering radio toggles rather than checkboxes.
    */
   bool get_radio() const;
@@ -132,18 +139,31 @@ public:
    */
   void set_active(bool setting = true);
 
+   //TODO: Maybe the parameter should be a TreePath.
+  /** The toggled signal is emitted when the cell is toggled.
+   *
+   * @param path string representation of TreePath describing the event location
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %toggled(const Glib::ustring& path)</tt>
+   */
 
   Glib::SignalProxy1< void,const Glib::ustring& > signal_toggled();
 
 
-  /** The toggle button can be activated.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The toggle button can be activated.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_activatable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The toggle button can be activated.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -151,15 +171,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_activatable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The toggle state of the button.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The toggle state of the button.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_active() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The toggle state of the button.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -167,15 +191,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_active() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Draw the toggle button as a radio button.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Draw the toggle button as a radio button.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_radio() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Draw the toggle button as a radio button.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -183,9 +211,34 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_radio() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Size of check or radio indicator.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<int> property_indicator_size() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  virtual Glib::PropertyProxy_Base _property_renderable(); //override
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Size of check or radio indicator.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<int> property_indicator_size() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+  virtual Glib::PropertyProxy_Base _property_renderable();
+#else
+  virtual Glib::ustring _property_renderable();
+#endif
 
 
 };
@@ -201,6 +254,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::CellRendererToggle* wrap(GtkCellRendererToggle* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CELLRENDERERTOGGLE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/cellview.cc b/libs/gtkmm2/gtk/gtkmm/cellview.cc
index 5b57ccf3a0..3691fbaa6b 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellview.cc
+++ b/libs/gtkmm2/gtk/gtkmm/cellview.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/cellview.h>
 #include <gtkmm/private/cellview_p.h>
 
@@ -38,12 +39,24 @@ CellView::CellView(const Glib::ustring& text, bool use_markup)
   Gtk::Widget(Glib::ConstructParams(cellview_class_.init(), (char*) 0))
 {
   Gtk::CellRendererText* cell = Gtk::manage(new Gtk::CellRendererText());
-  
+
   if(use_markup)
+  {
+    #ifdef GLIBMM_PROPERTIES_ENABLED
     cell->property_markup() = text;
+    #else
+    cell->set_property("markup", text);
+    #endif
+  }
   else
+  {
+    #ifdef GLIBMM_PROPERTIES_ENABLED
     cell->property_text() = text;
-  
+    #else
+    cell->set_property("text", text);
+    #endif
+  }
+
   pack_start(*cell);
 }
 
@@ -53,15 +66,19 @@ CellView::CellView(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
   Gtk::Widget(Glib::ConstructParams(cellview_class_.init(), (char*) 0))
 {
   Gtk::CellRendererPixbuf* cell = Gtk::manage(new Gtk::CellRendererPixbuf());
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
   cell->property_pixbuf() = pixbuf;
-  
+  #else
+  cell->set_property("pixbuf", (void*)(pixbuf->gobj()));
+  #endif
+
   pack_start(*cell);
 }
 
 
 } //namespace Gtk
 
-
 namespace
 {
 } // anonymous namespace
@@ -109,8 +126,19 @@ void CellView_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* CellView_Class::wrap_new(GObject* o)
 {
@@ -160,12 +188,12 @@ CellView::CellView()
 
 void CellView::set_model(const Glib::RefPtr<TreeModel>& model)
 {
-  gtk_cell_view_set_model(gobj(), Glib::unwrap(model));
+gtk_cell_view_set_model(gobj(), Glib::unwrap(model)); 
 }
 
 void CellView::set_displayed_row(const TreeModel::Path& path)
 {
-  gtk_cell_view_set_displayed_row(gobj(), const_cast<GtkTreePath*>((path).gobj()));
+gtk_cell_view_set_displayed_row(gobj(), const_cast<GtkTreePath*>((path).gobj())); 
 }
 
 TreeModel::Path CellView::get_displayed_row() const
@@ -180,7 +208,7 @@ bool CellView::get_size_of_row(const TreeModel::Path& path, Requisition& requisi
 
 void CellView::set_background_color(const Gdk::Color& color)
 {
-  gtk_cell_view_set_background_color(gobj(), (color).gobj());
+gtk_cell_view_set_background_color(gobj(), (color).gobj()); 
 }
 
 Glib::ListHandle<CellRenderer*> CellView::get_cell_renderers()
@@ -194,6 +222,13 @@ Glib::ListHandle<const CellRenderer*> CellView::get_cell_renderers() const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/cellview.h b/libs/gtkmm2/gtk/gtkmm/cellview.h
index 6e798c5f56..a804824739 100644
--- a/libs/gtkmm2/gtk/gtkmm/cellview.h
+++ b/libs/gtkmm2/gtk/gtkmm/cellview.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CELLVIEW_H
 #define _GTKMM_CELLVIEW_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -98,11 +99,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -135,7 +142,7 @@ public:
    * set, it will remove it before setting the new model.  If @a model  is 
    * <tt>0</tt>, then it will unset the old model.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param model A Gtk::TreeModel.
    */
   void set_model(const Glib::RefPtr<TreeModel>& model);
@@ -147,11 +154,18 @@ public:
    * a needed intermediate state if say, the model for
    * the Gtk::CellView becomes temporarily empty.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param path A Gtk::TreePath or <tt>0</tt> to unset.
    */
   void set_displayed_row(const TreeModel::Path& path);
   
+  /** Returns a Gtk::TreePath referring to the currently 
+   * displayed row. If no row is currently displayed, 
+   * <tt>0</tt> is returned.
+   * @return The currently displayed row or <tt>0</tt>
+   * 
+   * @newin2p6.
+   */
   TreeModel::Path get_displayed_row() const;
   
   /** Sets @a requisition  to the size needed by @a cell_view  to display 
@@ -160,14 +174,14 @@ public:
    * @param requisition Return location for the size.
    * @return <tt>true</tt>
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool get_size_of_row(const TreeModel::Path& path, Requisition& requisition) const;
 
   
   /** Sets the background color of @a view .
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param color The new background color.
    */
   void set_background_color(const Gdk::Color& color);
@@ -178,7 +192,7 @@ public:
    * renderers has been newly allocated and should be freed with
    * Glib::list_free() when no longer needed.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ListHandle<CellRenderer*> get_cell_renderers();
   
@@ -187,7 +201,7 @@ public:
    * renderers has been newly allocated and should be freed with
    * Glib::list_free() when no longer needed.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ListHandle<const CellRenderer*> get_cell_renderers() const;
 
@@ -205,6 +219,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::CellView* wrap(GtkCellView* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CELLVIEW_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/checkbutton.cc b/libs/gtkmm2/gtk/gtkmm/checkbutton.cc
index 110d0c5edc..61fec35704 100644
--- a/libs/gtkmm2/gtk/gtkmm/checkbutton.cc
+++ b/libs/gtkmm2/gtk/gtkmm/checkbutton.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/private/checkbutton_p.h>
 
@@ -85,9 +86,15 @@ void CheckButton_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->draw_indicator = &draw_indicator_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void CheckButton_Class::draw_indicator_vfunc_callback(GtkCheckButton* self, GdkRectangle* area)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -100,15 +107,19 @@ void CheckButton_Class::draw_indicator_vfunc_callback(GtkCheckButton* self, GdkR
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_indicator_vfunc(area);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -121,6 +132,10 @@ void CheckButton_Class::draw_indicator_vfunc_callback(GtkCheckButton* self, GdkR
       (*base->draw_indicator)(self, area);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* CheckButton_Class::wrap_new(GObject* o)
@@ -170,6 +185,10 @@ CheckButton::CheckButton()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::CheckButton::draw_indicator_vfunc(GdkRectangle* area) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -179,6 +198,7 @@ void Gtk::CheckButton::draw_indicator_vfunc(GdkRectangle* area)
   if(base && base->draw_indicator)
     (*base->draw_indicator)(gobj(),area);
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/checkbutton.h b/libs/gtkmm2/gtk/gtkmm/checkbutton.h
index bff262d400..2e33cf9f6d 100644
--- a/libs/gtkmm2/gtk/gtkmm/checkbutton.h
+++ b/libs/gtkmm2/gtk/gtkmm/checkbutton.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CHECKBUTTON_H
 #define _GTKMM_CHECKBUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -93,11 +94,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -129,9 +136,11 @@ protected:
    * The GdkRectangle specifies the area of the widget which will get
    * redrawn.
    */
-    virtual void draw_indicator_vfunc(GdkRectangle* area);
-  
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_indicator_vfunc(GdkRectangle* area);
+#endif //GLIBMM_VFUNCS_ENABLED
 
+  
 };
 
 
@@ -146,6 +155,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::CheckButton* wrap(GtkCheckButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CHECKBUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/checkmenuitem.cc b/libs/gtkmm2/gtk/gtkmm/checkmenuitem.cc
index 2a1a6b4ac2..f66910811f 100644
--- a/libs/gtkmm2/gtk/gtkmm/checkmenuitem.cc
+++ b/libs/gtkmm2/gtk/gtkmm/checkmenuitem.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/checkmenuitem.h>
 #include <gtkmm/private/checkmenuitem_p.h>
 
@@ -46,13 +47,15 @@ CheckMenuItem::CheckMenuItem(const Glib::ustring& label, bool mnemonic)
 namespace
 {
 
-const Glib::SignalProxyInfo CheckMenuItem_signal_toggled_info =
+
+static const Glib::SignalProxyInfo CheckMenuItem_signal_toggled_info =
 {
   "toggled",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -97,10 +100,16 @@ void CheckMenuItem_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->draw_indicator = &draw_indicator_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->toggled = &toggled_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void CheckMenuItem_Class::draw_indicator_vfunc_callback(GtkCheckMenuItem* self, GdkRectangle* area)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -113,15 +122,19 @@ void CheckMenuItem_Class::draw_indicator_vfunc_callback(GtkCheckMenuItem* self,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_indicator_vfunc(area);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -134,8 +147,9 @@ void CheckMenuItem_Class::draw_indicator_vfunc_callback(GtkCheckMenuItem* self,
       (*base->draw_indicator)(self, area);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void CheckMenuItem_Class::toggled_callback(GtkCheckMenuItem* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -148,15 +162,19 @@ void CheckMenuItem_Class::toggled_callback(GtkCheckMenuItem* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_toggled();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -169,6 +187,7 @@ void CheckMenuItem_Class::toggled_callback(GtkCheckMenuItem* self)
       (*base->toggled)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* CheckMenuItem_Class::wrap_new(GObject* o)
@@ -219,7 +238,7 @@ CheckMenuItem::CheckMenuItem()
 
 void CheckMenuItem::set_active(bool state)
 {
-  gtk_check_menu_item_set_active(gobj(), static_cast<int>(state));
+gtk_check_menu_item_set_active(gobj(), static_cast<int>(state)); 
 }
 
 bool CheckMenuItem::get_active() const
@@ -229,12 +248,12 @@ bool CheckMenuItem::get_active() const
 
 void CheckMenuItem::toggled()
 {
-  gtk_check_menu_item_toggled(gobj());
+gtk_check_menu_item_toggled(gobj()); 
 }
 
 void CheckMenuItem::set_inconsistent(bool setting)
 {
-  gtk_check_menu_item_set_inconsistent(gobj(), static_cast<int>(setting));
+gtk_check_menu_item_set_inconsistent(gobj(), static_cast<int>(setting)); 
 }
 
 bool CheckMenuItem::get_inconsistent() const
@@ -244,7 +263,7 @@ bool CheckMenuItem::get_inconsistent() const
 
 void CheckMenuItem::set_draw_as_radio(bool draw_as_radio)
 {
-  gtk_check_menu_item_set_draw_as_radio(gobj(), static_cast<int>(draw_as_radio));
+gtk_check_menu_item_set_draw_as_radio(gobj(), static_cast<int>(draw_as_radio)); 
 }
 
 bool CheckMenuItem::get_draw_as_radio() const
@@ -259,37 +278,50 @@ Glib::SignalProxy0< void > CheckMenuItem::signal_toggled()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CheckMenuItem::property_active() 
 {
   return Glib::PropertyProxy<bool>(this, "active");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CheckMenuItem::property_active() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "active");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CheckMenuItem::property_inconsistent() 
 {
   return Glib::PropertyProxy<bool>(this, "inconsistent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CheckMenuItem::property_inconsistent() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "inconsistent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> CheckMenuItem::property_draw_as_radio() 
 {
   return Glib::PropertyProxy<bool>(this, "draw-as-radio");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> CheckMenuItem::property_draw_as_radio() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "draw-as-radio");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::CheckMenuItem::on_toggled()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -299,8 +331,9 @@ void Gtk::CheckMenuItem::on_toggled()
   if(base && base->toggled)
     (*base->toggled)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::CheckMenuItem::draw_indicator_vfunc(GdkRectangle* area) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -310,6 +343,7 @@ void Gtk::CheckMenuItem::draw_indicator_vfunc(GdkRectangle* area)
   if(base && base->draw_indicator)
     (*base->draw_indicator)(gobj(),area);
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/checkmenuitem.h b/libs/gtkmm2/gtk/gtkmm/checkmenuitem.h
index faa95d431f..0aa9405b5b 100644
--- a/libs/gtkmm2/gtk/gtkmm/checkmenuitem.h
+++ b/libs/gtkmm2/gtk/gtkmm/checkmenuitem.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CHECKMENUITEM_H
 #define _GTKMM_CHECKMENUITEM_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -90,12 +91,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_toggled();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -139,7 +146,7 @@ public:
   
   /** Sets whether @a check_menu_item  is drawn like a Gtk::RadioMenuItem
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param draw_as_radio Whether @a check_menu_item  is drawn like a Gtk::RadioMenuItem.
    */
   void set_draw_as_radio(bool draw_as_radio = true);
@@ -147,7 +154,7 @@ public:
   /** Returns whether @a check_menu_item  looks like a Gtk::RadioMenuItem
    * @return Whether @a check_menu_item  looks like a Gtk::RadioMenuItem
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_draw_as_radio() const;
   
@@ -156,18 +163,25 @@ public:
    * this signal)
    */
   
+/**
+   * @par Prototype:
+   * <tt>void %toggled()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_toggled();
 
 
-  /** Whether the menu item is checked.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the menu item is checked.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_active() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the menu item is checked.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -175,15 +189,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_active() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether to display an inconsistent state.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to display an inconsistent state.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_inconsistent() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether to display an inconsistent state.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -191,15 +209,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_inconsistent() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the menu item looks like a radio menu item.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the menu item looks like a radio menu item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_draw_as_radio() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the menu item looks like a radio menu item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -207,6 +229,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_draw_as_radio() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
@@ -216,7 +239,9 @@ protected:
    * The GdkRectangle specifies the area of the widget which will get
    * redrawn.
    */
-    virtual void draw_indicator_vfunc(GdkRectangle* area);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_indicator_vfunc(GdkRectangle* area);
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 };
@@ -232,6 +257,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::CheckMenuItem* wrap(GtkCheckMenuItem* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CHECKMENUITEM_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/clipboard.cc b/libs/gtkmm2/gtk/gtkmm/clipboard.cc
index e543bb8eee..341e015130 100644
--- a/libs/gtkmm2/gtk/gtkmm/clipboard.cc
+++ b/libs/gtkmm2/gtk/gtkmm/clipboard.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/clipboard.h>
 #include <gtkmm/private/clipboard_p.h>
 
@@ -25,6 +26,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <gtkmm/textbuffer.h>
 #include <gtkmm/selectiondata_private.h>
 #include <glibmm/utility.h> //For ScopedPtr<>.
 #include <gtk/gtkclipboard.h>
@@ -39,13 +41,11 @@ class SignalProxy_GetClear
 public:
   SignalProxy_GetClear(const Gtk::Clipboard::SlotGet& slot_get,
                        const Gtk::Clipboard::SlotClear& slot_clear);
-  ~SignalProxy_GetClear();
 
   static void gtk_callback_get(GtkClipboard* clipboard, GtkSelectionData* selection_data,
                                unsigned int info, void* data);
   static void gtk_callback_clear(GtkClipboard* clipboard, void* data);
 
-protected:
   Gtk::Clipboard::SlotGet   slot_get_;
   Gtk::Clipboard::SlotClear slot_clear_;
 };
@@ -57,37 +57,42 @@ SignalProxy_GetClear::SignalProxy_GetClear(const Gtk::Clipboard::SlotGet& slot_g
   slot_clear_ (slot_clear)
 {}
 
-SignalProxy_GetClear::~SignalProxy_GetClear()
-{}
-
-void SignalProxy_GetClear::gtk_callback_get(GtkClipboard*, GtkSelectionData* selection_data,
+static void SignalProxy_GetClear_gtk_callback_get(GtkClipboard*, GtkSelectionData* selection_data,
                                             unsigned int info, void* data)
 {
   SignalProxy_GetClear *const self = static_cast<SignalProxy_GetClear*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     Gtk::SelectionData_WithoutOwnership cppSelectionData(selection_data);
     (self->slot_get_)(cppSelectionData, info);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void SignalProxy_GetClear::gtk_callback_clear(GtkClipboard*, void* data)
+static void SignalProxy_GetClear_gtk_callback_clear(GtkClipboard*, void* data)
 {
   SignalProxy_GetClear *const self = static_cast<SignalProxy_GetClear*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     (self->slot_clear_)();
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   delete self; // After this callback has been called, none of the 2 callbacks will be called again.
 
@@ -95,73 +100,30 @@ void SignalProxy_GetClear::gtk_callback_clear(GtkClipboard*, void* data)
   //because clear() is called when set() is called again.
 }
 
+} //anonymous namespace
 
-// SignalProxy_Received:
-// This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_Received
-{
-public:
-  typedef Gtk::Clipboard::SlotReceived SlotType;
-
-  SignalProxy_Received(const SlotType& slot);
-  ~SignalProxy_Received();
-
-  static void gtk_callback(GtkClipboard* clipboard, GtkSelectionData* selection_data, gpointer data);
 
-protected:
-  SlotType slot_;
-};
-
-SignalProxy_Received::SignalProxy_Received(const SlotType& slot)
-:
-  slot_ (slot)
-{}
-
-SignalProxy_Received::~SignalProxy_Received()
-{}
-
-void SignalProxy_Received::gtk_callback(GtkClipboard*, GtkSelectionData* selection_data, void* data)
+static void SignalProxy_Received_gtk_callback(GtkClipboard*, GtkSelectionData* selection_data, void* data)
 {
-  SignalProxy_Received *const self = static_cast<SignalProxy_Received*>(data);
+  Gtk::Clipboard::SlotReceived* the_slot = static_cast<Gtk::Clipboard::SlotReceived*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     Gtk::SelectionData cppSelectionData(selection_data, true /*take_copy=true*/);
-    (self->slot_)(cppSelectionData);
+    (*the_slot)(cppSelectionData);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
-  delete self;
+  delete the_slot;
 }
 
-
-// SignalProxy_TargetsReceived:
-// This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_TargetsReceived
-{
-public:
-  typedef Gtk::Clipboard::SlotTargetsReceived SlotType;
-
-  SignalProxy_TargetsReceived(const SlotType& slot);
-  ~SignalProxy_TargetsReceived();
-
-  static void gtk_callback(GtkClipboard* clipboard, GdkAtom* atoms, gint n_atoms, gpointer data);
-
-protected:
-  SlotType slot_;
-};
-
-SignalProxy_TargetsReceived::SignalProxy_TargetsReceived(const SlotType& slot)
-:
-  slot_ (slot)
-{}
-
-SignalProxy_TargetsReceived::~SignalProxy_TargetsReceived()
-{}
-
 //This is not public API:
 typedef std::list<Glib::ustring> listStrings;
 static listStrings util_convert_atoms_to_strings(GdkAtom* targets, int n_targets)
@@ -172,115 +134,102 @@ static listStrings util_convert_atoms_to_strings(GdkAtom* targets, int n_targets
   for(int i = 0; i < n_targets; i++)
   {
     //Convert the atom to a string:
-    Glib::ustring target = gdk_atom_name(targets[i]);
-    listTargets.push_back(target);
+    char* atom_name = gdk_atom_name(targets[i]);
+    if(atom_name)
+    {
+      listTargets.push_back( Glib::ustring(atom_name) );
+      g_free(atom_name);
+    }
   }
 
   return listTargets;
 }
 
-void SignalProxy_TargetsReceived::gtk_callback(GtkClipboard*, GdkAtom* atoms, gint n_atoms, gpointer data)
+static void SignalProxy_TargetsReceived_gtk_callback(GtkClipboard*, GdkAtom* atoms, gint n_atoms, gpointer data)
 {
-  SignalProxy_TargetsReceived *const self = static_cast<SignalProxy_TargetsReceived*>(data);
+  Gtk::Clipboard::SlotTargetsReceived* the_slot = static_cast<Gtk::Clipboard::SlotTargetsReceived*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     listStrings listTargets = util_convert_atoms_to_strings(atoms, n_atoms);
-    (self->slot_)(listTargets);
+    (*the_slot)(listTargets);
     //I guess that GTK+ does a g_free of the GdkAtoms* array itself, so we do not need to. murrayc.
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
-  delete self; // the callback is only used once
+  delete the_slot; // the callback is only used once
 }
 
 
-// SignalProxy_TextReceived:
-// This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_TextReceived
+static void SignalProxy_TextReceived_gtk_callback(GtkClipboard*, const char* text, void* data)
 {
-public:
-  typedef Gtk::Clipboard::SlotTextReceived SlotType;
-
-  SignalProxy_TextReceived(const SlotType& slot);
-  ~SignalProxy_TextReceived();
-
-  static void gtk_callback(GtkClipboard* clipboard, const char* text, void* data);
-
-protected:
-  SlotType slot_;
-};
-
-SignalProxy_TextReceived::SignalProxy_TextReceived(const SlotType& slot)
-:
-  slot_ (slot)
-{}
-
-SignalProxy_TextReceived::~SignalProxy_TextReceived()
-{}
-
-void SignalProxy_TextReceived::gtk_callback(GtkClipboard*, const char* text, void* data)
-{
-  SignalProxy_TextReceived *const self = static_cast<SignalProxy_TextReceived*>(data);
+  Gtk::Clipboard::SlotTextReceived* the_slot = static_cast<Gtk::Clipboard::SlotTextReceived*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    (self->slot_)((text) ? Glib::ustring(text) : Glib::ustring());
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    (*the_slot)((text) ? Glib::ustring(text) : Glib::ustring());
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
-  delete self; // the callback is only used once
+  delete the_slot; // the callback is only used once
 }
 
-
-// SignalProxy_ImageReceived:
-// This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_ImageReceived
+static void SignalProxy_RichTextReceived_gtk_callback(GtkClipboard*, GdkAtom format, const guint8* text, gsize             length, void* data)
 {
-public:
-  typedef Gtk::Clipboard::SlotImageReceived SlotType;
-
-  SignalProxy_ImageReceived(const SlotType& slot);
-  ~SignalProxy_ImageReceived();
-
-  static void gtk_callback(GtkClipboard* clipboard, GdkPixbuf* image, void* data);
-
-protected:
-  SlotType slot_;
-};
+  Gtk::Clipboard::SlotRichTextReceived* the_slot = static_cast<Gtk::Clipboard::SlotRichTextReceived*>(data);
 
-SignalProxy_ImageReceived::SignalProxy_ImageReceived(const SlotType& slot)
-:
-  slot_ (slot)
-{}
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  try
+  {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    gchar* format_atom_name = gdk_atom_name(format);
+    (*the_slot)( (format_atom_name ? Glib::ustring(format_atom_name) : Glib::ustring()), (text ? std::string((char*)text, length) : std::string()) );
+    g_free(format_atom_name);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  }
+  catch(...)
+  {
+    Glib::exception_handlers_invoke();
+  }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
-SignalProxy_ImageReceived::~SignalProxy_ImageReceived()
-{}
+  delete the_slot; // the callback is only used once
+}
 
-void SignalProxy_ImageReceived::gtk_callback(GtkClipboard*, GdkPixbuf* image, void* data)
+static void SignalProxy_ImageReceived_gtk_callback(GtkClipboard*, GdkPixbuf* image, void* data)
 {
-  SignalProxy_ImageReceived *const self = static_cast<SignalProxy_ImageReceived*>(data);
+  Gtk::Clipboard::SlotImageReceived* the_slot = static_cast<Gtk::Clipboard::SlotImageReceived*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    (self->slot_)(Glib::wrap(image, true /* take_ref */));
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    (*the_slot)(Glib::wrap(image, true /* take_ref */));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
-  delete self; // the callback is only used once
+  delete the_slot; // the callback is only used once
 }
 
-} // anonymous namespace
-
 
 namespace Gtk
 {
@@ -293,8 +242,8 @@ bool Clipboard::set(const ArrayHandle_TargetEntry& targets,
 
   return gtk_clipboard_set_with_data(
       gobj(), targets.data(), targets.size(),
-      &SignalProxy_GetClear::gtk_callback_get,
-      &SignalProxy_GetClear::gtk_callback_clear,
+      &SignalProxy_GetClear_gtk_callback_get,
+      &SignalProxy_GetClear_gtk_callback_clear,
       pSignalProxy);
 }
 
@@ -306,37 +255,46 @@ void Clipboard::set_text(const Glib::ustring& text)
 
 void Clipboard::request_contents(const Glib::ustring& target, const SlotReceived& slot)
 {
-  // Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
-  SignalProxy_Received *const pSignalProxy = new SignalProxy_Received(slot);
+  // Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
+  SlotReceived* slot_copy = new SlotReceived(slot);
 
   gtk_clipboard_request_contents(gobj(), gdk_atom_intern(target.c_str(), FALSE),
-      &SignalProxy_Received::gtk_callback, pSignalProxy);
+      &SignalProxy_Received_gtk_callback, slot_copy);
 }
 
 void Clipboard::request_text(const SlotTextReceived& slot)
 {
-  // Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
-  SignalProxy_TextReceived *const pSignalProxy = new SignalProxy_TextReceived(slot);
+  // Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
+  SlotTextReceived* slot_copy = new SlotTextReceived(slot);
 
   gtk_clipboard_request_text(gobj(),
-      &SignalProxy_TextReceived::gtk_callback, pSignalProxy);
+      &SignalProxy_TextReceived_gtk_callback, slot_copy);
+}
+
+void Clipboard::request_rich_text(const Glib::RefPtr<TextBuffer>& buffer, const SlotRichTextReceived& slot)
+{
+  // Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
+  SlotRichTextReceived* slot_copy = new SlotRichTextReceived(slot);
+
+  gtk_clipboard_request_rich_text(gobj(), buffer->gobj(), 
+      &SignalProxy_RichTextReceived_gtk_callback, slot_copy);
 }
 
 void Clipboard::request_image(const SlotImageReceived& slot)
 {
-  // Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
-  SignalProxy_ImageReceived *const pSignalProxy = new SignalProxy_ImageReceived(slot);
+  // Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
+  SlotImageReceived* slot_copy = new SlotImageReceived(slot);
 
   gtk_clipboard_request_image(gobj(),
-      &SignalProxy_ImageReceived::gtk_callback, pSignalProxy);
+      &SignalProxy_ImageReceived_gtk_callback, slot_copy);
 }
 
 void Clipboard::request_targets(const SlotTargetsReceived& slot)
 {
-  // Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
-  SignalProxy_TargetsReceived *const pSignalProxy = new SignalProxy_TargetsReceived(slot);
+  // Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
+  SlotTargetsReceived* slot_copy = new SlotTargetsReceived(slot);
 
-  gtk_clipboard_request_targets(gobj(), &SignalProxy_TargetsReceived::gtk_callback, pSignalProxy);
+  gtk_clipboard_request_targets(gobj(), &SignalProxy_TargetsReceived_gtk_callback, slot_copy);
 }
 
 SelectionData Clipboard::wait_for_contents(const Glib::ustring& target) const
@@ -382,12 +340,67 @@ void Clipboard::set_can_store()
 {
   gtk_clipboard_set_can_store( gobj(), 0, 0 /* See C docs */ );
 }
+
+std::string Clipboard::wait_for_rich_text(const Glib::RefPtr<TextBuffer>& buffer, std::string& format)
+{
+  std::string result;
+
+  GdkAtom format_atom = 0;
+  gsize length = 0;
+  guint8* text = gtk_clipboard_wait_for_rich_text(const_cast<GtkClipboard*>(gobj()), buffer->gobj(), &format_atom, &length);
+  if(text && length)
+  {
+    gchar* format_atom_name = gdk_atom_name(format_atom);
+    if(format_atom_name)
+      format = Glib::ScopedPtr<char>(format_atom_name).get(); //This frees the buffer.
+
+    result = std::string((char*)text, length);
+    g_free(text);
+  }
+
+  return result;
+}
+
     
 } //namespace Gtk
 
 
 namespace
 {
+
+
+static void Clipboard_signal_owner_change_callback(GtkClipboard* self, GdkEventOwnerChange* p0,void* data)
+{
+  using namespace Gtk;
+  typedef sigc::slot< void,GdkEventOwnerChange* > SlotType;
+
+  // Do not try to call a signal on a disassociated wrapper.
+  if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
+  {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    try
+    {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+      if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
+        (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    }
+    catch(...)
+    {
+      Glib::exception_handlers_invoke();
+    }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+  }
+}
+
+static const Glib::SignalProxyInfo Clipboard_signal_owner_change_info =
+{
+  "owner_change",
+  (GCallback) &Clipboard_signal_owner_change_callback,
+  (GCallback) &Clipboard_signal_owner_change_callback
+};
+
+
 } // anonymous namespace
 
 
@@ -434,8 +447,19 @@ void Clipboard_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Clipboard_Class::wrap_new(GObject* object)
 {
@@ -488,6 +512,7 @@ Glib::RefPtr<Clipboard> Clipboard::get(GdkAtom selection)
   return retvalue;
 }
 
+
 Glib::RefPtr<Clipboard> Clipboard::get_for_display(const Glib::RefPtr<Gdk::Display>& display, GdkAtom selection)
 {
 
@@ -498,54 +523,45 @@ Glib::RefPtr<Clipboard> Clipboard::get_for_display(const Glib::RefPtr<Gdk::Displ
   return retvalue;
 }
 
+
 Glib::RefPtr<Gdk::Display> Clipboard::get_display()
 {
 
   Glib::RefPtr<Gdk::Display> retvalue = Glib::wrap(gtk_clipboard_get_display(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Display> Clipboard::get_display() const
 {
-
-  Glib::RefPtr<const Gdk::Display> retvalue = Glib::wrap(gtk_clipboard_get_display(const_cast<GtkClipboard*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Clipboard*>(this)->get_display();
 }
 
 Glib::RefPtr<Glib::Object> Clipboard::get_owner()
 {
 
   Glib::RefPtr<Glib::Object> retvalue = Glib::wrap(gtk_clipboard_get_owner(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Glib::Object> Clipboard::get_owner() const
 {
-
-  Glib::RefPtr<const Glib::Object> retvalue = Glib::wrap(gtk_clipboard_get_owner(const_cast<GtkClipboard*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Clipboard*>(this)->get_owner();
 }
 
 void Clipboard::clear()
 {
-  gtk_clipboard_clear(gobj());
+gtk_clipboard_clear(gobj()); 
 }
 
 void Clipboard::set_image(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
 {
-  gtk_clipboard_set_image(gobj(), Glib::unwrap(pixbuf));
+gtk_clipboard_set_image(gobj(), Glib::unwrap(pixbuf)); 
 }
 
 Glib::ustring Clipboard::wait_for_text() const
@@ -563,6 +579,11 @@ bool Clipboard::wait_is_text_available() const
   return gtk_clipboard_wait_is_text_available(const_cast<GtkClipboard*>(gobj()));
 }
 
+bool Clipboard::wait_is_rich_text_available(const Glib::RefPtr<TextBuffer>& buffer) const
+{
+  return gtk_clipboard_wait_is_rich_text_available(const_cast<GtkClipboard*>(gobj()), Glib::unwrap(buffer));
+}
+
 bool Clipboard::wait_is_image_available() const
 {
   return gtk_clipboard_wait_is_image_available(const_cast<GtkClipboard*>(gobj()));
@@ -575,10 +596,23 @@ bool Clipboard::wait_is_target_available(const Glib::ustring& target)
 
 void Clipboard::store()
 {
-  gtk_clipboard_store(gobj());
+gtk_clipboard_store(gobj()); 
 }
 
 
+Glib::SignalProxy1< void,GdkEventOwnerChange* > Clipboard::signal_owner_change()
+{
+  return Glib::SignalProxy1< void,GdkEventOwnerChange* >(this, &Clipboard_signal_owner_change_info);
+}
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/clipboard.h b/libs/gtkmm2/gtk/gtkmm/clipboard.h
index 193eae10cc..401a1738b9 100644
--- a/libs/gtkmm2/gtk/gtkmm/clipboard.h
+++ b/libs/gtkmm2/gtk/gtkmm/clipboard.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CLIPBOARD_H
 #define _GTKMM_CLIPBOARD_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -45,6 +46,10 @@ namespace Gtk
 namespace Gtk
 {
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+class TextBuffer;
+#endif //DOXYGEN_SHOULD_SKIP_THIS
+
 /** The Clipboard object represents a clipboard of data shared between different processes or between 
  * different widgets in the same process. Each clipboard is identified by a name encoded as a GdkAtom. *
  * (Conversion to and from strings can be done with gdk_atom_intern() and gdk_atom_name().) The default 
@@ -145,7 +150,7 @@ public:
    * 
    * (Passing Gdk::NONE is the same as using <tt>gdk_atom_intern
    * ("CLIPBOARD", <tt>false</tt>)</tt>. See 
-   * http://www.freedesktop.org/standards/clipboards-spec/clipboards.txt
+   * http://www.freedesktop.org/Standards/clipboards-spec
    * for a detailed discussion of the "CLIPBOARD" vs. "PRIMARY"
    * selections under the X window system. On Win32 the
    * Gdk::SELECTION_PRIMARY clipboard is essentially ignored.)
@@ -166,7 +171,7 @@ public:
    * it is owned by GTK+, must not be freed or
    * unrefd.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   static Glib::RefPtr<Clipboard> get_for_display(const Glib::RefPtr<Gdk::Display>& display, GdkAtom selection = GDK_SELECTION_CLIPBOARD);
 
@@ -174,14 +179,14 @@ public:
   /** Gets the Gdk::Display associated with @a clipboard 
    * @return The Gdk::Display associated with @a clipboard 
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Gdk::Display> get_display();
   
   /** Gets the Gdk::Display associated with @a clipboard 
    * @return The Gdk::Display associated with @a clipboard 
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Gdk::Display> get_display() const;
 
@@ -255,7 +260,7 @@ public:
    * for the image, and for converting the image into the 
    * requested format.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param pixbuf A Gdk::Pixbuf.
    */
   void set_image(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
@@ -295,6 +300,24 @@ public:
    */
   void request_text(const SlotTextReceived& slot);
   
+
+  /// For instance: void on_rich_text_received(const Glib::ustring& format, const std::string& text);
+  typedef sigc::slot<void, const Glib::ustring& , const std::string&> SlotRichTextReceived;
+
+  /** Requests the contents of the clipboard as rich text. When the rich text is later received, 
+   * callback will be called.
+   *
+   * The text parameter to the callback will contain the resulting rich text if the request succeeded, or 
+   * an empty string if it failed. This function can fail for various reasons, in particular if the 
+   * clipboard was empty or if the contents of the clipboard could not be converted into rich text form.
+   *
+   *
+   * @param slot:  a function to call when the text is received,
+   *             or the retrieval fails. (It will always be called
+   *             one way or the other.)
+   */
+  void request_rich_text(const Glib::RefPtr<TextBuffer>& buffer, const SlotRichTextReceived& slot);
+  
   
   /// For instance: void on_image_received(const Glib::RefPtr<Gdk::Pixbuf>& text);
   typedef sigc::slot<void, const Glib::RefPtr<Gdk::Pixbuf>&> SlotImageReceived;
@@ -332,7 +355,7 @@ public:
    *             is an intermediate type, so you should convert it to a
    *             standard C++ container.
    *
-   * Since: 2.4
+   * @newin2p4
    */
   void request_targets(const SlotTargetsReceived& slot);
   
@@ -360,6 +383,9 @@ public:
    * clipboard could not be converted into text form.).
    */
   Glib::ustring wait_for_text() const;
+
+  std::string wait_for_rich_text(const Glib::RefPtr<TextBuffer>& buffer, std::string& format);
+  
   
   //Maybe the result should be const, but constness is not so clear-cut here. murrayc
   
@@ -374,7 +400,7 @@ public:
    * if the clipboard was empty or if the contents of 
    * the clipboard could not be converted into an image.)
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::RefPtr<Gdk::Pixbuf> wait_for_image() const;
   
@@ -392,6 +418,8 @@ public:
    */
   bool wait_is_text_available() const;
   
+  bool wait_is_rich_text_available(const Glib::RefPtr<TextBuffer>& buffer) const;
+  
   /** Test to see if there is an image available to be pasted
    * This is done by requesting the TARGETS atom and checking
    * if it contains any of the supported image targets. This function 
@@ -403,7 +431,7 @@ public:
    * the actual image data.
    * @return <tt>true</tt> is there is an image available, <tt>false</tt> otherwise.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool wait_is_image_available() const;  
   
@@ -416,7 +444,7 @@ public:
    * @param target A Gdk::Atom indicating which target to look for.
    * @return <tt>true</tt> if the target is available, <tt>false</tt> otherwise.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool wait_is_target_available(const Glib::ustring& target);
 
@@ -426,7 +454,7 @@ public:
    *
    * @result targets: The targets.
    *
-   * Since: 2.4
+   * @newin2p4
    */
   Glib::StringArrayHandle wait_for_targets() const;
   
@@ -453,20 +481,35 @@ public:
   /** Stores the current clipboard data somewhere so that it will stay
    * around after the application has quit.
    * 
-   * Since: 2.6
+   * @newin2p6
    */
   void store();
-           
 
+  //We use no_default_handler because this signal was added and we don't want to break the ABI by adding a virtual function.
+  
+/**
+   * @par Prototype:
+   * <tt>void %owner_change(GdkEventOwnerChange* event)</tt>
+   */
+
+  Glib::SignalProxy1< void,GdkEventOwnerChange* > signal_owner_change();
+
+           
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/colorbutton.cc b/libs/gtkmm2/gtk/gtkmm/colorbutton.cc
index 15b2f5ddd1..6696319b15 100644
--- a/libs/gtkmm2/gtk/gtkmm/colorbutton.cc
+++ b/libs/gtkmm2/gtk/gtkmm/colorbutton.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/colorbutton.h>
 #include <gtkmm/private/colorbutton_p.h>
 
@@ -45,13 +46,15 @@ Gdk::Color ColorButton::get_color() const
 namespace
 {
 
-const Glib::SignalProxyInfo ColorButton_signal_color_set_info =
+
+static const Glib::SignalProxyInfo ColorButton_signal_color_set_info =
 {
   "color-set",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -96,10 +99,18 @@ void ColorButton_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->color_set = &color_set_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void ColorButton_Class::color_set_callback(GtkColorButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -112,15 +123,19 @@ void ColorButton_Class::color_set_callback(GtkColorButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_color_set();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -133,6 +148,7 @@ void ColorButton_Class::color_set_callback(GtkColorButton* self)
       (*base->color_set)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* ColorButton_Class::wrap_new(GObject* o)
@@ -190,12 +206,12 @@ ColorButton::ColorButton(const Gdk::Color& color)
 
 void ColorButton::set_color(const Gdk::Color& color)
 {
-  gtk_color_button_set_color(gobj(), (color).gobj());
+gtk_color_button_set_color(gobj(), (color).gobj()); 
 }
 
 void ColorButton::set_alpha(guint16 alpha)
 {
-  gtk_color_button_set_alpha(gobj(), alpha);
+gtk_color_button_set_alpha(gobj(), alpha); 
 }
 
 guint16 ColorButton::get_alpha() const
@@ -205,7 +221,7 @@ guint16 ColorButton::get_alpha() const
 
 void ColorButton::set_use_alpha(bool use_alpha)
 {
-  gtk_color_button_set_use_alpha(gobj(), static_cast<int>(use_alpha));
+gtk_color_button_set_use_alpha(gobj(), static_cast<int>(use_alpha)); 
 }
 
 bool ColorButton::get_use_alpha() const
@@ -215,7 +231,7 @@ bool ColorButton::get_use_alpha() const
 
 void ColorButton::set_title(const Glib::ustring& title)
 {
-  gtk_color_button_set_title(gobj(), title.c_str());
+gtk_color_button_set_title(gobj(), title.c_str()); 
 }
 
 Glib::ustring ColorButton::get_title() const
@@ -230,47 +246,64 @@ Glib::SignalProxy0< void > ColorButton::signal_color_set()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ColorButton::property_use_alpha() 
 {
   return Glib::PropertyProxy<bool>(this, "use-alpha");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ColorButton::property_use_alpha() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "use-alpha");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> ColorButton::property_title() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> ColorButton::property_title() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gdk::Color> ColorButton::property_color() 
 {
   return Glib::PropertyProxy<Gdk::Color>(this, "color");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gdk::Color> ColorButton::property_color() const
 {
   return Glib::PropertyProxy_ReadOnly<Gdk::Color>(this, "color");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint16> ColorButton::property_alpha() 
 {
   return Glib::PropertyProxy<guint16>(this, "alpha");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint16> ColorButton::property_alpha() const
 {
   return Glib::PropertyProxy_ReadOnly<guint16>(this, "alpha");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::ColorButton::on_color_set()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -280,6 +313,10 @@ void Gtk::ColorButton::on_color_set()
   if(base && base->color_set)
     (*base->color_set)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/colorbutton.h b/libs/gtkmm2/gtk/gtkmm/colorbutton.h
index aea0bc1d16..214bad401a 100644
--- a/libs/gtkmm2/gtk/gtkmm/colorbutton.h
+++ b/libs/gtkmm2/gtk/gtkmm/colorbutton.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_COLORBUTTON_H
 #define _GTKMM_COLORBUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -93,12 +94,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_color_set();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -112,7 +119,7 @@ public:
    * open, allowing the user to select a color. The swatch will be updated to reflect the
    * new color when the user finishes.
    *
-   * Since: 2.4
+   * @newin2p4
    */
   ColorButton();
   
@@ -125,21 +132,21 @@ public:
    *
    * @param color A Gdk::Color to set the current color with.
    *
-   * Since: 2.4
+   * @newin2p4
    */
   explicit ColorButton(const Gdk::Color& color);
 
   
   /** Sets the current color to be @a color .
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param color A Gdk::Color to set the current color with.
    */
   void set_color(const Gdk::Color& color);
   
   /** Sets the current opacity to be @a alpha . 
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param alpha An integer between 0 and 65535.
    */
   void set_alpha(guint16 alpha);
@@ -150,7 +157,7 @@ public:
    *
    * @return A Gdk::Color representing the current internal color of the Gtk::ColorButton.
    *
-   * Since: 2.4
+   * @newin2p4
    */
   Gdk::Color get_color() const;
   
@@ -158,13 +165,13 @@ public:
   /** Returns the current alpha value.
    * @return An integer between 0 and 65535.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   guint16 get_alpha() const;
   
   /** Sets whether or not the color button should use the alpha channel.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param use_alpha <tt>true</tt> if color button should use alpha channel, <tt>false</tt> if not.
    */
   void set_use_alpha(bool use_alpha = true);
@@ -172,32 +179,35 @@ public:
   /** Does the color selection dialog use the alpha channel?
    * @return <tt>true</tt> if the color sample uses alpha channel, <tt>false</tt> if not.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_use_alpha() const;
   
   /** Sets the title for the color selection dialog.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param title String containing new window title.
    */
   void set_title(const Glib::ustring& title);
   
   /** Gets the title of the color selection dialog.
-   * @return An internal string, do not free the return value
    * 
-   * Since: 2.4.
+   * @newin2p4
+   * @return The title.
    */
   Glib::ustring get_title() const;
 
-  /** Whether or not to give the color an alpha value.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether or not to give the color an alpha value.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_use_alpha() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether or not to give the color an alpha value.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -205,15 +215,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_use_alpha() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The title of the color selection dialog.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The title of the color selection dialog.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_title() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The title of the color selection dialog.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -221,15 +235,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_title() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The selected color.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The selected color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gdk::Color> property_color() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The selected color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -237,15 +255,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gdk::Color> property_color() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The selected opacity value (0 fully transparent, 65535 fully opaque).
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The selected opacity value (0 fully transparent, 65535 fully opaque).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint16> property_alpha() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The selected opacity value (0 fully transparent, 65535 fully opaque).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -253,8 +275,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint16> property_alpha() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
+  /** The color_set signal is emitted when the user selects a color. When handling this signal,
+   * use get_color() and get_alpha() to find out which color 
+   * was just selected.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %color_set()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_color_set();
                     
 
@@ -272,6 +305,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ColorButton* wrap(GtkColorButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_COLORBUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/colorselection.cc b/libs/gtkmm2/gtk/gtkmm/colorselection.cc
index 54525905bf..489b929c18 100644
--- a/libs/gtkmm2/gtk/gtkmm/colorselection.cc
+++ b/libs/gtkmm2/gtk/gtkmm/colorselection.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/colorselection.h>
 #include <gtkmm/private/colorselection_p.h>
 
@@ -30,25 +31,29 @@
 namespace
 {
 
-Gtk::ColorSelection::SlotChangePaletteHook* global_change_palette_hook = 0;
+static Gtk::ColorSelection::SlotChangePaletteHook* global_change_palette_hook = 0;
 
-void global_change_palette_hook_callback(GdkScreen* screen, const GdkColor* colors, int n_colors)
+static void global_change_palette_hook_callback(GdkScreen* screen, const GdkColor* colors, int n_colors)
 {
   g_return_if_fail(global_change_palette_hook != 0);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     (*global_change_palette_hook)(
         Glib::wrap(screen, true),
         Gdk::ArrayHandle_Color(colors, n_colors, Glib::OWNERSHIP_NONE));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void old_change_palette_hook_callback(const Glib::RefPtr<Gdk::Screen>& screen,
+static void old_change_palette_hook_callback(const Glib::RefPtr<Gdk::Screen>& screen,
                                       const Gdk::ArrayHandle_Color&    colors,
                                       GtkColorSelectionChangePaletteWithScreenFunc func)
 {
@@ -116,12 +121,15 @@ ColorSelection::set_change_palette_hook(const ColorSelection::SlotChangePaletteH
 
   if(old_func)
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(old_func != &global_change_palette_hook_callback)
         old_slot = sigc::bind<-1>(sigc::ptr_fun(&old_change_palette_hook_callback), old_func);
       else if(global_change_palette_hook)
         old_slot = *global_change_palette_hook;
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
@@ -129,6 +137,7 @@ ColorSelection::set_change_palette_hook(const ColorSelection::SlotChangePaletteH
       delete new_slot;
       throw;
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   delete global_change_palette_hook;
@@ -143,13 +152,15 @@ ColorSelection::set_change_palette_hook(const ColorSelection::SlotChangePaletteH
 namespace
 {
 
-const Glib::SignalProxyInfo ColorSelection_signal_color_changed_info =
+
+static const Glib::SignalProxyInfo ColorSelection_signal_color_changed_info =
 {
   "color_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -194,10 +205,18 @@ void ColorSelection_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->color_changed = &color_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void ColorSelection_Class::color_changed_callback(GtkColorSelection* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -210,15 +229,19 @@ void ColorSelection_Class::color_changed_callback(GtkColorSelection* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_color_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -231,6 +254,7 @@ void ColorSelection_Class::color_changed_callback(GtkColorSelection* self)
       (*base->color_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* ColorSelection_Class::wrap_new(GObject* o)
@@ -286,7 +310,7 @@ bool ColorSelection::get_has_opacity_control() const
 
 void ColorSelection::set_has_opacity_control(bool has_opacity)
 {
-  gtk_color_selection_set_has_opacity_control(gobj(), static_cast<int>(has_opacity));
+gtk_color_selection_set_has_opacity_control(gobj(), static_cast<int>(has_opacity)); 
 }
 
 bool ColorSelection::get_has_palette() const
@@ -296,17 +320,17 @@ bool ColorSelection::get_has_palette() const
 
 void ColorSelection::set_has_palette(bool has_palette)
 {
-  gtk_color_selection_set_has_palette(gobj(), static_cast<int>(has_palette));
+gtk_color_selection_set_has_palette(gobj(), static_cast<int>(has_palette)); 
 }
 
 void ColorSelection::set_current_color(const Gdk::Color& color)
 {
-  gtk_color_selection_set_current_color(gobj(), (color).gobj());
+gtk_color_selection_set_current_color(gobj(), (color).gobj()); 
 }
 
 void ColorSelection::set_current_alpha(guint16 alpha)
 {
-  gtk_color_selection_set_current_alpha(gobj(), alpha);
+gtk_color_selection_set_current_alpha(gobj(), alpha); 
 }
 
 guint16 ColorSelection::get_current_alpha() const
@@ -316,12 +340,12 @@ guint16 ColorSelection::get_current_alpha() const
 
 void ColorSelection::set_previous_color(const Gdk::Color& color)
 {
-  gtk_color_selection_set_previous_color(gobj(), (color).gobj());
+gtk_color_selection_set_previous_color(gobj(), (color).gobj()); 
 }
 
 void ColorSelection::set_previous_alpha(guint16 alpha)
 {
-  gtk_color_selection_set_previous_alpha(gobj(), alpha);
+gtk_color_selection_set_previous_alpha(gobj(), alpha); 
 }
 
 guint16 ColorSelection::get_previous_alpha() const
@@ -341,47 +365,64 @@ Glib::SignalProxy0< void > ColorSelection::signal_color_changed()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ColorSelection::property_has_palette() 
 {
   return Glib::PropertyProxy<bool>(this, "has-palette");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ColorSelection::property_has_palette() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "has-palette");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ColorSelection::property_has_opacity_control() 
 {
   return Glib::PropertyProxy<bool>(this, "has-opacity-control");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ColorSelection::property_has_opacity_control() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "has-opacity-control");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gdk::Color> ColorSelection::property_current_color() 
 {
   return Glib::PropertyProxy<Gdk::Color>(this, "current-color");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gdk::Color> ColorSelection::property_current_color() const
 {
   return Glib::PropertyProxy_ReadOnly<Gdk::Color>(this, "current-color");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> ColorSelection::property_current_alpha() 
 {
   return Glib::PropertyProxy<guint>(this, "current-alpha");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> ColorSelection::property_current_alpha() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "current-alpha");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::ColorSelection::on_color_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -391,6 +432,10 @@ void Gtk::ColorSelection::on_color_changed()
   if(base && base->color_changed)
     (*base->color_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
@@ -437,8 +482,19 @@ void ColorSelectionDialog_Class::class_init_function(void* g_class, void* class_
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* ColorSelectionDialog_Class::wrap_new(GObject* o)
 {
@@ -492,7 +548,7 @@ ColorSelectionDialog::ColorSelectionDialog(const Glib::ustring& title)
 {
   }
 
-ColorSelection* ColorSelectionDialog::get_colorsel()
+ ColorSelection* ColorSelectionDialog::get_colorsel()
 {
   return Glib::wrap((GtkColorSelection*)(gobj()->colorsel));
 }
@@ -501,8 +557,8 @@ const ColorSelection* ColorSelectionDialog::get_colorsel() const
 {
   return Glib::wrap((GtkColorSelection*)(gobj()->colorsel));
 }
-
-Button* ColorSelectionDialog::get_ok_button()
+ 
+ Button* ColorSelectionDialog::get_ok_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->ok_button));
 }
@@ -511,8 +567,8 @@ const Button* ColorSelectionDialog::get_ok_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->ok_button));
 }
-
-Button* ColorSelectionDialog::get_cancel_button()
+ 
+ Button* ColorSelectionDialog::get_cancel_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->cancel_button));
 }
@@ -521,8 +577,8 @@ const Button* ColorSelectionDialog::get_cancel_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->cancel_button));
 }
-
-Button* ColorSelectionDialog::get_help_button()
+ 
+ Button* ColorSelectionDialog::get_help_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->help_button));
 }
@@ -531,6 +587,13 @@ const Button* ColorSelectionDialog::get_help_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->help_button));
 }
+ 
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/colorselection.h b/libs/gtkmm2/gtk/gtkmm/colorselection.h
index 0d77feb43e..718565383c 100644
--- a/libs/gtkmm2/gtk/gtkmm/colorselection.h
+++ b/libs/gtkmm2/gtk/gtkmm/colorselection.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_COLORSELECTION_H
 #define _GTKMM_COLORSELECTION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -104,12 +105,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_color_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -193,17 +200,25 @@ public:
   static SlotChangePaletteHook set_change_palette_hook(const SlotChangePaletteHook& slot);
 
   
+/**
+   * @par Prototype:
+   * <tt>void %color_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_color_changed();
 
 
-  /** Whether a palette should be used.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether a palette should be used.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_has_palette() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether a palette should be used.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -211,15 +226,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_has_palette() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the color selector should allow setting opacity.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the color selector should allow setting opacity.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_has_opacity_control() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the color selector should allow setting opacity.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -227,15 +246,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_has_opacity_control() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The current color.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The current color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gdk::Color> property_current_color() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The current color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -243,15 +266,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gdk::Color> property_current_color() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The current opacity value (0 fully transparent, 65535 fully opaque).
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The current opacity value (0 fully transparent, 65535 fully opaque).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_current_alpha() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The current opacity value (0 fully transparent, 65535 fully opaque).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -259,6 +286,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_current_alpha() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -310,11 +338,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -325,15 +359,15 @@ public:
   ColorSelectionDialog();
   explicit ColorSelectionDialog(const Glib::ustring& title);
 
-  ColorSelection* get_colorsel();
+   ColorSelection* get_colorsel();
   const ColorSelection* get_colorsel() const;
-  Button* get_ok_button();
+    Button* get_ok_button();
   const Button* get_ok_button() const;
-  Button* get_cancel_button();
+    Button* get_cancel_button();
   const Button* get_cancel_button() const;
-  Button* get_help_button();
+    Button* get_help_button();
   const Button* get_help_button() const;
-
+ 
 
 };
 
@@ -348,7 +382,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ColorSelection* wrap(GtkColorSelection* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::ColorSelectionDialog
@@ -357,6 +393,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ColorSelectionDialog* wrap(GtkColorSelectionDialog* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_COLORSELECTION_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/combo.cc b/libs/gtkmm2/gtk/gtkmm/combo.cc
index 453c7ec39e..c36c030ace 100644
--- a/libs/gtkmm2/gtk/gtkmm/combo.cc
+++ b/libs/gtkmm2/gtk/gtkmm/combo.cc
@@ -1,5 +1,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
+
 #include <gtkmm/combo.h>
 #include <gtkmm/private/combo_p.h>
 
@@ -136,7 +139,8 @@ Glib::ListHandle<Glib::ustring> Combo::get_popdown_strings() const
 namespace
 {
 
-void ComboDropDownItem_signal_scroll_horizontal_callback(GtkListItem* self, GtkScrollType p0,gfloat p1,void* data)
+
+static void ComboDropDownItem_signal_scroll_horizontal_callback(GtkListItem* self, GtkScrollType p0,gfloat p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,ScrollType,float > SlotType;
@@ -144,21 +148,25 @@ void ComboDropDownItem_signal_scroll_horizontal_callback(GtkListItem* self, GtkS
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(((ScrollType)(p0))
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo ComboDropDownItem_signal_scroll_horizontal_info =
+static const Glib::SignalProxyInfo ComboDropDownItem_signal_scroll_horizontal_info =
 {
   "scroll-horizontal",
   (GCallback) &ComboDropDownItem_signal_scroll_horizontal_callback,
@@ -166,7 +174,7 @@ const Glib::SignalProxyInfo ComboDropDownItem_signal_scroll_horizontal_info =
 };
 
 
-void ComboDropDownItem_signal_scroll_vertical_callback(GtkListItem* self, GtkScrollType p0,gfloat p1,void* data)
+static void ComboDropDownItem_signal_scroll_vertical_callback(GtkListItem* self, GtkScrollType p0,gfloat p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,ScrollType,float > SlotType;
@@ -174,21 +182,25 @@ void ComboDropDownItem_signal_scroll_vertical_callback(GtkListItem* self, GtkScr
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(((ScrollType)(p0))
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo ComboDropDownItem_signal_scroll_vertical_info =
+static const Glib::SignalProxyInfo ComboDropDownItem_signal_scroll_vertical_info =
 {
   "scroll-vertical",
   (GCallback) &ComboDropDownItem_signal_scroll_vertical_callback,
@@ -196,7 +208,7 @@ const Glib::SignalProxyInfo ComboDropDownItem_signal_scroll_vertical_info =
 };
 
 
-void ComboDropDown_signal_select_child_callback(GtkList* self, GtkWidget* p0,void* data)
+static void ComboDropDown_signal_select_child_callback(GtkList* self, GtkWidget* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Widget& > SlotType;
@@ -204,20 +216,24 @@ void ComboDropDown_signal_select_child_callback(GtkList* self, GtkWidget* p0,voi
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(*Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo ComboDropDown_signal_select_child_info =
+static const Glib::SignalProxyInfo ComboDropDown_signal_select_child_info =
 {
   "select_child",
   (GCallback) &ComboDropDown_signal_select_child_callback,
@@ -225,7 +241,7 @@ const Glib::SignalProxyInfo ComboDropDown_signal_select_child_info =
 };
 
 
-const Glib::SignalProxyInfo ComboDropDown_signal_selection_changed_info =
+static const Glib::SignalProxyInfo ComboDropDown_signal_selection_changed_info =
 {
   "selection_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -233,7 +249,7 @@ const Glib::SignalProxyInfo ComboDropDown_signal_selection_changed_info =
 };
 
 
-void ComboDropDown_signal_unselect_child_callback(GtkList* self, GtkWidget* p0,void* data)
+static void ComboDropDown_signal_unselect_child_callback(GtkList* self, GtkWidget* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Widget& > SlotType;
@@ -241,26 +257,31 @@ void ComboDropDown_signal_unselect_child_callback(GtkList* self, GtkWidget* p0,v
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(*Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo ComboDropDown_signal_unselect_child_info =
+static const Glib::SignalProxyInfo ComboDropDown_signal_unselect_child_info =
 {
   "unselect_child",
   (GCallback) &ComboDropDown_signal_unselect_child_callback,
   (GCallback) &ComboDropDown_signal_unselect_child_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -305,11 +326,19 @@ void ComboDropDownItem_Class::class_init_function(void* g_class, void* class_dat
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->scroll_horizontal = &scroll_horizontal_callback;
   klass->scroll_vertical = &scroll_vertical_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void ComboDropDownItem_Class::scroll_horizontal_callback(GtkListItem* self, GtkScrollType p0, gfloat p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -322,17 +351,21 @@ void ComboDropDownItem_Class::scroll_horizontal_callback(GtkListItem* self, GtkS
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_scroll_horizontal(((ScrollType)(p0))
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -345,7 +378,6 @@ void ComboDropDownItem_Class::scroll_horizontal_callback(GtkListItem* self, GtkS
       (*base->scroll_horizontal)(self, p0, p1);
   }
 }
-
 void ComboDropDownItem_Class::scroll_vertical_callback(GtkListItem* self, GtkScrollType p0, gfloat p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -358,17 +390,21 @@ void ComboDropDownItem_Class::scroll_vertical_callback(GtkListItem* self, GtkScr
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_scroll_vertical(((ScrollType)(p0))
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -381,6 +417,7 @@ void ComboDropDownItem_Class::scroll_vertical_callback(GtkListItem* self, GtkScr
       (*base->scroll_vertical)(self, p0, p1);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* ComboDropDownItem_Class::wrap_new(GObject* o)
@@ -435,12 +472,14 @@ Glib::SignalProxy2< void,ScrollType,float > ComboDropDownItem::signal_scroll_hor
   return Glib::SignalProxy2< void,ScrollType,float >(this, &ComboDropDownItem_signal_scroll_horizontal_info);
 }
 
+
 Glib::SignalProxy2< void,ScrollType,float > ComboDropDownItem::signal_scroll_vertical()
 {
   return Glib::SignalProxy2< void,ScrollType,float >(this, &ComboDropDownItem_signal_scroll_vertical_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::ComboDropDownItem::on_scroll_horizontal(ScrollType scroll_type, float position)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -450,7 +489,6 @@ void Gtk::ComboDropDownItem::on_scroll_horizontal(ScrollType scroll_type, float
   if(base && base->scroll_horizontal)
     (*base->scroll_horizontal)(gobj(),((GtkScrollType)(scroll_type)),position);
 }
-
 void Gtk::ComboDropDownItem::on_scroll_vertical(ScrollType scroll_type, float position)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -460,6 +498,10 @@ void Gtk::ComboDropDownItem::on_scroll_vertical(ScrollType scroll_type, float po
   if(base && base->scroll_vertical)
     (*base->scroll_vertical)(gobj(),((GtkScrollType)(scroll_type)),position);
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
@@ -506,12 +548,20 @@ void ComboDropDown_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->select_child = &select_child_callback;
   klass->selection_changed = &selection_changed_callback;
   klass->unselect_child = &unselect_child_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void ComboDropDown_Class::select_child_callback(GtkList* self, GtkWidget* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -524,16 +574,20 @@ void ComboDropDown_Class::select_child_callback(GtkList* self, GtkWidget* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_select_child(*Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -546,7 +600,6 @@ void ComboDropDown_Class::select_child_callback(GtkList* self, GtkWidget* p0)
       (*base->select_child)(self, p0);
   }
 }
-
 void ComboDropDown_Class::selection_changed_callback(GtkList* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -559,15 +612,19 @@ void ComboDropDown_Class::selection_changed_callback(GtkList* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_selection_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -580,7 +637,6 @@ void ComboDropDown_Class::selection_changed_callback(GtkList* self)
       (*base->selection_changed)(self);
   }
 }
-
 void ComboDropDown_Class::unselect_child_callback(GtkList* self, GtkWidget* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -593,16 +649,20 @@ void ComboDropDown_Class::unselect_child_callback(GtkList* self, GtkWidget* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_unselect_child(*Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -615,6 +675,7 @@ void ComboDropDown_Class::unselect_child_callback(GtkList* self, GtkWidget* p0)
       (*base->unselect_child)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* ComboDropDown_Class::wrap_new(GObject* o)
@@ -733,12 +794,12 @@ ComboDropDown::ComboDropDown()
 
 void ComboDropDown::scroll_horizontal(ScrollType scroll_type, float position)
 {
-  gtk_list_scroll_horizontal(gobj(), ((GtkScrollType)(scroll_type)), position);
+gtk_list_scroll_horizontal(gobj(), ((GtkScrollType)(scroll_type)), position); 
 }
 
 void ComboDropDown::scroll_vertical(ScrollType scroll_type, float position)
 {
-  gtk_list_scroll_vertical(gobj(), ((GtkScrollType)(scroll_type)), position);
+gtk_list_scroll_vertical(gobj(), ((GtkScrollType)(scroll_type)), position); 
 }
 
 
@@ -747,17 +808,20 @@ Glib::SignalProxy1< void,Widget& > ComboDropDown::signal_select_child()
   return Glib::SignalProxy1< void,Widget& >(this, &ComboDropDown_signal_select_child_info);
 }
 
+
 Glib::SignalProxy0< void > ComboDropDown::signal_selection_changed()
 {
   return Glib::SignalProxy0< void >(this, &ComboDropDown_signal_selection_changed_info);
 }
 
+
 Glib::SignalProxy1< void,Widget& > ComboDropDown::signal_unselect_child()
 {
   return Glib::SignalProxy1< void,Widget& >(this, &ComboDropDown_signal_unselect_child_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::ComboDropDown::on_select_child(Widget& item)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -767,7 +831,6 @@ void Gtk::ComboDropDown::on_select_child(Widget& item)
   if(base && base->select_child)
     (*base->select_child)(gobj(),(item).gobj());
 }
-
 void Gtk::ComboDropDown::on_selection_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -777,7 +840,6 @@ void Gtk::ComboDropDown::on_selection_changed()
   if(base && base->selection_changed)
     (*base->selection_changed)(gobj());
 }
-
 void Gtk::ComboDropDown::on_unselect_child(Widget& item)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -787,6 +849,10 @@ void Gtk::ComboDropDown::on_unselect_child(Widget& item)
   if(base && base->unselect_child)
     (*base->unselect_child)(gobj(),(item).gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
@@ -833,8 +899,19 @@ void Combo_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Combo_Class::wrap_new(GObject* o)
 {
@@ -883,40 +960,40 @@ Combo::Combo()
 
 void Combo::set_value_in_list(bool value, bool empty)
 {
-  gtk_combo_set_value_in_list(gobj(), static_cast<int>(value), static_cast<int>(empty));
+gtk_combo_set_value_in_list(gobj(), static_cast<int>(value), static_cast<int>(empty)); 
 }
 
 void Combo::set_use_arrows(bool arrows_on)
 {
-  gtk_combo_set_use_arrows(gobj(), static_cast<int>(arrows_on));
+gtk_combo_set_use_arrows(gobj(), static_cast<int>(arrows_on)); 
 }
 
 void Combo::set_use_arrows_always(bool arrows_always)
 {
-  gtk_combo_set_use_arrows_always(gobj(), static_cast<int>(arrows_always));
+gtk_combo_set_use_arrows_always(gobj(), static_cast<int>(arrows_always)); 
 }
 
 void Combo::set_case_sensitive(bool val)
 {
-  gtk_combo_set_case_sensitive(gobj(), static_cast<int>(val));
+gtk_combo_set_case_sensitive(gobj(), static_cast<int>(val)); 
 }
 
 void Combo::set_item_string(Gtk::Item& item, const Glib::ustring& item_value)
 {
-  gtk_combo_set_item_string(gobj(), (item).gobj(), item_value.c_str());
+gtk_combo_set_item_string(gobj(), (item).gobj(), item_value.c_str()); 
 }
 
 void Combo::set_popdown_strings(const Glib::ListHandle<Glib::ustring>& strings)
 {
-  gtk_combo_set_popdown_strings(gobj(), strings.data());
+gtk_combo_set_popdown_strings(gobj(), strings.data()); 
 }
 
 void Combo::disable_activate()
 {
-  gtk_combo_disable_activate(gobj());
+gtk_combo_disable_activate(gobj()); 
 }
 
-Entry* Combo::get_entry()
+ Entry* Combo::get_entry()
 {
   return Glib::wrap((GtkEntry*)(gobj()->entry));
 }
@@ -925,8 +1002,8 @@ const Entry* Combo::get_entry() const
 {
   return Glib::wrap((GtkEntry*)(gobj()->entry));
 }
-
-ComboDropDown* Combo::get_list()
+ 
+ ComboDropDown* Combo::get_list()
 {
   return Glib::wrap((GtkList*)(gobj()->list));
 }
@@ -935,59 +1012,88 @@ const ComboDropDown* Combo::get_list() const
 {
   return Glib::wrap((GtkList*)(gobj()->list));
 }
+ 
 
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Combo::property_enable_arrow_keys() 
 {
   return Glib::PropertyProxy<bool>(this, "enable-arrow-keys");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Combo::property_enable_arrow_keys() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "enable-arrow-keys");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Combo::property_enable_arrows_always() 
 {
   return Glib::PropertyProxy<bool>(this, "enable-arrows-always");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Combo::property_enable_arrows_always() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "enable-arrows-always");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Combo::property_case_sensitive() 
 {
   return Glib::PropertyProxy<bool>(this, "case-sensitive");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Combo::property_case_sensitive() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "case-sensitive");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Combo::property_allow_empty() 
 {
   return Glib::PropertyProxy<bool>(this, "allow-empty");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Combo::property_allow_empty() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "allow-empty");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Combo::property_value_in_list() 
 {
   return Glib::PropertyProxy<bool>(this, "value-in-list");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Combo::property_value_in_list() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "value-in-list");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
 
diff --git a/libs/gtkmm2/gtk/gtkmm/combo.h b/libs/gtkmm2/gtk/gtkmm/combo.h
index d0c973204d..efbb772495 100644
--- a/libs/gtkmm2/gtk/gtkmm/combo.h
+++ b/libs/gtkmm2/gtk/gtkmm/combo.h
@@ -3,6 +3,9 @@
 #ifndef _GTKMM_COMBO_H
 #define _GTKMM_COMBO_H
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -112,13 +115,19 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_scroll_horizontal(ScrollType scroll_type, float position);
   virtual void on_scroll_vertical(ScrollType scroll_type, float position);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -128,9 +137,19 @@ public:
   ComboDropDownItem();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %scroll_horizontal(ScrollType scroll_type, float position)</tt>
+   */
+
   Glib::SignalProxy2< void,ScrollType,float > signal_scroll_horizontal();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %scroll_vertical(ScrollType scroll_type, float position)</tt>
+   */
+
   Glib::SignalProxy2< void,ScrollType,float > signal_scroll_vertical();
 
 
@@ -249,14 +268,20 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_select_child(Widget& item);
   virtual void on_selection_changed();
   virtual void on_unselect_child(Widget& item);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -279,12 +304,27 @@ public:
   const ComboDropDownList& children() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %select_child(Widget& item)</tt>
+   */
+
   Glib::SignalProxy1< void,Widget& > signal_select_child();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %selection_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_selection_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %unselect_child(Widget& item)</tt>
+   */
+
   Glib::SignalProxy1< void,Widget& > signal_unselect_child();
 
 
@@ -354,20 +394,26 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
 
+  
 public:
 
   Combo();
   
-
   /** Allow direct text entry
    * Whether the text in the entry must be or not be in the list.
    *
@@ -422,19 +468,22 @@ public:
   
   void disable_activate();
 
-  Entry* get_entry();
+   Entry* get_entry();
   const Entry* get_entry() const;
-  ComboDropDown* get_list();
+    ComboDropDown* get_list();
   const ComboDropDown* get_list() const;
-
-  /** Whether the arrow keys move through the list of items.
+ 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the arrow keys move through the list of items.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_enable_arrow_keys() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the arrow keys move through the list of items.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -442,15 +491,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_enable_arrow_keys() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Obsolete property
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Obsolete property
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_enable_arrows_always() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Obsolete property
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -458,15 +511,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_enable_arrows_always() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether list item matching is case sensitive.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether list item matching is case sensitive.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_case_sensitive() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether list item matching is case sensitive.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -474,15 +531,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_case_sensitive() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether an empty value may be entered in this field.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether an empty value may be entered in this field.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_allow_empty() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether an empty value may be entered in this field.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -490,15 +551,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_allow_empty() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether entered values must already be present in the list.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether entered values must already be present in the list.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_value_in_list() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether entered values must already be present in the list.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -506,6 +571,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_value_in_list() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -522,7 +588,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ComboDropDownItem* wrap(GtkListItem* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::ComboDropDown
@@ -531,7 +599,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ComboDropDown* wrap(GtkList* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::Combo
@@ -540,6 +610,11 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Combo* wrap(GtkCombo* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
 #endif /* _GTKMM_COMBO_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/combobox.cc b/libs/gtkmm2/gtk/gtkmm/combobox.cc
index d16c27d274..b56d24e2ba 100644
--- a/libs/gtkmm2/gtk/gtkmm/combobox.cc
+++ b/libs/gtkmm2/gtk/gtkmm/combobox.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/combobox.h>
 #include <gtkmm/private/combobox_p.h>
 
@@ -24,7 +25,7 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
- 
+
 #include <gtkmm/liststore.h>
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/treeview_private.h> //For SignalProxy_RowSeparator.
@@ -74,13 +75,13 @@ TreeModel::const_iterator ComboBox::get_active() const
 
 void ComboBox::set_row_separator_func(const SlotRowSeparator& slot)
 {
-  //Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
-  //It will be deleted when SignalProxy_RowSeparator::gtk_callback_destroy() is called.
-  TreeView_Private::SignalProxy_RowSeparator *const pSignalProxy = new TreeView_Private::SignalProxy_RowSeparator(slot);
+  //Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
+  //It will be deleted when SignalProxy_RowSeparator_gtk_callback_destroy() is called.
+  SlotRowSeparator* slot_copy = new SlotRowSeparator(slot);
 
   gtk_combo_box_set_row_separator_func(gobj(),
-      &TreeView_Private::SignalProxy_RowSeparator::gtk_callback, pSignalProxy,
-      &TreeView_Private::SignalProxy_RowSeparator::gtk_callback_destroy);
+      &TreeView_Private::SignalProxy_RowSeparator_gtk_callback, slot_copy,
+      &TreeView_Private::SignalProxy_RowSeparator_gtk_callback_destroy);
 }
 
 void ComboBox::unset_row_separator_func()
@@ -94,13 +95,15 @@ void ComboBox::unset_row_separator_func()
 namespace
 {
 
-const Glib::SignalProxyInfo ComboBox_signal_changed_info =
+
+static const Glib::SignalProxyInfo ComboBox_signal_changed_info =
 {
   "changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -146,10 +149,18 @@ void ComboBox_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->changed = &changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void ComboBox_Class::changed_callback(GtkComboBox* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -162,15 +173,19 @@ void ComboBox_Class::changed_callback(GtkComboBox* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -183,6 +198,7 @@ void ComboBox_Class::changed_callback(GtkComboBox* self)
       (*base->changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* ComboBox_Class::wrap_new(GObject* o)
@@ -240,7 +256,7 @@ ComboBox::ComboBox(const Glib::RefPtr<TreeModel>& model)
 
 void ComboBox::set_wrap_width(int width)
 {
-  gtk_combo_box_set_wrap_width(gobj(), width);
+gtk_combo_box_set_wrap_width(gobj(), width); 
 }
 
 int ComboBox::get_wrap_width() const
@@ -250,7 +266,7 @@ int ComboBox::get_wrap_width() const
 
 void ComboBox::set_row_span_column(int row_span)
 {
-  gtk_combo_box_set_row_span_column(gobj(), row_span);
+gtk_combo_box_set_row_span_column(gobj(), row_span); 
 }
 
 int ComboBox::get_row_span_column() const
@@ -260,7 +276,7 @@ int ComboBox::get_row_span_column() const
 
 void ComboBox::set_column_span_column(int column_span)
 {
-  gtk_combo_box_set_column_span_column(gobj(), column_span);
+gtk_combo_box_set_column_span_column(gobj(), column_span); 
 }
 
 int ComboBox::get_column_span_column() const
@@ -275,7 +291,17 @@ bool ComboBox::get_add_tearoffs() const
 
 void ComboBox::set_add_tearoffs(bool add_tearoffs)
 {
-  gtk_combo_box_set_add_tearoffs(gobj(), static_cast<int>(add_tearoffs));
+gtk_combo_box_set_add_tearoffs(gobj(), static_cast<int>(add_tearoffs)); 
+}
+
+Glib::ustring ComboBox::get_title() const
+{
+  return Glib::convert_const_gchar_ptr_to_ustring(gtk_combo_box_get_title(const_cast<GtkComboBox*>(gobj())));
+}
+
+void ComboBox::set_title(const Glib::ustring& title)
+{
+gtk_combo_box_set_title(gobj(), title.c_str()); 
 }
 
 bool ComboBox::get_focus_on_click() const
@@ -285,7 +311,7 @@ bool ComboBox::get_focus_on_click() const
 
 void ComboBox::set_focus_on_click(bool focus_on_click)
 {
-  gtk_combo_box_set_focus_on_click(gobj(), static_cast<int>(focus_on_click));
+gtk_combo_box_set_focus_on_click(gobj(), static_cast<int>(focus_on_click)); 
 }
 
 int ComboBox::get_active_row_number() const
@@ -295,147 +321,196 @@ int ComboBox::get_active_row_number() const
 
 void ComboBox::set_active(int index)
 {
-  gtk_combo_box_set_active(gobj(), index);
+gtk_combo_box_set_active(gobj(), index); 
 }
 
 void ComboBox::set_active(const TreeModel::iterator& iter)
 {
-  gtk_combo_box_set_active_iter(gobj(), const_cast<GtkTreeIter*>((iter).gobj()));
+gtk_combo_box_set_active_iter(gobj(), const_cast<GtkTreeIter*>((iter).gobj())); 
 }
 
 Glib::RefPtr<TreeModel> ComboBox::get_model()
 {
 
   Glib::RefPtr<TreeModel> retvalue = Glib::wrap(gtk_combo_box_get_model(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TreeModel> ComboBox::get_model() const
 {
-
-  Glib::RefPtr<const TreeModel> retvalue = Glib::wrap(gtk_combo_box_get_model(const_cast<GtkComboBox*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<ComboBox*>(this)->get_model();
 }
 
 void ComboBox::set_model(const Glib::RefPtr<TreeModel>& model)
 {
-  gtk_combo_box_set_model(gobj(), Glib::unwrap(model));
+gtk_combo_box_set_model(gobj(), Glib::unwrap(model)); 
 }
 
 void ComboBox::popup()
 {
-  gtk_combo_box_popup(gobj());
+gtk_combo_box_popup(gobj()); 
 }
 
 void ComboBox::popdown()
 {
-  gtk_combo_box_popdown(gobj());
+gtk_combo_box_popdown(gobj()); 
 }
 
+#ifdef GTKMM_ATKMM_ENABLED
 Glib::RefPtr<Atk::Object> ComboBox::get_popup_accessible()
 {
   return Glib::wrap(gtk_combo_box_get_popup_accessible(gobj()));
 }
 
+
+#endif // GTKMM_ATKMM_ENABLED
+#ifdef GTKMM_ATKMM_ENABLED
 Glib::RefPtr<const Atk::Object> ComboBox::get_popup_accessible() const
 {
-  return Glib::wrap(gtk_combo_box_get_popup_accessible(const_cast<GtkComboBox*>(gobj())));
+  return const_cast<ComboBox*>(this)->get_popup_accessible();
 }
 
 
+#endif // GTKMM_ATKMM_ENABLED
+
+
 Glib::SignalProxy0< void > ComboBox::signal_changed()
 {
   return Glib::SignalProxy0< void >(this, &ComboBox_signal_changed_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<TreeModel> > ComboBox::property_model() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<TreeModel> >(this, "model");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TreeModel> > ComboBox::property_model() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TreeModel> >(this, "model");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> ComboBox::property_wrap_width() 
 {
   return Glib::PropertyProxy<int>(this, "wrap-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> ComboBox::property_wrap_width() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "wrap-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> ComboBox::property_row_span_column() 
 {
   return Glib::PropertyProxy<int>(this, "row-span-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> ComboBox::property_row_span_column() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "row-span-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> ComboBox::property_column_span_column() 
 {
   return Glib::PropertyProxy<int>(this, "column-span-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> ComboBox::property_column_span_column() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "column-span-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> ComboBox::property_active() 
 {
   return Glib::PropertyProxy<int>(this, "active");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> ComboBox::property_active() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "active");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ComboBox::property_add_tearoffs() 
 {
   return Glib::PropertyProxy<bool>(this, "add-tearoffs");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ComboBox::property_add_tearoffs() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "add-tearoffs");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ComboBox::property_has_frame() 
 {
   return Glib::PropertyProxy<bool>(this, "has-frame");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ComboBox::property_has_frame() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "has-frame");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ComboBox::property_focus_on_click() 
 {
   return Glib::PropertyProxy<bool>(this, "focus-on-click");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ComboBox::property_focus_on_click() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "focus-on-click");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<Glib::ustring> ComboBox::property_tearoff_title() 
+{
+  return Glib::PropertyProxy<Glib::ustring>(this, "tearoff-title");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<Glib::ustring> ComboBox::property_tearoff_title() const
+{
+  return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "tearoff-title");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::ComboBox::on_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -445,6 +520,10 @@ void Gtk::ComboBox::on_changed()
   if(base && base->changed)
     (*base->changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/combobox.h b/libs/gtkmm2/gtk/gtkmm/combobox.h
index c143e59bc2..2201940cec 100644
--- a/libs/gtkmm2/gtk/gtkmm/combobox.h
+++ b/libs/gtkmm2/gtk/gtkmm/combobox.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_COMBOBOX_H
 #define _GTKMM_COMBOBOX_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -65,6 +66,7 @@ namespace Gtk
 class ComboBox
 : public Bin,
   public CellLayout
+//TODO: Since GTK+ 2.6, this should now inherit also from CellEditable, but we can't add this base without breaking ABI.
 {
   public:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -107,12 +109,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -131,7 +139,7 @@ public:
    * the preferred number of columns when you want the popup to be layed out
    * in a table.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param width Preferred number of columns.
    */
   void set_wrap_width(int width);
@@ -141,7 +149,7 @@ public:
    * 1, the combo box is in table mode.
    * @return The wrap width.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   int get_wrap_width() const;
 
@@ -150,7 +158,7 @@ public:
    * The row span column contains integers which indicate how many rows
    * an item should span.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param row_span A column in the model passed during construction.
    */
   void set_row_span_column(int row_span);
@@ -158,7 +166,7 @@ public:
   /** Returns the column with row span information for @a combo_box .
    * @return The row span column.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   int get_row_span_column() const;
 
@@ -167,7 +175,7 @@ public:
    *  @a column_span . The column span column contains integers which indicate
    * how many columns an item should span.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param column_span A column in the model passed during construction.
    */
   void set_column_span_column(int column_span);
@@ -175,7 +183,7 @@ public:
   /** Returns the column with column span information for @a combo_box .
    * @return The column span column.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   int get_column_span_column() const;
 
@@ -188,18 +196,23 @@ public:
   /** Sets whether the popup menu should have a tearoff 
    * menu item.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param add_tearoffs <tt>true</tt> to add tearoff menu items.
    */
   void set_add_tearoffs(bool add_tearoffs = true);
 
   
+  Glib::ustring get_title() const;
+  
+  void set_title(const Glib::ustring& title);
+
+  
   /** Returns whether the combo box grabs focus when it is clicked 
    * with the mouse. See set_focus_on_click().
    * @return <tt>true</tt> if the combo box grabs focus when it is 
    * clicked with the mouse.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool get_focus_on_click() const;
   
@@ -208,7 +221,7 @@ public:
    * like toolbars where you don't want the keyboard focus removed from 
    * the main area of the application.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param focus_on_click Whether the combo box grabs focus when clicked 
    * with the mouse.
    */
@@ -224,7 +237,7 @@ public:
    * @return An integer which is the index of the currently active item, or
    * -1 if there's no active item.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   int get_active_row_number() const;
 
@@ -241,7 +254,7 @@ public:
     
   /** Sets the active item of @a combo_box  to be the item at @a index .
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param index An index in the model passed during construction, or -1 to have
    * no active item.
    */
@@ -250,7 +263,7 @@ public:
   /** Sets the current active item to be the one referenced by @a iter . 
    *  @a iter  must correspond to a path of depth one.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param iter The Gtk::TreeIter.
    */
   void set_active(const TreeModel::iterator& iter);
@@ -263,14 +276,14 @@ public:
   /** Returns the Gtk::TreeModel which is acting as data source for @a combo_box .
    * @return A Gtk::TreeModel which was passed during construction.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<TreeModel> get_model();
   
   /** Returns the Gtk::TreeModel which is acting as data source for @a combo_box .
    * @return A Gtk::TreeModel which was passed during construction.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<const TreeModel> get_model() const;
   
@@ -281,7 +294,7 @@ public:
    * call gtk_combo_box_cell_layout_clear() yourself if you need to set up 
    * different cell renderers for the new model.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param model A Gtk::TreeModel.
    */
   void set_model(const Glib::RefPtr<TreeModel>& model);
@@ -305,7 +318,7 @@ public:
    * This function is mostly intended for use by accessibility technologies;
    * applications should have little use for it.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void popup();
   
@@ -314,10 +327,10 @@ public:
    * This function is mostly intended for use by accessibility technologies;
    * applications should have little use for it.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void popdown();
-    
+
   
   /** Gets the accessible object corresponding to the combo box's popup.
    * 
@@ -325,9 +338,13 @@ public:
    * applications should have little use for it.
    * @return The accessible object corresponding to the combo box's popup.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
+
+#ifdef  GTKMM_ATKMM_ENABLED
   Glib::RefPtr<Atk::Object> get_popup_accessible();
+#endif //  GTKMM_ATKMM_ENABLED
+
   
   /** Gets the accessible object corresponding to the combo box's popup.
    * 
@@ -335,20 +352,27 @@ public:
    * applications should have little use for it.
    * @return The accessible object corresponding to the combo box's popup.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
+
+#ifdef  GTKMM_ATKMM_ENABLED
   Glib::RefPtr<const Atk::Object> get_popup_accessible() const;
+#endif //  GTKMM_ATKMM_ENABLED
+
 
    //These are in ComboBoxText.
 
-  /** The model for the combo box.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The model for the combo box.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<TreeModel> > property_model() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The model for the combo box.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -356,31 +380,39 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TreeModel> > property_model() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Wrap width for layouting the items in a grid.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Wrap width for laying out the items in a grid.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_wrap_width() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Wrap width for layouting the items in a grid.
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Wrap width for laying out the items in a grid.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_wrap_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** TreeModel column containing the row span values.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** TreeModel column containing the row span values.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_row_span_column() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** TreeModel column containing the row span values.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -388,15 +420,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_row_span_column() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** TreeModel column containing the column span values.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** TreeModel column containing the column span values.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_column_span_column() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** TreeModel column containing the column span values.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -404,15 +440,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_column_span_column() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The item which is currently active.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The item which is currently active.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_active() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The item which is currently active.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -420,15 +460,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_active() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether dropdowns should have a tearoff menu item.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether dropdowns should have a tearoff menu item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_add_tearoffs() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether dropdowns should have a tearoff menu item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -436,15 +480,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_add_tearoffs() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the combo box draws a frame around the child.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the combo box draws a frame around the child.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_has_frame() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the combo box draws a frame around the child.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -452,15 +500,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_has_frame() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the combo box grabs focus when it is clicked with the mouse.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the combo box grabs focus when it is clicked with the mouse.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_focus_on_click() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the combo box grabs focus when it is clicked with the mouse.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -468,7 +520,39 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_focus_on_click() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A title that may be displayed by the window manager when the popup is torn-off.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<Glib::ustring> property_tearoff_title() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** A title that may be displayed by the window manager when the popup is torn-off.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_tearoff_title() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+
+  /** The changed signal gets emitted when the active
+   * item is changed. This can be due to the user selecting
+   * a different item from the list, or due to a 
+   * call to set_active_iter().
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %changed()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_changed();
                                              
@@ -487,6 +571,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ComboBox* wrap(GtkComboBox* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_COMBOBOX_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/comboboxentry.cc b/libs/gtkmm2/gtk/gtkmm/comboboxentry.cc
index 90a0bf6b39..0b850de778 100644
--- a/libs/gtkmm2/gtk/gtkmm/comboboxentry.cc
+++ b/libs/gtkmm2/gtk/gtkmm/comboboxentry.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/comboboxentry.h>
 #include <gtkmm/private/comboboxentry_p.h>
 
@@ -92,8 +93,19 @@ void ComboBoxEntry_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* ComboBoxEntry_Class::wrap_new(GObject* o)
 {
@@ -157,12 +169,12 @@ ComboBoxEntry::ComboBoxEntry(const Glib::RefPtr<TreeModel>& model, int text_colu
 
 void ComboBoxEntry::set_text_column(const TreeModelColumnBase& text_column) const
 {
-  gtk_combo_box_entry_set_text_column(const_cast<GtkComboBoxEntry*>(gobj()), (text_column).index());
+gtk_combo_box_entry_set_text_column(const_cast<GtkComboBoxEntry*>(gobj()), (text_column).index()); 
 }
 
 void ComboBoxEntry::set_text_column(int text_column) const
 {
-  gtk_combo_box_entry_set_text_column(const_cast<GtkComboBoxEntry*>(gobj()), text_column);
+gtk_combo_box_entry_set_text_column(const_cast<GtkComboBoxEntry*>(gobj()), text_column); 
 }
 
 int ComboBoxEntry::get_text_column() const
@@ -171,6 +183,13 @@ int ComboBoxEntry::get_text_column() const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/comboboxentry.h b/libs/gtkmm2/gtk/gtkmm/comboboxentry.h
index dce4c67019..72d8d8ec73 100644
--- a/libs/gtkmm2/gtk/gtkmm/comboboxentry.h
+++ b/libs/gtkmm2/gtk/gtkmm/comboboxentry.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_COMBOBOXENTRY_H
 #define _GTKMM_COMBOBOXENTRY_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -98,11 +99,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -133,7 +140,7 @@ public:
   /** Sets the model column which @a entry_box  should use to get strings from
    * to be @a text_column .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    * @param text_column A column in @a model  to get the strings from.
    */
   void set_text_column(const TreeModelColumnBase& text_column) const;   
@@ -141,7 +148,7 @@ public:
   /** Sets the model column which @a entry_box  should use to get strings from
    * to be @a text_column .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    * @param text_column A column in @a model  to get the strings from.
    */
   void set_text_column(int text_column) const; 
@@ -149,17 +156,17 @@ public:
   /** Returns the column which @a entry_box  is using to get the strings from.
    * @return A column in the data source model of @a entry_box .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   int get_text_column() const; 
 
   //The child is always an entry:
 
-  /** See Bin::get_entry().
+  /** @see Bin::get_child().
    */
   Entry* get_entry();
 
-  /** See Bin::get_entry().
+  /** @see Bin::get_child().
    */
   const Entry* get_entry() const;                                      
 
@@ -178,6 +185,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ComboBoxEntry* wrap(GtkComboBoxEntry* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_COMBOBOXENTRY_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/comboboxentrytext.cc b/libs/gtkmm2/gtk/gtkmm/comboboxentrytext.cc
index d74c01ae72..b4eda9cb3c 100644
--- a/libs/gtkmm2/gtk/gtkmm/comboboxentrytext.cc
+++ b/libs/gtkmm2/gtk/gtkmm/comboboxentrytext.cc
@@ -81,16 +81,44 @@ void ComboBoxEntryText::prepend_text(const Glib::ustring& text)
   }
 }
 
+//deprecated.
 void ComboBoxEntryText::clear()
 {
+  clear_items();
+}
+
+void ComboBoxEntryText::clear_items()
+{
   //Ideally, we would just store the ListStore as a member variable, but we forgot to do that and not it would break the ABI.
   Glib::RefPtr<Gtk::TreeModel> model = get_model();
   Glib::RefPtr<Gtk::ListStore> list_model = Glib::RefPtr<ListStore>::cast_dynamic(model);
-  
+
   if(list_model)  
     list_model->clear();
 }
 
+void ComboBoxEntryText::remove_text(const Glib::ustring& text)
+{
+  //Ideally, we would just store the ListStore as a member variable, but we forgot to do that and not it would break the ABI.
+  Glib::RefPtr<Gtk::TreeModel> model = get_model();
+  Glib::RefPtr<Gtk::ListStore> list_model = Glib::RefPtr<ListStore>::cast_dynamic(model);
+
+  //Look for the row with this text, and remove it:
+  if(list_model)
+  {
+    for(Gtk::TreeModel::iterator iter = list_model->children().begin(); iter != list_model->children().end(); ++iter)
+    {
+      const Glib::ustring& this_text = (*iter)[m_text_columns.m_column];
+
+      if(this_text == text)
+      {
+        list_model->erase(iter);
+        return; //success
+      }
+    }
+  }
+}
+
 Glib::ustring ComboBoxEntryText::get_active_text() const
 {
   Glib::ustring result;
diff --git a/libs/gtkmm2/gtk/gtkmm/comboboxentrytext.h b/libs/gtkmm2/gtk/gtkmm/comboboxentrytext.h
index fe9e6bbdf8..2ca020a3c6 100644
--- a/libs/gtkmm2/gtk/gtkmm/comboboxentrytext.h
+++ b/libs/gtkmm2/gtk/gtkmm/comboboxentrytext.h
@@ -53,18 +53,39 @@ protected:
 
 public:
   ComboBoxEntryText();
-  
+
+  /** Add an item to the end of the drop-down list.
+   * @param text The text for the item.
+   */
   void append_text(const Glib::ustring& text);
-  
+
   void insert_text(int position, const Glib::ustring& text);
-  
+
+  /** Add an item to the beginning of the drop-down list.
+   * @param text The text for the item.
+   */
   void prepend_text(const Glib::ustring& text);
 
+  //@deprecated Use get_entry()->get_text() to get the actual entered text.
   Glib::ustring get_active_text() const;
+
+  //@deprecated Use get_entry()->set_text() to set the actual entered text.
   void set_active_text(const Glib::ustring& text);
 
+  //There is a clear() method in the CellLayout base class, so this would cause confusion.
+  //TODO: Remove this when we can break API.
+  /// @deprecated See clear_items(). Since 2.8.
   void clear();
 
+  /** Remove all items from the drop-down menu.
+   */
+  void clear_items();
+
+  /** Remove the specified item if it is in the drop-down menu.
+   * @text The text of the item that should be removed.
+   */
+  void remove_text(const Glib::ustring& text);
+
 protected:
 
   //Tree model columns:
diff --git a/libs/gtkmm2/gtk/gtkmm/comboboxtext.cc b/libs/gtkmm2/gtk/gtkmm/comboboxtext.cc
index a9c8d20d5f..b5f1f73f7e 100644
--- a/libs/gtkmm2/gtk/gtkmm/comboboxtext.cc
+++ b/libs/gtkmm2/gtk/gtkmm/comboboxtext.cc
@@ -99,8 +99,14 @@ Glib::ustring ComboBoxText::get_active_text() const
   return result;
 }
 
+//deprecated.
 void ComboBoxText::clear()
 {
+  clear_items();
+}
+
+void ComboBoxText::clear_items()
+{
   //Ideally, we would just store the ListStore as a member variable, but we forgot to do that and not it would break the ABI.
   Glib::RefPtr<Gtk::TreeModel> model = get_model();
   Glib::RefPtr<Gtk::ListStore> list_model = Glib::RefPtr<ListStore>::cast_dynamic(model);
@@ -109,6 +115,28 @@ void ComboBoxText::clear()
     list_model->clear();
 }
 
+void ComboBoxText::remove_text(const Glib::ustring& text)
+{
+  //Ideally, we would just store the ListStore as a member variable, but we forgot to do that and not it would break the ABI.
+  Glib::RefPtr<Gtk::TreeModel> model = get_model();
+  Glib::RefPtr<Gtk::ListStore> list_model = Glib::RefPtr<ListStore>::cast_dynamic(model);
+
+  //Look for the row with this text, and remove it:
+  if(list_model)
+  {
+    for(Gtk::TreeModel::iterator iter = list_model->children().begin(); iter != list_model->children().end(); ++iter)
+    {
+      const Glib::ustring& this_text = (*iter)[m_text_columns.m_column];
+
+      if(this_text == text)
+      {
+        list_model->erase(iter);
+        return; //success
+      }
+    }
+  }
+}
+
 void ComboBoxText::set_active_text(const Glib::ustring& text)
 {
   //Look for the row with this text, and activate it:
diff --git a/libs/gtkmm2/gtk/gtkmm/comboboxtext.h b/libs/gtkmm2/gtk/gtkmm/comboboxtext.h
index 22b87f5f00..cff1bc8bf4 100644
--- a/libs/gtkmm2/gtk/gtkmm/comboboxtext.h
+++ b/libs/gtkmm2/gtk/gtkmm/comboboxtext.h
@@ -56,18 +56,43 @@ protected:
 
 public:
   ComboBoxText();
-  
+
+  /** Add an item to the end of the drop-down list.
+   * @param text The text for the item.
+   */
   void append_text(const Glib::ustring& text);
-  
+
   void insert_text(int position, const Glib::ustring& text);
-  
+
+  /** Add an item to the beginning of the drop-down list.
+   * @param text The text for the item.
+   */
   void prepend_text(const Glib::ustring& text);
 
+  /** Get the currently-chosen item.
+   * @result The text of the active item.
+   */
   Glib::ustring get_active_text() const;
+
+  /** Set the currently-chosen item if it matches the specified text.
+   * @text The text of the item that should be selected.
+   */
   void set_active_text(const Glib::ustring& text);
 
+  //There is a clear() method in the CellLayout base class, so this would cause confusion.
+  //TODO: Remove this when we can break API.
+  /// @deprecated See clear_items(). Since 2.8.
   void clear();
 
+  /** Remove all items from the drop-down menu.
+   */
+  void clear_items();
+
+  /** Remove the specified item if it is in the drop-down menu.
+   * @text The text of the item that should be removed.
+   */
+  void remove_text(const Glib::ustring& text);
+
 protected:
 
   //Tree model columns:
diff --git a/libs/gtkmm2/gtk/gtkmm/container.cc b/libs/gtkmm2/gtk/gtkmm/container.cc
index c3db4bd7ef..6c6d70caec 100644
--- a/libs/gtkmm2/gtk/gtkmm/container.cc
+++ b/libs/gtkmm2/gtk/gtkmm/container.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/container.h>
 #include <gtkmm/private/container_p.h>
 
@@ -30,22 +31,74 @@
 namespace
 {
 
-
-void container_foreach_callback(GtkWidget* widget_gobj, void* data)
+static void container_foreach_callback(GtkWidget* widget_gobj, void* data)
 {
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     Gtk::Container::ForeachSlot& slot = *static_cast<Gtk::Container::ForeachSlot*>(data);
     Gtk::Widget *const widget = Glib::wrap(widget_gobj);
 
     g_return_if_fail(widget != 0);
 
     slot(*widget);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+}
+
+
+//Copy of generated callback:
+static void Container_signal_remove_callback_normal(GtkContainer* self, GtkWidget* p0,void* data)
+{
+  using namespace Gtk;
+  typedef sigc::slot< void,Widget* > SlotType;
+
+  // Do not try to call a signal on a disassociated wrapper.
+  if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
+  {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    try
+    {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+      if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
+        (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
+);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    }
+    catch(...)
+    {
+      Glib::exception_handlers_invoke();
+    }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+  }
+}
+
+static void Container_signal_remove_callback(GtkContainer* self, GtkWidget* p0, void* data)
+{
+  //GTKMM_LIFECYCLE
+
+#ifdef GLIBMM_DEBUG_REFCOUNTING
+  g_warning("Container_signal_remove_callback()");
+#endif
+
+  //Don't call wrap() on a GTK+ instance whose gtkmm instance has been deleted - just call the original C callback.
+  const bool gtkmm_child_already_deleted = Glib::_gobject_cppinstance_already_deleted((GObject*)p0);
+
+  if(!gtkmm_child_already_deleted)
+  {
+    //Call the regular, generated callback:
+    Container_signal_remove_callback_normal(self, p0, data);
+  }
+  else
+  {
+    //Do nothing.
+  }
 }
 
 } // anonymous namespace
@@ -54,7 +107,49 @@ void container_foreach_callback(GtkWidget* widget_gobj, void* data)
 namespace Gtk
 {
 
-void Container_Class::remove_callback_custom(GtkContainer* self, GtkWidget* p0)
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+//Copy of generated callback:
+void Container_Class::remove_callback_normal(GtkContainer* self, GtkWidget* p0)
+{
+  CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+      Glib::ObjectBase::_get_current_wrapper((GObject*)self));
+
+  // Non-gtkmmproc-generated custom classes implicitly call the default
+  // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
+  // generated classes can use this optimisation, which avoids the unnecessary
+  // parameter conversions if there is no possibility of the virtual function
+  // being overridden:
+  if(obj && obj->is_derived_())
+  {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    try // Trap C++ exceptions which would normally be lost because this is a C callback.
+    {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+      // Call the virtual member method, which derived classes might override.
+      obj->on_remove(Glib::wrap(p0)
+);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    }
+    catch(...)
+    {
+      Glib::exception_handlers_invoke();
+    }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+  }
+  else
+  {
+    BaseClassType *const base = static_cast<BaseClassType*>(
+        g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
+    );
+
+    // Call the original underlying C function:
+    if(base && base->remove)
+      (*base->remove)(self, p0);
+  }
+}
+
+//Custom hand-coded callback:
+void Container_Class::remove_callback(GtkContainer* self, GtkWidget* p0)
 {
   //GTKMM_LIFECYCLE
 
@@ -64,12 +159,12 @@ void Container_Class::remove_callback_custom(GtkContainer* self, GtkWidget* p0)
 #endif
   
   //Don't call wrap() on a GTK+ instance whose gtkmm instance has been deleted - just call the original C callback.
-  bool gtkmm_child_already_deleted = Glib::_gobject_cppinstance_already_deleted((GObject*)p0);
+  const bool gtkmm_child_already_deleted = Glib::_gobject_cppinstance_already_deleted((GObject*)p0);
 
   if(!gtkmm_child_already_deleted)
   {
     //Call the regular, generated callback:
-    Container_Class::remove_callback(self, p0);
+    Container_Class::remove_callback_normal(self, p0);
   }
   else
   {
@@ -82,6 +177,7 @@ void Container_Class::remove_callback_custom(GtkContainer* self, GtkWidget* p0)
       (*base->remove)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 void Container::foreach(const Container::ForeachSlot& slot)
 {
@@ -142,6 +238,7 @@ void Container::remove(Widget& widget)
   gtk_container_remove(gobj(), widget.gobj());
 }
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 // static
 void Container_Class::destroy_callback(GtkObject* self)
 {
@@ -159,6 +256,7 @@ void Container_Class::destroy_callback(GtkObject* self)
   if(base->destroy)
     (*base->destroy)(self);
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 } // namespace Gtk
 
@@ -166,7 +264,8 @@ void Container_Class::destroy_callback(GtkObject* self)
 namespace
 {
 
-void Container_signal_add_callback(GtkContainer* self, GtkWidget* p0,void* data)
+
+static void Container_signal_add_callback(GtkContainer* self, GtkWidget* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Widget* > SlotType;
@@ -174,20 +273,24 @@ void Container_signal_add_callback(GtkContainer* self, GtkWidget* p0,void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Container_signal_add_info =
+static const Glib::SignalProxyInfo Container_signal_add_info =
 {
   "add",
   (GCallback) &Container_signal_add_callback,
@@ -195,28 +298,7 @@ const Glib::SignalProxyInfo Container_signal_add_info =
 };
 
 
-void Container_signal_remove_callback(GtkContainer* self, GtkWidget* p0,void* data)
-{
-  using namespace Gtk;
-  typedef sigc::slot< void,Widget* > SlotType;
-
-  // Do not try to call a signal on a disassociated wrapper.
-  if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
-  {
-    try
-    {
-      if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
-        (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
-);
-    }
-    catch(...)
-    {
-      Glib::exception_handlers_invoke();
-    }
-  }
-}
-
-const Glib::SignalProxyInfo Container_signal_remove_info =
+static const Glib::SignalProxyInfo Container_signal_remove_info =
 {
   "remove",
   (GCallback) &Container_signal_remove_callback,
@@ -224,7 +306,7 @@ const Glib::SignalProxyInfo Container_signal_remove_info =
 };
 
 
-const Glib::SignalProxyInfo Container_signal_check_resize_info =
+static const Glib::SignalProxyInfo Container_signal_check_resize_info =
 {
   "check_resize",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -232,7 +314,7 @@ const Glib::SignalProxyInfo Container_signal_check_resize_info =
 };
 
 
-void Container_signal_set_focus_child_callback(GtkContainer* self, GtkWidget* p0,void* data)
+static void Container_signal_set_focus_child_callback(GtkContainer* self, GtkWidget* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Widget* > SlotType;
@@ -240,26 +322,31 @@ void Container_signal_set_focus_child_callback(GtkContainer* self, GtkWidget* p0
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Container_signal_set_focus_child_info =
+static const Glib::SignalProxyInfo Container_signal_set_focus_child_info =
 {
   "set_focus_child",
   (GCallback) &Container_signal_set_focus_child_callback,
   (GCallback) &Container_signal_set_focus_child_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -304,28 +391,24 @@ void Container_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->child_type = &child_type_vfunc_callback;
   klass->forall = &forall_vfunc_callback;
   klass->composite_name = &composite_name_vfunc_callback;
   klass->set_child_property = &set_child_property_vfunc_callback;
   klass->get_child_property = &get_child_property_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->add = &add_callback;
   klass->remove = &remove_callback;
   klass->check_resize = &check_resize_callback;
   klass->set_focus_child = &set_focus_child_callback;
     reinterpret_cast<GtkObjectClass*>(klass)->destroy = &destroy_callback;
-      klass->remove = &remove_callback_custom;
-
-    if(G_OBJECT_CLASS_TYPE(klass) == Gtk::Container::get_type())
-    { 
-      //Remove the parent class's (GtkContainer) remove callback - it just prints a warning.
-      //This prevents that warning when people derive directly from Gtk::Container.
-      BaseClassType *const base = static_cast<BaseClassType*>( g_type_class_peek_parent(klass) );
-      base->remove = 0;
-    }
-                
-  }
+  #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+}
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 GtkType Container_Class::child_type_vfunc_callback(GtkContainer* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -338,15 +421,19 @@ GtkType Container_Class::child_type_vfunc_callback(GtkContainer* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->child_type_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -362,7 +449,6 @@ GtkType Container_Class::child_type_vfunc_callback(GtkContainer* self)
   typedef GtkType RType;
   return RType();
 }
-
 void Container_Class::forall_vfunc_callback(GtkContainer* self, gboolean include_internals, GtkCallback callback, gpointer callback_data)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -375,15 +461,19 @@ void Container_Class::forall_vfunc_callback(GtkContainer* self, gboolean include
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->forall_vfunc(include_internals, callback, callback_data);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -396,7 +486,6 @@ void Container_Class::forall_vfunc_callback(GtkContainer* self, gboolean include
       (*base->forall)(self, include_internals, callback, callback_data);
   }
 }
-
 gchar* Container_Class::composite_name_vfunc_callback(GtkContainer* self, GtkWidget* child)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -409,15 +498,19 @@ gchar* Container_Class::composite_name_vfunc_callback(GtkContainer* self, GtkWid
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->composite_name_vfunc(child);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -433,7 +526,6 @@ gchar* Container_Class::composite_name_vfunc_callback(GtkContainer* self, GtkWid
   typedef gchar* RType;
   return RType();
 }
-
 void Container_Class::set_child_property_vfunc_callback(GtkContainer* self, GtkWidget* child, guint property_id, const GValue* value, GParamSpec* pspec)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -446,15 +538,19 @@ void Container_Class::set_child_property_vfunc_callback(GtkContainer* self, GtkW
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_child_property_vfunc(child, property_id, value, pspec);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -467,7 +563,6 @@ void Container_Class::set_child_property_vfunc_callback(GtkContainer* self, GtkW
       (*base->set_child_property)(self, child, property_id, value, pspec);
   }
 }
-
 void Container_Class::get_child_property_vfunc_callback(GtkContainer* self, GtkWidget* child, guint property_id, GValue* value, GParamSpec* pspec)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -480,15 +575,19 @@ void Container_Class::get_child_property_vfunc_callback(GtkContainer* self, GtkW
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_child_property_vfunc(child, property_id, value, pspec);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -501,8 +600,9 @@ void Container_Class::get_child_property_vfunc_callback(GtkContainer* self, GtkW
       (*base->get_child_property)(self, child, property_id, value, pspec);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Container_Class::add_callback(GtkContainer* self, GtkWidget* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -515,16 +615,20 @@ void Container_Class::add_callback(GtkContainer* self, GtkWidget* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_add(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -537,42 +641,6 @@ void Container_Class::add_callback(GtkContainer* self, GtkWidget* p0)
       (*base->add)(self, p0);
   }
 }
-
-void Container_Class::remove_callback(GtkContainer* self, GtkWidget* p0)
-{
-  CppObjectType *const obj = dynamic_cast<CppObjectType*>(
-      Glib::ObjectBase::_get_current_wrapper((GObject*)self));
-
-  // Non-gtkmmproc-generated custom classes implicitly call the default
-  // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
-  // generated classes can use this optimisation, which avoids the unnecessary
-  // parameter conversions if there is no possibility of the virtual function
-  // being overridden:
-  if(obj && obj->is_derived_())
-  {
-    try // Trap C++ exceptions which would normally be lost because this is a C callback.
-    {
-      // Call the virtual member method, which derived classes might override.
-      obj->on_remove(Glib::wrap(p0)
-);
-    }
-    catch(...)
-    {
-      Glib::exception_handlers_invoke();
-    }
-  }
-  else
-  {
-    BaseClassType *const base = static_cast<BaseClassType*>(
-        g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
-    );
-
-    // Call the original underlying C function:
-    if(base && base->remove)
-      (*base->remove)(self, p0);
-  }
-}
-
 void Container_Class::check_resize_callback(GtkContainer* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -585,15 +653,19 @@ void Container_Class::check_resize_callback(GtkContainer* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_check_resize();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -606,7 +678,6 @@ void Container_Class::check_resize_callback(GtkContainer* self)
       (*base->check_resize)(self);
   }
 }
-
 void Container_Class::set_focus_child_callback(GtkContainer* self, GtkWidget* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -619,16 +690,20 @@ void Container_Class::set_focus_child_callback(GtkContainer* self, GtkWidget* p0
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_set_focus_child(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -641,6 +716,7 @@ void Container_Class::set_focus_child_callback(GtkContainer* self, GtkWidget* p0
       (*base->set_focus_child)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Container_Class::wrap_new(GObject* o)
@@ -684,7 +760,7 @@ GType Container::get_base_type()
 
 void Container::set_border_width(guint border_width)
 {
-  gtk_container_set_border_width(gobj(), border_width);
+gtk_container_set_border_width(gobj(), border_width); 
 }
 
 guint Container::get_border_width() const
@@ -694,7 +770,7 @@ guint Container::get_border_width() const
 
 void Container::set_resize_mode(ResizeMode resize_mode)
 {
-  gtk_container_set_resize_mode(gobj(), ((GtkResizeMode)(resize_mode)));
+gtk_container_set_resize_mode(gobj(), ((GtkResizeMode)(resize_mode))); 
 }
 
 ResizeMode Container::get_resize_mode() const
@@ -704,7 +780,7 @@ ResizeMode Container::get_resize_mode() const
 
 void Container::check_resize()
 {
-  gtk_container_check_resize(gobj());
+gtk_container_check_resize(gobj()); 
 }
 
 Glib::ListHandle<Widget*> Container::get_children()
@@ -719,32 +795,32 @@ Glib::ListHandle<const Widget*> Container::get_children() const
 
 void Container::propagate_expose(Widget& child, GdkEventExpose* event)
 {
-  gtk_container_propagate_expose(gobj(), (child).gobj(), event);
+gtk_container_propagate_expose(gobj(), (child).gobj(), event); 
 }
 
 void Container::set_focus_chain(const Glib::ListHandle<Widget*>& focusable_widgets)
 {
-  gtk_container_set_focus_chain(gobj(), focusable_widgets.data());
+gtk_container_set_focus_chain(gobj(), focusable_widgets.data()); 
 }
 
 void Container::unset_focus_chain()
 {
-  gtk_container_unset_focus_chain(gobj());
+gtk_container_unset_focus_chain(gobj()); 
 }
 
 void Container::set_reallocate_redraws(bool needs_redraws)
 {
-  gtk_container_set_reallocate_redraws(gobj(), static_cast<int>(needs_redraws));
+gtk_container_set_reallocate_redraws(gobj(), static_cast<int>(needs_redraws)); 
 }
 
 void Container::set_focus_child(Widget& widget)
 {
-  gtk_container_set_focus_child(gobj(), (widget).gobj());
+gtk_container_set_focus_child(gobj(), (widget).gobj()); 
 }
 
 void Container::set_focus_vadjustment(Adjustment& adjustment)
 {
-  gtk_container_set_focus_vadjustment(gobj(), (adjustment).gobj());
+gtk_container_set_focus_vadjustment(gobj(), (adjustment).gobj()); 
 }
 
 Adjustment* Container::get_focus_vadjustment()
@@ -754,12 +830,12 @@ Adjustment* Container::get_focus_vadjustment()
 
 const Adjustment* Container::get_focus_vadjustment() const
 {
-  return Glib::wrap(gtk_container_get_focus_vadjustment(const_cast<GtkContainer*>(gobj())));
+  return const_cast<Container*>(this)->get_focus_vadjustment();
 }
 
 void Container::set_focus_hadjustment(Adjustment& adjustment)
 {
-  gtk_container_set_focus_hadjustment(gobj(), (adjustment).gobj());
+gtk_container_set_focus_hadjustment(gobj(), (adjustment).gobj()); 
 }
 
 Adjustment* Container::get_focus_hadjustment()
@@ -769,12 +845,12 @@ Adjustment* Container::get_focus_hadjustment()
 
 const Adjustment* Container::get_focus_hadjustment() const
 {
-  return Glib::wrap(gtk_container_get_focus_hadjustment(const_cast<GtkContainer*>(gobj())));
+  return const_cast<Container*>(this)->get_focus_hadjustment();
 }
 
 void Container::resize_children()
 {
-  gtk_container_resize_children(gobj());
+gtk_container_resize_children(gobj()); 
 }
 
 GType Container::child_type() const
@@ -795,53 +871,62 @@ Glib::SignalProxy1< void,Widget* > Container::signal_add()
   return Glib::SignalProxy1< void,Widget* >(this, &Container_signal_add_info);
 }
 
+
 Glib::SignalProxy1< void,Widget* > Container::signal_remove()
 {
   return Glib::SignalProxy1< void,Widget* >(this, &Container_signal_remove_info);
 }
 
+
 Glib::SignalProxy0< void > Container::signal_check_resize()
 {
   return Glib::SignalProxy0< void >(this, &Container_signal_check_resize_info);
 }
 
+
 Glib::SignalProxy1< void,Widget* > Container::signal_set_focus_child()
 {
   return Glib::SignalProxy1< void,Widget* >(this, &Container_signal_set_focus_child_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Container::property_border_width() 
 {
   return Glib::PropertyProxy<guint>(this, "border-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Container::property_border_width() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "border-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ResizeMode> Container::property_resize_mode() 
 {
   return Glib::PropertyProxy<ResizeMode>(this, "resize-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ResizeMode> Container::property_resize_mode() const
 {
   return Glib::PropertyProxy_ReadOnly<ResizeMode>(this, "resize-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_WriteOnly<Widget*> Container::property_child() 
 {
   return Glib::PropertyProxy_WriteOnly<Widget*>(this, "child");
 }
-
-Glib::PropertyProxy_ReadOnly<Widget*> Container::property_child() const
-{
-  return Glib::PropertyProxy_ReadOnly<Widget*>(this, "child");
-}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Container::on_add(Widget* widget)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -851,7 +936,6 @@ void Gtk::Container::on_add(Widget* widget)
   if(base && base->add)
     (*base->add)(gobj(),(GtkWidget*)Glib::unwrap(widget));
 }
-
 void Gtk::Container::on_remove(Widget* widget)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -861,7 +945,6 @@ void Gtk::Container::on_remove(Widget* widget)
   if(base && base->remove)
     (*base->remove)(gobj(),(GtkWidget*)Glib::unwrap(widget));
 }
-
 void Gtk::Container::on_check_resize()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -871,7 +954,6 @@ void Gtk::Container::on_check_resize()
   if(base && base->check_resize)
     (*base->check_resize)(gobj());
 }
-
 void Gtk::Container::on_set_focus_child(Widget* widget)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -881,8 +963,9 @@ void Gtk::Container::on_set_focus_child(Widget* widget)
   if(base && base->set_focus_child)
     (*base->set_focus_child)(gobj(),(GtkWidget*)Glib::unwrap(widget));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 GtkType Gtk::Container::child_type_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -895,7 +978,6 @@ GtkType Gtk::Container::child_type_vfunc() const
   typedef GtkType RType;
   return RType();
 }
-
 void Gtk::Container::forall_vfunc(gboolean include_internals, GtkCallback callback, gpointer callback_data) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -905,7 +987,6 @@ void Gtk::Container::forall_vfunc(gboolean include_internals, GtkCallback callba
   if(base && base->forall)
     (*base->forall)(gobj(),include_internals,callback,callback_data);
 }
-
 char* Gtk::Container::composite_name_vfunc(GtkWidget* child) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -918,7 +999,6 @@ char* Gtk::Container::composite_name_vfunc(GtkWidget* child)
   typedef char* RType;
   return RType();
 }
-
 void Gtk::Container::set_child_property_vfunc(GtkWidget* child, guint property_id, const GValue* value, GParamSpec* pspec) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -928,7 +1008,6 @@ void Gtk::Container::set_child_property_vfunc(GtkWidget* child, guint property_i
   if(base && base->set_child_property)
     (*base->set_child_property)(gobj(),child,property_id,value,pspec);
 }
-
 void Gtk::Container::get_child_property_vfunc(GtkWidget* child, guint property_id, GValue* value, GParamSpec* pspec) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -938,6 +1017,7 @@ void Gtk::Container::get_child_property_vfunc(GtkWidget* child, guint property_i
   if(base && base->get_child_property)
     (*base->get_child_property)(const_cast<GtkContainer*>(gobj()),child,property_id,value,pspec);
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/container.h b/libs/gtkmm2/gtk/gtkmm/container.h
index a555229bbf..a3b04aaa08 100644
--- a/libs/gtkmm2/gtk/gtkmm/container.h
+++ b/libs/gtkmm2/gtk/gtkmm/container.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CONTAINER_H
 #define _GTKMM_CONTAINER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -109,15 +110,21 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_add(Widget* widget);
   virtual void on_remove(Widget* widget);
   virtual void on_check_resize();
   virtual void on_set_focus_child(Widget* widget);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -154,14 +161,9 @@ public:
   
 
   /** Removes @a widget  from @a container . @a widget  must be inside @a container .
-   * Note that @a container  will own a reference to @a widget , and that this
-   * may be the last reference held; so removing a widget from its
-   * container can destroy that widget. If you want to use @a widget 
-   * again, you need to add a reference to it while it's not inside
-   * a container, using Glib::object_ref(). If you don't want to use @a widget 
-   * again it's usually more efficient to simply destroy it directly
-   * using Gtk::Widget::destroy() since this will remove it from the
-   * container and help break any circular reference count cycles.
+   * If @a widget  is managed with Gtk::manage(), and you don't want to use @a widget 
+   * again then you should delete @a widget , because there will no longer be any parent 
+   * container to delete it automatically.
    * @param widget A current child of @a container .
    */
 
@@ -211,13 +213,13 @@ public:
   //_WRAP_METHOD(void foreach_full_(GtkCallback callback,GtkCallbackMarshal marshal, gpointer data,GtkDestroyNotify notify),gtk_container_foreach_full)
 
   
-  /** Returns the the container's non-internal children. See
+  /** Returns the container's non-internal children. See
    * forall() for details on what constitutes an "internal" child.
    * @return A newly-allocated list of the container's non-internal children.
    */
   Glib::ListHandle<Widget*> get_children();
   
-  /** Returns the the container's non-internal children. See
+  /** Returns the container's non-internal children. See
    * forall() for details on what constitutes an "internal" child.
    * @return A newly-allocated list of the container's non-internal children.
    */
@@ -355,15 +357,38 @@ public:
   // Ignore functions such as gtk_container_class_install_child_property(),  which I think are for themes, like the GtkWidget style properties.
   
 
+/**
+   * @par Prototype:
+   * <tt>void %add(Widget* widget)</tt>
+   */
+
   Glib::SignalProxy1< void,Widget* > signal_add();
 
+
+  //We use the optional custom_c_callback parameter with _WRAP_SIGNAL() here,
+  //so that we can write special code to check for deleted child widget parameters:
   
+/**
+   * @par Prototype:
+   * <tt>void %remove(Widget* widget)</tt>
+   */
+
   Glib::SignalProxy1< void,Widget* > signal_remove();
 
-  
+
+/**
+   * @par Prototype:
+   * <tt>void %check_resize()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_check_resize();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %set_focus_child(Widget* widget)</tt>
+   */
+
   Glib::SignalProxy1< void,Widget* > signal_set_focus_child();
 
 
@@ -372,21 +397,39 @@ public:
 protected:
   Container();
 
-    virtual GtkType child_type_vfunc() const;
-    virtual void forall_vfunc(gboolean include_internals, GtkCallback callback, gpointer callback_data);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual GtkType child_type_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void forall_vfunc(gboolean include_internals, GtkCallback callback, gpointer callback_data);
+#endif //GLIBMM_VFUNCS_ENABLED
+
   //TODO: What is this?
-    virtual char* composite_name_vfunc(GtkWidget* child);
-    virtual void set_child_property_vfunc(GtkWidget* child, guint property_id, const GValue* value, GParamSpec* pspec);
-    virtual void get_child_property_vfunc(GtkWidget* child, guint property_id, GValue* value, GParamSpec* pspec) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual char* composite_name_vfunc(GtkWidget* child);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_child_property_vfunc(GtkWidget* child, guint property_id, const GValue* value, GParamSpec* pspec);
+#endif //GLIBMM_VFUNCS_ENABLED
 
-  /** The width of the empty border outside the containers children.
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_child_property_vfunc(GtkWidget* child, guint property_id, GValue* value, GParamSpec* pspec) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The width of the empty border outside the containers children.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_border_width() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The width of the empty border outside the containers children.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -394,15 +437,19 @@ protected:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_border_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Specify how resize events are handled.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Specify how resize events are handled.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ResizeMode> property_resize_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Specify how resize events are handled.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -410,22 +457,17 @@ protected:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ResizeMode> property_resize_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Can be used to add a new child to the container.
-   *
-   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
-   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
-   * the value of the property changes.
-   */
-  Glib::PropertyProxy_WriteOnly<Widget*> property_child() ;
-
+  #ifdef GLIBMM_PROPERTIES_ENABLED
 /** Can be used to add a new child to the container.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
-  Glib::PropertyProxy_ReadOnly<Widget*> property_child() const;
+  Glib::PropertyProxy_WriteOnly<Widget*> property_child() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -441,6 +483,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Container* wrap(GtkContainer* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CONTAINER_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/curve.cc b/libs/gtkmm2/gtk/gtkmm/curve.cc
index ed6b949ea3..9cd9cc345e 100644
--- a/libs/gtkmm2/gtk/gtkmm/curve.cc
+++ b/libs/gtkmm2/gtk/gtkmm/curve.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/curve.h>
 #include <gtkmm/private/curve_p.h>
 
@@ -50,13 +51,15 @@ void Curve::set_vector(const Glib::ArrayHandle<float>& array)
 namespace
 {
 
-const Glib::SignalProxyInfo Curve_signal_curve_type_changed_info =
+
+static const Glib::SignalProxyInfo Curve_signal_curve_type_changed_info =
 {
   "curve_type_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -101,10 +104,18 @@ void Curve_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->curve_type_changed = &curve_type_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Curve_Class::curve_type_changed_callback(GtkCurve* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -117,15 +128,19 @@ void Curve_Class::curve_type_changed_callback(GtkCurve* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_curve_type_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -138,6 +153,7 @@ void Curve_Class::curve_type_changed_callback(GtkCurve* self)
       (*base->curve_type_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Curve_Class::wrap_new(GObject* o)
@@ -188,27 +204,27 @@ Curve::Curve()
 
 void Curve::reset()
 {
-  gtk_curve_reset(gobj());
+gtk_curve_reset(gobj()); 
 }
 
 void Curve::set_gamma(float gamma)
 {
-  gtk_curve_set_gamma(gobj(), gamma);
+gtk_curve_set_gamma(gobj(), gamma); 
 }
 
 void Curve::set_range(float min_x, float max_x, float min_y, float max_y)
 {
-  gtk_curve_set_range(gobj(), min_x, max_x, min_y, max_y);
+gtk_curve_set_range(gobj(), min_x, max_x, min_y, max_y); 
 }
 
 void Curve::get_vector(int veclen, float* data) const
 {
-  gtk_curve_get_vector(const_cast<GtkCurve*>(gobj()), veclen, data);
+gtk_curve_get_vector(const_cast<GtkCurve*>(gobj()), veclen, data); 
 }
 
 void Curve::set_curve_type(CurveType type)
 {
-  gtk_curve_set_curve_type(gobj(), ((GtkCurveType)(type)));
+gtk_curve_set_curve_type(gobj(), ((GtkCurveType)(type))); 
 }
 
 
@@ -218,57 +234,78 @@ Glib::SignalProxy0< void > Curve::signal_curve_type_changed()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<CurveType> Curve::property_curve_type() 
 {
   return Glib::PropertyProxy<CurveType>(this, "curve-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<CurveType> Curve::property_curve_type() const
 {
   return Glib::PropertyProxy_ReadOnly<CurveType>(this, "curve-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Curve::property_min_x() 
 {
   return Glib::PropertyProxy<float>(this, "min-x");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Curve::property_min_x() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "min-x");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Curve::property_max_x() 
 {
   return Glib::PropertyProxy<float>(this, "max-x");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Curve::property_max_x() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "max-x");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Curve::property_min_y() 
 {
   return Glib::PropertyProxy<float>(this, "min-y");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Curve::property_min_y() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "min-y");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Curve::property_max_y() 
 {
   return Glib::PropertyProxy<float>(this, "max-y");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Curve::property_max_y() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "max-y");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Curve::on_curve_type_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -278,6 +315,10 @@ void Gtk::Curve::on_curve_type_changed()
   if(base && base->curve_type_changed)
     (*base->curve_type_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
@@ -324,8 +365,19 @@ void GammaCurve_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* GammaCurve_Class::wrap_new(GObject* o)
 {
@@ -373,6 +425,13 @@ GammaCurve::GammaCurve()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/curve.h b/libs/gtkmm2/gtk/gtkmm/curve.h
index eaddc1116b..9ccfcc7e90 100644
--- a/libs/gtkmm2/gtk/gtkmm/curve.h
+++ b/libs/gtkmm2/gtk/gtkmm/curve.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_CURVE_H
 #define _GTKMM_CURVE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -98,12 +99,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_curve_type_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -129,17 +136,25 @@ public:
   void set_curve_type(CurveType type);
 
   
+/**
+   * @par Prototype:
+   * <tt>void %curve_type_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_curve_type_changed();
 
 
-  /** Is this curve linear
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Is this curve linear
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<CurveType> property_curve_type() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Is this curve linear
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -147,15 +162,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<CurveType> property_curve_type() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Minimum possible value for X.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Minimum possible value for X.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_min_x() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Minimum possible value for X.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -163,15 +182,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_min_x() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Maximum possible X value.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Maximum possible X value.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_max_x() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Maximum possible X value.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -179,15 +202,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_max_x() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Minimum possible value for Y.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Minimum possible value for Y.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_min_y() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Minimum possible value for Y.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -195,15 +222,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_min_y() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Maximum possible value for Y.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Maximum possible value for Y.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_max_y() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Maximum possible value for Y.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -211,6 +242,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_max_y() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -263,11 +295,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -289,7 +327,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Curve* wrap(GtkCurve* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::GammaCurve
@@ -298,6 +338,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::GammaCurve* wrap(GtkGammaCurve* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_CURVE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/dialog.cc b/libs/gtkmm2/gtk/gtkmm/dialog.cc
index b55b84f645..803a6b149d 100644
--- a/libs/gtkmm2/gtk/gtkmm/dialog.cc
+++ b/libs/gtkmm2/gtk/gtkmm/dialog.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/dialog.h>
 #include <gtkmm/private/dialog_p.h>
 
@@ -63,7 +64,8 @@ void Dialog::set_alternative_button_order_from_array(const Glib::ArrayHandle<int
 namespace
 {
 
-void Dialog_signal_response_callback(GtkDialog* self, gint p0,void* data)
+
+static void Dialog_signal_response_callback(GtkDialog* self, gint p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,int > SlotType;
@@ -71,26 +73,31 @@ void Dialog_signal_response_callback(GtkDialog* self, gint p0,void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Dialog_signal_response_info =
+static const Glib::SignalProxyInfo Dialog_signal_response_info =
 {
   "response",
   (GCallback) &Dialog_signal_response_callback,
   (GCallback) &Dialog_signal_response_callback
 };
 
+
 } // anonymous namespace
 
 // static
@@ -141,10 +148,18 @@ void Dialog_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->response = &response_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Dialog_Class::response_callback(GtkDialog* self, gint p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -157,16 +172,20 @@ void Dialog_Class::response_callback(GtkDialog* self, gint p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_response(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -179,6 +198,7 @@ void Dialog_Class::response_callback(GtkDialog* self, gint p0)
       (*base->response)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Dialog_Class::wrap_new(GObject* o)
@@ -229,7 +249,7 @@ Dialog::Dialog()
 
 void Dialog::add_action_widget(Widget& child, int response_id)
 {
-  gtk_dialog_add_action_widget(gobj(), (child).gobj(), response_id);
+gtk_dialog_add_action_widget(gobj(), (child).gobj(), response_id); 
 }
 
 Button* Dialog::add_button(const Glib::ustring& button_text, int response_id)
@@ -244,17 +264,22 @@ Button* Dialog::add_button(const Gtk::StockID& stock_id, int response_id)
 
 void Dialog::set_response_sensitive(int response_id, bool setting)
 {
-  gtk_dialog_set_response_sensitive(gobj(), response_id, static_cast<int>(setting));
+gtk_dialog_set_response_sensitive(gobj(), response_id, static_cast<int>(setting)); 
 }
 
 void Dialog::set_default_response(int response_id)
 {
-  gtk_dialog_set_default_response(gobj(), response_id);
+gtk_dialog_set_default_response(gobj(), response_id); 
+}
+
+int Dialog::get_response_for_widget(const Gtk::Widget& widget) const
+{
+  return gtk_dialog_get_response_for_widget(const_cast<GtkDialog*>(gobj()), const_cast<GtkWidget*>(widget.gobj()));
 }
 
 void Dialog::set_has_separator(bool setting)
 {
-  gtk_dialog_set_has_separator(gobj(), static_cast<int>(setting));
+gtk_dialog_set_has_separator(gobj(), static_cast<int>(setting)); 
 }
 
 bool Dialog::get_has_separator() const
@@ -267,9 +292,10 @@ bool Dialog::alternative_button_order(const Glib::RefPtr<const Gdk::Screen>& scr
   return gtk_alternative_dialog_button_order(const_cast<GdkScreen*>(Glib::unwrap<Gdk::Screen>(screen)));
 }
 
+
 void Dialog::response(int response_id)
 {
-  gtk_dialog_response(gobj(), response_id);
+gtk_dialog_response(gobj(), response_id); 
 }
 
 int Dialog::run()
@@ -277,7 +303,7 @@ int Dialog::run()
   return gtk_dialog_run(gobj());
 }
 
-VBox* Dialog::get_vbox()
+ VBox* Dialog::get_vbox()
 {
   return Glib::wrap((GtkVBox*)(gobj()->vbox));
 }
@@ -286,8 +312,8 @@ const VBox* Dialog::get_vbox() const
 {
   return Glib::wrap((GtkVBox*)(gobj()->vbox));
 }
-
-HButtonBox* Dialog::get_action_area()
+ 
+ HButtonBox* Dialog::get_action_area()
 {
   return Glib::wrap((GtkHButtonBox*)(gobj()->action_area));
 }
@@ -296,7 +322,7 @@ const HButtonBox* Dialog::get_action_area() const
 {
   return Glib::wrap((GtkHButtonBox*)(gobj()->action_area));
 }
-
+ 
 
 Glib::SignalProxy1< void,int > Dialog::signal_response()
 {
@@ -304,17 +330,22 @@ Glib::SignalProxy1< void,int > Dialog::signal_response()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Dialog::property_has_separator() 
 {
   return Glib::PropertyProxy<bool>(this, "has-separator");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Dialog::property_has_separator() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "has-separator");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Dialog::on_response(int response_id)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -324,6 +355,10 @@ void Gtk::Dialog::on_response(int response_id)
   if(base && base->response)
     (*base->response)(gobj(),response_id);
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/dialog.h b/libs/gtkmm2/gtk/gtkmm/dialog.h
index 2b4ae3f461..d019795eb6 100644
--- a/libs/gtkmm2/gtk/gtkmm/dialog.h
+++ b/libs/gtkmm2/gtk/gtkmm/dialog.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_DIALOG_H
 #define _GTKMM_DIALOG_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -162,12 +163,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_response(int response_id);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -227,6 +234,16 @@ public:
    */
   void set_default_response(int response_id);
   
+  /** Gets the response id of a widget in the action area
+   * of a dialog.
+   * @param widget A widget in the action area of @a dialog .
+   * @return The response id of @a widget , or Gtk::RESPONSE_NONE
+   * if @a widget  doesn't have a response id set.
+   * 
+   * @newin2p8.
+   */
+  int get_response_for_widget(const Gtk::Widget& widget) const;
+  
   /** Sets whether the dialog has a separator above the buttons.
    * <tt>true</tt> by default.
    * @param setting <tt>true</tt> to have a separator.
@@ -237,7 +254,7 @@ public:
    * @return <tt>true</tt> if the dialog has a separator.
    */
   bool get_has_separator() const;
-  
+
   
   /** Returns <tt>true</tt> if dialogs are expected to use an alternative
    * button order on the screen @a screen . See 
@@ -251,11 +268,27 @@ public:
    * @param screen A Gdk::Screen, or <tt>0</tt> to use the default screen.
    * @return Whether the alternative button order should be used
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   static bool alternative_button_order(const Glib::RefPtr<const Gdk::Screen>& screen);
-  	
-  //TODO: Document this:   
+
+  /** Sets an alternative button order. If the gtk-alternative-button-order 
+   * setting is set to true, the dialog buttons are reordered according to 
+   * the order of the response ids in @a new_order.
+   *
+   * By default, GTK+ dialogs use the button order advocated by the Gnome 
+   * <ulink url="http://developer.gnome.org/projects/gup/hig/2.0/">Human 
+   * Interface Guidelines</ulink> with the affirmative button at the far 
+   * right, and the cancel button left of it. But the builtin GTK+ dialogs
+   * and #GtkMessageDialog<!-- -->s do provide an alternative button order,
+   * which is more suitable on some platforms, e.g. Windows.
+   *
+   * Use this function after adding all the buttons to your dialog
+   *
+   * @param new_order an array of response ids of the dialog's buttons.
+   * 
+   * @newinp26
+   */
   void set_alternative_button_order_from_array(const Glib::ArrayHandle<int>& new_order);
   
 
@@ -299,19 +332,22 @@ public:
    */
   int run();
 
-  VBox* get_vbox();
+   VBox* get_vbox();
   const VBox* get_vbox() const;
-  HButtonBox* get_action_area();
+    HButtonBox* get_action_area();
   const HButtonBox* get_action_area() const;
-
-  /** The dialog has a separator bar above its buttons.
+ 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The dialog has a separator bar above its buttons.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_has_separator() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The dialog has a separator bar above its buttons.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -319,8 +355,14 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_has_separator() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
+/**
+   * @par Prototype:
+   * <tt>void %response(int response_id)</tt>
+   */
+
   Glib::SignalProxy1< void,int > signal_response();
 
 
@@ -341,6 +383,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Dialog* wrap(GtkDialog* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_DIALOG_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/drawingarea.cc b/libs/gtkmm2/gtk/gtkmm/drawingarea.cc
index 53c90ec888..20796b368c 100644
--- a/libs/gtkmm2/gtk/gtkmm/drawingarea.cc
+++ b/libs/gtkmm2/gtk/gtkmm/drawingarea.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/private/drawingarea_p.h>
 
@@ -74,8 +75,19 @@ void DrawingArea_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* DrawingArea_Class::wrap_new(GObject* o)
 {
@@ -124,6 +136,13 @@ DrawingArea::DrawingArea()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/drawingarea.h b/libs/gtkmm2/gtk/gtkmm/drawingarea.h
index 3d3774deb6..0d0529c3a3 100644
--- a/libs/gtkmm2/gtk/gtkmm/drawingarea.h
+++ b/libs/gtkmm2/gtk/gtkmm/drawingarea.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_DRAWINGAREA_H
 #define _GTKMM_DRAWINGAREA_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -88,11 +89,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -115,6 +122,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::DrawingArea* wrap(GtkDrawingArea* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_DRAWINGAREA_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/editable.cc b/libs/gtkmm2/gtk/gtkmm/editable.cc
index 9109009a2f..4f02024475 100644
--- a/libs/gtkmm2/gtk/gtkmm/editable.cc
+++ b/libs/gtkmm2/gtk/gtkmm/editable.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/editable.h>
 #include <gtkmm/private/editable_p.h>
 
@@ -29,7 +30,8 @@
 namespace
 {
 
-void Editable_signal_insert_text_callback(GtkEditable* self, const gchar* text,gint length,gint* position,void* data)
+
+static void Editable_signal_insert_text_callback(GtkEditable* self, const gchar* text,gint length,gint* position,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::ustring&,int* > SlotType;
@@ -37,19 +39,23 @@ void Editable_signal_insert_text_callback(GtkEditable* self, const gchar* text,g
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(      Glib::ustring(text, text + length), position);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Editable_signal_insert_text_info =
+static const Glib::SignalProxyInfo Editable_signal_insert_text_info =
 {
   "insert_text",
   (GCallback) &Editable_signal_insert_text_callback,
@@ -57,7 +63,7 @@ const Glib::SignalProxyInfo Editable_signal_insert_text_info =
 };
 
 
-void Editable_signal_delete_text_callback(GtkEditable* self, gint start_pos,gint end_pos,void* data)
+static void Editable_signal_delete_text_callback(GtkEditable* self, gint start_pos,gint end_pos,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,int,int > SlotType;
@@ -65,21 +71,25 @@ void Editable_signal_delete_text_callback(GtkEditable* self, gint start_pos,gint
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(start_pos
 , end_pos
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Editable_signal_delete_text_info =
+static const Glib::SignalProxyInfo Editable_signal_delete_text_info =
 {
   "delete_text",
   (GCallback) &Editable_signal_delete_text_callback,
@@ -87,13 +97,14 @@ const Glib::SignalProxyInfo Editable_signal_delete_text_info =
 };
 
 
-const Glib::SignalProxyInfo Editable_signal_changed_info =
+static const Glib::SignalProxyInfo Editable_signal_changed_info =
 {
   "changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -138,6 +149,7 @@ void Editable_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->do_insert_text = &do_insert_text_vfunc_callback;
   klass->do_delete_text = &do_delete_text_vfunc_callback;
   klass->get_chars = &get_chars_vfunc_callback;
@@ -145,11 +157,16 @@ void Editable_Class::iface_init_function(void* g_iface, void*)
   klass->get_selection_bounds = &get_selection_bounds_vfunc_callback;
   klass->set_position = &set_position_vfunc_callback;
   klass->get_position = &get_position_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->insert_text = &insert_text_callback;
   klass->delete_text = &delete_text_callback;
   klass->changed = &changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Editable_Class::do_insert_text_vfunc_callback(GtkEditable* self, const gchar* text, gint length, gint* position)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -162,15 +179,19 @@ void Editable_Class::do_insert_text_vfunc_callback(GtkEditable* self, const gcha
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->insert_text_vfunc(      Glib::ustring(text, text + length), *position);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -184,7 +205,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->do_insert_text)(      self, text, length, position);
   }
 }
-
 void Editable_Class::do_delete_text_vfunc_callback(GtkEditable* self, gint start_pos, gint end_pos)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -197,17 +217,21 @@ void Editable_Class::do_delete_text_vfunc_callback(GtkEditable* self, gint start
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->delete_text_vfunc(start_pos
 , end_pos
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -221,7 +245,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->do_delete_text)(self, start_pos, end_pos);
   }
 }
-
 gchar* Editable_Class::get_chars_vfunc_callback(GtkEditable* self, gint start_pos, gint end_pos)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -234,17 +257,21 @@ gchar* Editable_Class::get_chars_vfunc_callback(GtkEditable* self, gint start_po
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return g_strdup((obj->get_chars_vfunc(start_pos
 , end_pos
 )).c_str());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -261,7 +288,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gchar* RType;
   return RType();
 }
-
 void Editable_Class::set_selection_bounds_vfunc_callback(GtkEditable* self, gint start_pos, gint end_pos)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -274,17 +300,21 @@ void Editable_Class::set_selection_bounds_vfunc_callback(GtkEditable* self, gint
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->select_region_vfunc(start_pos
 , end_pos
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -298,7 +328,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_selection_bounds)(self, start_pos, end_pos);
   }
 }
-
 gboolean Editable_Class::get_selection_bounds_vfunc_callback(GtkEditable* self, gint* start_pos, gint* end_pos)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -311,17 +340,21 @@ gboolean Editable_Class::get_selection_bounds_vfunc_callback(GtkEditable* self,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->get_selection_bounds_vfunc(*(start_pos)
 , *(end_pos)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -338,7 +371,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 void Editable_Class::set_position_vfunc_callback(GtkEditable* self, gint position)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -351,16 +383,20 @@ void Editable_Class::set_position_vfunc_callback(GtkEditable* self, gint positio
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_position_vfunc(position
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -374,7 +410,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_position)(self, position);
   }
 }
-
 gint Editable_Class::get_position_vfunc_callback(GtkEditable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -387,15 +422,19 @@ gint Editable_Class::get_position_vfunc_callback(GtkEditable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_position_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -412,8 +451,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Editable_Class::insert_text_callback(GtkEditable* self, const gchar* text, gint length, gint* position)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -426,15 +466,19 @@ void Editable_Class::insert_text_callback(GtkEditable* self, const gchar* text,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_insert_text(      Glib::ustring(text, text + length), position);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -448,7 +492,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->insert_text)(      self, text, length, position);
   }
 }
-
 void Editable_Class::delete_text_callback(GtkEditable* self, gint start_pos, gint end_pos)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -461,17 +504,21 @@ void Editable_Class::delete_text_callback(GtkEditable* self, gint start_pos, gin
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_delete_text(start_pos
 , end_pos
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -485,7 +532,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->delete_text)(self, start_pos, end_pos);
   }
 }
-
 void Editable_Class::changed_callback(GtkEditable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -498,15 +544,19 @@ void Editable_Class::changed_callback(GtkEditable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -520,6 +570,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Editable_Class::wrap_new(GObject* object)
@@ -564,27 +615,27 @@ GType Editable::get_base_type()
 
 void Editable::cut_clipboard()
 {
-  gtk_editable_cut_clipboard(gobj());
+gtk_editable_cut_clipboard(gobj()); 
 }
 
 void Editable::copy_clipboard()
 {
-  gtk_editable_copy_clipboard(gobj());
+gtk_editable_copy_clipboard(gobj()); 
 }
 
 void Editable::paste_clipboard()
 {
-  gtk_editable_paste_clipboard(gobj());
+gtk_editable_paste_clipboard(gobj()); 
 }
 
 void Editable::delete_selection()
 {
-  gtk_editable_delete_selection(gobj());
+gtk_editable_delete_selection(gobj()); 
 }
 
 void Editable::set_editable(bool is_editable)
 {
-  gtk_editable_set_editable(gobj(), static_cast<int>(is_editable));
+gtk_editable_set_editable(gobj(), static_cast<int>(is_editable)); 
 }
 
 bool Editable::get_editable() const
@@ -594,12 +645,12 @@ bool Editable::get_editable() const
 
 void Editable::insert_text(const Glib::ustring& text, int length, int& position)
 {
-  gtk_editable_insert_text(gobj(), text.c_str(), length, &position);
+gtk_editable_insert_text(gobj(), text.c_str(), length, &position); 
 }
 
 void Editable::delete_text(int start_pos, int end_pos)
 {
-  gtk_editable_delete_text(gobj(), start_pos, end_pos);
+gtk_editable_delete_text(gobj(), start_pos, end_pos); 
 }
 
 Glib::ustring Editable::get_chars(int start_pos, int end_pos) const
@@ -609,7 +660,7 @@ Glib::ustring Editable::get_chars(int start_pos, int end_pos) const
 
 void Editable::select_region(int start_pos, int end_pos)
 {
-  gtk_editable_select_region(gobj(), start_pos, end_pos);
+gtk_editable_select_region(gobj(), start_pos, end_pos); 
 }
 
 bool Editable::get_selection_bounds(int& start_pos, int& end_pos) const
@@ -619,7 +670,7 @@ bool Editable::get_selection_bounds(int& start_pos, int& end_pos) const
 
 void Editable::set_position(int position)
 {
-  gtk_editable_set_position(gobj(), position);
+gtk_editable_set_position(gobj(), position); 
 }
 
 int Editable::get_position() const
@@ -633,17 +684,20 @@ Glib::SignalProxy2< void,const Glib::ustring&,int* > Editable::signal_insert_tex
   return Glib::SignalProxy2< void,const Glib::ustring&,int* >(this, &Editable_signal_insert_text_info);
 }
 
+
 Glib::SignalProxy2< void,int,int > Editable::signal_delete_text()
 {
   return Glib::SignalProxy2< void,int,int >(this, &Editable_signal_delete_text_info);
 }
 
+
 Glib::SignalProxy0< void > Editable::signal_changed()
 {
   return Glib::SignalProxy0< void >(this, &Editable_signal_changed_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Editable::on_insert_text(const Glib::ustring& text, int* position)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -654,7 +708,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->insert_text)
     (*base->insert_text)(gobj(),text.data(),text.bytes(),position);
 }
-
 void Gtk::Editable::on_delete_text(int start_pos, int end_pos)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -665,7 +718,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->delete_text)
     (*base->delete_text)(gobj(),start_pos,end_pos);
 }
-
 void Gtk::Editable::on_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -676,8 +728,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->changed)
     (*base->changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::Editable::insert_text_vfunc(const Glib::ustring& text, int& position) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -688,7 +741,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->do_insert_text)
     (*base->do_insert_text)(gobj(),text.data(),text.bytes(),&position);
 }
-
 void Gtk::Editable::delete_text_vfunc(int start_pos, int end_pos) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -699,7 +751,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->do_delete_text)
     (*base->do_delete_text)(gobj(),start_pos,end_pos);
 }
-
 Glib::ustring Gtk::Editable::get_chars_vfunc(int start_pos, int end_pos) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -713,7 +764,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef Glib::ustring RType;
   return RType();
 }
-
 void Gtk::Editable::select_region_vfunc(int start_pos, int end_pos) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -724,7 +774,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_selection_bounds)
     (*base->set_selection_bounds)(gobj(),start_pos,end_pos);
 }
-
 bool Gtk::Editable::get_selection_bounds_vfunc(int& start_pos, int& end_pos) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -738,7 +787,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 void Gtk::Editable::set_position_vfunc(int position) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -749,7 +797,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_position)
     (*base->set_position)(gobj(),position);
 }
-
 int Gtk::Editable::get_position_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -763,6 +810,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/editable.h b/libs/gtkmm2/gtk/gtkmm/editable.h
index 89832dcba7..edc79ed88b 100644
--- a/libs/gtkmm2/gtk/gtkmm/editable.h
+++ b/libs/gtkmm2/gtk/gtkmm/editable.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_EDITABLE_H
 #define _GTKMM_EDITABLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -134,40 +135,72 @@ public:
   Glib::SignalProxy2< void,const Glib::ustring&,int* > signal_insert_text();
 
     
+/**
+   * @par Prototype:
+   * <tt>void %delete_text(int start_pos, int end_pos)</tt>
+   */
+
   Glib::SignalProxy2< void,int,int > signal_delete_text();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_changed();
 
 
 protected:
 
 
-    virtual void delete_text_vfunc(int start_pos, int end_pos);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void delete_text_vfunc(int start_pos, int end_pos);
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::ustring get_chars_vfunc(int start_pos, int end_pos) const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
-    virtual Glib::ustring get_chars_vfunc(int start_pos, int end_pos) const;
 
-    virtual void select_region_vfunc(int start_pos, int end_pos);
-    virtual bool get_selection_bounds_vfunc(int& start_pos, int& end_pos) const;
-    virtual void set_position_vfunc(int position);
-    virtual int get_position_vfunc() const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void select_region_vfunc(int start_pos, int end_pos);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool get_selection_bounds_vfunc(int& start_pos, int& end_pos) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_position_vfunc(int position);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_position_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
 virtual void insert_text_vfunc(const Glib::ustring& text, int& position);
 
- 
+#endif //GLIBMM_VFUNCS_ENABLED
+
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_insert_text(const Glib::ustring& text, int* position);
   virtual void on_delete_text(int start_pos, int end_pos);
   virtual void on_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -186,5 +219,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_EDITABLE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/entry.cc b/libs/gtkmm2/gtk/gtkmm/entry.cc
index 6b08e95c3b..9c10aecef8 100644
--- a/libs/gtkmm2/gtk/gtkmm/entry.cc
+++ b/libs/gtkmm2/gtk/gtkmm/entry.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/entry.h>
 #include <gtkmm/private/entry_p.h>
 
@@ -31,7 +32,8 @@
 namespace
 {
 
-void Entry_signal_populate_popup_callback(GtkEntry* self, GtkMenu* p0,void* data)
+
+static void Entry_signal_populate_popup_callback(GtkEntry* self, GtkMenu* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Menu* > SlotType;
@@ -39,20 +41,24 @@ void Entry_signal_populate_popup_callback(GtkEntry* self, GtkMenu* p0,void* data
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Entry_signal_populate_popup_info =
+static const Glib::SignalProxyInfo Entry_signal_populate_popup_info =
 {
   "populate_popup",
   (GCallback) &Entry_signal_populate_popup_callback,
@@ -60,7 +66,7 @@ const Glib::SignalProxyInfo Entry_signal_populate_popup_info =
 };
 
 
-void Entry_signal_insert_at_cursor_callback(GtkEntry* self, const gchar* p0,void* data)
+static void Entry_signal_insert_at_cursor_callback(GtkEntry* self, const gchar* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::ustring& > SlotType;
@@ -68,20 +74,24 @@ void Entry_signal_insert_at_cursor_callback(GtkEntry* self, const gchar* p0,void
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::convert_const_gchar_ptr_to_ustring(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Entry_signal_insert_at_cursor_info =
+static const Glib::SignalProxyInfo Entry_signal_insert_at_cursor_info =
 {
   "insert_at_cursor",
   (GCallback) &Entry_signal_insert_at_cursor_callback,
@@ -89,13 +99,14 @@ const Glib::SignalProxyInfo Entry_signal_insert_at_cursor_info =
 };
 
 
-const Glib::SignalProxyInfo Entry_signal_activate_info =
+static const Glib::SignalProxyInfo Entry_signal_activate_info =
 {
   "activate",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -142,12 +153,20 @@ void Entry_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->populate_popup = &populate_popup_callback;
   klass->insert_at_cursor = &insert_at_cursor_callback;
   klass->activate = &activate_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Entry_Class::populate_popup_callback(GtkEntry* self, GtkMenu* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -160,16 +179,20 @@ void Entry_Class::populate_popup_callback(GtkEntry* self, GtkMenu* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_populate_popup(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -182,7 +205,6 @@ void Entry_Class::populate_popup_callback(GtkEntry* self, GtkMenu* p0)
       (*base->populate_popup)(self, p0);
   }
 }
-
 void Entry_Class::insert_at_cursor_callback(GtkEntry* self, const gchar* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -195,16 +217,20 @@ void Entry_Class::insert_at_cursor_callback(GtkEntry* self, const gchar* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_insert_at_cursor(Glib::convert_const_gchar_ptr_to_ustring(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -217,7 +243,6 @@ void Entry_Class::insert_at_cursor_callback(GtkEntry* self, const gchar* p0)
       (*base->insert_at_cursor)(self, p0);
   }
 }
-
 void Entry_Class::activate_callback(GtkEntry* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -230,15 +255,19 @@ void Entry_Class::activate_callback(GtkEntry* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_activate();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -251,6 +280,7 @@ void Entry_Class::activate_callback(GtkEntry* self)
       (*base->activate)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Entry_Class::wrap_new(GObject* o)
@@ -301,7 +331,7 @@ Entry::Entry()
 
 void Entry::set_visibility(bool visible)
 {
-  gtk_entry_set_visibility(gobj(), static_cast<int>(visible));
+gtk_entry_set_visibility(gobj(), static_cast<int>(visible)); 
 }
 
 bool Entry::get_visibility() const
@@ -311,7 +341,7 @@ bool Entry::get_visibility() const
 
 void Entry::set_invisible_char(gunichar ch)
 {
-  gtk_entry_set_invisible_char(gobj(), ch);
+gtk_entry_set_invisible_char(gobj(), ch); 
 }
 
 gunichar Entry::get_invisible_char() const
@@ -321,7 +351,7 @@ gunichar Entry::get_invisible_char() const
 
 void Entry::set_has_frame(bool setting)
 {
-  gtk_entry_set_has_frame(gobj(), static_cast<int>(setting));
+gtk_entry_set_has_frame(gobj(), static_cast<int>(setting)); 
 }
 
 bool Entry::get_has_frame() const
@@ -329,9 +359,19 @@ bool Entry::get_has_frame() const
   return gtk_entry_get_has_frame(const_cast<GtkEntry*>(gobj()));
 }
 
+void Entry::set_inner_border(const Border& border)
+{
+gtk_entry_set_inner_border(gobj(), &(border)); 
+}
+
+Border Entry::get_inner_border() const
+{
+  return *(gtk_entry_get_inner_border(const_cast<GtkEntry*>(gobj())));
+}
+
 void Entry::set_max_length(int max)
 {
-  gtk_entry_set_max_length(gobj(), max);
+gtk_entry_set_max_length(gobj(), max); 
 }
 
 int Entry::get_max_length() const
@@ -341,7 +381,7 @@ int Entry::get_max_length() const
 
 void Entry::set_activates_default(bool setting)
 {
-  gtk_entry_set_activates_default(gobj(), static_cast<int>(setting));
+gtk_entry_set_activates_default(gobj(), static_cast<int>(setting)); 
 }
 
 gboolean Entry::get_activates_default() const
@@ -351,7 +391,7 @@ gboolean Entry::get_activates_default() const
 
 void Entry::set_width_chars(int n_chars)
 {
-  gtk_entry_set_width_chars(gobj(), n_chars);
+gtk_entry_set_width_chars(gobj(), n_chars); 
 }
 
 int Entry::get_width_chars() const
@@ -361,7 +401,7 @@ int Entry::get_width_chars() const
 
 void Entry::set_text(const Glib::ustring & text)
 {
-  gtk_entry_set_text(gobj(), text.c_str());
+gtk_entry_set_text(gobj(), text.c_str()); 
 }
 
 Glib::ustring Entry::get_text() const
@@ -373,25 +413,20 @@ Glib::RefPtr<Pango::Layout> Entry::get_layout()
 {
 
   Glib::RefPtr<Pango::Layout> retvalue = Glib::wrap(gtk_entry_get_layout(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Pango::Layout> Entry::get_layout() const
 {
-
-  Glib::RefPtr<const Pango::Layout> retvalue = Glib::wrap(gtk_entry_get_layout(const_cast<GtkEntry*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Entry*>(this)->get_layout();
 }
 
 void Entry::get_layout_offsets(int& x, int& y)
 {
-  gtk_entry_get_layout_offsets(gobj(), &x, &y);
+gtk_entry_get_layout_offsets(gobj(), &x, &y); 
 }
 
 int Entry::layout_index_to_text_index(int layout_index) const
@@ -406,12 +441,12 @@ int Entry::text_index_to_layout_index(int text_index) const
 
 void Entry::set_alignment(float xalign)
 {
-  gtk_entry_set_alignment(gobj(), xalign);
+gtk_entry_set_alignment(gobj(), xalign); 
 }
 
 void Entry::set_alignment(AlignmentEnum xalign)
 {
-  gtk_entry_set_alignment(gobj(), _gtkmm_align_float_from_enum(xalign));
+gtk_entry_set_alignment(gobj(), _gtkmm_align_float_from_enum(xalign)); 
 }
 
 float Entry::get_alignment() const
@@ -421,147 +456,211 @@ float Entry::get_alignment() const
 
 void Entry::set_completion(const Glib::RefPtr<EntryCompletion>& completion)
 {
-  gtk_entry_set_completion(gobj(), Glib::unwrap(completion));
+gtk_entry_set_completion(gobj(), Glib::unwrap(completion)); 
 }
 
 Glib::RefPtr<EntryCompletion> Entry::get_completion()
 {
 
   Glib::RefPtr<EntryCompletion> retvalue = Glib::wrap(gtk_entry_get_completion(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const EntryCompletion> Entry::get_completion() const
 {
-
-  Glib::RefPtr<const EntryCompletion> retvalue = Glib::wrap(gtk_entry_get_completion(const_cast<GtkEntry*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Entry*>(this)->get_completion();
 }
 
-guint16 Entry::get_text_length() const
+ guint16 Entry::get_text_length() const
 {
   return gobj()->text_length;
 }
-
+ 
 
 Glib::SignalProxy1< void,Menu* > Entry::signal_populate_popup()
 {
   return Glib::SignalProxy1< void,Menu* >(this, &Entry_signal_populate_popup_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::ustring& > Entry::signal_insert_at_cursor()
 {
   return Glib::SignalProxy1< void,const Glib::ustring& >(this, &Entry_signal_insert_at_cursor_info);
 }
 
+
 Glib::SignalProxy0< void > Entry::signal_activate()
 {
   return Glib::SignalProxy0< void >(this, &Entry_signal_activate_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Entry::property_cursor_position() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "cursor-position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Entry::property_selection_bound() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "selection-bound");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Entry::property_editable() 
 {
   return Glib::PropertyProxy<bool>(this, "editable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Entry::property_editable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "editable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Entry::property_max_length() 
 {
   return Glib::PropertyProxy<int>(this, "max-length");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Entry::property_max_length() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "max-length");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Entry::property_visibility() 
 {
   return Glib::PropertyProxy<bool>(this, "visibility");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Entry::property_visibility() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "visibility");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Entry::property_has_frame() 
 {
   return Glib::PropertyProxy<bool>(this, "has-frame");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Entry::property_has_frame() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "has-frame");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<gunichar> Entry::property_invisible_char() 
 {
   return Glib::PropertyProxy<gunichar>(this, "invisible-char");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<gunichar> Entry::property_invisible_char() const
 {
   return Glib::PropertyProxy_ReadOnly<gunichar>(this, "invisible-char");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Entry::property_activates_default() 
 {
   return Glib::PropertyProxy<bool>(this, "activates-default");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Entry::property_activates_default() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "activates-default");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Entry::property_width_chars() 
 {
   return Glib::PropertyProxy<int>(this, "width-chars");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Entry::property_width_chars() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "width-chars");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Entry::property_scroll_offset() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "scroll-offset");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Entry::property_text() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "text");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Entry::property_text() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "text");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<float> Entry::property_xalign() 
+{
+  return Glib::PropertyProxy<float>(this, "xalign");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<float> Entry::property_xalign() const
+{
+  return Glib::PropertyProxy_ReadOnly<float>(this, "xalign");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> Entry::property_truncate_multiline() 
+{
+  return Glib::PropertyProxy<bool>(this, "truncate-multiline");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> Entry::property_truncate_multiline() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "truncate-multiline");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Entry::on_populate_popup(Menu* menu)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -571,7 +670,6 @@ void Gtk::Entry::on_populate_popup(Menu* menu)
   if(base && base->populate_popup)
     (*base->populate_popup)(gobj(),(GtkMenu*)Glib::unwrap(menu));
 }
-
 void Gtk::Entry::on_insert_at_cursor(const Glib::ustring& str)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -581,7 +679,6 @@ void Gtk::Entry::on_insert_at_cursor(const Glib::ustring& str)
   if(base && base->insert_at_cursor)
     (*base->insert_at_cursor)(gobj(),str.c_str());
 }
-
 void Gtk::Entry::on_activate()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -591,6 +688,10 @@ void Gtk::Entry::on_activate()
   if(base && base->activate)
     (*base->activate)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/entry.h b/libs/gtkmm2/gtk/gtkmm/entry.h
index d7b9a3fb3c..4b2eb14177 100644
--- a/libs/gtkmm2/gtk/gtkmm/entry.h
+++ b/libs/gtkmm2/gtk/gtkmm/entry.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ENTRY_H
 #define _GTKMM_ENTRY_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -44,6 +45,9 @@ namespace Gtk
 namespace Gtk
 {
 
+//TODO: This is used in Range too, so put it somewhere more appropriate:
+typedef GtkBorder Border;
+
 /** A single line text entry field.
  *
  * The Gtk::Entry widget is a single line text entry widget. A fairly large
@@ -100,14 +104,20 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_populate_popup(Menu* menu);
   virtual void on_insert_at_cursor(const Glib::ustring& str);
   virtual void on_activate();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -153,6 +163,12 @@ public:
    * @return Whether the entry has a beveled frame.
    */
   bool get_has_frame() const;
+
+  
+  void set_inner_border(const Border& border);
+  
+  Border get_inner_border() const;
+
   
   /** Sets the maximum allowed length of the contents of the widget. If
    * the current contents are longer than the given length, then they
@@ -215,8 +231,8 @@ public:
   /** Gets the Pango::Layout used to display the entry.
    * The layout is useful to e.g. convert text positions to
    * pixel positions, in combination with get_layout_offsets().
-   * The returned layout is owned by the entry so need not be
-   * freed by the caller.
+   * The returned layout is owned by the entry and must not be 
+   * modified or freed by the caller.
    * 
    * Keep in mind that the layout text may contain a preedit string, so
    * layout_index_to_text_index() and
@@ -229,8 +245,8 @@ public:
   /** Gets the Pango::Layout used to display the entry.
    * The layout is useful to e.g. convert text positions to
    * pixel positions, in combination with get_layout_offsets().
-   * The returned layout is owned by the entry so need not be
-   * freed by the caller.
+   * The returned layout is owned by the entry and must not be 
+   * modified or freed by the caller.
    * 
    * Keep in mind that the layout text may contain a preedit string, so
    * layout_index_to_text_index() and
@@ -287,7 +303,7 @@ public:
    * the horizontal positioning of the contents when the displayed
    * text is shorter than the width of the entry.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param xalign The horizontal alignment, from 0 (left) to 1 (right).
    * Reversed for RTL layouts.
    */
@@ -297,7 +313,7 @@ public:
    * the horizontal positioning of the contents when the displayed
    * text is shorter than the width of the entry.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param xalign The horizontal alignment, from 0 (left) to 1 (right).
    * Reversed for RTL layouts.
    */
@@ -306,7 +322,7 @@ public:
   /** Gets the value set by set_alignment().
    * @return The alignment
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   float get_alignment() const;
 
@@ -315,7 +331,7 @@ public:
    * All further configuration of the completion mechanism is done on
    *  @a completion  using the Gtk::EntryCompletion API.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param completion The Gtk::EntryCompletion.
    */
   void set_completion(const Glib::RefPtr<EntryCompletion>& completion);
@@ -323,59 +339,83 @@ public:
   /** Returns the auxiliary completion object currently in use by @a entry .
    * @return The auxiliary completion object currently in use by @a entry .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<EntryCompletion> get_completion();
   
   /** Returns the auxiliary completion object currently in use by @a entry .
    * @return The auxiliary completion object currently in use by @a entry .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<const EntryCompletion> get_completion() const;
 
-  guint16 get_text_length() const;
-
+   guint16 get_text_length() const;
+ 
   
+/**
+   * @par Prototype:
+   * <tt>void %populate_popup(Menu* menu)</tt>
+   */
+
   Glib::SignalProxy1< void,Menu* > signal_populate_popup();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %insert_at_cursor(const Glib::ustring& str)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::ustring& > signal_insert_at_cursor();
 
 
   //Key-binding signals:
+
+  //This is a keybinding signal, but it is allowed:
+  // http://mail.gnome.org/archives/gtk-devel-list/2003-January/msg00108.html
+  // "activate is probably about the only exception"
   
+/**
+   * @par Prototype:
+   * <tt>void %activate()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_activate();
- //TODO: ignore this too? It's used in an example.
-  
-  
-  /** The current position of the insertion cursor in chars.
+
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The current position of the insertion cursor in chars.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_cursor_position() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The position of the opposite end of the selection from the cursor in chars.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The position of the opposite end of the selection from the cursor in chars.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_selection_bound() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** Whether the entry contents can be edited.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the entry contents can be edited.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_editable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the entry contents can be edited.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -383,15 +423,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_editable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Maximum number of characters for this entry. Zero if no maximum.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Maximum number of characters for this entry. Zero if no maximum.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_max_length() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Maximum number of characters for this entry. Zero if no maximum.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -399,15 +443,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_max_length() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** FALSE displays the invisible char instead of the actual text (password mode).
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** FALSE displays the invisible char instead of the actual text (password mode).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_visibility() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** FALSE displays the invisible char instead of the actual text (password mode).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -415,15 +463,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_visibility() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** FALSE removes outside bevel from entry.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** FALSE removes outside bevel from entry.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_has_frame() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** FALSE removes outside bevel from entry.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -431,15 +483,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_has_frame() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The character to use when masking entry contents (in password mode).
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The character to use when masking entry contents (in password mode).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<gunichar> property_invisible_char() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The character to use when masking entry contents (in password mode).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -447,15 +503,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<gunichar> property_invisible_char() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_activates_default() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -463,15 +523,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_activates_default() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Number of characters to leave space for in the entry.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Number of characters to leave space for in the entry.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_width_chars() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Number of characters to leave space for in the entry.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -479,24 +543,30 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_width_chars() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Number of pixels of the entry scrolled off the screen to the left.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Number of pixels of the entry scrolled off the screen to the left.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_scroll_offset() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The contents of the entry.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The contents of the entry.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_text() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The contents of the entry.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -504,6 +574,47 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_text() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The horizontal alignment
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<float> property_xalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The horizontal alignment
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<float> property_xalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to truncate multiline pastes to one line.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_truncate_multiline() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to truncate multiline pastes to one line.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_truncate_multiline() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -519,6 +630,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Entry* wrap(GtkEntry* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_ENTRY_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/entrycompletion.cc b/libs/gtkmm2/gtk/gtkmm/entrycompletion.cc
index 4b7d15975d..83c619c9a8 100644
--- a/libs/gtkmm2/gtk/gtkmm/entrycompletion.cc
+++ b/libs/gtkmm2/gtk/gtkmm/entrycompletion.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/entrycompletion.h>
 #include <gtkmm/private/entrycompletion_p.h>
 
@@ -27,71 +28,49 @@
 #include <gtkmm/entry.h>
 #include <gtk/gtkentrycompletion.h>
 
-namespace //anonymous
-{
-
-// This Signal Proxy allows the C++ coder to specify
-// a sigc::slot instead of a static function.
-class SignalProxy_Match
-{
-public:
-  typedef Gtk::EntryCompletion::SlotMatch SlotType;
-
-  SignalProxy_Match(const SlotType& slot)
-  : slot_(slot) {}
-  
-  ~SignalProxy_Match();
-
-  static gboolean gtk_callback(GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer user_data);
-  static void gtk_callback_destroy(void* data);                                               
-
-private:
-  SlotType slot_;
-};
-
-SignalProxy_Match::~SignalProxy_Match()
-{}
 
-gboolean SignalProxy_Match::gtk_callback(GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer user_data)
+static gboolean SignalProxy_Match_gtk_callback(GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer user_data)
 {
-  SignalProxy_Match *const self = static_cast<SignalProxy_Match*>(user_data);
+  Gtk::EntryCompletion::SlotMatch* the_slot = static_cast<Gtk::EntryCompletion::SlotMatch*>(user_data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     GtkTreeModel* tree_model = gtk_entry_completion_get_model(completion);
-    return (self->slot_)(Glib::convert_const_gchar_ptr_to_ustring(key),
+    return (*the_slot)(Glib::convert_const_gchar_ptr_to_ustring(key),
                          Gtk::TreeModel::const_iterator(tree_model, iter)
                          );
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
 
-  return FALSE; //An arbitary default, just to avoid the compiler warning.
+  return false; //An arbitary default, just to avoid the compiler warning.
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void SignalProxy_Match::gtk_callback_destroy(void* data)
+static void SignalProxy_Match_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_Match*>(data);
+  delete static_cast<Gtk::EntryCompletion::SlotMatch*>(data);
 }
 
-} // anonymous namespace
-
 
 namespace Gtk
 {
 
 void EntryCompletion::set_match_func(const SlotMatch& slot)
 {
-  // Create a signal proxy.  A pointer to this will be passed
+  // Create a copy of the slot.  A pointer to this will be passed
   // through the callback's data parameter.  It will be deleted
-  // when SignalProxy_Match::gtk_callback_destroy() is called.
-  SignalProxy_Match *const pSignalProxy = new SignalProxy_Match(slot);
+  // when SignalProxy_Match_gtk_callback_destroy() is called.
+  SlotMatch* slot_copy = new SlotMatch(slot);
 
   gtk_entry_completion_set_match_func(gobj(),
-      &SignalProxy_Match::gtk_callback, pSignalProxy,
-      &SignalProxy_Match::gtk_callback_destroy);
+      &SignalProxy_Match_gtk_callback, slot_copy,
+      &SignalProxy_Match_gtk_callback_destroy);
 }
 
 void EntryCompletion::insert_action_text(const Glib::ustring& text, int index)
@@ -126,7 +105,7 @@ void EntryCompletion::prepend_action_markup(const Glib::ustring& markup)
 namespace //anonymous
 {
 
-gboolean Widget_signal_match_selected_callback(GtkEntryCompletion* self, GtkTreeModel* c_model, GtkTreeIter* c_iter, void* data)
+static gboolean Widget_signal_match_selected_callback(GtkEntryCompletion* self, GtkTreeModel* c_model, GtkTreeIter* c_iter, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool, const TreeModel::iterator& > SlotType;
@@ -134,27 +113,31 @@ gboolean Widget_signal_match_selected_callback(GtkEntryCompletion* self, GtkTree
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
       {
         //This conversion is the custom-written part:
         Gtk::TreeModel::iterator cppIter(c_model, c_iter);
-        
+
         return static_cast<int>( (*static_cast<SlotType*>(slot))(cppIter) );
       }
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_match_selected_notify_callback(GtkEntryCompletion* self, GtkTreeModel* c_model, GtkTreeIter* c_iter, void* data)
+static gboolean Widget_signal_match_selected_notify_callback(GtkEntryCompletion* self, GtkTreeModel* c_model, GtkTreeIter* c_iter, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void, const TreeModel::iterator& > SlotType;
@@ -162,8 +145,10 @@ gboolean Widget_signal_match_selected_notify_callback(GtkEntryCompletion* self,
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
       {
         //This conversion is the custom-written part:
@@ -171,11 +156,13 @@ gboolean Widget_signal_match_selected_notify_callback(GtkEntryCompletion* self,
 
         (*static_cast<SlotType*>(slot))(cppIter);
       }
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
@@ -195,7 +182,7 @@ const Glib::SignalProxyInfo EntryCompletion_signal_match_selected_info =
 namespace Gtk
 {
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 //Hand-coded signal wrapping:
 
 bool Gtk::EntryCompletion::on_match_selected(const TreeModel::iterator& iter)
@@ -225,18 +212,22 @@ gboolean EntryCompletion_Class::match_selected_callback_custom(GtkEntryCompletio
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
 
       //This conversion is the custom-written part:
       Gtk::TreeModel::iterator cppIter(c_model, c_iter);
       return obj->on_match_selected(cppIter);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -252,6 +243,7 @@ gboolean EntryCompletion_Class::match_selected_callback_custom(GtkEntryCompletio
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 Glib::SignalProxy1< bool, const TreeModel::iterator& > EntryCompletion::signal_match_selected()
 {
@@ -265,7 +257,8 @@ Glib::SignalProxy1< bool, const TreeModel::iterator& > EntryCompletion::signal_m
 namespace
 {
 
-void EntryCompletion_signal_action_activated_callback(GtkEntryCompletion* self, gint p0,void* data)
+
+static void EntryCompletion_signal_action_activated_callback(GtkEntryCompletion* self, gint p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,int > SlotType;
@@ -273,20 +266,24 @@ void EntryCompletion_signal_action_activated_callback(GtkEntryCompletion* self,
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo EntryCompletion_signal_action_activated_info =
+static const Glib::SignalProxyInfo EntryCompletion_signal_action_activated_info =
 {
   "action_activated",
   (GCallback) &EntryCompletion_signal_action_activated_callback,
@@ -294,7 +291,7 @@ const Glib::SignalProxyInfo EntryCompletion_signal_action_activated_info =
 };
 
 
-gboolean EntryCompletion_signal_insert_prefix_callback(GtkEntryCompletion* self, const gchar* p0,void* data)
+static gboolean EntryCompletion_signal_insert_prefix_callback(GtkEntryCompletion* self, const gchar* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,const Glib::ustring& > SlotType;
@@ -302,23 +299,27 @@ gboolean EntryCompletion_signal_insert_prefix_callback(GtkEntryCompletion* self,
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(Glib::convert_const_gchar_ptr_to_ustring(p0)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean EntryCompletion_signal_insert_prefix_notify_callback(GtkEntryCompletion* self, const gchar* p0, void* data)
+static gboolean EntryCompletion_signal_insert_prefix_notify_callback(GtkEntryCompletion* self, const gchar* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::ustring& > SlotType;
@@ -326,29 +327,34 @@ gboolean EntryCompletion_signal_insert_prefix_notify_callback(GtkEntryCompletion
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::convert_const_gchar_ptr_to_ustring(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo EntryCompletion_signal_insert_prefix_info =
+static const Glib::SignalProxyInfo EntryCompletion_signal_insert_prefix_info =
 {
   "insert_prefix",
   (GCallback) &EntryCompletion_signal_insert_prefix_callback,
   (GCallback) &EntryCompletion_signal_insert_prefix_notify_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -395,11 +401,19 @@ void EntryCompletion_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->action_activated = &action_activated_callback;
     klass->match_selected = &match_selected_callback_custom;
-  }
+  #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+}
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void EntryCompletion_Class::action_activated_callback(GtkEntryCompletion* self, gint p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -412,16 +426,20 @@ void EntryCompletion_Class::action_activated_callback(GtkEntryCompletion* self,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_action_activated(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -434,6 +452,7 @@ void EntryCompletion_Class::action_activated_callback(GtkEntryCompletion* self,
       (*base->action_activated)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* EntryCompletion_Class::wrap_new(GObject* object)
@@ -500,32 +519,27 @@ const Entry* EntryCompletion::get_entry() const
 
 void EntryCompletion::set_model(const Glib::RefPtr<TreeModel>& model)
 {
-  gtk_entry_completion_set_model(gobj(), Glib::unwrap(model));
+gtk_entry_completion_set_model(gobj(), Glib::unwrap(model)); 
 }
 
 Glib::RefPtr<TreeModel> EntryCompletion::get_model()
 {
 
   Glib::RefPtr<TreeModel> retvalue = Glib::wrap(gtk_entry_completion_get_model(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TreeModel> EntryCompletion::get_model() const
 {
-
-  Glib::RefPtr<const TreeModel> retvalue = Glib::wrap(gtk_entry_completion_get_model(const_cast<GtkEntryCompletion*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<EntryCompletion*>(this)->get_model();
 }
 
 void EntryCompletion::set_minimum_key_length(int length)
 {
-  gtk_entry_completion_set_minimum_key_length(gobj(), length);
+gtk_entry_completion_set_minimum_key_length(gobj(), length); 
 }
 
 int EntryCompletion::get_minimum_key_length() const
@@ -535,22 +549,22 @@ int EntryCompletion::get_minimum_key_length() const
 
 void EntryCompletion::complete()
 {
-  gtk_entry_completion_complete(gobj());
+gtk_entry_completion_complete(gobj()); 
 }
 
 void EntryCompletion::insert_prefix()
 {
-  gtk_entry_completion_insert_prefix(gobj());
+gtk_entry_completion_insert_prefix(gobj()); 
 }
 
 void EntryCompletion::delete_action(int index)
 {
-  gtk_entry_completion_delete_action(gobj(), index);
+gtk_entry_completion_delete_action(gobj(), index); 
 }
 
 void EntryCompletion::set_inline_completion(bool inline_completion)
 {
-  gtk_entry_completion_set_inline_completion(gobj(), static_cast<int>(inline_completion));
+gtk_entry_completion_set_inline_completion(gobj(), static_cast<int>(inline_completion)); 
 }
 
 bool EntryCompletion::get_inline_completion() const
@@ -560,7 +574,7 @@ bool EntryCompletion::get_inline_completion() const
 
 void EntryCompletion::set_popup_completion(bool popup_completion)
 {
-  gtk_entry_completion_set_popup_completion(gobj(), static_cast<int>(popup_completion));
+gtk_entry_completion_set_popup_completion(gobj(), static_cast<int>(popup_completion)); 
 }
 
 bool EntryCompletion::get_popup_completion() const
@@ -568,14 +582,34 @@ bool EntryCompletion::get_popup_completion() const
   return gtk_entry_completion_get_popup_completion(const_cast<GtkEntryCompletion*>(gobj()));
 }
 
+void EntryCompletion::set_popup_set_width(bool popup_set_width)
+{
+gtk_entry_completion_set_popup_set_width(gobj(), static_cast<int>(popup_set_width)); 
+}
+
+bool EntryCompletion::get_popup_set_width() const
+{
+  return gtk_entry_completion_get_popup_set_width(const_cast<GtkEntryCompletion*>(gobj()));
+}
+
+void EntryCompletion::set_popup_single_width(bool popup_single_match)
+{
+gtk_entry_completion_set_popup_single_match(gobj(), static_cast<int>(popup_single_match)); 
+}
+
+bool EntryCompletion::get_popup_single_match() const
+{
+  return gtk_entry_completion_get_popup_single_match(const_cast<GtkEntryCompletion*>(gobj()));
+}
+
 void EntryCompletion::set_text_column(const TreeModelColumnBase& column)
 {
-  gtk_entry_completion_set_text_column(gobj(), (column).index());
+gtk_entry_completion_set_text_column(gobj(), (column).index()); 
 }
 
 void EntryCompletion::set_text_column(int column)
 {
-  gtk_entry_completion_set_text_column(gobj(), column);
+gtk_entry_completion_set_text_column(gobj(), column); 
 }
 
 int EntryCompletion::get_text_column()
@@ -589,12 +623,113 @@ Glib::SignalProxy1< void,int > EntryCompletion::signal_action_activated()
   return Glib::SignalProxy1< void,int >(this, &EntryCompletion_signal_action_activated_info);
 }
 
+
 Glib::SignalProxy1< bool,const Glib::ustring& > EntryCompletion::signal_insert_prefix()
 {
   return Glib::SignalProxy1< bool,const Glib::ustring& >(this, &EntryCompletion_signal_insert_prefix_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy< Glib::RefPtr<Gtk::TreeModel> > EntryCompletion::property_model() 
+{
+  return Glib::PropertyProxy< Glib::RefPtr<Gtk::TreeModel> >(this, "model");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gtk::TreeModel> > EntryCompletion::property_model() const
+{
+  return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gtk::TreeModel> >(this, "model");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<int> EntryCompletion::property_minimum_key_length() 
+{
+  return Glib::PropertyProxy<int>(this, "minimum-key-length");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<int> EntryCompletion::property_minimum_key_length() const
+{
+  return Glib::PropertyProxy_ReadOnly<int>(this, "minimum-key-length");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<int> EntryCompletion::property_text_column() 
+{
+  return Glib::PropertyProxy<int>(this, "text-column");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<int> EntryCompletion::property_text_column() const
+{
+  return Glib::PropertyProxy_ReadOnly<int>(this, "text-column");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> EntryCompletion::property_inline_completion() 
+{
+  return Glib::PropertyProxy<bool>(this, "inline-completion");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> EntryCompletion::property_inline_completion() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "inline-completion");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> EntryCompletion::property_popup_completion() 
+{
+  return Glib::PropertyProxy<bool>(this, "popup-completion");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> EntryCompletion::property_popup_completion() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "popup-completion");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> EntryCompletion::property_popup_set_width() 
+{
+  return Glib::PropertyProxy<bool>(this, "popup-set-width");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> EntryCompletion::property_popup_set_width() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "popup-set-width");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> EntryCompletion::property_popup_single_match() 
+{
+  return Glib::PropertyProxy<bool>(this, "popup-single-match");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> EntryCompletion::property_popup_single_match() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "popup-single-match");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::EntryCompletion::on_action_activated(int index)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -604,6 +739,10 @@ void Gtk::EntryCompletion::on_action_activated(int index)
   if(base && base->action_activated)
     (*base->action_activated)(gobj(),index);
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/entrycompletion.h b/libs/gtkmm2/gtk/gtkmm/entrycompletion.h
index 2d8e0c5bd0..d4086b2bfb 100644
--- a/libs/gtkmm2/gtk/gtkmm/entrycompletion.h
+++ b/libs/gtkmm2/gtk/gtkmm/entrycompletion.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ENTRYCOMPLETION_H
 #define _GTKMM_ENTRYCOMPLETION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -41,6 +42,7 @@ namespace Gtk
 
 class Entry;
 
+//TODO: This should derive+implement from CellLayout, when we can break ABI.
 
 class EntryCompletion : public Glib::Object
 {
@@ -100,14 +102,14 @@ public:
   /** Gets the entry @a completion  has been attached to.
    * @return The entry @a completion  has been attached to.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Entry* get_entry();
   
   /** Gets the entry @a completion  has been attached to.
    * @return The entry @a completion  has been attached to.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const Entry* get_entry() const;
 
@@ -116,7 +118,7 @@ public:
    * a model set, it will remove it before setting the new model.
    * If model is <tt>0</tt>, then it will unset the model.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param model The Gtk::TreeModel.
    */
   void set_model(const Glib::RefPtr<TreeModel>& model);
@@ -125,7 +127,7 @@ public:
    * Returns <tt>0</tt> if the model is unset.
    * @return A Gtk::TreeModel, or <tt>0</tt> if none is currently being used.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<TreeModel> get_model();
   
@@ -133,7 +135,7 @@ public:
    * Returns <tt>0</tt> if the model is unset.
    * @return A Gtk::TreeModel, or <tt>0</tt> if none is currently being used.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<const TreeModel> get_model() const;
 
@@ -148,7 +150,7 @@ public:
    * key takes a lot of time and will come up with meaningless results anyway
    * (ie, a too large dataset).
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param length The minimum length of the key in order to start completing.
    */
   void set_minimum_key_length(int length);
@@ -156,7 +158,7 @@ public:
   /** Returns the minimum key length as set for @a completion .
    * @return The currently used minimum key length.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   int get_minimum_key_length() const;
   
@@ -164,14 +166,14 @@ public:
    * current list with completions, using the current key. The completion list
    * view will be updated accordingly.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void complete();
 
   
   /** Requests a prefix insertion. 
    * 
-   * Since: 2.6
+   * @newin2p6
    */
   void insert_prefix();
 
@@ -191,7 +193,7 @@ public:
   
   /** Deletes the action at @a index  from @a completion 's action list.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param index The index of the item to Delete.
    */
   void delete_action(int index = 0);
@@ -200,7 +202,7 @@ public:
   /** Sets whether the common prefix of the possible completions should
    * be automatically inserted in the entry.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param inline_completion <tt>true</tt> to do inline completion.
    */
   void set_inline_completion(bool inline_completion = true);
@@ -209,13 +211,13 @@ public:
    * be automatically inserted in the entry.
    * @return <tt>true</tt> if inline completion is turned on
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool get_inline_completion() const;
   
   /** Sets whether the completions should be presented in a popup window.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param popup_completion <tt>true</tt> to do popup completion.
    */
   void set_popup_completion(bool popup_completion = true);
@@ -223,11 +225,49 @@ public:
   /** Returns whether the completions should be presented in a popup window.
    * @return <tt>true</tt> if popup completion is turned on
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool get_popup_completion() const;
 
   
+  /** Sets whether the completion popup window will be resized to be the same
+   * width as the entry.
+   * 
+   * @newin2p8
+   * @param popup_set_width <tt>true</tt> to make the width of the popup the same as the entry.
+   */
+  void set_popup_set_width(bool popup_set_width = true);
+  
+  /** Returns whether the  completion popup window will be resized to the 
+   * width of the entry.
+   * @return <tt>true</tt> if the popup window will be resized to the width of 
+   * the entry
+   * 
+   * @newin2p8.
+   */
+  bool get_popup_set_width() const;
+  
+  /** Sets whether the completion popup window will appear even if there is
+   * only a single match. You may want to set this to <tt>false</tt> if you
+   * are using inline
+   * completion.
+   * 
+   * @newin2p8
+   * @param popup_single_match <tt>true</tt> if the popup should appear even for a single
+   * match.
+   */
+  void set_popup_single_width(bool popup_single_match = true);
+  
+  /** Returns whether the completion popup window will appear even if there is
+   * only a single match.
+   * @return <tt>true</tt> if the popup window will appear regardless of the
+   * number of matches.
+   * 
+   * @newin2p8.
+   */
+  bool get_popup_single_match() const;
+
+  
   /** Convenience function for setting up the most used case of this code: a
    * completion list with just strings. This function will set up @a completion 
    * to have a list displaying all (and just) strings in the completion list,
@@ -237,7 +277,7 @@ public:
    * column. If you need to set the text column, but don't want the cell 
    * renderer, use Glib::object_set() to set the ::text_column property directly.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param column The column in the model of @a completion  to get strings from.
    */
   void set_text_column(const TreeModelColumnBase& column);
@@ -251,7 +291,7 @@ public:
    * column. If you need to set the text column, but don't want the cell 
    * renderer, use Glib::object_set() to set the ::text_column property directly.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param column The column in the model of @a completion  to get strings from.
    */
   void set_text_column(int column);
@@ -259,11 +299,20 @@ public:
   /** Returns the column in the model of @a completion  to get strings from.
    * @return The column containing the strings
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   int get_text_column();
 
+  /** Emitted when an action is activated.
+   *
+   * @param index The index of the activated action.
+   */
   
+/**
+   * @par Prototype:
+   * <tt>void %action_activated(int index)</tt>
+   */
+
   Glib::SignalProxy1< void,int > signal_action_activated();
 
 
@@ -271,7 +320,15 @@ public:
   //because we need both the iter and the model to make the C++ iter.
   
 
-  /**
+  /** Emitted when a match from the list is selected. 
+   * The default behaviour is to replace the contents of the 
+   * entry with the contents of the text column in the row 
+   * pointed to by @a iter.
+   *
+   * @param model The TreeModel containing the matches
+   * @param iter A TreeModel::iterator positioned at the selected match
+   * @result true if the signal has been handled
+   * 
    * @par Prototype:
    * <tt>bool %match_selected(const TreeModel::iterator& iter)</tt>
    */
@@ -280,27 +337,194 @@ public:
   
   //We use no_default_handler for this, because we can not add a new vfunc to 2.5 without breaking ABI.
   //TODO: Remove no_default_handler when we do an ABI-break-with-parallel-install.
+  /** Emitted when the inline autocompletion is triggered. 
+   * The default behaviour is to make the entry display the 
+   * whole prefix and select the newly inserted part.
+   *
+   * Applications may connect to this signal in order to insert only a
+   * smaller part of the @a prefix into the entry - e.g. the entry used in
+   * the FileChooser inserts only the part of the prefix up to the 
+   * next '/'.
+   * 
+   * @newin2p6
+   *
+   * @param prefix The common prefix of all possible completions.
+   * @result true if the signal has been handled
+   */ 
   
+/**
+   * @par Prototype:
+   * <tt>bool %insert_prefix(const Glib::ustring& prefix)</tt>
+   */
 
   Glib::SignalProxy1< bool,const Glib::ustring& > signal_insert_prefix();
  
 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The model to find matches in.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy< Glib::RefPtr<Gtk::TreeModel> > property_model() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The model to find matches in.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gtk::TreeModel> > property_model() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Minimum length of the search key in order to look up matches.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<int> property_minimum_key_length() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Minimum length of the search key in order to look up matches.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<int> property_minimum_key_length() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The column of the model containing the strings.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<int> property_text_column() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The column of the model containing the strings.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<int> property_text_column() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the common prefix should be inserted automatically.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_inline_completion() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the common prefix should be inserted automatically.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_inline_completion() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the completions should be shown in a popup window.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_popup_completion() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the completions should be shown in a popup window.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_popup_completion() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_popup_set_width() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_popup_set_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_popup_single_match() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_popup_single_match() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Default Signal Handler:
   virtual bool on_match_selected(const TreeModel::iterator& iter);        
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_action_activated(int index);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/enums.cc b/libs/gtkmm2/gtk/gtkmm/enums.cc
index a20f39360f..2833f83ff7 100644
--- a/libs/gtkmm2/gtk/gtkmm/enums.cc
+++ b/libs/gtkmm2/gtk/gtkmm/enums.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/enums.h>
 #include <gtkmm/private/enums_p.h>
 
@@ -280,4 +281,10 @@ GType Glib::Value<Gtk::SortType>::value_type()
   return gtk_sort_type_get_type();
 }
 
+// static
+GType Glib::Value<Gtk::PageOrientation>::value_type()
+{
+  return gtk_page_orientation_get_type();
+}
+
 
diff --git a/libs/gtkmm2/gtk/gtkmm/enums.h b/libs/gtkmm2/gtk/gtkmm/enums.h
index 07d0830d40..052f7ecf40 100644
--- a/libs/gtkmm2/gtk/gtkmm/enums.h
+++ b/libs/gtkmm2/gtk/gtkmm/enums.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ENUMS_H
 #define _GTKMM_ENUMS_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -154,7 +155,8 @@ enum ArrowType
   ARROW_UP,
   ARROW_DOWN,
   ARROW_LEFT,
-  ARROW_RIGHT
+  ARROW_RIGHT,
+  ARROW_NONE
 };
 
 } // namespace Gtk
@@ -1347,6 +1349,38 @@ public:
 namespace Gtk
 {
 
+/**
+ * @ingroup gtkmmEnums
+ */
+enum PageOrientation
+{
+  PAGE_ORIENTATION_PORTRAIT,
+  PAGE_ORIENTATION_LANDSCAPE,
+  PAGE_ORIENTATION_REVERSE_PORTRAIT,
+  PAGE_ORIENTATION_REVERSE_LANDSCAPE
+};
+
+} // namespace Gtk
+
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+namespace Glib
+{
+
+template <>
+class Value<Gtk::PageOrientation> : public Glib::Value_Enum<Gtk::PageOrientation>
+{
+public:
+  static GType value_type() G_GNUC_CONST;
+};
+
+} // namespace Glib
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
+
+namespace Gtk
+{
+
 
 /* We use a class to implement the GtkIconSize enum, because you can register
  * new "enum" values.  The strict type rules of C++ don't allow using an enum
diff --git a/libs/gtkmm2/gtk/gtkmm/eventbox.cc b/libs/gtkmm2/gtk/gtkmm/eventbox.cc
index 9b15790c9d..25dc971d05 100644
--- a/libs/gtkmm2/gtk/gtkmm/eventbox.cc
+++ b/libs/gtkmm2/gtk/gtkmm/eventbox.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/eventbox.h>
 #include <gtkmm/private/eventbox_p.h>
 
@@ -27,7 +28,6 @@
 
 #include <gtk/gtkeventbox.h>
 
-
 namespace
 {
 } // anonymous namespace
@@ -74,8 +74,19 @@ void EventBox_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* EventBox_Class::wrap_new(GObject* o)
 {
@@ -130,7 +141,7 @@ bool EventBox::get_visible_window() const
 
 void EventBox::set_visible_window(bool visible_window)
 {
-  gtk_event_box_set_visible_window(gobj(), static_cast<int>(visible_window));
+gtk_event_box_set_visible_window(gobj(), static_cast<int>(visible_window)); 
 }
 
 bool EventBox::get_above_child() const
@@ -140,29 +151,44 @@ bool EventBox::get_above_child() const
 
 void EventBox::set_above_child(bool above_child)
 {
-  gtk_event_box_set_above_child(gobj(), static_cast<int>(above_child));
+gtk_event_box_set_above_child(gobj(), static_cast<int>(above_child)); 
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> EventBox::property_visible_window() 
 {
   return Glib::PropertyProxy<bool>(this, "visible-window");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> EventBox::property_visible_window() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "visible-window");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> EventBox::property_above_child() 
 {
   return Glib::PropertyProxy<bool>(this, "above-child");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> EventBox::property_above_child() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "above-child");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/eventbox.h b/libs/gtkmm2/gtk/gtkmm/eventbox.h
index 927f196888..74854dd095 100644
--- a/libs/gtkmm2/gtk/gtkmm/eventbox.h
+++ b/libs/gtkmm2/gtk/gtkmm/eventbox.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_EVENTBOX_H
 #define _GTKMM_EVENTBOX_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -96,11 +97,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -113,7 +120,7 @@ public:
    * See set_visible_window() for details.
    * @return <tt>true</tt> if the event box window is visible
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_visible_window() const;
   
@@ -153,7 +160,7 @@ public:
    * descendant windows, not just at the same place on the screen.
    * &lt;/note&gt;
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param visible_window Boolean value.
    */
   void set_visible_window(bool visible_window = true);
@@ -164,7 +171,7 @@ public:
    * @return <tt>true</tt> if the event box window is above the window
    * of its child.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_above_child() const;
   
@@ -176,19 +183,22 @@ public:
    * 
    * The default is to keep the window below the child.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param above_child <tt>true</tt> if the event box window is above the windows of its child.
    */
   void set_above_child(bool above_child = true);
 
-  /** Whether the event box is visible
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the event box is visible
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_visible_window() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the event box is visible
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -196,15 +206,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_visible_window() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
  
-  /** Whether the event-trapping window of the eventbox is above the window of the child widget as opposed to below it.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the event-trapping window of the eventbox is above the window of the child widget as opposed to below it.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_above_child() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the event-trapping window of the eventbox is above the window of the child widget as opposed to below it.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -212,6 +226,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_above_child() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
  
 
 };
@@ -227,6 +242,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::EventBox* wrap(GtkEventBox* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_EVENTBOX_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/expander.cc b/libs/gtkmm2/gtk/gtkmm/expander.cc
index e2c7f83908..7a14dda085 100644
--- a/libs/gtkmm2/gtk/gtkmm/expander.cc
+++ b/libs/gtkmm2/gtk/gtkmm/expander.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/expander.h>
 #include <gtkmm/private/expander_p.h>
 
@@ -85,8 +86,19 @@ void Expander_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Expander_Class::wrap_new(GObject* o)
 {
@@ -136,7 +148,7 @@ Expander::Expander()
 
 void Expander::set_expanded(bool expanded)
 {
-  gtk_expander_set_expanded(gobj(), static_cast<int>(expanded));
+gtk_expander_set_expanded(gobj(), static_cast<int>(expanded)); 
 }
 
 bool Expander::get_expanded() const
@@ -146,7 +158,7 @@ bool Expander::get_expanded() const
 
 void Expander::set_spacing(int spacing)
 {
-  gtk_expander_set_spacing(gobj(), spacing);
+gtk_expander_set_spacing(gobj(), spacing); 
 }
 
 int Expander::get_spacing() const
@@ -156,7 +168,7 @@ int Expander::get_spacing() const
 
 void Expander::set_label(const Glib::ustring& label)
 {
-  gtk_expander_set_label(gobj(), label.c_str());
+gtk_expander_set_label(gobj(), label.c_str()); 
 }
 
 Glib::ustring Expander::get_label() const
@@ -166,7 +178,7 @@ Glib::ustring Expander::get_label() const
 
 void Expander::set_use_underline(bool use_underline)
 {
-  gtk_expander_set_use_underline(gobj(), static_cast<int>(use_underline));
+gtk_expander_set_use_underline(gobj(), static_cast<int>(use_underline)); 
 }
 
 bool Expander::get_use_underline() const
@@ -176,7 +188,7 @@ bool Expander::get_use_underline() const
 
 void Expander::set_use_markup(bool use_markup)
 {
-  gtk_expander_set_use_markup(gobj(), static_cast<int>(use_markup));
+gtk_expander_set_use_markup(gobj(), static_cast<int>(use_markup)); 
 }
 
 bool Expander::get_use_markup() const
@@ -186,7 +198,7 @@ bool Expander::get_use_markup() const
 
 void Expander::set_label_widget(Widget& label_widget)
 {
-  gtk_expander_set_label_widget(gobj(), (label_widget).gobj());
+gtk_expander_set_label_widget(gobj(), (label_widget).gobj()); 
 }
 
 Widget* Expander::get_label_widget()
@@ -196,69 +208,100 @@ Widget* Expander::get_label_widget()
 
 const Widget* Expander::get_label_widget() const
 {
-  return Glib::wrap(gtk_expander_get_label_widget(const_cast<GtkExpander*>(gobj())));
+  return const_cast<Expander*>(this)->get_label_widget();
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Expander::property_expanded() 
 {
   return Glib::PropertyProxy<bool>(this, "expanded");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Expander::property_expanded() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "expanded");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Expander::property_label() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Expander::property_label() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Expander::property_use_underline() 
 {
   return Glib::PropertyProxy<bool>(this, "use-underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Expander::property_use_underline() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "use-underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Expander::property_use_markup() 
 {
   return Glib::PropertyProxy<bool>(this, "use-markup");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Expander::property_use_markup() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "use-markup");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Expander::property_spacing() 
 {
   return Glib::PropertyProxy<int>(this, "spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Expander::property_spacing() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Widget*> Expander::property_label_widget() 
 {
   return Glib::PropertyProxy<Widget*>(this, "label-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Widget*> Expander::property_label_widget() const
 {
   return Glib::PropertyProxy_ReadOnly<Widget*>(this, "label-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/expander.h b/libs/gtkmm2/gtk/gtkmm/expander.h
index 8f4d52b425..cb9e89894c 100644
--- a/libs/gtkmm2/gtk/gtkmm/expander.h
+++ b/libs/gtkmm2/gtk/gtkmm/expander.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_EXPANDER_H
 #define _GTKMM_EXPANDER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -42,10 +43,29 @@ namespace Gtk
 
 /** A container which can hide its child.
  *
- * A Expander allows the user to hide or show its child by clicking on an
+ * An Expander allows the user to hide or show its child by clicking on an
  * expander triangle similar to the triangles used in a Gtk::TreeView.
  *
+ * Normally you use an expander as you would use any other descendant
+ * of Gtk::Bin; you create the child widget and use add() to add it to 
+ * the expander.  When the expander is toggled, it will take care of 
+ * showing and hiding the child automatically.
+ *
+ * Special Usage: There are situations in which you may prefer to show and
+ * hide the expanded widget yourself, such as when you want to
+ * actually create the widget at expansion time.  In this case,
+ * create an Expander but do not add a child to it.  The
+ * expander widget has an <tt>expanded</tt> property
+ * which can be used to monitor its expansion state.  You should
+ * watch this property with a signal connection as follows:
+ * @code
+ * expander.property_expanded().signal_changed().connect(
+ *   sigc::mem_fun(*this, &SomeClass::on_expander_changed)
+ * );
+ * @endcode
+ *
  * @ingroup Widgets
+ * @ingroup Containers
  */
 
 class Expander : public Bin
@@ -91,11 +111,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -106,7 +132,7 @@ public:
    *
    * The Expander has an empty label.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   Expander();
 
@@ -121,7 +147,7 @@ public:
    * @param label The string for the label describing the Expander.
    * @param mnemonic Wether the label may contain underscores to set up accelerators.
    
-   * Since: 2.4
+   * @newin2p4
    */
   explicit Expander(const Glib::ustring& label, bool mnemonic = false);
   
@@ -130,7 +156,7 @@ public:
    * the child widget to be revealed, and <tt>false</tt> if you want the
    * child widget to be hidden.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param expanded Whether the child widget is revealed.
    */
   void set_expanded(bool expanded = true);
@@ -141,7 +167,7 @@ public:
    * See set_expanded().
    * @return The current state of the expander.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_expanded() const;
 
@@ -149,7 +175,7 @@ public:
   /** Sets the spacing field of @a expander , which is the number of pixels to
    * place between expander and the child.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param spacing Distance between the expander and child in pixels.
    */
   void set_spacing(int spacing);
@@ -157,7 +183,7 @@ public:
   /** Gets the value set by set_spacing().
    * @return Spacing between the expander and child.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   int get_spacing() const;
 
@@ -166,7 +192,7 @@ public:
    * 
    * This will also clear any previously set labels.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param label A string.
    */
   void set_label(const Glib::ustring& label);
@@ -179,7 +205,7 @@ public:
    * @return The text of the label widget. This string is owned
    * by the widget and must not be modified or freed.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_label() const;
 
@@ -187,7 +213,7 @@ public:
   /** If true, an underline in the text of the expander label indicates
    * the next character should be used for the mnemonic accelerator key.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param use_underline <tt>true</tt> if underlines in the text indicate mnemonics.
    */
   void set_use_underline(bool use_underline = true);
@@ -197,7 +223,7 @@ public:
    * @return <tt>true</tt> if an embedded underline in the expander label
    * indicates the mnemonic accelerator keys.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_use_underline() const;
 
@@ -205,7 +231,7 @@ public:
   /** Sets whether the text of the label contains markup in Pango's text markup
    * language. See Gtk::Label::set_markup().
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param use_markup <tt>true</tt> if the label's text should be parsed for markup.
    */
   void set_use_markup(bool use_markup = true);
@@ -215,7 +241,7 @@ public:
    * language. See set_use_markup().
    * @return <tt>true</tt> if the label's text will be parsed for markup
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_use_markup() const;
 
@@ -223,7 +249,7 @@ public:
   /** Set the label widget for the expander. This is the widget
    * that will appear embedded alongside the expander arrow.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param label_widget The new label widget.
    */
   void set_label_widget(Widget& label_widget);
@@ -232,7 +258,7 @@ public:
    * set_label_widget().
    * @return The label widget, or <tt>0</tt> if there is none.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Widget* get_label_widget();
   
@@ -240,20 +266,23 @@ public:
    * set_label_widget().
    * @return The label widget, or <tt>0</tt> if there is none.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const Widget* get_label_widget() const;
 
    //keybinding
 
-  /** Whether the expander has been opened to reveal the child widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the expander has been opened to reveal the child widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_expanded() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the expander has been opened to reveal the child widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -261,15 +290,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_expanded() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Text of the expander's label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Text of the expander's label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_label() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Text of the expander's label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -277,15 +310,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_label() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If set
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_use_underline() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -293,15 +330,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_use_underline() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The text of the label includes XML markup. See pango_parse_markup.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The text of the label includes XML markup. See pango_parse_markup.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_use_markup() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The text of the label includes XML markup. See pango_parse_markup.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -309,15 +350,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_use_markup() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Space to put between the label and the child.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Space to put between the label and the child.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_spacing() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Space to put between the label and the child.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -325,15 +370,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_spacing() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** A widget to display in place of the usual expander label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A widget to display in place of the usual expander label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Widget*> property_label_widget() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A widget to display in place of the usual expander label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -341,6 +390,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Widget*> property_label_widget() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
             
 
 };
@@ -357,6 +407,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Expander* wrap(GtkExpander* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_EXPANDER_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/filechooser.cc b/libs/gtkmm2/gtk/gtkmm/filechooser.cc
index 708a94365c..ae4be56d65 100644
--- a/libs/gtkmm2/gtk/gtkmm/filechooser.cc
+++ b/libs/gtkmm2/gtk/gtkmm/filechooser.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/filechooser.h>
 #include <gtkmm/private/filechooser_p.h>
 
@@ -30,7 +31,8 @@
 namespace
 {
 
-const Glib::SignalProxyInfo FileChooser_signal_current_folder_changed_info =
+
+static const Glib::SignalProxyInfo FileChooser_signal_current_folder_changed_info =
 {
   "current_folder_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -38,7 +40,7 @@ const Glib::SignalProxyInfo FileChooser_signal_current_folder_changed_info =
 };
 
 
-const Glib::SignalProxyInfo FileChooser_signal_selection_changed_info =
+static const Glib::SignalProxyInfo FileChooser_signal_selection_changed_info =
 {
   "selection_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -46,7 +48,7 @@ const Glib::SignalProxyInfo FileChooser_signal_selection_changed_info =
 };
 
 
-const Glib::SignalProxyInfo FileChooser_signal_update_preview_info =
+static const Glib::SignalProxyInfo FileChooser_signal_update_preview_info =
 {
   "update_preview",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -54,13 +56,76 @@ const Glib::SignalProxyInfo FileChooser_signal_update_preview_info =
 };
 
 
-const Glib::SignalProxyInfo FileChooser_signal_file_activated_info =
+static const Glib::SignalProxyInfo FileChooser_signal_file_activated_info =
 {
   "file_activated",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
+static GtkFileChooserConfirmation FileChooser_signal_confirm_overwrite_callback(GtkFileChooser* self, void* data)
+{
+  using namespace Gtk;
+  typedef sigc::slot< FileChooserConfirmation > SlotType;
+
+  // Do not try to call a signal on a disassociated wrapper.
+  if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
+  {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    try
+    {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+      if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
+        return ((GtkFileChooserConfirmation)((*static_cast<SlotType*>(slot))()));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    }
+    catch(...)
+    {
+      Glib::exception_handlers_invoke();
+    }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+  }
+
+  typedef GtkFileChooserConfirmation RType;
+  return RType();
+}
+
+static GtkFileChooserConfirmation FileChooser_signal_confirm_overwrite_notify_callback(GtkFileChooser* self,  void* data)
+{
+  using namespace Gtk;
+  typedef sigc::slot< void > SlotType;
+
+  // Do not try to call a signal on a disassociated wrapper.
+  if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
+  {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    try
+    {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+      if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
+        (*static_cast<SlotType*>(slot))();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    }
+    catch(...)
+    {
+      Glib::exception_handlers_invoke();
+    }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+  }
+
+  typedef GtkFileChooserConfirmation RType;
+  return RType();
+}
+
+static const Glib::SignalProxyInfo FileChooser_signal_confirm_overwrite_info =
+{
+  "confirm-overwrite",
+  (GCallback) &FileChooser_signal_confirm_overwrite_callback,
+  (GCallback) &FileChooser_signal_confirm_overwrite_notify_callback
+};
+
+
 } // anonymous namespace
 
 // static
@@ -69,6 +134,12 @@ GType Glib::Value<Gtk::FileChooserAction>::value_type()
   return gtk_file_chooser_action_get_type();
 }
 
+// static
+GType Glib::Value<Gtk::FileChooserConfirmation>::value_type()
+{
+  return gtk_file_chooser_confirmation_get_type();
+}
+
 
 Gtk::FileChooserError::FileChooserError(Gtk::FileChooserError::Code error_code, const Glib::ustring& error_message)
 :
@@ -85,10 +156,18 @@ Gtk::FileChooserError::Code Gtk::FileChooserError::code() const
   return static_cast<Code>(Glib::Error::code());
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void Gtk::FileChooserError::throw_func(GError* gobject)
 {
   throw Gtk::FileChooserError(gobject);
 }
+#else
+//When not using exceptions, we just pass the Exception object around without throwing it:
+std::auto_ptr<Glib::Error> Gtk::FileChooserError::throw_func(GError* gobject)
+{
+  return std::auto_ptr<Glib::Error>(new Gtk::FileChooserError(gobject));
+}
+#endif //GLIBMM_EXCEPTIONS_ENABLED
 
 // static
 GType Glib::Value<Gtk::FileChooserError::Code>::value_type()
@@ -138,8 +217,19 @@ void FileChooser_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* FileChooser_Class::wrap_new(GObject* object)
 {
@@ -183,7 +273,7 @@ GType FileChooser::get_base_type()
 
 void FileChooser::set_action(FileChooserAction action)
 {
-  gtk_file_chooser_set_action(gobj(), ((GtkFileChooserAction)(action)));
+gtk_file_chooser_set_action(gobj(), ((GtkFileChooserAction)(action))); 
 }
 
 FileChooserAction FileChooser::get_action() const
@@ -193,7 +283,7 @@ FileChooserAction FileChooser::get_action() const
 
 void FileChooser::set_local_only(bool local_only)
 {
-  gtk_file_chooser_set_local_only(gobj(), static_cast<int>(local_only));
+gtk_file_chooser_set_local_only(gobj(), static_cast<int>(local_only)); 
 }
 
 bool FileChooser::get_local_only() const
@@ -203,7 +293,7 @@ bool FileChooser::get_local_only() const
 
 void FileChooser::set_select_multiple(bool select_multiple)
 {
-  gtk_file_chooser_set_select_multiple(gobj(), static_cast<int>(select_multiple));
+gtk_file_chooser_set_select_multiple(gobj(), static_cast<int>(select_multiple)); 
 }
 
 bool FileChooser::get_select_multiple() const
@@ -213,7 +303,7 @@ bool FileChooser::get_select_multiple() const
 
 void FileChooser::set_show_hidden(bool show_hidden)
 {
-  gtk_file_chooser_set_show_hidden(gobj(), static_cast<int>(show_hidden));
+gtk_file_chooser_set_show_hidden(gobj(), static_cast<int>(show_hidden)); 
 }
 
 bool FileChooser::get_show_hidden() const
@@ -221,9 +311,19 @@ bool FileChooser::get_show_hidden() const
   return gtk_file_chooser_get_show_hidden(const_cast<GtkFileChooser*>(gobj()));
 }
 
+void FileChooser::set_do_overwrite_confirmation(bool do_overwrite_confirmation)
+{
+gtk_file_chooser_set_do_overwrite_confirmation(gobj(), static_cast<int>(do_overwrite_confirmation)); 
+}
+
+bool FileChooser::get_do_overwrite_confirmation() const
+{
+  return gtk_file_chooser_get_do_overwrite_confirmation(const_cast<GtkFileChooser*>(gobj()));
+}
+
 void FileChooser::set_current_name(const Glib::ustring& name)
 {
-  gtk_file_chooser_set_current_name(gobj(), name.c_str());
+gtk_file_chooser_set_current_name(gobj(), name.c_str()); 
 }
 
 Glib::ustring FileChooser::get_filename() const
@@ -243,17 +343,17 @@ bool FileChooser::select_filename(const Glib::ustring& filename)
 
 void FileChooser::unselect_filename(const Glib::ustring& filename)
 {
-  gtk_file_chooser_unselect_filename(gobj(), filename.c_str());
+gtk_file_chooser_unselect_filename(gobj(), filename.c_str()); 
 }
 
 void FileChooser::select_all()
 {
-  gtk_file_chooser_select_all(gobj());
+gtk_file_chooser_select_all(gobj()); 
 }
 
 void FileChooser::unselect_all()
 {
-  gtk_file_chooser_unselect_all(gobj());
+gtk_file_chooser_unselect_all(gobj()); 
 }
 
 Glib::SListHandle<Glib::ustring> FileChooser::get_filenames() const
@@ -288,7 +388,7 @@ bool FileChooser::select_uri(const Glib::ustring& uri)
 
 void FileChooser::unselect_uri(const Glib::ustring& uri)
 {
-  gtk_file_chooser_unselect_uri(gobj(), uri.c_str());
+gtk_file_chooser_unselect_uri(gobj(), uri.c_str()); 
 }
 
 Glib::SListHandle<Glib::ustring> FileChooser::get_uris() const
@@ -308,22 +408,22 @@ Glib::ustring FileChooser::get_current_folder_uri() const
 
 void FileChooser::set_preview_widget(Gtk::Widget& preview_widget)
 {
-  gtk_file_chooser_set_preview_widget(gobj(), (preview_widget).gobj());
+gtk_file_chooser_set_preview_widget(gobj(), (preview_widget).gobj()); 
 }
 
 const Gtk::Widget* FileChooser::get_preview_widget() const
 {
-  return Glib::wrap(gtk_file_chooser_get_preview_widget(const_cast<GtkFileChooser*>(gobj())));
+  return const_cast<FileChooser*>(this)->get_preview_widget();
 }
 
 Gtk::Widget* FileChooser::get_preview_widget()
 {
-  return Glib::wrap(gtk_file_chooser_get_preview_widget(gobj()));
+  return const_cast<FileChooser*>(this)->get_preview_widget();
 }
 
 void FileChooser::set_preview_widget_active(bool active)
 {
-  gtk_file_chooser_set_preview_widget_active(gobj(), static_cast<int>(active));
+gtk_file_chooser_set_preview_widget_active(gobj(), static_cast<int>(active)); 
 }
 
 bool FileChooser::get_preview_widget_active() const
@@ -333,7 +433,7 @@ bool FileChooser::get_preview_widget_active() const
 
 void FileChooser::set_use_preview_label(bool use_label)
 {
-  gtk_file_chooser_set_use_preview_label(gobj(), static_cast<int>(use_label));
+gtk_file_chooser_set_use_preview_label(gobj(), static_cast<int>(use_label)); 
 }
 
 bool FileChooser::get_use_preview_label() const
@@ -353,7 +453,7 @@ Glib::ustring FileChooser::get_preview_uri() const
 
 void FileChooser::set_extra_widget(Gtk::Widget& extra_widget)
 {
-  gtk_file_chooser_set_extra_widget(gobj(), (extra_widget).gobj());
+gtk_file_chooser_set_extra_widget(gobj(), (extra_widget).gobj()); 
 }
 
 Gtk::Widget* FileChooser::get_extra_widget()
@@ -363,17 +463,17 @@ Gtk::Widget* FileChooser::get_extra_widget()
 
 const Gtk::Widget* FileChooser::get_extra_widget() const
 {
-  return Glib::wrap(gtk_file_chooser_get_extra_widget(const_cast<GtkFileChooser*>(gobj())));
+  return const_cast<FileChooser*>(this)->get_extra_widget();
 }
 
 void FileChooser::add_filter(const FileFilter& filter)
 {
-  gtk_file_chooser_add_filter(gobj(), const_cast<GtkFileFilter*>((filter).gobj()));
+gtk_file_chooser_add_filter(gobj(), const_cast<GtkFileFilter*>((filter).gobj())); 
 }
 
 void FileChooser::remove_filter(const FileFilter& filter)
 {
-  gtk_file_chooser_remove_filter(gobj(), const_cast<GtkFileFilter*>((filter).gobj()));
+gtk_file_chooser_remove_filter(gobj(), const_cast<GtkFileFilter*>((filter).gobj())); 
 }
 
 Glib::SListHandle< FileFilter* > FileChooser::list_filters()
@@ -388,43 +488,62 @@ Glib::SListHandle< const FileFilter* > FileChooser::list_filters() const
 
 void FileChooser::set_filter(const FileFilter& filter)
 {
-  gtk_file_chooser_set_filter(gobj(), const_cast<GtkFileFilter*>((filter).gobj()));
+gtk_file_chooser_set_filter(gobj(), const_cast<GtkFileFilter*>((filter).gobj())); 
 }
 
 FileFilter* FileChooser::get_filter()
 {
 
   FileFilter* retvalue = Glib::wrap(gtk_file_chooser_get_filter(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 const FileFilter* FileChooser::get_filter() const
 {
-
-  const FileFilter* retvalue = Glib::wrap(gtk_file_chooser_get_filter(const_cast<GtkFileChooser*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<FileChooser*>(this)->get_filter();
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 bool FileChooser::add_shortcut_folder(const Glib::ustring& folder)
-{
-  GError *error = 0;
-  bool retvalue = gtk_file_chooser_add_shortcut_folder(gobj(), folder.c_str(), &(error));
-  if(error) ::Glib::Error::throw_exception(error);
+#else
+bool FileChooser::add_shortcut_folder(const Glib::ustring& folder, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  bool retvalue = gtk_file_chooser_add_shortcut_folder(gobj(), folder.c_str(), &(gerror));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   return retvalue;
+
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 bool FileChooser::remove_shortcut_folder(const Glib::ustring& folder)
-{
-  GError *error = 0;
-  bool retvalue = gtk_file_chooser_remove_shortcut_folder(gobj(), folder.c_str(), &(error));
-  if(error) ::Glib::Error::throw_exception(error);
+#else
+bool FileChooser::remove_shortcut_folder(const Glib::ustring& folder, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  bool retvalue = gtk_file_chooser_remove_shortcut_folder(gobj(), folder.c_str(), &(gerror));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   return retvalue;
+
 }
 
 Glib::SListHandle<Glib::ustring> FileChooser::list_shortcut_folders() const
@@ -432,20 +551,44 @@ Glib::SListHandle<Glib::ustring> FileChooser::list_shortcut_folders() const
   return Glib::SListHandle<Glib::ustring>(gtk_file_chooser_list_shortcut_folders(const_cast<GtkFileChooser*>(gobj())), Glib::OWNERSHIP_DEEP);
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 bool FileChooser::add_shortcut_folder_uri(const Glib::ustring& uri)
-{
-  GError *error = 0;
-  bool retvalue = gtk_file_chooser_add_shortcut_folder_uri(gobj(), uri.c_str(), &(error));
-  if(error) ::Glib::Error::throw_exception(error);
+#else
+bool FileChooser::add_shortcut_folder_uri(const Glib::ustring& uri, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  bool retvalue = gtk_file_chooser_add_shortcut_folder_uri(gobj(), uri.c_str(), &(gerror));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   return retvalue;
+
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 bool FileChooser::remove_shortcut_folder_uri(const Glib::ustring& uri)
-{
-  GError *error = 0;
-  bool retvalue = gtk_file_chooser_remove_shortcut_folder_uri(gobj(), uri.c_str(), &(error));
-  if(error) ::Glib::Error::throw_exception(error);
+#else
+bool FileChooser::remove_shortcut_folder_uri(const Glib::ustring& uri, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  bool retvalue = gtk_file_chooser_remove_shortcut_folder_uri(gobj(), uri.c_str(), &(gerror));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   return retvalue;
+
 }
 
 Glib::SListHandle<Glib::ustring> FileChooser::list_shortcut_folder_uris() const
@@ -459,121 +602,191 @@ Glib::SignalProxy0< void > FileChooser::signal_current_folder_changed()
   return Glib::SignalProxy0< void >(this, &FileChooser_signal_current_folder_changed_info);
 }
 
+
 Glib::SignalProxy0< void > FileChooser::signal_selection_changed()
 {
   return Glib::SignalProxy0< void >(this, &FileChooser_signal_selection_changed_info);
 }
 
+
 Glib::SignalProxy0< void > FileChooser::signal_update_preview()
 {
   return Glib::SignalProxy0< void >(this, &FileChooser_signal_update_preview_info);
 }
 
+
 Glib::SignalProxy0< void > FileChooser::signal_file_activated()
 {
   return Glib::SignalProxy0< void >(this, &FileChooser_signal_file_activated_info);
 }
 
 
+Glib::SignalProxy0< FileChooserConfirmation > FileChooser::signal_confirm_overwrite()
+{
+  return Glib::SignalProxy0< FileChooserConfirmation >(this, &FileChooser_signal_confirm_overwrite_info);
+}
+
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<FileChooserAction> FileChooser::property_action() 
 {
   return Glib::PropertyProxy<FileChooserAction>(this, "action");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<FileChooserAction> FileChooser::property_action() const
 {
   return Glib::PropertyProxy_ReadOnly<FileChooserAction>(this, "action");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<FileFilter*> FileChooser::property_filter() 
 {
   return Glib::PropertyProxy<FileFilter*>(this, "filter");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<FileFilter*> FileChooser::property_filter() const
 {
   return Glib::PropertyProxy_ReadOnly<FileFilter*>(this, "filter");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FileChooser::property_folder_mode() 
 {
   return Glib::PropertyProxy<bool>(this, "folder-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FileChooser::property_folder_mode() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "folder-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FileChooser::property_local_only() 
 {
   return Glib::PropertyProxy<bool>(this, "local-only");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FileChooser::property_local_only() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "local-only");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Widget*> FileChooser::property_preview_widget() 
 {
   return Glib::PropertyProxy<Widget*>(this, "preview-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Widget*> FileChooser::property_preview_widget() const
 {
   return Glib::PropertyProxy_ReadOnly<Widget*>(this, "preview-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FileChooser::property_preview_widget_active() 
 {
   return Glib::PropertyProxy<bool>(this, "preview-widget-active");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FileChooser::property_preview_widget_active() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "preview-widget-active");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FileChooser::property_use_preview_label() 
 {
   return Glib::PropertyProxy<bool>(this, "use-preview-label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FileChooser::property_use_preview_label() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "use-preview-label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Widget*> FileChooser::property_extra_widget() 
 {
   return Glib::PropertyProxy<Widget*>(this, "extra-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Widget*> FileChooser::property_extra_widget() const
 {
   return Glib::PropertyProxy_ReadOnly<Widget*>(this, "extra-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FileChooser::property_select_multiple() 
 {
   return Glib::PropertyProxy<bool>(this, "select-multiple");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FileChooser::property_select_multiple() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "select-multiple");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FileChooser::property_show_hidden() 
 {
   return Glib::PropertyProxy<bool>(this, "show-hidden");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FileChooser::property_show_hidden() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "show-hidden");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> FileChooser::property_do_overwrite_confirmation() 
+{
+  return Glib::PropertyProxy<bool>(this, "do-overwrite-confirmation");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> FileChooser::property_do_overwrite_confirmation() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "do-overwrite-confirmation");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/filechooser.h b/libs/gtkmm2/gtk/gtkmm/filechooser.h
index 2bbc5954ab..24a51c0a6f 100644
--- a/libs/gtkmm2/gtk/gtkmm/filechooser.h
+++ b/libs/gtkmm2/gtk/gtkmm/filechooser.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_FILECHOOSER_H
 #define _GTKMM_FILECHOOSER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -74,6 +75,37 @@ public:
 namespace Gtk
 {
 
+/**
+ * @ingroup gtkmmEnums
+ */
+enum FileChooserConfirmation
+{
+  FILE_CHOOSER_CONFIRMATION_CONFIRM,
+  FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME,
+  FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN
+};
+
+} // namespace Gtk
+
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+namespace Glib
+{
+
+template <>
+class Value<Gtk::FileChooserConfirmation> : public Glib::Value_Enum<Gtk::FileChooserConfirmation>
+{
+public:
+  static GType value_type() G_GNUC_CONST;
+};
+
+} // namespace Glib
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
+
+namespace Gtk
+{
+
 
 //TODO: //Is GTK_FILE_SYSTEM_ERROR really part of the public API? For instance, do app writers ever need to check for it?.
 //If so, then it needs to have a generated get_type() function, like the others. murrayc.
@@ -87,7 +119,8 @@ public:
   enum Code
   {
     NONEXISTENT,
-    BAD_FILENAME
+    BAD_FILENAME,
+    ALREADY_EXISTS
   };
 
   FileChooserError(Code error_code, const Glib::ustring& error_message);
@@ -96,7 +129,14 @@ public:
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 private:
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   static void throw_func(GError* gobject);
+#else
+  //When not using exceptions, we just pass the Exception object around without throwing it:
+  static std::auto_ptr<Glib::Error> throw_func(GError* gobject);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   friend void wrap_init(); // uses throw_func()
 #endif
 };
@@ -203,13 +243,13 @@ private:
 public:
 
   
-  /** Sets the type of operation that that the chooser is performing; the
+  /** Sets the type of operation that the chooser is performing; the
    * user interface is adapted to suit the selected action. For example,
    * an option to create a new folder might be shown if the action is
    * Gtk::FILE_CHOOSER_ACTION_SAVE but not if the action is
    * Gtk::FILE_CHOOSER_ACTION_OPEN.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param action The action that the file selector is performing.
    */
   void set_action(FileChooserAction action);
@@ -218,7 +258,7 @@ public:
    * set_action().
    * @return The action that the file selector is performing
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   FileChooserAction get_action() const;
   
@@ -232,7 +272,7 @@ public:
    * rather than the URI functions like
    * get_uri(),
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param local_only <tt>true</tt> if only local files can be selected.
    */
   void set_local_only(bool local_only = true);
@@ -241,7 +281,7 @@ public:
    * file selector. See set_local_only()
    * @return <tt>true</tt> if only local files can be selected.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_local_only() const;
   
@@ -250,7 +290,7 @@ public:
    * GTK_FILE_CHOOSER_ACTION_SAVE.  It cannot be set with either of the folder
    * actions.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param select_multiple <tt>true</tt> if multiple files can be selected.
    */
   void set_select_multiple(bool select_multiple = true);
@@ -259,14 +299,14 @@ public:
    * selector. See set_select_multiple().
    * @return <tt>true</tt> if multiple files can be selected.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_select_multiple() const;
 
   
   /** Sets whether hidden files and folders are displayed in the file selector.  
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param show_hidden <tt>true</tt> if hidden files and folders should be displayed.
    */
   void set_show_hidden(bool show_hidden = true);
@@ -275,20 +315,49 @@ public:
    * See set_show_hidden().
    * @return <tt>true</tt> if hidden files and folders are displayed.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool get_show_hidden() const;
 
   
+  /** Sets whether a file chooser in GTK_FILE_CHOOSER_ACTION_SAVE mode will present
+   * a confirmation dialog if the user types a file name that already exists.  This
+   * is <tt>false</tt> by default.
+   * 
+   * Regardless of this setting, the @a chooser  will emit the "confirm-overwrite"
+   * signal when appropriate.
+   * 
+   * If all you need is the stock confirmation dialog, set this property to <tt>true</tt>.
+   * You can override the way confirmation is done by actually handling the
+   * "confirm-overwrite" signal; please refer to its documentation for the
+   * details.
+   * 
+   * @newin2p8
+   * @param do_overwrite_confirmation Whether to confirm overwriting in save mode.
+   */
+  void set_do_overwrite_confirmation(bool do_overwrite_confirmation = true);
+  
+  /** Queries whether a file chooser is set to confirm for overwriting when the user
+   * types a file name that already exists.
+   * @return <tt>true</tt> if the file chooser will present a confirmation dialog;
+   * <tt>false</tt> otherwise.
+   * 
+   * @newin2p8.
+   */
+  bool get_do_overwrite_confirmation() const;
+
+  
   /** Sets the current name in the file selector, as if entered
    * by the user. Note that the name passed in here is a UTF-8
    * string rather than a filename. This function is meant for
    * such uses as a suggested name in a "Save As..." dialog.
    * 
-   * If you want to preselect a particular existing file, you
-   * should use set_filename() instead.
+   * If you want to preselect a particular existing file, you should use
+   * set_filename() or set_uri() instead.
+   * Please see the documentation for those functions for an example of using
+   * set_current_name() as well.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param name The filename to use, as a UTF-8 string.
    */
   void set_current_name(const Glib::ustring& name);
@@ -305,20 +374,44 @@ public:
    */
   Glib::ustring get_filename() const;
   
-  /** Sets @a filename  as the current filename for the the file chooser;
-   * If the file name isn't in the current folder of @a chooser , then the
-   * current folder of @a chooser  will be changed to the folder containing
-   *  @a filename . This is equivalent to a sequence of
-   * unselect_all() followed by select_filename().
+  /** Sets @a filename  as the current filename for the file chooser, by changing
+   * to the file's parent folder and actually selecting the file in list.  If
+   * the @a chooser  is in Gtk::FILE_CHOOSER_ACTION_SAVE mode, the file's base name
+   * will also appear in the dialog's file name entry.
+   * 
+   * If the file name isn't in the current folder of @a chooser , then the current
+   * folder of @a chooser  will be changed to the folder containing @a filename . This
+   * is equivalent to a sequence of unselect_all() followed by
+   * select_filename().
    * 
    * Note that the file must exist, or nothing will be done except
-   * for the directory change. To pre-enter a filename for the user, as in
-   * a save-as dialog, use set_current_name()
+   * for the directory change.
+   * 
+   * If you are implementing a &lt;guimenuitem&gt;File/Save As...&lt;/guimenuitem&gt; dialog, you
+   * should use this function if you already have a file name to which the user may save; for example,
+   * when the user opens an existing file and then does &lt;guimenuitem&gt;File/Save As...&lt;/guimenuitem&gt;
+   * on it.  If you don't have a file name already  @htmlonly&mdash;@endhtmlonly  for example, if the user just created
+   * a new file and is saving it for the first time, do not call this function.  Instead, use
+   * something similar to this:
+   * 
+   * 
+   * if (document_is_new)
+   * {
+   * /&lt;!-- --&gt;* the user just created a new document *&lt;!-- --&gt;/
+   * gtk_file_chooser_set_current_folder (chooser, default_folder_for_saving);
+   * gtk_file_chooser_set_current_name (chooser, "Untitled document");
+   * }
+   * else
+   * {
+   * /&lt;!-- --&gt;* the user edited an existing document *&lt;!-- --&gt;/ 
+   * gtk_file_chooser_set_filename (chooser, existing_filename);
+   * }
+   * 
    * @param filename The filename to set as current.
    * @return <tt>true</tt> if both the folder could be changed and the file was
    * selected successfully, <tt>false</tt> otherwise.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool set_filename(const Glib::ustring& filename);
   
@@ -329,7 +422,7 @@ public:
    * @return <tt>true</tt> if both the folder could be changed and the file was
    * selected successfully, <tt>false</tt> otherwise.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool select_filename(const Glib::ustring& filename);
   
@@ -337,20 +430,20 @@ public:
    * is not in the current directory, does not exist, or
    * is otherwise not currently selected, does nothing.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param filename The filename to unselect.
    */
   void unselect_filename(const Glib::ustring& filename);
   
   /** Selects all the files in the current folder of a file chooser.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void select_all();
   
   /** Unselects all the files in the current folder of a file chooser.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void unselect_all();
   
@@ -362,7 +455,7 @@ public:
    * files and subfolders in the current folder. Free the returned list
    * with Glib::slist_free(), and the filenames with Glib::free().
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::SListHandle<Glib::ustring> get_filenames() const;
   
@@ -373,17 +466,19 @@ public:
    * @return <tt>true</tt> if the folder could be changed successfully, <tt>false</tt>
    * otherwise.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool set_current_folder(const Glib::ustring& filename);
   
   /** Gets the current folder of @a chooser  as a local filename.
    * See set_current_folder().
-   * @return The full path of the current folder, or <tt>0</tt>
-   * if the current path cannot be represented as a local filename.
-   * Free with Glib::free().
+   * @return The full path of the current folder, or <tt>0</tt> if the current
+   * path cannot be represented as a local filename.  Free with Glib::free().  This
+   * function will also return <tt>0</tt> if the file chooser was unable to load the
+   * last folder that was requested from it; for example, as would be for calling
+   * set_current_folder() on a nonexistent folder.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_current_folder() const;
 
@@ -402,20 +497,43 @@ public:
    */
   Glib::ustring get_uri() const;
   
-  /** Sets the file referred to by @a uri  as the current file for the the
-   * file chooser; If the file name isn't in the current folder of @a chooser ,
-   * then the current folder of @a chooser  will be changed to the folder containing
-   *  @a uri . This is equivalent to a sequence of unselect_all()
-   * followed by select_uri().
+  /** Sets the file referred to by @a uri  as the current file for the file chooser,
+   * by changing to the URI's parent folder and actually selecting the URI in the
+   * list.  If the @a chooser  is Gtk::FILE_CHOOSER_ACTION_SAVE mode, the URI's base
+   * name will also appear in the dialog's file name entry.
+   * 
+   * If the URI isn't in the current folder of @a chooser , then the current folder
+   * of @a chooser  will be changed to the folder containing @a uri . This is equivalent
+   * to a sequence of unselect_all() followed by
+   * select_uri().
+   * 
+   * Note that the URI must exist, or nothing will be done except
+   * for the directory change.
+   * If you are implementing a &lt;guimenuitem&gt;File/Save As...&lt;/guimenuitem&gt; dialog, you
+   * should use this function if you already have a file name to which the user may save; for example,
+   * when the user opens an existing file and then does &lt;guimenuitem&gt;File/Save As...&lt;/guimenuitem&gt;
+   * on it.  If you don't have a file name already  @htmlonly&mdash;@endhtmlonly  for example, if the user just created
+   * a new file and is saving it for the first time, do not call this function.  Instead, use
+   * something similar to this:
+   * 
+   * 
+   * if (document_is_new)
+   * {
+   * /&lt;!-- --&gt;* the user just created a new document *&lt;!-- --&gt;/
+   * gtk_file_chooser_set_current_folder_uri (chooser, default_folder_for_saving);
+   * gtk_file_chooser_set_current_name (chooser, "Untitled document");
+   * }
+   * else
+   * {
+   * /&lt;!-- --&gt;* the user edited an existing document *&lt;!-- --&gt;/ 
+   * gtk_file_chooser_set_uri (chooser, existing_uri);
+   * }
    * 
-   * Note that the file must exist, or nothing will be done except
-   * for the directory change. To pre-enter a filename for the user, as in
-   * a save-as dialog, use set_current_name()
    * @param uri The URI to set as current.
    * @return <tt>true</tt> if both the folder could be changed and the URI was
    * selected successfully, <tt>false</tt> otherwise.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool set_uri(const Glib::ustring& uri);
   
@@ -426,7 +544,7 @@ public:
    * @return <tt>true</tt> if both the folder could be changed and the URI was
    * selected successfully, <tt>false</tt> otherwise.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool select_uri(const Glib::ustring& uri);
   
@@ -434,7 +552,7 @@ public:
    * is not in the current directory, does not exist, or
    * is otherwise not currently selected, does nothing.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param uri The URI to unselect.
    */
   void unselect_uri(const Glib::ustring& uri);
@@ -445,7 +563,7 @@ public:
    * files and subfolders in the current folder. Free the returned list
    * with Glib::slist_free(), and the filenames with Glib::free().
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::SListHandle<Glib::ustring> get_uris() const;
 
@@ -457,7 +575,7 @@ public:
    * @return <tt>true</tt> if the folder could be changed successfully, <tt>false</tt>
    * otherwise.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool set_current_folder_uri(const Glib::ustring& uri);
   
@@ -484,7 +602,7 @@ public:
    * may display an internally generated preview of the current file or
    * it may display no preview at all.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param preview_widget Widget for displaying preview.
    */
   void set_preview_widget(Gtk::Widget& preview_widget);
@@ -493,7 +611,7 @@ public:
    * set_preview_widget().
    * @return The current preview widget, or <tt>0</tt>
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const Gtk::Widget* get_preview_widget() const;
   
@@ -501,18 +619,18 @@ public:
    * set_preview_widget().
    * @return The current preview widget, or <tt>0</tt>
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Gtk::Widget* get_preview_widget();
   
   /** Sets whether the preview widget set by
-   * set_preview_widget_active() should be shown for the
+   * set_preview_widget() should be shown for the
    * current filename. When @a active  is set to false, the file chooser
    * may display an internally generated preview of the current file
    * or it may display no preview at all. See
    * set_preview_widget() for more details.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param active Whether to display the user-specified preview widget.
    */
   void set_preview_widget_active(bool active = true);
@@ -522,7 +640,7 @@ public:
    * set_preview_widget_active().
    * @return <tt>true</tt> if the preview widget is active for the current filename.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_preview_widget_active() const;
 
@@ -534,7 +652,7 @@ public:
    * 
    * See also: set_preview_widget()
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param use_label Whether to display a stock label with the name of the previewed file.
    */
   void set_use_preview_label(bool use_label = true);
@@ -567,7 +685,7 @@ public:
   
   /** Sets an application-supplied widget to provide extra options to the user.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param extra_widget Widget for extra options.
    */
   void set_extra_widget(Gtk::Widget& extra_widget);
@@ -576,7 +694,7 @@ public:
    * set_extra_widget().
    * @return The current extra widget, or <tt>0</tt>
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Gtk::Widget* get_extra_widget();
   
@@ -584,7 +702,7 @@ public:
    * set_extra_widget().
    * @return The current extra widget, or <tt>0</tt>
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const Gtk::Widget* get_extra_widget() const;
 
@@ -593,16 +711,19 @@ public:
   
   /** Adds @a filter  to the list of filters that the user can select between.
    * When a filter is selected, only files that are passed by that
-   * filter are displayed.
+   * filter are displayed. 
+   * 
+   * Note that the @a chooser  takes ownership of the filter, so you have to 
+   * ref and sink it if you want to keep a reference.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param filter A Gtk::FileFilter.
    */
   void add_filter(const FileFilter& filter);
   
   /** Removes @a filter  from the list of filters that the user can select between.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param filter A Gtk::FileFilter.
    */
   void remove_filter (const FileFilter& filter);
@@ -615,7 +736,7 @@ public:
    * owned by GTK+, but you must free the list itself with
    * Glib::slist_free() when you are done with it.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::SListHandle< FileFilter* > list_filters();
   
@@ -626,7 +747,7 @@ public:
    * owned by GTK+, but you must free the list itself with
    * Glib::slist_free() when you are done with it.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::SListHandle< const FileFilter* > list_filters() const;
   
@@ -640,7 +761,7 @@ public:
    * filters is empty is useful if you want to restrict the displayed
    * set of files without letting the user change it.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param filter A Gtk::FileFilter.
    */
   void set_filter(const FileFilter& filter);
@@ -648,14 +769,14 @@ public:
   /** Gets the current filter; see set_filter().
    * @return The current filter, or <tt>0</tt>
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   FileFilter* get_filter();
   
   /** Gets the current filter; see set_filter().
    * @return The current filter, or <tt>0</tt>
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const FileFilter* get_filter() const;
   
@@ -670,9 +791,14 @@ public:
    * @return <tt>true</tt> if the folder could be added successfully, <tt>false</tt>
    * otherwise.  In the latter case, the @a error  will be set as appropriate.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool add_shortcut_folder(const Glib::ustring& folder);
+#else
+  bool add_shortcut_folder(const Glib::ustring& folder, std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   
   /** Removes a folder from a file chooser's list of shortcut folders.
    * @param folder Filename of the folder to remove.
@@ -681,17 +807,21 @@ public:
    * 
    * See also: add_shortcut_folder()
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool remove_shortcut_folder(const Glib::ustring& folder);
+#else
+  bool remove_shortcut_folder(const Glib::ustring& folder, std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   
   /** Queries the list of shortcut folders in the file chooser, as set by
    * add_shortcut_folder().
-   * @return A list of folder filenames, or <tt>0</tt> if there are no shortcut
-   * folders.  Free the returned list with Glib::slist_free(), and the filenames with
-   * Glib::free().
    * 
-   * Since: 2.4.
+   * @newin2p4
+   * @return A list of folder filenames, if there are any shortcut
+   * folders..
    */
   Glib::SListHandle<Glib::ustring> list_shortcut_folders() const;
 
@@ -704,9 +834,14 @@ public:
    * @return <tt>true</tt> if the folder could be added successfully, <tt>false</tt>
    * otherwise.  In the latter case, the @a error  will be set as appropriate.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool add_shortcut_folder_uri(const Glib::ustring& uri);
+#else
+  bool add_shortcut_folder_uri(const Glib::ustring& uri, std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   
   /** Removes a folder URI from a file chooser's list of shortcut folders.
    * @param uri URI of the folder to remove.
@@ -715,9 +850,14 @@ public:
    * 
    * See also: add_shortcut_folder_uri()
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool remove_shortcut_folder_uri(const Glib::ustring& uri);
+#else
+  bool remove_shortcut_folder_uri(const Glib::ustring& uri, std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   
   /** Queries the list of shortcut folders in the file chooser, as set by
    * add_shortcut_folder_uri().
@@ -725,31 +865,121 @@ public:
    * folders.  Free the returned list with Glib::slist_free(), and the URIs with
    * Glib::free().
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::SListHandle<Glib::ustring> list_shortcut_folder_uris() const;
 
+  
+  /** This signal is emitted when the current folder in a FileChooser
+   * changes.  This can happen due to the user performing some action that
+   * changes folders, such as selecting a bookmark or visiting a folder on the
+   * file list.  It can also happen as a result of calling a function to
+   * explicitly change the current folder in a file chooser.
+   *
+   * Normally you do not need to connect to this signal, unless you need to keep
+   * track of which folder a file chooser is showing.
+   *
+   * @see set_current_folder(), get_current_folder(),
+   * set_current_folder_uri(), get_current_folder_uri().
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %current_folder_changed()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_current_folder_changed();
 
   
+  /** This signal is emitted when there is a change in the set of selected files
+   * in a #GtkFileChooser.  This can happen when the user modifies the selection
+   * with the mouse or the keyboard, or when explicitly calling functions to
+   * change the selection.
+   *
+   * Normally you do not need to connect to this signal, as it is easier to wait
+   * for the file chooser to finish running, and then to get the list of
+   * selected files using the functions mentioned below.
+   *
+   * @see select_filename(), unselect_filename(), get_filename(),
+   * get_filenames(), select_uri(),
+   * unselect_uri(), get_uri(),
+   * get_uris().
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %selection_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_selection_changed();
 
   
+  /** This signal is emitted when the preview in a file chooser should be
+   * regenerated.  For example, this can happen when the currently selected file
+   * changes.  You should use this signal if you want your file chooser to have
+   * a preview widget.
+   *
+   * Once you have installed a preview widget with
+   * set_preview_widget(), you should update it when this
+   * signal is emitted.  You can use the functions
+   * get_preview_filename() or get_preview_uri() to get the name of the file to preview.
+   * Your widget may not be able to preview all kinds of files; your signal handler
+   * must call set_preview_wiget_active() to inform the file
+   * chooser about whether the preview was generated successfully or not.
+   *
+   * @see set_preview_widget(), set_preview_widget_active(),
+   * set_use_preview_label(), get_preview_filename(), get_preview_uri().
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %update_preview()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_update_preview();
 
   
+  /** This signal is emitted when the user "activates" a file in the file
+   * chooser.  This can happen by double-clicking on a file in the file list, or
+   * by pressing <keycap>Enter</keycap>.
+   *
+   * Normally you do not need to connect to this signal.  It is used internally
+   * by FileChooserDialog to know when to activate the default button in the
+   * dialog.
+   *
+   * @see get_filename(), get_filenames(), get_uri(), get_uris().
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %file_activated()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_file_activated();
 
 
-  /** 
+  /** TODO
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>FileChooserConfirmation %confirm_overwrite()</tt>
+   */
+
+  Glib::SignalProxy0< FileChooserConfirmation > signal_confirm_overwrite();
+
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<FileChooserAction> property_action() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -757,16 +987,20 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<FileChooserAction> property_action() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
   //TODO: _WRAP_PROPERTY("file-system", FileSystem) //FileSystem is not really public API.
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<FileFilter*> property_filter() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -774,15 +1008,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<FileFilter*> property_filter() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_folder_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -790,15 +1028,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_folder_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_local_only() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -806,15 +1048,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_local_only() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Widget*> property_preview_widget() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -822,15 +1068,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Widget*> property_preview_widget() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_preview_widget_active() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -838,15 +1088,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_preview_widget_active() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_use_preview_label() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -854,15 +1108,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_use_preview_label() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Widget*> property_extra_widget() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -870,15 +1128,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Widget*> property_extra_widget() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_select_multiple() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -886,15 +1148,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_select_multiple() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_show_hidden() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -902,17 +1168,44 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_show_hidden() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_do_overwrite_confirmation() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_do_overwrite_confirmation() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -931,5 +1224,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_FILECHOOSER_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserbutton.cc b/libs/gtkmm2/gtk/gtkmm/filechooserbutton.cc
index ebdc540ddd..730a0f70c4 100644
--- a/libs/gtkmm2/gtk/gtkmm/filechooserbutton.cc
+++ b/libs/gtkmm2/gtk/gtkmm/filechooserbutton.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/filechooserbutton.h>
 #include <gtkmm/private/filechooserbutton_p.h>
 
@@ -88,8 +89,19 @@ void FileChooserButton_Class::class_init_function(void* g_class, void* class_dat
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* FileChooserButton_Class::wrap_new(GObject* o)
 {
@@ -158,7 +170,7 @@ Glib::ustring FileChooserButton::get_title() const
 
 void FileChooserButton::set_title(const Glib::ustring& title)
 {
-  gtk_file_chooser_button_set_title(gobj(), title.c_str());
+gtk_file_chooser_button_set_title(gobj(), title.c_str()); 
 }
 
 int FileChooserButton::get_width_chars() const
@@ -168,34 +180,75 @@ int FileChooserButton::get_width_chars() const
 
 void FileChooserButton::set_width_chars(int n_chars)
 {
-  gtk_file_chooser_button_set_width_chars(gobj(), n_chars);
+gtk_file_chooser_button_set_width_chars(gobj(), n_chars); 
+}
+
+bool FileChooserButton::get_focus_on_click() const
+{
+  return gtk_file_chooser_button_get_focus_on_click(const_cast<GtkFileChooserButton*>(gobj()));
+}
+
+void FileChooserButton::set_focus_on_click(gboolean focus_on_click)
+{
+gtk_file_chooser_button_set_focus_on_click(gobj(), focus_on_click); 
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<FileChooserDialog*> FileChooserButton::property_dialog() const
 {
   return Glib::PropertyProxy_ReadOnly<FileChooserDialog*>(this, "dialog");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> FileChooserButton::property_focus_on_click() 
+{
+  return Glib::PropertyProxy<bool>(this, "focus-on-click");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> FileChooserButton::property_focus_on_click() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "focus-on-click");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> FileChooserButton::property_title() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> FileChooserButton::property_title() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> FileChooserButton::property_width_chars() 
 {
   return Glib::PropertyProxy<int>(this, "width-chars");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> FileChooserButton::property_width_chars() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "width-chars");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserbutton.h b/libs/gtkmm2/gtk/gtkmm/filechooserbutton.h
index 0865ac58e6..a6de8ea035 100644
--- a/libs/gtkmm2/gtk/gtkmm/filechooserbutton.h
+++ b/libs/gtkmm2/gtk/gtkmm/filechooserbutton.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_FILECHOOSERBUTTON_H
 #define _GTKMM_FILECHOOSERBUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -101,11 +102,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -146,13 +153,13 @@ public:
    * should not be modified or freed.
    * @return A pointer to the browse dialog's title.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::ustring get_title() const;
   
   /** Modifies the @a title  of the browse dialog used by @a button .
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param title The new browse dialog title.
    */
   void set_title(const Glib::ustring& title);
@@ -161,35 +168,64 @@ public:
   /** Retrieves the width in characters of the @a button  widget's entry and/or label.
    * @return An integer width (in characters) that the button will use to size itself.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   int get_width_chars() const;
   
   /** Sets the width (in characters) that @a button  will use to @a n_chars .
    * 
-   * Since: 2.6
-   * @param n_chars The new width, in chracters.
+   * @newin2p6
+   * @param n_chars The new width, in characters.
    */
   void set_width_chars(int n_chars);
 
+  
+  bool get_focus_on_click() const;
+  
+  void set_focus_on_click(gboolean focus_on_click = true);   
 
-  /** The file chooser dialog to use.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The file chooser dialog to use.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<FileChooserDialog*> property_dialog() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The title of the file chooser dialog.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the button grabs focus when it is clicked with the mouse.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_focus_on_click() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the button grabs focus when it is clicked with the mouse.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_focus_on_click() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The title of the file chooser dialog.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_title() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The title of the file chooser dialog.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -197,15 +233,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_title() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
                                           
-  /** The desired width of the button widget
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The desired width of the button widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_width_chars() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The desired width of the button widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -213,6 +253,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_width_chars() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
     
 
 };
@@ -229,6 +270,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::FileChooserButton* wrap(GtkFileChooserButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_FILECHOOSERBUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserdialog.cc b/libs/gtkmm2/gtk/gtkmm/filechooserdialog.cc
index 88dc4078e5..dc48e4337c 100644
--- a/libs/gtkmm2/gtk/gtkmm/filechooserdialog.cc
+++ b/libs/gtkmm2/gtk/gtkmm/filechooserdialog.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/private/filechooserdialog_p.h>
 
@@ -111,8 +112,19 @@ void FileChooserDialog_Class::class_init_function(void* g_class, void* class_dat
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* FileChooserDialog_Class::wrap_new(GObject* o)
 {
@@ -153,6 +165,13 @@ GType FileChooserDialog::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserdialog.h b/libs/gtkmm2/gtk/gtkmm/filechooserdialog.h
index 08ba746815..e6c818c1dc 100644
--- a/libs/gtkmm2/gtk/gtkmm/filechooserdialog.h
+++ b/libs/gtkmm2/gtk/gtkmm/filechooserdialog.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_FILECHOOSERDIALOG_H
 #define _GTKMM_FILECHOOSERDIALOG_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -91,11 +92,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -124,6 +131,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::FileChooserDialog* wrap(GtkFileChooserDialog* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_FILECHOOSERDIALOG_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserwidget.cc b/libs/gtkmm2/gtk/gtkmm/filechooserwidget.cc
index db14e802eb..59d9fece59 100644
--- a/libs/gtkmm2/gtk/gtkmm/filechooserwidget.cc
+++ b/libs/gtkmm2/gtk/gtkmm/filechooserwidget.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/filechooserwidget.h>
 #include <gtkmm/private/filechooserwidget_p.h>
 
@@ -81,8 +82,19 @@ void FileChooserWidget_Class::class_init_function(void* g_class, void* class_dat
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* FileChooserWidget_Class::wrap_new(GObject* o)
 {
@@ -145,6 +157,13 @@ FileChooserWidget::FileChooserWidget(FileChooserAction action, const Glib::ustri
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserwidget.h b/libs/gtkmm2/gtk/gtkmm/filechooserwidget.h
index fa8afffd6c..2a40a95b94 100644
--- a/libs/gtkmm2/gtk/gtkmm/filechooserwidget.h
+++ b/libs/gtkmm2/gtk/gtkmm/filechooserwidget.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_FILECHOOSERWIDGET_H
 #define _GTKMM_FILECHOOSERWIDGET_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -96,11 +97,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -116,7 +123,7 @@ public:
    *
    * @param action Open or save mode for the widget
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   explicit FileChooserWidget(FileChooserAction action);
   explicit FileChooserWidget(FileChooserAction action, const Glib::ustring& backend);
@@ -135,6 +142,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::FileChooserWidget* wrap(GtkFileChooserWidget* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_FILECHOOSERWIDGET_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/filefilter.cc b/libs/gtkmm2/gtk/gtkmm/filefilter.cc
index 72c921934d..4c6bc09958 100644
--- a/libs/gtkmm2/gtk/gtkmm/filefilter.cc
+++ b/libs/gtkmm2/gtk/gtkmm/filefilter.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/filefilter.h>
 #include <gtkmm/private/filefilter_p.h>
 
@@ -26,41 +27,14 @@
 #include <gtk/gtkfilefilter.h>
 #include <gtk/gtktypebuiltins.h> //For gtk_file_filter_flags_get_type().
 
-namespace
-{
-
-//SignalProxy_Custom:
-
-//This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_Custom
+static gboolean SignalProxy_Custom_gtk_callback(const GtkFileFilterInfo* filter_info, gpointer data)
 {
-public:
-  typedef Gtk::FileFilter::SlotCustom SlotType;
-
-  SignalProxy_Custom(const SlotType& slot);
-  ~SignalProxy_Custom();
-
-  static gboolean gtk_callback(const GtkFileFilterInfo* filter_info, gpointer data);
-  static void gtk_callback_destroy(void* data);
-  
-protected:
-  SlotType slot_;
-};
-
-SignalProxy_Custom::SignalProxy_Custom(const SlotType& slot)
-:
-  slot_ (slot)
-{}
-
-SignalProxy_Custom::~SignalProxy_Custom()
-{}
-
-gboolean SignalProxy_Custom::gtk_callback(const GtkFileFilterInfo* filter_info, gpointer data)
-{
-  SignalProxy_Custom *const self = static_cast<SignalProxy_Custom*>(data);
+  Gtk::FileFilter::SlotCustom* the_slot = static_cast<Gtk::FileFilter::SlotCustom*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     //Create a suitable C++ instance to pass to the C++ method:
     Gtk::FileFilter::Info cppInfo;
     cppInfo.contains = (Gtk::FileFilterFlags)filter_info->contains;
@@ -69,35 +43,36 @@ gboolean SignalProxy_Custom::gtk_callback(const GtkFileFilterInfo* filter_info,
     cppInfo.display_name = Glib::convert_const_gchar_ptr_to_ustring(filter_info->display_name);
     cppInfo.mime_type = Glib::convert_const_gchar_ptr_to_ustring(filter_info->mime_type);
   
-    return (self->slot_)(cppInfo);
+    return (*the_slot)(cppInfo);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
     return false; //arbitrary default;
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void SignalProxy_Custom::gtk_callback_destroy(void* data)
+static void SignalProxy_Custom_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_Custom*>(data);
+  delete static_cast<Gtk::FileFilter::SlotCustom*>(data);
 }
 
-} //anonymous namespace
 
 namespace Gtk
 {
 
 void FileFilter::add_custom(FileFilterFlags needed, const SlotCustom& slot)
 {
-  //Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
+  //Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
   //It will be deleted when SignalProxy_Custom::gtk_callback_destroy() is called.
-  SignalProxy_Custom *const pSignalProxy = new SignalProxy_Custom(slot);
+  SlotCustom* slot_copy = new SlotCustom(slot);
       
   gtk_file_filter_add_custom(gobj(), (GtkFileFilterFlags)needed,
-                             &SignalProxy_Custom::gtk_callback,
-                             pSignalProxy,
-                             &SignalProxy_Custom::gtk_callback_destroy);     
+                             &SignalProxy_Custom_gtk_callback,
+                             slot_copy,
+                             &SignalProxy_Custom_gtk_callback_destroy);     
 }
  
 } // namespace Gtk
@@ -155,8 +130,19 @@ void FileFilter_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* FileFilter_Class::wrap_new(GObject* o)
 {
@@ -206,7 +192,7 @@ FileFilter::FileFilter()
 
 void FileFilter::set_name(const Glib::ustring& name)
 {
-  gtk_file_filter_set_name(gobj(), name.c_str());
+gtk_file_filter_set_name(gobj(), name.c_str()); 
 }
 
 Glib::ustring FileFilter::get_name() const
@@ -216,17 +202,17 @@ Glib::ustring FileFilter::get_name() const
 
 void FileFilter::add_mime_type(const Glib::ustring& mime_type)
 {
-  gtk_file_filter_add_mime_type(gobj(), mime_type.c_str());
+gtk_file_filter_add_mime_type(gobj(), mime_type.c_str()); 
 }
 
 void FileFilter::add_pattern(const Glib::ustring& pattern)
 {
-  gtk_file_filter_add_pattern(gobj(), pattern.c_str());
+gtk_file_filter_add_pattern(gobj(), pattern.c_str()); 
 }
 
 void FileFilter::add_pixbuf_formats()
 {
-  gtk_file_filter_add_pixbuf_formats(gobj());
+gtk_file_filter_add_pixbuf_formats(gobj()); 
 }
 
 FileFilterFlags FileFilter::get_needed() const
@@ -235,6 +221,13 @@ FileFilterFlags FileFilter::get_needed() const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/filefilter.h b/libs/gtkmm2/gtk/gtkmm/filefilter.h
index 1800856266..fd5aadf8c4 100644
--- a/libs/gtkmm2/gtk/gtkmm/filefilter.h
+++ b/libs/gtkmm2/gtk/gtkmm/filefilter.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_FILEFILTER_H
 #define _GTKMM_FILEFILTER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -158,11 +159,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -175,7 +182,7 @@ public:
    * that will be displayed in the file selector user interface if
    * there is a selectable list of filters.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param name The human-readable-name for the filter, or <tt>0</tt>
    * to remove any existing name.
    */
@@ -186,21 +193,21 @@ public:
    * or <tt>0</tt>. This value is owned by GTK+ and must not
    * be modified or freed.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_name() const;
 
   
   /** Adds a rule allowing a given mime type to @a filter .
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param mime_type Name of a MIME type.
    */
   void add_mime_type(const Glib::ustring& mime_type);
   
   /** Adds a rule allowing a shell style glob to a filter.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param pattern A shell style glob.
    */
   void add_pattern(const Glib::ustring& pattern);
@@ -208,7 +215,7 @@ public:
   /** Adds a rule allowing image files in the formats supported
    * by GdkPixbuf.
    * 
-   * Since: 2.6
+   * @newin2p6
    */
   void add_pixbuf_formats();
 
@@ -237,7 +244,7 @@ public:
    * @return Bitfield of flags indicating needed fields when
    * calling gtk_file_filter_filter()
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   FileFilterFlags get_needed() const;
 
@@ -259,6 +266,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::FileFilter* wrap(GtkFileFilter* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_FILEFILTER_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/fileselection.cc b/libs/gtkmm2/gtk/gtkmm/fileselection.cc
index 9379da1c9f..4a5f387047 100644
--- a/libs/gtkmm2/gtk/gtkmm/fileselection.cc
+++ b/libs/gtkmm2/gtk/gtkmm/fileselection.cc
@@ -1,5 +1,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
+
 #include <gtkmm/fileselection.h>
 #include <gtkmm/private/fileselection_p.h>
 
@@ -88,8 +91,19 @@ void FileSelection_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* FileSelection_Class::wrap_new(GObject* o)
 {
@@ -139,7 +153,7 @@ FileSelection::FileSelection(const Glib::ustring& title)
 
 void FileSelection::set_filename(const std::string& filename)
 {
-  gtk_file_selection_set_filename(gobj(), (filename).c_str());
+gtk_file_selection_set_filename(gobj(), (filename).c_str()); 
 }
 
 std::string FileSelection::get_filename() const
@@ -149,17 +163,17 @@ std::string FileSelection::get_filename() const
 
 void FileSelection::complete(const Glib::ustring& pattern)
 {
-  gtk_file_selection_complete(gobj(), pattern.c_str());
+gtk_file_selection_complete(gobj(), pattern.c_str()); 
 }
 
 void FileSelection::show_fileop_buttons()
 {
-  gtk_file_selection_show_fileop_buttons(gobj());
+gtk_file_selection_show_fileop_buttons(gobj()); 
 }
 
 void FileSelection::hide_fileop_buttons()
 {
-  gtk_file_selection_hide_fileop_buttons(gobj());
+gtk_file_selection_hide_fileop_buttons(gobj()); 
 }
 
 Glib::ArrayHandle<std::string> FileSelection::get_selections() const
@@ -169,7 +183,7 @@ Glib::ArrayHandle<std::string> FileSelection::get_selections() const
 
 void FileSelection::set_select_multiple(bool select_multiple)
 {
-  gtk_file_selection_set_select_multiple(gobj(), static_cast<int>(select_multiple));
+gtk_file_selection_set_select_multiple(gobj(), static_cast<int>(select_multiple)); 
 }
 
 bool FileSelection::get_select_multiple() const
@@ -177,7 +191,7 @@ bool FileSelection::get_select_multiple() const
   return gtk_file_selection_get_select_multiple(const_cast<GtkFileSelection*>(gobj()));
 }
 
-TreeView* FileSelection::get_dir_list()
+ TreeView* FileSelection::get_dir_list()
 {
   return Glib::wrap((GtkTreeView*)(gobj()->dir_list));
 }
@@ -186,8 +200,8 @@ const TreeView* FileSelection::get_dir_list() const
 {
   return Glib::wrap((GtkTreeView*)(gobj()->dir_list));
 }
-
-TreeView* FileSelection::get_file_list()
+ 
+ TreeView* FileSelection::get_file_list()
 {
   return Glib::wrap((GtkTreeView*)(gobj()->file_list));
 }
@@ -196,8 +210,8 @@ const TreeView* FileSelection::get_file_list() const
 {
   return Glib::wrap((GtkTreeView*)(gobj()->file_list));
 }
-
-OptionMenu* FileSelection::get_history_pulldown()
+ 
+ OptionMenu* FileSelection::get_history_pulldown()
 {
   return Glib::wrap((GtkOptionMenu*)(gobj()->history_pulldown));
 }
@@ -206,8 +220,8 @@ const OptionMenu* FileSelection::get_history_pulldown() const
 {
   return Glib::wrap((GtkOptionMenu*)(gobj()->history_pulldown));
 }
-
-Entry* FileSelection::get_selection_entry()
+ 
+ Entry* FileSelection::get_selection_entry()
 {
   return Glib::wrap((GtkEntry*)(gobj()->selection_entry));
 }
@@ -216,8 +230,8 @@ const Entry* FileSelection::get_selection_entry() const
 {
   return Glib::wrap((GtkEntry*)(gobj()->selection_entry));
 }
-
-Label* FileSelection::get_selection_text()
+ 
+ Label* FileSelection::get_selection_text()
 {
   return Glib::wrap((GtkLabel*)(gobj()->selection_text));
 }
@@ -226,8 +240,8 @@ const Label* FileSelection::get_selection_text() const
 {
   return Glib::wrap((GtkLabel*)(gobj()->selection_text));
 }
-
-VBox* FileSelection::get_main_vbox()
+ 
+ VBox* FileSelection::get_main_vbox()
 {
   return Glib::wrap((GtkVBox*)(gobj()->main_vbox));
 }
@@ -236,8 +250,8 @@ const VBox* FileSelection::get_main_vbox() const
 {
   return Glib::wrap((GtkVBox*)(gobj()->main_vbox));
 }
-
-Button* FileSelection::get_ok_button()
+ 
+ Button* FileSelection::get_ok_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->ok_button));
 }
@@ -246,8 +260,8 @@ const Button* FileSelection::get_ok_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->ok_button));
 }
-
-Button* FileSelection::get_cancel_button()
+ 
+ Button* FileSelection::get_cancel_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->cancel_button));
 }
@@ -256,8 +270,8 @@ const Button* FileSelection::get_cancel_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->cancel_button));
 }
-
-Button* FileSelection::get_help_button()
+ 
+ Button* FileSelection::get_help_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->help_button));
 }
@@ -266,8 +280,8 @@ const Button* FileSelection::get_help_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->help_button));
 }
-
-HButtonBox* FileSelection::get_button_area()
+ 
+ HButtonBox* FileSelection::get_button_area()
 {
   return Glib::wrap((GtkHButtonBox*)(gobj()->button_area));
 }
@@ -276,8 +290,8 @@ const HButtonBox* FileSelection::get_button_area() const
 {
   return Glib::wrap((GtkHButtonBox*)(gobj()->button_area));
 }
-
-HBox* FileSelection::get_action_area()
+ 
+ HBox* FileSelection::get_action_area()
 {
   return Glib::wrap((GtkHBox*)(gobj()->action_area));
 }
@@ -286,39 +300,60 @@ const HBox* FileSelection::get_action_area() const
 {
   return Glib::wrap((GtkHBox*)(gobj()->action_area));
 }
+ 
 
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FileSelection::property_show_fileops() 
 {
   return Glib::PropertyProxy<bool>(this, "show-fileops");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FileSelection::property_show_fileops() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "show-fileops");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<std::string> FileSelection::property_filename() 
 {
   return Glib::PropertyProxy<std::string>(this, "filename");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<std::string> FileSelection::property_filename() const
 {
   return Glib::PropertyProxy_ReadOnly<std::string>(this, "filename");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FileSelection::property_select_multiple() 
 {
   return Glib::PropertyProxy<bool>(this, "select-multiple");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FileSelection::property_select_multiple() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "select-multiple");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
 
diff --git a/libs/gtkmm2/gtk/gtkmm/fileselection.h b/libs/gtkmm2/gtk/gtkmm/fileselection.h
index 6a5e734362..5923b16da0 100644
--- a/libs/gtkmm2/gtk/gtkmm/fileselection.h
+++ b/libs/gtkmm2/gtk/gtkmm/fileselection.h
@@ -3,6 +3,9 @@
 #ifndef _GTKMM_FILESELECTION_H
 #define _GTKMM_FILESELECTION_H
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -103,11 +106,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -179,37 +188,40 @@ public:
   bool get_select_multiple() const;
 
   //: Accessors
-  TreeView* get_dir_list();
+   TreeView* get_dir_list();
   const TreeView* get_dir_list() const;
-  TreeView* get_file_list();
+    TreeView* get_file_list();
   const TreeView* get_file_list() const;
-  OptionMenu* get_history_pulldown();
+    OptionMenu* get_history_pulldown();
   const OptionMenu* get_history_pulldown() const;
-  Entry* get_selection_entry();
+    Entry* get_selection_entry();
   const Entry* get_selection_entry() const;
-  Label* get_selection_text();
+    Label* get_selection_text();
   const Label* get_selection_text() const;
-  VBox* get_main_vbox();
+    VBox* get_main_vbox();
   const VBox* get_main_vbox() const;
-  Button* get_ok_button();
+    Button* get_ok_button();
   const Button* get_ok_button() const;
-  Button* get_cancel_button();
+    Button* get_cancel_button();
   const Button* get_cancel_button() const;
-  Button* get_help_button();
+    Button* get_help_button();
   const Button* get_help_button() const;
-  HButtonBox* get_button_area();
+    HButtonBox* get_button_area();
   const HButtonBox* get_button_area() const;
-  HBox* get_action_area();
+    HBox* get_action_area();
   const HBox* get_action_area() const;
-
-  /** Whether buttons for creating/manipulating files should be displayed.
+ 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether buttons for creating/manipulating files should be displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_show_fileops() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether buttons for creating/manipulating files should be displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -217,15 +229,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_show_fileops() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The currently selected filename.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The currently selected filename.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<std::string> property_filename() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The currently selected filename.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -233,15 +249,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<std::string> property_filename() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether to allow multiple files to be selected.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to allow multiple files to be selected.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_select_multiple() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether to allow multiple files to be selected.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -249,11 +269,11 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_select_multiple() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
 
-
 } // namespace Gtk
 
 
@@ -265,6 +285,11 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::FileSelection* wrap(GtkFileSelection* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
 #endif /* _GTKMM_FILESELECTION_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/fixed.cc b/libs/gtkmm2/gtk/gtkmm/fixed.cc
index 9edbae969a..9b522f3579 100644
--- a/libs/gtkmm2/gtk/gtkmm/fixed.cc
+++ b/libs/gtkmm2/gtk/gtkmm/fixed.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/fixed.h>
 #include <gtkmm/private/fixed_p.h>
 
@@ -78,8 +79,19 @@ void Fixed_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Fixed_Class::wrap_new(GObject* o)
 {
@@ -129,17 +141,17 @@ Fixed::Fixed()
 
 void Fixed::put(Widget& widget, int x, int y)
 {
-  gtk_fixed_put(gobj(), (widget).gobj(), x, y);
+gtk_fixed_put(gobj(), (widget).gobj(), x, y); 
 }
 
 void Fixed::move(Widget& widget, int x, int y)
 {
-  gtk_fixed_move(gobj(), (widget).gobj(), x, y);
+gtk_fixed_move(gobj(), (widget).gobj(), x, y); 
 }
 
 void Fixed::set_has_window(bool has_window)
 {
-  gtk_fixed_set_has_window(gobj(), static_cast<int>(has_window));
+gtk_fixed_set_has_window(gobj(), static_cast<int>(has_window)); 
 }
 
 bool Fixed::get_has_window() const
@@ -148,6 +160,13 @@ bool Fixed::get_has_window() const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/fixed.h b/libs/gtkmm2/gtk/gtkmm/fixed.h
index c7b334a238..d0f8eeeb98 100644
--- a/libs/gtkmm2/gtk/gtkmm/fixed.h
+++ b/libs/gtkmm2/gtk/gtkmm/fixed.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_FIXED_H
 #define _GTKMM_FIXED_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -98,11 +99,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -116,10 +123,13 @@ public:
   void move(Widget& widget, int x, int y);
   
   /** Sets whether a Gtk::Fixed widget is created with a separate
-   * Gdk::Window for widget->window or not. (By default, it will be
+   * Gdk::Window for @a widget -&gt;window or not. (By default, it will be
    * created with no separate Gdk::Window). This function must be called
    * while the Gtk::Fixed is not realized, for instance, immediately after the
    * window is created.
+   * 
+   * This function was added to provide an easy migration path for
+   * older applications which may expect Gtk::Fixed to have a separate window.
    * @param has_window <tt>true</tt> if a separate window should be created.
    */
   void set_has_window(bool has_window = true);
@@ -144,6 +154,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Fixed* wrap(GtkFixed* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_FIXED_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/fontbutton.cc b/libs/gtkmm2/gtk/gtkmm/fontbutton.cc
index 4644534f21..731ad35b1d 100644
--- a/libs/gtkmm2/gtk/gtkmm/fontbutton.cc
+++ b/libs/gtkmm2/gtk/gtkmm/fontbutton.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/fontbutton.h>
 #include <gtkmm/private/fontbutton_p.h>
 
@@ -37,13 +38,15 @@ namespace Gtk
 namespace
 {
 
-const Glib::SignalProxyInfo FontButton_signal_font_set_info =
+
+static const Glib::SignalProxyInfo FontButton_signal_font_set_info =
 {
   "font-set",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -88,10 +91,18 @@ void FontButton_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->font_set = &font_set_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void FontButton_Class::font_set_callback(GtkFontButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -104,15 +115,19 @@ void FontButton_Class::font_set_callback(GtkFontButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_font_set();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -125,6 +140,7 @@ void FontButton_Class::font_set_callback(GtkFontButton* self)
       (*base->font_set)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* FontButton_Class::wrap_new(GObject* o)
@@ -173,10 +189,10 @@ FontButton::FontButton()
 {
   }
 
-FontButton::FontButton(const Glib::ustring& fontname)
+FontButton::FontButton(const Glib::ustring& font_name)
 :
   Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
-  Gtk::Button(Glib::ConstructParams(fontbutton_class_.init(), "fontname", fontname.c_str(), (char*) 0))
+  Gtk::Button(Glib::ConstructParams(fontbutton_class_.init(), "font_name", font_name.c_str(), (char*) 0))
 {
   }
 
@@ -187,7 +203,7 @@ Glib::ustring FontButton::get_title() const
 
 void FontButton::set_title(const Glib::ustring& title)
 {
-  gtk_font_button_set_title(gobj(), title.c_str());
+gtk_font_button_set_title(gobj(), title.c_str()); 
 }
 
 bool FontButton::get_use_font() const
@@ -197,7 +213,7 @@ bool FontButton::get_use_font() const
 
 void FontButton::set_use_font(bool use_font)
 {
-  gtk_font_button_set_use_font(gobj(), static_cast<int>(use_font));
+gtk_font_button_set_use_font(gobj(), static_cast<int>(use_font)); 
 }
 
 bool FontButton::get_use_size() const
@@ -207,7 +223,7 @@ bool FontButton::get_use_size() const
 
 void FontButton::set_use_size(bool use_size)
 {
-  gtk_font_button_set_use_size(gobj(), static_cast<int>(use_size));
+gtk_font_button_set_use_size(gobj(), static_cast<int>(use_size)); 
 }
 
 Glib::ustring FontButton::get_font_name() const
@@ -227,7 +243,7 @@ bool FontButton::get_show_style() const
 
 void FontButton::set_show_style(bool show_style)
 {
-  gtk_font_button_set_show_style(gobj(), static_cast<int>(show_style));
+gtk_font_button_set_show_style(gobj(), static_cast<int>(show_style)); 
 }
 
 bool FontButton::get_show_size() const
@@ -237,7 +253,7 @@ bool FontButton::get_show_size() const
 
 void FontButton::set_show_size(bool show_size)
 {
-  gtk_font_button_set_show_size(gobj(), static_cast<int>(show_size));
+gtk_font_button_set_show_size(gobj(), static_cast<int>(show_size)); 
 }
 
 
@@ -247,67 +263,92 @@ Glib::SignalProxy0< void > FontButton::signal_font_set()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> FontButton::property_title() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> FontButton::property_title() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> FontButton::property_font_name() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "font-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> FontButton::property_font_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "font-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FontButton::property_use_font() 
 {
   return Glib::PropertyProxy<bool>(this, "use-font");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FontButton::property_use_font() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "use-font");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FontButton::property_use_size() 
 {
   return Glib::PropertyProxy<bool>(this, "use-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FontButton::property_use_size() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "use-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FontButton::property_show_style() 
 {
   return Glib::PropertyProxy<bool>(this, "show-style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FontButton::property_show_style() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "show-style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> FontButton::property_show_size() 
 {
   return Glib::PropertyProxy<bool>(this, "show-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> FontButton::property_show_size() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "show-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::FontButton::on_font_set()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -317,6 +358,10 @@ void Gtk::FontButton::on_font_set()
   if(base && base->font_set)
     (*base->font_set)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/fontbutton.h b/libs/gtkmm2/gtk/gtkmm/fontbutton.h
index 79edaa1d02..5ac3bbd8a1 100644
--- a/libs/gtkmm2/gtk/gtkmm/fontbutton.h
+++ b/libs/gtkmm2/gtk/gtkmm/fontbutton.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_FONTBUTTON_H
 #define _GTKMM_FONTBUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -91,31 +92,37 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_font_set();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
 
 public:
   FontButton();
-  explicit FontButton(const Glib::ustring& fontname);
+  explicit FontButton(const Glib::ustring& font_name);
   
   
   /** Retrieves the title of the font selection dialog.
    * @return An internal copy of the title string which must not be freed.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_title() const;
   
   /** Sets the title for the font selection dialog.  
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param title A string containing the font selection dialog title.
    */
   void set_title(const Glib::ustring& title);
@@ -123,13 +130,13 @@ public:
   /** Returns whether the selected font is used in the label.
    * @return Whether the selected font is used in the label.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_use_font() const;
   
   /** If @a use_font  is <tt>true</tt>, the font name will be written using the selected font.  
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param use_font If <tt>true</tt>, font name will be written using font chosen.
    */
   void set_use_font(bool use_font = true);
@@ -137,13 +144,13 @@ public:
   /** Returns whether the selected size is used in the label.
    * @return Whether the selected size is used in the label.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_use_size() const;
   
   /** If @a use_size  is <tt>true</tt>, the font name will be written using the selected size.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param use_size If <tt>true</tt>, font name will be written using the selected size.
    */
   void set_use_size(bool use_size = true);
@@ -151,7 +158,7 @@ public:
   /** Retrieves the name of the currently selected font.
    * @return An internal copy of the font name which must not be freed.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_font_name() const;
   
@@ -160,20 +167,20 @@ public:
    * @return Return value of Gtk::FontSelectionDialog::set_font_name() if the
    * font selection dialog exists, otherwise <tt>false</tt>.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool set_font_name(const Glib::ustring& fontname);
   
   /** Returns whether the name of the font style will be shown in the label.
    * @return Whether the font style will be shown in the label.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_show_style() const;
   
   /** If @a show_style  is <tt>true</tt>, the font style will be displayed along with name of the selected font.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param show_style <tt>true</tt> if font style should be displayed in label.
    */
   void set_show_style(bool show_style = true);
@@ -181,25 +188,28 @@ public:
   /** Returns whether the font size will be shown in the label.
    * @return Whether the font size will be shown in the label.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_show_size() const;
   
   /** If @a show_size  is <tt>true</tt>, the font size will be displayed along with the name of the selected font.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param show_size <tt>true</tt> if font size should be displayed in dialog.
    */
   void set_show_size(bool show_size = true);
 
-  /** The title of the font selection dialog.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The title of the font selection dialog.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_title() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The title of the font selection dialog.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -207,15 +217,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_title() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The name of the selected font.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The name of the selected font.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_font_name() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The name of the selected font.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -223,15 +237,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_font_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the label is drawn in the selected font.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the label is drawn in the selected font.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_use_font() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the label is drawn in the selected font.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -239,15 +257,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_use_font() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the label is drawn with the selected font size.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the label is drawn with the selected font size.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_use_size() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the label is drawn with the selected font size.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -255,15 +277,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_use_size() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the selected font style is shown in the label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the selected font style is shown in the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_show_style() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the selected font style is shown in the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -271,15 +297,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_show_style() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether selected font size is shown in the label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether selected font size is shown in the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_show_size() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether selected font size is shown in the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -287,8 +317,18 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_show_size() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
+  /** The font_set signal is emitted when the user selects a font. When handling this signal,
+   * use get_font_name() to find out which font was just selected.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %font_set()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_font_set();
                                              
 
@@ -306,6 +346,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::FontButton* wrap(GtkFontButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_FONTBUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/fontselection.cc b/libs/gtkmm2/gtk/gtkmm/fontselection.cc
index 45ccfcee76..cf9e9799d4 100644
--- a/libs/gtkmm2/gtk/gtkmm/fontselection.cc
+++ b/libs/gtkmm2/gtk/gtkmm/fontselection.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/fontselection.h>
 #include <gtkmm/private/fontselection_p.h>
 
@@ -75,8 +76,19 @@ void FontSelection_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* FontSelection_Class::wrap_new(GObject* o)
 {
@@ -141,10 +153,10 @@ Glib::ustring FontSelection::get_preview_text() const
 
 void FontSelection::set_preview_text(const Glib::ustring& fontname)
 {
-  gtk_font_selection_set_preview_text(gobj(), fontname.c_str());
+gtk_font_selection_set_preview_text(gobj(), fontname.c_str()); 
 }
 
-Entry* FontSelection::get_font_entry()
+ Entry* FontSelection::get_font_entry()
 {
   return Glib::wrap((GtkEntry*)(gobj()->font_entry));
 }
@@ -153,8 +165,8 @@ const Entry* FontSelection::get_font_entry() const
 {
   return Glib::wrap((GtkEntry*)(gobj()->font_entry));
 }
-
-Entry* FontSelection::get_font_style_entry()
+ 
+ Entry* FontSelection::get_font_style_entry()
 {
   return Glib::wrap((GtkEntry*)(gobj()->font_style_entry));
 }
@@ -163,8 +175,8 @@ const Entry* FontSelection::get_font_style_entry() const
 {
   return Glib::wrap((GtkEntry*)(gobj()->font_style_entry));
 }
-
-Entry* FontSelection::get_size_entry()
+ 
+ Entry* FontSelection::get_size_entry()
 {
   return Glib::wrap((GtkEntry*)(gobj()->size_entry));
 }
@@ -173,8 +185,8 @@ const Entry* FontSelection::get_size_entry() const
 {
   return Glib::wrap((GtkEntry*)(gobj()->size_entry));
 }
-
-RadioButton* FontSelection::get_pixels_button()
+ 
+ RadioButton* FontSelection::get_pixels_button()
 {
   return Glib::wrap((GtkRadioButton*)(gobj()->pixels_button));
 }
@@ -183,8 +195,8 @@ const RadioButton* FontSelection::get_pixels_button() const
 {
   return Glib::wrap((GtkRadioButton*)(gobj()->pixels_button));
 }
-
-RadioButton* FontSelection::get_points_button()
+ 
+ RadioButton* FontSelection::get_points_button()
 {
   return Glib::wrap((GtkRadioButton*)(gobj()->points_button));
 }
@@ -193,8 +205,8 @@ const RadioButton* FontSelection::get_points_button() const
 {
   return Glib::wrap((GtkRadioButton*)(gobj()->points_button));
 }
-
-Button* FontSelection::get_filter_button()
+ 
+ Button* FontSelection::get_filter_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->filter_button));
 }
@@ -203,8 +215,8 @@ const Button* FontSelection::get_filter_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->filter_button));
 }
-
-Entry* FontSelection::get_preview_entry()
+ 
+ Entry* FontSelection::get_preview_entry()
 {
   return Glib::wrap((GtkEntry*)(gobj()->preview_entry));
 }
@@ -213,27 +225,42 @@ const Entry* FontSelection::get_preview_entry() const
 {
   return Glib::wrap((GtkEntry*)(gobj()->preview_entry));
 }
+ 
 
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> FontSelection::property_font_name() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "font-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> FontSelection::property_font_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "font-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> FontSelection::property_preview_text() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "preview-text");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> FontSelection::property_preview_text() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "preview-text");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
@@ -280,8 +307,19 @@ void FontSelectionDialog_Class::class_init_function(void* g_class, void* class_d
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* FontSelectionDialog_Class::wrap_new(GObject* o)
 {
@@ -352,10 +390,10 @@ Glib::ustring FontSelectionDialog::get_preview_text() const
 
 void FontSelectionDialog::set_preview_text(const Glib::ustring& fontname)
 {
-  gtk_font_selection_dialog_set_preview_text(gobj(), fontname.c_str());
+gtk_font_selection_dialog_set_preview_text(gobj(), fontname.c_str()); 
 }
 
-FontSelection* FontSelectionDialog::get_font_selection()
+ FontSelection* FontSelectionDialog::get_font_selection()
 {
   return Glib::wrap((GtkFontSelection*)(gobj()->fontsel));
 }
@@ -364,8 +402,8 @@ const FontSelection* FontSelectionDialog::get_font_selection() const
 {
   return Glib::wrap((GtkFontSelection*)(gobj()->fontsel));
 }
-
-Button* FontSelectionDialog::get_ok_button()
+ 
+ Button* FontSelectionDialog::get_ok_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->ok_button));
 }
@@ -374,8 +412,8 @@ const Button* FontSelectionDialog::get_ok_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->ok_button));
 }
-
-Button* FontSelectionDialog::get_apply_button()
+ 
+ Button* FontSelectionDialog::get_apply_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->apply_button));
 }
@@ -384,8 +422,8 @@ const Button* FontSelectionDialog::get_apply_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->apply_button));
 }
-
-Button* FontSelectionDialog::get_cancel_button()
+ 
+ Button* FontSelectionDialog::get_cancel_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->cancel_button));
 }
@@ -394,6 +432,13 @@ const Button* FontSelectionDialog::get_cancel_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->cancel_button));
 }
+ 
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/fontselection.h b/libs/gtkmm2/gtk/gtkmm/fontselection.h
index ae0b9045d6..f1afc19017 100644
--- a/libs/gtkmm2/gtk/gtkmm/fontselection.h
+++ b/libs/gtkmm2/gtk/gtkmm/fontselection.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_FONTSELECTION_H
 #define _GTKMM_FONTSELECTION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -106,11 +107,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -129,31 +136,34 @@ public:
   void set_preview_text(const Glib::ustring& fontname);
 
   // Font page
-  Entry* get_font_entry();
+   Entry* get_font_entry();
   const Entry* get_font_entry() const;
-  Entry* get_font_style_entry();
+    Entry* get_font_style_entry();
   const Entry* get_font_style_entry() const;
-  Entry* get_size_entry();
+    Entry* get_size_entry();
   const Entry* get_size_entry() const;
-
-  RadioButton* get_pixels_button();
+ 
+   RadioButton* get_pixels_button();
   const RadioButton* get_pixels_button() const;
-  RadioButton* get_points_button();
+    RadioButton* get_points_button();
   const RadioButton* get_points_button() const;
-  Button* get_filter_button();
+    Button* get_filter_button();
   const Button* get_filter_button() const;
-
-  Entry* get_preview_entry();
+ 
+   Entry* get_preview_entry();
   const Entry* get_preview_entry() const;
-
-  /** The X string that represents this font.
+ 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The X string that represents this font.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_font_name() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The X string that represents this font.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -161,15 +171,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_font_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The text to display in order to demonstrate the selected font.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The text to display in order to demonstrate the selected font.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_preview_text() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The text to display in order to demonstrate the selected font.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -177,6 +191,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_preview_text() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -231,11 +246,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -255,15 +276,15 @@ public:
   
   void set_preview_text(const Glib::ustring& fontname);
 
-  FontSelection* get_font_selection();
+   FontSelection* get_font_selection();
   const FontSelection* get_font_selection() const;
-  Button* get_ok_button();
+    Button* get_ok_button();
   const Button* get_ok_button() const;
-  Button* get_apply_button();
+    Button* get_apply_button();
   const Button* get_apply_button() const;
-  Button* get_cancel_button();
+    Button* get_cancel_button();
   const Button* get_cancel_button() const;
-
+ 
 
 };
 
@@ -278,7 +299,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::FontSelection* wrap(GtkFontSelection* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::FontSelectionDialog
@@ -287,6 +310,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::FontSelectionDialog* wrap(GtkFontSelectionDialog* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_FONTSELECTION_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/frame.cc b/libs/gtkmm2/gtk/gtkmm/frame.cc
index d24fa422c7..03df181272 100644
--- a/libs/gtkmm2/gtk/gtkmm/frame.cc
+++ b/libs/gtkmm2/gtk/gtkmm/frame.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/frame.h>
 #include <gtkmm/private/frame_p.h>
 
@@ -82,9 +83,15 @@ void Frame_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->compute_child_allocation = &compute_child_allocation_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Frame_Class::compute_child_allocation_vfunc_callback(GtkFrame* self, GtkAllocation* allocation)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -97,16 +104,20 @@ void Frame_Class::compute_child_allocation_vfunc_callback(GtkFrame* self, GtkAll
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->compute_child_allocation_vfunc((Allocation&)(Glib::wrap(allocation))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -119,6 +130,10 @@ void Frame_Class::compute_child_allocation_vfunc_callback(GtkFrame* self, GtkAll
       (*base->compute_child_allocation)(self, allocation);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Frame_Class::wrap_new(GObject* o)
@@ -176,7 +191,7 @@ Frame::Frame(const Glib::ustring& label)
 
 void Frame::set_label(const Glib::ustring& label)
 {
-  gtk_frame_set_label(gobj(), label.c_str());
+gtk_frame_set_label(gobj(), label.c_str()); 
 }
 
 Glib::ustring Frame::get_label() const
@@ -186,7 +201,7 @@ Glib::ustring Frame::get_label() const
 
 void Frame::set_label_widget(Widget& label_widget)
 {
-  gtk_frame_set_label_widget(gobj(), (label_widget).gobj());
+gtk_frame_set_label_widget(gobj(), (label_widget).gobj()); 
 }
 
 Widget* Frame::get_label_widget()
@@ -196,27 +211,27 @@ Widget* Frame::get_label_widget()
 
 const Widget* Frame::get_label_widget() const
 {
-  return Glib::wrap(gtk_frame_get_label_widget(const_cast<GtkFrame*>(gobj())));
+  return const_cast<Frame*>(this)->get_label_widget();
 }
 
 void Frame::set_label_align(float xalign, float yalign)
 {
-  gtk_frame_set_label_align(gobj(), xalign, yalign);
+gtk_frame_set_label_align(gobj(), xalign, yalign); 
 }
 
 void Frame::set_label_align(AlignmentEnum xalign, AlignmentEnum yalign)
 {
-  gtk_frame_set_label_align(gobj(), _gtkmm_align_float_from_enum(xalign), _gtkmm_align_float_from_enum(yalign));
+gtk_frame_set_label_align(gobj(), _gtkmm_align_float_from_enum(xalign), _gtkmm_align_float_from_enum(yalign)); 
 }
 
 void Frame::get_label_align(float& xalign, float& yalign) const
 {
-  gtk_frame_get_label_align(const_cast<GtkFrame*>(gobj()), &(xalign), &(yalign));
+gtk_frame_get_label_align(const_cast<GtkFrame*>(gobj()), &(xalign), &(yalign)); 
 }
 
 void Frame::set_shadow_type(ShadowType type)
 {
-  gtk_frame_set_shadow_type(gobj(), ((GtkShadowType)(type)));
+gtk_frame_set_shadow_type(gobj(), ((GtkShadowType)(type))); 
 }
 
 ShadowType Frame::get_shadow_type() const
@@ -225,57 +240,81 @@ ShadowType Frame::get_shadow_type() const
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Frame::property_label() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Frame::property_label() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> Frame::property_label_xalign() 
 {
   return Glib::PropertyProxy<double>(this, "label-xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> Frame::property_label_xalign() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "label-xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> Frame::property_label_yalign() 
 {
   return Glib::PropertyProxy<double>(this, "label-yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> Frame::property_label_yalign() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "label-yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ShadowType> Frame::property_shadow_type() 
 {
   return Glib::PropertyProxy<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ShadowType> Frame::property_shadow_type() const
 {
   return Glib::PropertyProxy_ReadOnly<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Widget*> Frame::property_label_widget() 
 {
   return Glib::PropertyProxy<Widget*>(this, "label-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Widget*> Frame::property_label_widget() const
 {
   return Glib::PropertyProxy_ReadOnly<Widget*>(this, "label-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::Frame::compute_child_allocation_vfunc(Allocation& allocation) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -285,6 +324,7 @@ void Gtk::Frame::compute_child_allocation_vfunc(Allocation& allocation)
   if(base && base->compute_child_allocation)
     (*base->compute_child_allocation)(gobj(),(GtkAllocation*)(allocation.gobj()));
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/frame.h b/libs/gtkmm2/gtk/gtkmm/frame.h
index aaac3dd63c..d67fab075c 100644
--- a/libs/gtkmm2/gtk/gtkmm/frame.h
+++ b/libs/gtkmm2/gtk/gtkmm/frame.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_FRAME_H
 #define _GTKMM_FRAME_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -95,11 +96,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -202,14 +209,17 @@ public:
    */
   ShadowType get_shadow_type() const;
 
-  /** Text of the frame's label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Text of the frame's label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_label() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Text of the frame's label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -217,15 +227,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_label() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The horizontal alignment of the label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The horizontal alignment of the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_label_xalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The horizontal alignment of the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -233,15 +247,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_label_xalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The vertical alignment of the label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The vertical alignment of the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_label_yalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The vertical alignment of the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -249,15 +267,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_label_yalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Appearance of the frame border.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Appearance of the frame border.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ShadowType> property_shadow_type() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Appearance of the frame border.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -265,15 +287,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ShadowType> property_shadow_type() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** A widget to display in place of the usual frame label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A widget to display in place of the usual frame label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Widget*> property_label_widget() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A widget to display in place of the usual frame label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -281,10 +307,13 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Widget*> property_label_widget() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
-    virtual void compute_child_allocation_vfunc(Allocation& allocation);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void compute_child_allocation_vfunc(Allocation& allocation);
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 };
@@ -300,6 +329,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Frame* wrap(GtkFrame* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_FRAME_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/handlebox.cc b/libs/gtkmm2/gtk/gtkmm/handlebox.cc
index 86c2a0fe9c..2e4000b1f7 100644
--- a/libs/gtkmm2/gtk/gtkmm/handlebox.cc
+++ b/libs/gtkmm2/gtk/gtkmm/handlebox.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/handlebox.h>
 #include <gtkmm/private/handlebox_p.h>
 
@@ -57,7 +58,8 @@ bool HandleBox::shrinks_on_detach() const
 namespace
 {
 
-void HandleBox_signal_child_attached_callback(GtkHandleBox* self, GtkWidget* p0,void* data)
+
+static void HandleBox_signal_child_attached_callback(GtkHandleBox* self, GtkWidget* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Widget* > SlotType;
@@ -65,20 +67,24 @@ void HandleBox_signal_child_attached_callback(GtkHandleBox* self, GtkWidget* p0,
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo HandleBox_signal_child_attached_info =
+static const Glib::SignalProxyInfo HandleBox_signal_child_attached_info =
 {
   "child_attached",
   (GCallback) &HandleBox_signal_child_attached_callback,
@@ -86,7 +92,7 @@ const Glib::SignalProxyInfo HandleBox_signal_child_attached_info =
 };
 
 
-void HandleBox_signal_child_detached_callback(GtkHandleBox* self, GtkWidget* p0,void* data)
+static void HandleBox_signal_child_detached_callback(GtkHandleBox* self, GtkWidget* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Widget* > SlotType;
@@ -94,26 +100,31 @@ void HandleBox_signal_child_detached_callback(GtkHandleBox* self, GtkWidget* p0,
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo HandleBox_signal_child_detached_info =
+static const Glib::SignalProxyInfo HandleBox_signal_child_detached_info =
 {
   "child_detached",
   (GCallback) &HandleBox_signal_child_detached_callback,
   (GCallback) &HandleBox_signal_child_detached_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -158,11 +169,19 @@ void HandleBox_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->child_attached = &child_attached_callback;
   klass->child_detached = &child_detached_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void HandleBox_Class::child_attached_callback(GtkHandleBox* self, GtkWidget* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -175,16 +194,20 @@ void HandleBox_Class::child_attached_callback(GtkHandleBox* self, GtkWidget* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_child_attached(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -197,7 +220,6 @@ void HandleBox_Class::child_attached_callback(GtkHandleBox* self, GtkWidget* p0)
       (*base->child_attached)(self, p0);
   }
 }
-
 void HandleBox_Class::child_detached_callback(GtkHandleBox* self, GtkWidget* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -210,16 +232,20 @@ void HandleBox_Class::child_detached_callback(GtkHandleBox* self, GtkWidget* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_child_detached(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -232,6 +258,7 @@ void HandleBox_Class::child_detached_callback(GtkHandleBox* self, GtkWidget* p0)
       (*base->child_detached)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* HandleBox_Class::wrap_new(GObject* o)
@@ -282,7 +309,7 @@ HandleBox::HandleBox()
 
 void HandleBox::set_shadow_type(ShadowType type)
 {
-  gtk_handle_box_set_shadow_type(gobj(), ((GtkShadowType)(type)));
+gtk_handle_box_set_shadow_type(gobj(), ((GtkShadowType)(type))); 
 }
 
 ShadowType HandleBox::get_shadow_type() const
@@ -292,7 +319,7 @@ ShadowType HandleBox::get_shadow_type() const
 
 void HandleBox::set_handle_position(PositionType position)
 {
-  gtk_handle_box_set_handle_position(gobj(), ((GtkPositionType)(position)));
+gtk_handle_box_set_handle_position(gobj(), ((GtkPositionType)(position))); 
 }
 
 PositionType HandleBox::get_handle_position() const
@@ -302,7 +329,7 @@ PositionType HandleBox::get_handle_position() const
 
 void HandleBox::set_snap_edge(PositionType edge)
 {
-  gtk_handle_box_set_snap_edge(gobj(), ((GtkPositionType)(edge)));
+gtk_handle_box_set_snap_edge(gobj(), ((GtkPositionType)(edge))); 
 }
 
 PositionType HandleBox::get_snap_edge() const
@@ -310,7 +337,7 @@ PositionType HandleBox::get_snap_edge() const
   return ((PositionType)(gtk_handle_box_get_snap_edge(const_cast<GtkHandleBox*>(gobj()))));
 }
 
-Glib::RefPtr<Gdk::Window> HandleBox::get_bin_window()
+ Glib::RefPtr<Gdk::Window> HandleBox::get_bin_window()
 {
   Glib::RefPtr<Gdk::Window> ref_ptr(Glib::wrap((GdkWindowObject*)(gobj()->bin_window)));
 
@@ -329,8 +356,8 @@ Glib::RefPtr<const Gdk::Window> HandleBox::get_bin_window() const
 
   return ref_ptr;
 }
-
-Glib::RefPtr<Gdk::Window> HandleBox::get_float_window()
+ 
+ Glib::RefPtr<Gdk::Window> HandleBox::get_float_window()
 {
   Glib::RefPtr<Gdk::Window> ref_ptr(Glib::wrap((GdkWindowObject*)(gobj()->float_window)));
 
@@ -349,50 +376,64 @@ Glib::RefPtr<const Gdk::Window> HandleBox::get_float_window() const
 
   return ref_ptr;
 }
-
+ 
 
 Glib::SignalProxy1< void,Widget* > HandleBox::signal_child_attached()
 {
   return Glib::SignalProxy1< void,Widget* >(this, &HandleBox_signal_child_attached_info);
 }
 
+
 Glib::SignalProxy1< void,Widget* > HandleBox::signal_child_detached()
 {
   return Glib::SignalProxy1< void,Widget* >(this, &HandleBox_signal_child_detached_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ShadowType> HandleBox::property_shadow_type() 
 {
   return Glib::PropertyProxy<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ShadowType> HandleBox::property_shadow_type() const
 {
   return Glib::PropertyProxy_ReadOnly<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<PositionType> HandleBox::property_handle_position() 
 {
   return Glib::PropertyProxy<PositionType>(this, "handle-position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<PositionType> HandleBox::property_handle_position() const
 {
   return Glib::PropertyProxy_ReadOnly<PositionType>(this, "handle-position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<PositionType> HandleBox::property_snap_edge() 
 {
   return Glib::PropertyProxy<PositionType>(this, "snap-edge");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<PositionType> HandleBox::property_snap_edge() const
 {
   return Glib::PropertyProxy_ReadOnly<PositionType>(this, "snap-edge");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::HandleBox::on_child_attached(Widget* child)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -402,7 +443,6 @@ void Gtk::HandleBox::on_child_attached(Widget* child)
   if(base && base->child_attached)
     (*base->child_attached)(gobj(),(GtkWidget*)Glib::unwrap(child));
 }
-
 void Gtk::HandleBox::on_child_detached(Widget* child)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -412,6 +452,10 @@ void Gtk::HandleBox::on_child_detached(Widget* child)
   if(base && base->child_detached)
     (*base->child_detached)(gobj(),(GtkWidget*)Glib::unwrap(child));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/handlebox.h b/libs/gtkmm2/gtk/gtkmm/handlebox.h
index 89d4614bfc..fe211425e2 100644
--- a/libs/gtkmm2/gtk/gtkmm/handlebox.h
+++ b/libs/gtkmm2/gtk/gtkmm/handlebox.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_HANDLEBOX_H
 #define _GTKMM_HANDLEBOX_H
 
+
 #include <glibmm.h>
 
  /* $Id$ */
@@ -95,13 +96,19 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_child_attached(Widget* child);
   virtual void on_child_detached(Widget* child);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -136,31 +143,44 @@ public:
   PositionType get_snap_edge() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %child_attached(Widget* child)</tt>
+   */
+
   Glib::SignalProxy1< void,Widget* > signal_child_attached();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %child_detached(Widget* child)</tt>
+   */
+
   Glib::SignalProxy1< void,Widget* > signal_child_detached();
 
 
-  Glib::RefPtr<Gdk::Window> get_bin_window();
+   Glib::RefPtr<Gdk::Window> get_bin_window();
   Glib::RefPtr<const Gdk::Window> get_bin_window() const;
-  Glib::RefPtr<Gdk::Window> get_float_window();
+    Glib::RefPtr<Gdk::Window> get_float_window();
   Glib::RefPtr<const Gdk::Window> get_float_window() const;
-
+ 
   bool is_child_detached() const;
   bool is_float_window_mapped() const;
   bool is_in_drag() const;
   bool shrinks_on_detach() const;
 
   //_WRAP_PROPERTY("shadow", ShadowType); //deprecated.
-  /** Appearance of the shadow that surrounds the container.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Appearance of the shadow that surrounds the container.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ShadowType> property_shadow_type() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Appearance of the shadow that surrounds the container.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -168,15 +188,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ShadowType> property_shadow_type() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Position of the handle relative to the child widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Position of the handle relative to the child widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<PositionType> property_handle_position() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Position of the handle relative to the child widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -184,15 +208,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<PositionType> property_handle_position() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Side of the handlebox that's lined up with the docking point to dock the handlebox.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Side of the handlebox that's lined up with the docking point to dock the handlebox.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<PositionType> property_snap_edge() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Side of the handlebox that's lined up with the docking point to dock the handlebox.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -200,6 +228,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<PositionType> property_snap_edge() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -215,6 +244,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::HandleBox* wrap(GtkHandleBox* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_HANDLEBOX_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/iconfactory.cc b/libs/gtkmm2/gtk/gtkmm/iconfactory.cc
index 4a305d1291..d068b95433 100644
--- a/libs/gtkmm2/gtk/gtkmm/iconfactory.cc
+++ b/libs/gtkmm2/gtk/gtkmm/iconfactory.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/iconfactory.h>
 #include <gtkmm/private/iconfactory_p.h>
 
@@ -113,8 +114,19 @@ void IconFactory_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* IconFactory_Class::wrap_new(GObject* object)
 {
@@ -170,20 +182,27 @@ Glib::RefPtr<IconFactory> IconFactory::create()
 }
 void IconFactory::add(const Gtk::StockID& stock_id, const IconSet& icon_set)
 {
-  gtk_icon_factory_add(gobj(), (stock_id).get_c_str(), const_cast<GtkIconSet*>((icon_set).gobj()));
+gtk_icon_factory_add(gobj(), (stock_id).get_c_str(), const_cast<GtkIconSet*>((icon_set).gobj())); 
 }
 
 void IconFactory::add_default()
 {
-  gtk_icon_factory_add_default(gobj());
+gtk_icon_factory_add_default(gobj()); 
 }
 
 void IconFactory::remove_default()
 {
-  gtk_icon_factory_remove_default(gobj());
+gtk_icon_factory_remove_default(gobj()); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/iconfactory.h b/libs/gtkmm2/gtk/gtkmm/iconfactory.h
index 39b98e792f..5b323f1976 100644
--- a/libs/gtkmm2/gtk/gtkmm/iconfactory.h
+++ b/libs/gtkmm2/gtk/gtkmm/iconfactory.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ICONFACTORY_H
 #define _GTKMM_ICONFACTORY_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -114,11 +115,11 @@ public:
   void add(const Gtk::StockID& stock_id, const IconSet& icon_set);
   
   /** Adds an icon factory to the list of icon factories searched by
-   * Gtk::Style::lookup_icon_set(). This means that, for example,
-   * Gtk::Image::new_from_stock() will be able to find icons in @a factory .
-   * There will normally be an icon factory added for each library or
-   * application that comes with icons. The default icon factories
-   * can be overridden by themes.
+   *     Gtk::Style::lookup_icon_set(). This means that, for example,
+   *     the Image::Image(const Gtk::StockID& stock_id, IconSize size) constructor will be able to find icons in @a factory .
+   *     There will normally be an icon factory added for each library or
+   *     application that comes with icons. The default icon factories
+   *     can be overridden by themes.
    */
   void add_default();
   
@@ -133,11 +134,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/iconinfo.cc b/libs/gtkmm2/gtk/gtkmm/iconinfo.cc
index 7dfaa15c79..a5655cd711 100644
--- a/libs/gtkmm2/gtk/gtkmm/iconinfo.cc
+++ b/libs/gtkmm2/gtk/gtkmm/iconinfo.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/iconinfo.h>
 #include <gtkmm/private/iconinfo_p.h>
 
@@ -132,33 +133,40 @@ Glib::RefPtr<Gdk::Pixbuf> IconInfo::get_builtin_pixbuf()
 {
 
   Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_icon_info_get_builtin_pixbuf(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Pixbuf> IconInfo::get_builtin_pixbuf() const
 {
-
-  Glib::RefPtr<const Gdk::Pixbuf> retvalue = Glib::wrap(gtk_icon_info_get_builtin_pixbuf(const_cast<GtkIconInfo*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<IconInfo*>(this)->get_builtin_pixbuf();
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 Glib::RefPtr<Gdk::Pixbuf> IconInfo::load_icon() const
-{
-  GError *error = 0;
-  Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_icon_info_load_icon(const_cast<GtkIconInfo*>(gobj()), &(error)));
-  if(error) ::Glib::Error::throw_exception(error);
+#else
+Glib::RefPtr<Gdk::Pixbuf> IconInfo::load_icon(std::auto_ptr<Glib::Error>& error) const
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_icon_info_load_icon(const_cast<GtkIconInfo*>(gobj()), &(gerror)));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   return retvalue;
+
 }
 
 void IconInfo::set_raw_coordinates(bool raw_coordinates)
 {
-  gtk_icon_info_set_raw_coordinates(gobj(), static_cast<int>(raw_coordinates));
+gtk_icon_info_set_raw_coordinates(gobj(), static_cast<int>(raw_coordinates)); 
 }
 
 bool IconInfo::get_embedded_rect(Gdk::Rectangle& rectangle) const
diff --git a/libs/gtkmm2/gtk/gtkmm/iconinfo.h b/libs/gtkmm2/gtk/gtkmm/iconinfo.h
index 73f36a2f6f..5eadf4f2e8 100644
--- a/libs/gtkmm2/gtk/gtkmm/iconinfo.h
+++ b/libs/gtkmm2/gtk/gtkmm/iconinfo.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ICONINFO_H
 #define _GTKMM_ICONINFO_H
 
+
 #include <glibmm.h>
 
 /* Copyright (C) 2003 The gtkmm Development Team
@@ -89,7 +90,7 @@ public:
    * @return The base size, or 0, if no base
    * size is known for the icon.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   int get_base_size() const;
   
@@ -130,14 +131,20 @@ public:
    * will avoid scaling icons that it considers sufficiently close to the
    * requested size or for which the source image would have to be scaled
    * up too far. (This maintains sharpness.)
+   * @param error Location to store error information on failure, or <tt>0</tt>.
    * @return The rendered icon; this may be a newly created icon
    * or a new reference to an internal icon, so you must not modify
    * the icon. Use Glib::object_unref() to release your reference to the
    * icon.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   Glib::RefPtr<Gdk::Pixbuf> load_icon() const;
+#else
+  Glib::RefPtr<Gdk::Pixbuf> load_icon(std::auto_ptr<Glib::Error>& error) const;
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   
   /** Sets whether the coordinates returned by gtk_icon_info_get_embedded_rect()
    * and gtk_icon_info_get_attach_points() should be returned in their
@@ -154,7 +161,7 @@ public:
    * This function is provided primarily to allow compatibility wrappers
    * for older API's, and is not expected to be useful for applications.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param raw_coordinates Whether the coordinates of embedded rectangles
    * and attached points should be returned in their original
    * (unscaled) form.
@@ -171,7 +178,7 @@ public:
    * when this function returns <tt>true</tt>.
    * @return <tt>true</tt> if the icon has an embedded rectangle
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_embedded_rect(Gdk::Rectangle& rectangle) const;
   bool get_attach_points(Glib::ArrayHandle<Gdk::Point>& points) const;
@@ -183,7 +190,7 @@ public:
    * the icon doesn't have a specified display name. This value
    * is owned @a icon_info  and must not be modified or free.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_display_name() const;
 
@@ -223,5 +230,6 @@ class Value<Gtk::IconInfo> : public Glib::Value_Boxed<Gtk::IconInfo>
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_ICONINFO_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/iconset.cc b/libs/gtkmm2/gtk/gtkmm/iconset.cc
index 7546b7d7d2..8610da7c4c 100644
--- a/libs/gtkmm2/gtk/gtkmm/iconset.cc
+++ b/libs/gtkmm2/gtk/gtkmm/iconset.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/iconset.h>
 #include <gtkmm/private/iconset_p.h>
 
@@ -137,7 +138,7 @@ Glib::RefPtr<Gdk::Pixbuf> IconSet::render_icon(const Glib::RefPtr<Style>& style,
 
 void IconSet::add_source(const IconSource& source)
 {
-  gtk_icon_set_add_source(gobj(), (source).gobj());
+gtk_icon_set_add_source(gobj(), (source).gobj()); 
 }
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/iconset.h b/libs/gtkmm2/gtk/gtkmm/iconset.h
index 25ec3756ea..65ab0b57fa 100644
--- a/libs/gtkmm2/gtk/gtkmm/iconset.h
+++ b/libs/gtkmm2/gtk/gtkmm/iconset.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ICONSET_H
 #define _GTKMM_ICONSET_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -44,6 +45,9 @@ namespace Gtk
 class Style;
 class Widget;
 
+//TODO_API: Is _CLASS_BOXEDTYPE the appropriate thing to use here.
+//This seems to be reference-counted, not copied.
+
 class IconSet
 {
   public:
@@ -184,5 +188,6 @@ class Value<Gtk::IconSet> : public Glib::Value_Boxed<Gtk::IconSet>
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_ICONSET_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/iconsource.cc b/libs/gtkmm2/gtk/gtkmm/iconsource.cc
index 4ff332d9fd..49d86ee5b2 100644
--- a/libs/gtkmm2/gtk/gtkmm/iconsource.cc
+++ b/libs/gtkmm2/gtk/gtkmm/iconsource.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/iconsource.h>
 #include <gtkmm/private/iconsource_p.h>
 
@@ -26,7 +27,6 @@
  */
 
 #include <gtk/gtkiconfactory.h>
-
 namespace
 {
 } // anonymous namespace
@@ -99,12 +99,12 @@ GtkIconSource* IconSource::gobj_copy() const
 
 void IconSource::set_filename(const Glib::ustring& filename)
 {
-  gtk_icon_source_set_filename(gobj(), filename.c_str());
+gtk_icon_source_set_filename(gobj(), filename.c_str()); 
 }
 
 void IconSource::set_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
 {
-  gtk_icon_source_set_pixbuf(gobj(), Glib::unwrap(pixbuf));
+gtk_icon_source_set_pixbuf(gobj(), Glib::unwrap(pixbuf)); 
 }
 
 Glib::ustring IconSource::get_filename() const
@@ -116,35 +116,30 @@ Glib::RefPtr<Gdk::Pixbuf> IconSource::get_pixbuf()
 {
 
   Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_icon_source_get_pixbuf(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Pixbuf> IconSource::get_pixbuf() const
 {
-
-  Glib::RefPtr<const Gdk::Pixbuf> retvalue = Glib::wrap(gtk_icon_source_get_pixbuf(const_cast<GtkIconSource*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<IconSource*>(this)->get_pixbuf();
 }
 
 void IconSource::set_direction_wildcarded(bool setting)
 {
-  gtk_icon_source_set_direction_wildcarded(gobj(), static_cast<int>(setting));
+gtk_icon_source_set_direction_wildcarded(gobj(), static_cast<int>(setting)); 
 }
 
 void IconSource::set_state_wildcarded(bool setting)
 {
-  gtk_icon_source_set_state_wildcarded(gobj(), static_cast<int>(setting));
+gtk_icon_source_set_state_wildcarded(gobj(), static_cast<int>(setting)); 
 }
 
 void IconSource::set_size_wildcarded(bool setting)
 {
-  gtk_icon_source_set_size_wildcarded(gobj(), static_cast<int>(setting));
+gtk_icon_source_set_size_wildcarded(gobj(), static_cast<int>(setting)); 
 }
 
 bool IconSource::get_size_wildcarded() const
@@ -164,17 +159,17 @@ bool IconSource::get_direction_wildcarded() const
 
 void IconSource::set_direction(TextDirection direction)
 {
-  gtk_icon_source_set_direction(gobj(), ((GtkTextDirection)(direction)));
+gtk_icon_source_set_direction(gobj(), ((GtkTextDirection)(direction))); 
 }
 
 void IconSource::set_state(Gtk::StateType state)
 {
-  gtk_icon_source_set_state(gobj(), ((GtkStateType)(state)));
+gtk_icon_source_set_state(gobj(), ((GtkStateType)(state))); 
 }
 
 void IconSource::set_size(IconSize size)
 {
-  gtk_icon_source_set_size(gobj(), static_cast<GtkIconSize>(int(size)));
+gtk_icon_source_set_size(gobj(), static_cast<GtkIconSize>(int(size))); 
 }
 
 TextDirection IconSource::get_direction() const
@@ -194,7 +189,7 @@ IconSize IconSource::get_size() const
 
 void IconSource::set_icon_name(const Glib::ustring& icon_name)
 {
-  gtk_icon_source_set_icon_name(gobj(), icon_name.c_str());
+gtk_icon_source_set_icon_name(gobj(), icon_name.c_str()); 
 }
 
 Glib::ustring IconSource::get_icon_name() const
diff --git a/libs/gtkmm2/gtk/gtkmm/iconsource.h b/libs/gtkmm2/gtk/gtkmm/iconsource.h
index 67622aa2c7..9365b1984b 100644
--- a/libs/gtkmm2/gtk/gtkmm/iconsource.h
+++ b/libs/gtkmm2/gtk/gtkmm/iconsource.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ICONSOURCE_H
 #define _GTKMM_ICONSOURCE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -284,5 +285,6 @@ class Value<Gtk::IconSource> : public Glib::Value_Boxed<Gtk::IconSource>
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_ICONSOURCE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/icontheme.cc b/libs/gtkmm2/gtk/gtkmm/icontheme.cc
index 4403fe61f0..281df63663 100644
--- a/libs/gtkmm2/gtk/gtkmm/icontheme.cc
+++ b/libs/gtkmm2/gtk/gtkmm/icontheme.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/icontheme.h>
 #include <gtkmm/private/icontheme_p.h>
 
@@ -34,10 +35,10 @@ void IconTheme::set_search_path(const Glib::ArrayHandle<Glib::ustring>& path)
 
 Glib::ArrayHandle<Glib::ustring> IconTheme::get_search_path() const
 {
-  int* temp_int = 0;
-  gchar*** temp_path = 0;
-  gtk_icon_theme_get_search_path(const_cast<GtkIconTheme*>(gobj()), temp_path, temp_int);
-  return Glib::ArrayHandle<Glib::ustring>((const char**)(*temp_path), *temp_int, Glib::OWNERSHIP_SHALLOW);
+  int temp_int = 0;
+  gchar** temp_path = 0;
+  gtk_icon_theme_get_search_path(const_cast<GtkIconTheme*>(gobj()), &temp_path, &temp_int);
+  return Glib::ArrayHandle<Glib::ustring>((const char**) temp_path, temp_int, Glib::OWNERSHIP_DEEP);
 }
 
 Glib::ArrayHandle<int> IconTheme::get_icon_sizes(const Glib::ustring& icon_name) const
@@ -48,6 +49,11 @@ Glib::ArrayHandle<int> IconTheme::get_icon_sizes(const Glib::ustring& icon_name)
   return Glib::ArrayHandle<int>(pArrayInts, Glib::OWNERSHIP_SHALLOW); //TODO: I'm not sure about the ownership. murrayc.
 }
   
+Glib::ListHandle<Glib::ustring> IconTheme::list_icons() const
+{
+  return Glib::ListHandle<Glib::ustring>(gtk_icon_theme_list_icons(const_cast<GtkIconTheme*>(gobj()), 0 /* means all icons according to the C documentation. */ ), Glib::OWNERSHIP_SHALLOW);
+}
+
 
 } // namespace Gtk
 
@@ -55,13 +61,15 @@ Glib::ArrayHandle<int> IconTheme::get_icon_sizes(const Glib::ustring& icon_name)
 namespace
 {
 
-const Glib::SignalProxyInfo IconTheme_signal_changed_info =
+
+static const Glib::SignalProxyInfo IconTheme_signal_changed_info =
 {
   "changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -80,10 +88,18 @@ Gtk::IconThemeError::Code Gtk::IconThemeError::code() const
   return static_cast<Code>(Glib::Error::code());
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 void Gtk::IconThemeError::throw_func(GError* gobject)
 {
   throw Gtk::IconThemeError(gobject);
 }
+#else
+//When not using exceptions, we just pass the Exception object around without throwing it:
+std::auto_ptr<Glib::Error> Gtk::IconThemeError::throw_func(GError* gobject)
+{
+  return std::auto_ptr<Glib::Error>(new Gtk::IconThemeError(gobject));
+}
+#endif //GLIBMM_EXCEPTIONS_ENABLED
 
 // static
 GType Glib::Value<Gtk::IconThemeError::Code>::value_type()
@@ -135,10 +151,18 @@ void IconTheme_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->changed = &changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void IconTheme_Class::changed_callback(GtkIconTheme* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -151,15 +175,19 @@ void IconTheme_Class::changed_callback(GtkIconTheme* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -172,6 +200,7 @@ void IconTheme_Class::changed_callback(GtkIconTheme* self)
       (*base->changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* IconTheme_Class::wrap_new(GObject* object)
@@ -236,6 +265,7 @@ Glib::RefPtr<IconTheme> IconTheme::get_default()
   return retvalue;
 }
 
+
 Glib::RefPtr<IconTheme> IconTheme::get_for_screen(const Glib::RefPtr<Gdk::Screen>& screen)
 {
 
@@ -246,24 +276,25 @@ Glib::RefPtr<IconTheme> IconTheme::get_for_screen(const Glib::RefPtr<Gdk::Screen
   return retvalue;
 }
 
+
 void IconTheme::set_screen(const Glib::RefPtr<Gdk::Screen>& screen)
 {
-  gtk_icon_theme_set_screen(gobj(), Glib::unwrap(screen));
+gtk_icon_theme_set_screen(gobj(), Glib::unwrap(screen)); 
 }
 
 void IconTheme::append_search_path(const Glib::ustring& path)
 {
-  gtk_icon_theme_append_search_path(gobj(), path.c_str());
+gtk_icon_theme_append_search_path(gobj(), path.c_str()); 
 }
 
 void IconTheme::prepend_search_path(const Glib::ustring& path)
 {
-  gtk_icon_theme_prepend_search_path(gobj(), path.c_str());
+gtk_icon_theme_prepend_search_path(gobj(), path.c_str()); 
 }
 
 void IconTheme::set_custom_theme(const Glib::ustring& theme_name)
 {
-  gtk_icon_theme_set_custom_theme(gobj(), theme_name.c_str());
+gtk_icon_theme_set_custom_theme(gobj(), theme_name.c_str()); 
 }
 
 bool IconTheme::has_icon(const Glib::ustring& icon_name) const
@@ -276,12 +307,24 @@ IconInfo IconTheme::lookup_icon(const Glib::ustring& icon_name, int size, IconLo
   return Glib::wrap(gtk_icon_theme_lookup_icon(const_cast<GtkIconTheme*>(gobj()), icon_name.c_str(), size, ((GtkIconLookupFlags)(flags))));
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 Glib::RefPtr<Gdk::Pixbuf> IconTheme::load_icon(const Glib::ustring& icon_name, int size, IconLookupFlags flags) const
-{
-  GError *error = 0;
-  Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_icon_theme_load_icon(const_cast<GtkIconTheme*>(gobj()), icon_name.c_str(), size, ((GtkIconLookupFlags)(flags)), &(error)));
-  if(error) ::Glib::Error::throw_exception(error);
+#else
+Glib::RefPtr<Gdk::Pixbuf> IconTheme::load_icon(const Glib::ustring& icon_name, int size, IconLookupFlags flags, std::auto_ptr<Glib::Error>& error) const
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_icon_theme_load_icon(const_cast<GtkIconTheme*>(gobj()), icon_name.c_str(), size, ((GtkIconLookupFlags)(flags)), &(gerror)));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   return retvalue;
+
 }
 
 Glib::ListHandle<Glib::ustring> IconTheme::list_icons(const Glib::ustring& context) const
@@ -301,7 +344,7 @@ bool IconTheme::rescan_if_needed()
 
 void IconTheme::add_builtin_icon(const Glib::ustring& icon_name, int size, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
 {
-  gtk_icon_theme_add_builtin_icon(icon_name.c_str(), size, Glib::unwrap(pixbuf));
+gtk_icon_theme_add_builtin_icon(icon_name.c_str(), size, Glib::unwrap(pixbuf));
 }
 
 
@@ -311,6 +354,7 @@ Glib::SignalProxy0< void > IconTheme::signal_changed()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::IconTheme::on_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -320,6 +364,10 @@ void Gtk::IconTheme::on_changed()
   if(base && base->changed)
     (*base->changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/icontheme.h b/libs/gtkmm2/gtk/gtkmm/icontheme.h
index 450ad2f9ea..c17f46b828 100644
--- a/libs/gtkmm2/gtk/gtkmm/icontheme.h
+++ b/libs/gtkmm2/gtk/gtkmm/icontheme.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ICONTHEME_H
 #define _GTKMM_ICONTHEME_H
 
+
 #include <glibmm.h>
 
 /* Copyright (C) 2003 The gtkmm Development Team
@@ -105,7 +106,14 @@ public:
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 private:
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   static void throw_func(GError* gobject);
+#else
+  //When not using exceptions, we just pass the Exception object around without throwing it:
+  static std::auto_ptr<Glib::Error> throw_func(GError* gobject);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   friend void wrap_init(); // uses throw_func()
 #endif
 };
@@ -188,9 +196,9 @@ public:
    * @return A unique Gtk::IconTheme associated with
    * the default screen. This icon theme is associated with
    * the screen and can be used as long as the screen
-   * is open.
+   * is open. Do not ref or unref it.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   static Glib::RefPtr<IconTheme> get_default();
   
@@ -206,9 +214,9 @@ public:
    * @return A unique Gtk::IconTheme associated with
    * the given screen. This icon theme is associated with
    * the screen and can be used as long as the screen
-   * is open.
+   * is open. Do not ref or unref it.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   static Glib::RefPtr<IconTheme> get_for_screen(const Glib::RefPtr<Gdk::Screen>& screen);
   
@@ -216,7 +224,7 @@ public:
    * to track the user's currently configured icon theme,
    * which might be different for different screens.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param screen A Gdk::Screen.
    */
   void set_screen(const Glib::RefPtr<Gdk::Screen>& screen);
@@ -226,7 +234,7 @@ public:
   /** Appends a directory to the search path. 
    * See set_search_path(). 
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param path Directory name to append to the icon path.
    */
   void append_search_path(const Glib::ustring& path);
@@ -234,7 +242,7 @@ public:
   /** Prepends a directory to the search path. 
    * See set_search_path().
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param path Directory name to prepend to the icon path.
    */
   void prepend_search_path(const Glib::ustring& path);
@@ -242,10 +250,11 @@ public:
   /** Sets the name of the icon theme that the Gtk::IconTheme object uses
    * overriding system configuration. This function cannot be called
    * on the icon theme objects returned from get_default()
-   * and get_default().
+   * and get_for_screen().
    * 
-   * Since: 2.4
-   * @param theme_name Name of icon theme to use instead of configured theme.
+   * @newin2p4
+   * @param theme_name Name of icon theme to use instead of configured theme,
+   * or <tt>0</tt> to unset a previously set custom theme.
    */
   void set_custom_theme(const Glib::ustring& theme_name);
   
@@ -255,13 +264,13 @@ public:
    * @return <tt>true</tt> if @a icon_theme  includes an
    * icon for @a icon_name .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool has_icon(const Glib::ustring& icon_name) const;
 
   Glib::ArrayHandle<int> get_icon_sizes(const Glib::ustring& icon_name) const;
   
-  
+
 //TODO: Update the docs for this, to suggest use of IconInfo::operator bool() instead of saying that it returns null.
   
   /** Looks up a named icon and returns a structure containing
@@ -276,7 +285,7 @@ public:
    * about the icon, or <tt>0</tt> if the icon wasn't found. Free with
    * gtk_icon_info_free()
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   IconInfo lookup_icon(const Glib::ustring& icon_name, int size, IconLookupFlags flags) const;
 
@@ -285,6 +294,14 @@ public:
    * and renders it into a pixbuf. This is a convenience function;
    * if more details about the icon are needed, use
    * lookup_icon() followed by gtk_icon_info_load_icon().
+   * 
+   * Note that you probably want to listen for icon theme changes and
+   * update the icon. This is usually done by connecting to the 
+   * GtkWidget::style-set signal. If for some reason you do not want to
+   * update the icon when the icon theme changes, you should consider
+   * using gdk_pixbuf_copy() to make a private copy of the pixbuf
+   * returned by this function. Otherwise GTK+ may need to keep the old 
+   * icon theme loaded, which would be a waste of memory.
    * @param icon_name The name of the icon to lookup.
    * @param size The desired icon size. The resulting icon may not be exactly this size; see gtk_icon_info_load_icon().
    * @param flags Flags modifying the behavior of the icon lookup.
@@ -293,26 +310,36 @@ public:
    * the icon. Use Glib::object_unref() to release your reference to the
    * icon. <tt>0</tt> if the icon isn't found.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   Glib::RefPtr<Gdk::Pixbuf> load_icon(const Glib::ustring& icon_name, int size, IconLookupFlags flags) const;
+#else
+  Glib::RefPtr<Gdk::Pixbuf> load_icon(const Glib::ustring& icon_name, int size, IconLookupFlags flags, std::auto_ptr<Glib::Error>& error) const;
+#endif //GLIBMM_EXCEPTIONS_ENABLED
 
-  
-  /** Lists the icons in the current icon theme. Only a subset
-   * of the icons can be listed by providing a context string.
+
+  /** Lists a subset of icons in the current icon theme, by providing a context string.
    * The set of values for the context string is system dependent,
-   * but will typically include such values as 'apps' and
-   * 'mimetypes'.
-   * @param context A string identifying a particular type of icon,
-   * or <tt>0</tt> to list all icons.
-   * @return A G::List list holding the names of all the
-   * icons in the theme. You must first free each element
-   * in the list with Glib::free(), then free the list itself
-   * with Glib::list_free().
+   * but will typically include such values as 'Applications' and
+   * 'MimeTypes'.
+   * @param context A string identifying a particular type of icon.
+   * @return The names of all the
+   * icons in the theme.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ListHandle<Glib::ustring> list_icons(const Glib::ustring& context) const;
+
+  /** Lists the icons in the current icon theme.
+   *
+   * @return A list holding the names of all the
+   * icons in the theme.
+   * 
+   * @newin2p10.
+   */
+   Glib::ListHandle<Glib::ustring> list_icons() const;
+
   
   /** Gets the name of an icon that is representative of the
    * current theme (for instance, to use when presenting
@@ -320,7 +347,7 @@ public:
    * @return The name of an example icon or <tt>0</tt>.
    * Free with Glib::free().
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_example_icon_name() const;
   
@@ -330,7 +357,7 @@ public:
    * @return <tt>true</tt> if the icon theme has changed and needed
    * to be reloaded.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool rescan_if_needed();
   
@@ -348,7 +375,7 @@ public:
    * This function will generally be used with pixbufs loaded
    * via gdk_pixbuf_new_from_inline().
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param icon_name The name of the icon to register.
    * @param size The size at which to register the icon (different
    * images can be registered for the same icon name
@@ -359,6 +386,11 @@ public:
   static void add_builtin_icon(const Glib::ustring& icon_name, int size, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
 
   
+/**
+   * @par Prototype:
+   * <tt>void %changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_changed();
 
 
@@ -366,12 +398,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/iconview.cc b/libs/gtkmm2/gtk/gtkmm/iconview.cc
index a053eae250..82d3901f94 100644
--- a/libs/gtkmm2/gtk/gtkmm/iconview.cc
+++ b/libs/gtkmm2/gtk/gtkmm/iconview.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/iconview.h>
 #include <gtkmm/private/iconview_p.h>
 
@@ -29,19 +30,23 @@
 namespace //anonymous namespace
 {
 
-void proxy_foreach_callback(GtkIconView* /* icon_view */, GtkTreePath* path, void* data)
+static void proxy_foreach_callback(GtkIconView* /* icon_view */, GtkTreePath* path, void* data)
 {
   typedef Gtk::IconView::SlotForeach SlotType;
   SlotType& slot = *static_cast<SlotType*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     slot(Gtk::TreeModel::Path(path, true));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
 } //anonymous namespace
@@ -58,7 +63,135 @@ void IconView::selected_foreach(const SlotForeach& slot)
   SlotForeach slot_copy(slot);
   gtk_icon_view_selected_foreach(const_cast<GtkIconView*>(gobj()), &proxy_foreach_callback, &slot_copy);
 }
+
+bool IconView::get_item_at_pos(int x, int y, TreeModel::Path& path, CellRenderer*& cell) const
+{
+  GtkTreePath* cpath = 0;
+  GtkCellRenderer* ccell = 0;
+  bool result = gtk_icon_view_get_item_at_pos(const_cast<GtkIconView*>(gobj()), x, y, &cpath, &ccell);
+
+  path = Glib::wrap(cpath); //Don't take copy because the gtk_icon_view_get_item_at_pos documentation says we should free this.
+  cell = Glib::wrap(ccell);
+  return result;
+}
+
+bool IconView::get_item_at_pos(int x, int y, TreeModel::Path& path) const
+{
+  GtkTreePath* cpath = 0;
+  bool result = gtk_icon_view_get_item_at_pos(const_cast<GtkIconView*>(gobj()), x, y, &cpath, 0);
+
+  path = Glib::wrap(cpath); //Don't take copy because the gtk_icon_view_get_item_at_pos documentation says we should free this.
+  return result;
+}
+
+bool IconView::get_item_at_pos(int x, int y, CellRenderer*& cell) const
+{
+  GtkCellRenderer* ccell = 0;
+  bool result = gtk_icon_view_get_item_at_pos(const_cast<GtkIconView*>(gobj()), x, y, 0, &ccell);
+
+  cell = Glib::wrap(ccell);
+  return result;
+}
+
+bool IconView::get_visible_range(TreeModel::Path& start_path, TreeModel::Path& end_path) const
+{
+  GtkTreePath* cstart_path = 0;
+  GtkTreePath* cend_path = 0;
+  bool result = gtk_icon_view_get_visible_range(const_cast<GtkIconView*>(gobj()), &cstart_path, &cend_path);
+
+  start_path = Glib::wrap(cstart_path); //Don't take copy because the gtk_icon_view_get_visible_range documentation says we should free this.
+  end_path = Glib::wrap(cend_path); //Don't take copy because the gtk_icon_view_get_visible_range documentation says we should free this.
+  return result;
+}
+
   
+bool IconView::get_cursor(TreeModel::Path& path, CellRenderer*& cell) const
+{
+  GtkTreePath* cpath = 0;
+  GtkCellRenderer* ccell = 0;
+  bool result = gtk_icon_view_get_cursor(const_cast<GtkIconView*>(gobj()), &cpath, &ccell);
+
+  path = Glib::wrap(cpath); //Don't take copy because the gtk_icon_view_get_cursor documentation says we should free this.
+  cell = Glib::wrap(ccell);
+  return result;
+}
+
+bool IconView::get_cursor(TreeModel::Path& path) const
+{
+  GtkTreePath* cpath = 0;
+  bool result = gtk_icon_view_get_cursor(const_cast<GtkIconView*>(gobj()), &cpath, 0);
+
+  path = Glib::wrap(cpath); //Don't take copy because the gtk_icon_view_get_cursor documentation says we should free this.
+  return result;
+}
+
+bool IconView::get_cursor(CellRenderer*& cell) const
+{
+  GtkCellRenderer* ccell = 0;
+  bool result = gtk_icon_view_get_cursor(const_cast<GtkIconView*>(gobj()), 0, &ccell);
+
+  cell = Glib::wrap(ccell);
+  return result;
+}
+
+void IconView::get_drag_dest_item(TreeModel::Path& path, IconViewDropPosition& pos) const
+{
+  GtkTreePath* cpath = 0;
+  gtk_icon_view_get_drag_dest_item(const_cast<GtkIconView*>(gobj()), &cpath, (GtkIconViewDropPosition*)(&pos));
+  if(cpath)
+    path = Gtk::TreeModel::Path(cpath, true /* make_a_copy */);
+}
+
+void IconView::get_drag_dest_item(TreeModel::Path& path) const
+{
+  GtkTreePath* cpath = 0;
+  gtk_icon_view_get_drag_dest_item(const_cast<GtkIconView*>(gobj()), &cpath, NULL);
+  if(cpath)
+    path = Gtk::TreeModel::Path(cpath, true /* make_a_copy */);
+}
+
+void IconView::get_drag_dest_item(IconViewDropPosition& pos) const
+{
+   gtk_icon_view_get_drag_dest_item(const_cast<GtkIconView*>(gobj()), NULL, (GtkIconViewDropPosition*)(&pos));
+}
+
+
+bool IconView::get_dest_item_at_pos(int drag_x, int drag_y, TreeModel::Path& path, IconViewDropPosition& pos) const
+{
+  GtkTreePath* cpath = 0;
+  const bool result = gtk_icon_view_get_dest_item_at_pos(const_cast<GtkIconView*>(gobj()), drag_x, drag_y, &cpath, (GtkIconViewDropPosition*)(&pos));
+  if(cpath)
+    path = Gtk::TreeModel::Path(cpath, true /* make_a_copy */);
+
+  return result;
+}
+
+bool IconView::get_dest_item_at_pos(int drag_x, int drag_y, TreeModel::Path& path) const
+{
+  GtkTreePath* cpath = 0;
+  const bool result = gtk_icon_view_get_dest_item_at_pos(const_cast<GtkIconView*>(gobj()), drag_x, drag_y, &cpath, NULL);
+  if(cpath)
+    path = Gtk::TreeModel::Path(cpath, true /* make_a_copy */);
+
+  return result;
+}
+
+bool IconView::get_dest_item_at_pos(int drag_x, int drag_y, IconViewDropPosition& pos) const
+{
+  return gtk_icon_view_get_dest_item_at_pos(const_cast<GtkIconView*>(gobj()), drag_x, drag_y, NULL, (GtkIconViewDropPosition*)(&pos));
+}
+
+
+void IconView::enable_model_drag_source(const ArrayHandle_TargetEntry& targets, Gdk::ModifierType start_button_mask, Gdk::DragAction actions)
+{
+  gtk_icon_view_enable_model_drag_source(gobj(), (GdkModifierType)start_button_mask, targets.data(), targets.size(), (GdkDragAction)actions);
+}
+
+
+void  IconView::enable_model_drag_dest(const ArrayHandle_TargetEntry& targets, Gdk::DragAction actions)
+{
+  gtk_icon_view_enable_model_drag_dest(gobj(), targets.data(), targets.size(), (GdkDragAction)actions);
+}
 
 } // namespace Gtk
 
@@ -66,7 +199,8 @@ void IconView::selected_foreach(const SlotForeach& slot)
 namespace
 {
 
-void IconView_signal_set_scroll_adjustments_callback(GtkIconView* self, GtkAdjustment* p0,GtkAdjustment* p1,void* data)
+
+static void IconView_signal_set_scroll_adjustments_callback(GtkIconView* self, GtkAdjustment* p0,GtkAdjustment* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Adjustment*,Adjustment* > SlotType;
@@ -74,21 +208,25 @@ void IconView_signal_set_scroll_adjustments_callback(GtkIconView* self, GtkAdjus
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo IconView_signal_set_scroll_adjustments_info =
+static const Glib::SignalProxyInfo IconView_signal_set_scroll_adjustments_info =
 {
   "set_scroll_adjustments",
   (GCallback) &IconView_signal_set_scroll_adjustments_callback,
@@ -96,7 +234,7 @@ const Glib::SignalProxyInfo IconView_signal_set_scroll_adjustments_info =
 };
 
 
-void IconView_signal_item_activated_callback(GtkIconView* self, GtkTreePath* p0,void* data)
+static void IconView_signal_item_activated_callback(GtkIconView* self, GtkTreePath* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TreeModel::Path& > SlotType;
@@ -104,20 +242,24 @@ void IconView_signal_item_activated_callback(GtkIconView* self, GtkTreePath* p0,
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Gtk::TreePath(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo IconView_signal_item_activated_info =
+static const Glib::SignalProxyInfo IconView_signal_item_activated_info =
 {
   "item_activated",
   (GCallback) &IconView_signal_item_activated_callback,
@@ -125,15 +267,22 @@ const Glib::SignalProxyInfo IconView_signal_item_activated_info =
 };
 
 
-const Glib::SignalProxyInfo IconView_signal_selection_changed_info =
+static const Glib::SignalProxyInfo IconView_signal_selection_changed_info =
 {
   "selection_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
+// static
+GType Glib::Value<Gtk::IconViewDropPosition>::value_type()
+{
+  return gtk_icon_view_drop_position_get_type();
+}
+
 
 namespace Glib
 {
@@ -176,12 +325,20 @@ void IconView_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->set_scroll_adjustments = &set_scroll_adjustments_callback;
   klass->item_activated = &item_activated_callback;
   klass->selection_changed = &selection_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void IconView_Class::set_scroll_adjustments_callback(GtkIconView* self, GtkAdjustment* p0, GtkAdjustment* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -194,17 +351,21 @@ void IconView_Class::set_scroll_adjustments_callback(GtkIconView* self, GtkAdjus
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_set_scroll_adjustments(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -217,7 +378,6 @@ void IconView_Class::set_scroll_adjustments_callback(GtkIconView* self, GtkAdjus
       (*base->set_scroll_adjustments)(self, p0, p1);
   }
 }
-
 void IconView_Class::item_activated_callback(GtkIconView* self, GtkTreePath* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -230,16 +390,20 @@ void IconView_Class::item_activated_callback(GtkIconView* self, GtkTreePath* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_item_activated(Gtk::TreePath(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -252,7 +416,6 @@ void IconView_Class::item_activated_callback(GtkIconView* self, GtkTreePath* p0)
       (*base->item_activated)(self, p0);
   }
 }
-
 void IconView_Class::selection_changed_callback(GtkIconView* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -265,15 +428,19 @@ void IconView_Class::selection_changed_callback(GtkIconView* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_selection_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -286,6 +453,7 @@ void IconView_Class::selection_changed_callback(GtkIconView* self)
       (*base->selection_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* IconView_Class::wrap_new(GObject* o)
@@ -343,7 +511,7 @@ IconView::IconView(const Glib::RefPtr<TreeModel>& model)
 
 void IconView::set_model(const Glib::RefPtr<TreeModel>& model)
 {
-  gtk_icon_view_set_model(gobj(), Glib::unwrap(model));
+gtk_icon_view_set_model(gobj(), Glib::unwrap(model)); 
 }
 
 Glib::RefPtr<TreeModel> IconView::get_model()
@@ -353,17 +521,17 @@ Glib::RefPtr<TreeModel> IconView::get_model()
 
 Glib::RefPtr<const TreeModel> IconView::get_model() const
 {
-  return Glib::wrap(gtk_icon_view_get_model(const_cast<GtkIconView*>(gobj())));
+  return const_cast<IconView*>(this)->get_model();
 }
 
 void IconView::set_text_column(int column)
 {
-  gtk_icon_view_set_text_column(gobj(), column);
+gtk_icon_view_set_text_column(gobj(), column); 
 }
 
 void IconView::set_text_column(const TreeModelColumnBase& model_column)
 {
-  gtk_icon_view_set_text_column(gobj(), (model_column).index());
+gtk_icon_view_set_text_column(gobj(), (model_column).index()); 
 }
 
 int IconView::get_text_column() const
@@ -373,12 +541,12 @@ int IconView::get_text_column() const
 
 void IconView::set_markup_column(int column)
 {
-  gtk_icon_view_set_markup_column(gobj(), column);
+gtk_icon_view_set_markup_column(gobj(), column); 
 }
 
 void IconView::set_markup_column(const TreeModelColumnBase& column)
 {
-  gtk_icon_view_set_markup_column(gobj(), (column).index());
+gtk_icon_view_set_markup_column(gobj(), (column).index()); 
 }
 
 int IconView::get_markup_column() const
@@ -388,12 +556,12 @@ int IconView::get_markup_column() const
 
 void IconView::set_pixbuf_column(int column)
 {
-  gtk_icon_view_set_pixbuf_column(gobj(), column);
+gtk_icon_view_set_pixbuf_column(gobj(), column); 
 }
 
 void IconView::set_pixbuf_column(const TreeModelColumnBase& column)
 {
-  gtk_icon_view_set_pixbuf_column(gobj(), (column).index());
+gtk_icon_view_set_pixbuf_column(gobj(), (column).index()); 
 }
 
 int IconView::get_pixbuf_column() const
@@ -403,7 +571,7 @@ int IconView::get_pixbuf_column() const
 
 void IconView::set_orientation(Orientation orientation)
 {
-  gtk_icon_view_set_orientation(gobj(), ((GtkOrientation)(orientation)));
+gtk_icon_view_set_orientation(gobj(), ((GtkOrientation)(orientation))); 
 }
 
 Orientation IconView::get_orientation() const
@@ -413,7 +581,7 @@ Orientation IconView::get_orientation() const
 
 void IconView::set_columns(int columns)
 {
-  gtk_icon_view_set_columns(gobj(), columns);
+gtk_icon_view_set_columns(gobj(), columns); 
 }
 
 int IconView::get_columns() const
@@ -423,7 +591,7 @@ int IconView::get_columns() const
 
 void IconView::set_item_width(int item_width)
 {
-  gtk_icon_view_set_item_width(gobj(), item_width);
+gtk_icon_view_set_item_width(gobj(), item_width); 
 }
 
 int IconView::get_icon_width() const
@@ -433,7 +601,7 @@ int IconView::get_icon_width() const
 
 void IconView::set_spacing(int spacing)
 {
-  gtk_icon_view_set_spacing(gobj(), spacing);
+gtk_icon_view_set_spacing(gobj(), spacing); 
 }
 
 int IconView::get_spacing() const
@@ -443,7 +611,7 @@ int IconView::get_spacing() const
 
 void IconView::set_row_spacing(int row_spacing)
 {
-  gtk_icon_view_set_row_spacing(gobj(), row_spacing);
+gtk_icon_view_set_row_spacing(gobj(), row_spacing); 
 }
 
 gint IconView::get_row_spacing() const
@@ -453,7 +621,7 @@ gint IconView::get_row_spacing() const
 
 void IconView::set_column_spacing(int column_spacing)
 {
-  gtk_icon_view_set_column_spacing(gobj(), column_spacing);
+gtk_icon_view_set_column_spacing(gobj(), column_spacing); 
 }
 
 int IconView::get_column_spacing() const
@@ -463,7 +631,7 @@ int IconView::get_column_spacing() const
 
 void IconView::set_margin(int margin)
 {
-  gtk_icon_view_set_margin(gobj(), margin);
+gtk_icon_view_set_margin(gobj(), margin); 
 }
 
 int IconView::get_margin() const
@@ -478,7 +646,7 @@ TreeModel::Path IconView::get_path_at_pos(int x, int y) const
 
 void IconView::set_selection_mode(SelectionMode mode)
 {
-  gtk_icon_view_set_selection_mode(gobj(), ((GtkSelectionMode)(mode)));
+gtk_icon_view_set_selection_mode(gobj(), ((GtkSelectionMode)(mode))); 
 }
 
 SelectionMode IconView::get_selection_mode() const
@@ -488,12 +656,12 @@ SelectionMode IconView::get_selection_mode() const
 
 void IconView::select_path(const TreeModel::Path& path)
 {
-  gtk_icon_view_select_path(gobj(), const_cast<GtkTreePath*>((path).gobj()));
+gtk_icon_view_select_path(gobj(), const_cast<GtkTreePath*>((path).gobj())); 
 }
 
 void IconView::unselect_path(const TreeModel::Path& path)
 {
-  gtk_icon_view_unselect_path(gobj(), const_cast<GtkTreePath*>((path).gobj()));
+gtk_icon_view_unselect_path(gobj(), const_cast<GtkTreePath*>((path).gobj())); 
 }
 
 bool IconView::path_is_selected(const TreeModel::Path& path) const
@@ -508,17 +676,52 @@ ArrayHandle_TreePaths IconView::get_selected_items() const
 
 void IconView::select_all()
 {
-  gtk_icon_view_select_all(gobj());
+gtk_icon_view_select_all(gobj()); 
 }
 
 void IconView::unselect_all()
 {
-  gtk_icon_view_unselect_all(gobj());
+gtk_icon_view_unselect_all(gobj()); 
 }
 
 void IconView::item_activated(const TreeModel::Path& path)
 {
-  gtk_icon_view_item_activated(gobj(), const_cast<GtkTreePath*>((path).gobj()));
+gtk_icon_view_item_activated(gobj(), const_cast<GtkTreePath*>((path).gobj())); 
+}
+
+void IconView::scroll_to_path(const TreeModel::Path& path, bool use_align, gfloat row_align, gfloat col_align)
+{
+gtk_icon_view_scroll_to_path(gobj(), const_cast<GtkTreePath*>((path).gobj()), static_cast<int>(use_align), row_align, col_align); 
+}
+
+void IconView::unset_model_drag_source()
+{
+gtk_icon_view_unset_model_drag_source(gobj()); 
+}
+
+void IconView::unset_model_drag_dest()
+{
+gtk_icon_view_unset_model_drag_dest(gobj()); 
+}
+
+void IconView::set_reorderable(bool reorderable)
+{
+gtk_icon_view_set_reorderable(gobj(), static_cast<int>(reorderable)); 
+}
+
+bool IconView::get_reorderable() const
+{
+  return gtk_icon_view_get_reorderable(const_cast<GtkIconView*>(gobj()));
+}
+
+void IconView::set_drag_dest_item(const TreeModel::Path& path, IconViewDropPosition pos)
+{
+gtk_icon_view_set_drag_dest_item(gobj(), const_cast<GtkTreePath*>((path).gobj()), ((GtkIconViewDropPosition)(pos))); 
+}
+
+Glib::RefPtr<Gdk::Pixmap> IconView::create_drag_icon(const TreeModel::Path& path)
+{
+  return Glib::wrap((GdkPixmapObject*)(gtk_icon_view_create_drag_icon(gobj(), const_cast<GtkTreePath*>((path).gobj()))));
 }
 
 
@@ -527,138 +730,189 @@ Glib::SignalProxy2< void,Adjustment*,Adjustment* > IconView::signal_set_scroll_a
   return Glib::SignalProxy2< void,Adjustment*,Adjustment* >(this, &IconView_signal_set_scroll_adjustments_info);
 }
 
+
 Glib::SignalProxy1< void,const TreeModel::Path& > IconView::signal_item_activated()
 {
   return Glib::SignalProxy1< void,const TreeModel::Path& >(this, &IconView_signal_item_activated_info);
 }
 
+
 Glib::SignalProxy0< void > IconView::signal_selection_changed()
 {
   return Glib::SignalProxy0< void >(this, &IconView_signal_selection_changed_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> IconView::property_pixbuf_column() 
 {
   return Glib::PropertyProxy<int>(this, "pixbuf-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> IconView::property_pixbuf_column() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "pixbuf-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> IconView::property_text_column() 
 {
   return Glib::PropertyProxy<int>(this, "text-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> IconView::property_text_column() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "text-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> IconView::property_markup_column() 
 {
   return Glib::PropertyProxy<int>(this, "markup-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> IconView::property_markup_column() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "markup-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<SelectionMode> IconView::property_selection_mode() 
 {
   return Glib::PropertyProxy<SelectionMode>(this, "selection-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<SelectionMode> IconView::property_selection_mode() const
 {
   return Glib::PropertyProxy_ReadOnly<SelectionMode>(this, "selection-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Orientation> IconView::property_orientation() 
 {
   return Glib::PropertyProxy<Orientation>(this, "orientation");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Orientation> IconView::property_orientation() const
 {
   return Glib::PropertyProxy_ReadOnly<Orientation>(this, "orientation");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<TreeModel> > IconView::property_model() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<TreeModel> >(this, "model");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TreeModel> > IconView::property_model() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TreeModel> >(this, "model");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> IconView::property_columns() 
 {
   return Glib::PropertyProxy<int>(this, "columns");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> IconView::property_columns() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "columns");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> IconView::property_item_width() 
 {
   return Glib::PropertyProxy<int>(this, "item-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> IconView::property_item_width() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "item-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> IconView::property_spacing() 
 {
   return Glib::PropertyProxy<int>(this, "spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> IconView::property_spacing() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> IconView::property_row_spacing() 
 {
   return Glib::PropertyProxy<int>(this, "row-spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> IconView::property_row_spacing() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "row-spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> IconView::property_column_spacing() 
 {
   return Glib::PropertyProxy<int>(this, "column-spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> IconView::property_column_spacing() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "column-spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> IconView::property_margin() 
 {
   return Glib::PropertyProxy<int>(this, "margin");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> IconView::property_margin() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "margin");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::IconView::on_set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -668,7 +922,6 @@ void Gtk::IconView::on_set_scroll_adjustments(Adjustment* hadjustment, Adjustmen
   if(base && base->set_scroll_adjustments)
     (*base->set_scroll_adjustments)(gobj(),(GtkAdjustment*)Glib::unwrap(hadjustment),(GtkAdjustment*)Glib::unwrap(vadjustment));
 }
-
 void Gtk::IconView::on_item_activated(const TreeModel::Path& path)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -678,7 +931,6 @@ void Gtk::IconView::on_item_activated(const TreeModel::Path& path)
   if(base && base->item_activated)
     (*base->item_activated)(gobj(),const_cast<GtkTreePath*>((path).gobj()));
 }
-
 void Gtk::IconView::on_selection_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -688,6 +940,10 @@ void Gtk::IconView::on_selection_changed()
   if(base && base->selection_changed)
     (*base->selection_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/iconview.h b/libs/gtkmm2/gtk/gtkmm/iconview.h
index 26fc442662..54539e3046 100644
--- a/libs/gtkmm2/gtk/gtkmm/iconview.h
+++ b/libs/gtkmm2/gtk/gtkmm/iconview.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ICONVIEW_H
 #define _GTKMM_ICONVIEW_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -30,6 +31,7 @@
 #include <gtkmm/container.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treepath.h>
+#include <gtkmm/cellrenderer.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -43,7 +45,51 @@ namespace Gtk
 namespace Gtk
 {
 
-/** TODO
+/** @addtogroup gtkmmEnums Enums and Flags */
+
+/**
+ * @ingroup gtkmmEnums
+ */
+enum IconViewDropPosition
+{
+  ICON_VIEW_NO_DROP,
+  ICON_VIEW_DROP_INTO,
+  ICON_VIEW_DROP_LEFT,
+  ICON_VIEW_DROP_RIGHT,
+  ICON_VIEW_DROP_ABOVE,
+  ICON_VIEW_DROP_BELOW
+};
+
+} // namespace Gtk
+
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+namespace Glib
+{
+
+template <>
+class Value<Gtk::IconViewDropPosition> : public Glib::Value_Enum<Gtk::IconViewDropPosition>
+{
+public:
+  static GType value_type() G_GNUC_CONST;
+};
+
+} // namespace Glib
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
+
+namespace Gtk
+{
+
+
+//TODO: This should derive+implement from CellLayout when we can break ABI.
+
+/** The IconView provides an alternative view of a list model.
+ * It displays the model as a grid of icons with labels. 
+ * Like the TreeView, it allows the user to select one or multiple items 
+ * (depending on the selection mode - see set_selection_mode()).
+ * In addition to selection with the arrow keys, the IconView supports
+ * rubberband selection, by dragging the pointer.
  *
  * @ingroup Widgets
  * @ingroup Containers
@@ -92,14 +138,20 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment);
   virtual void on_item_activated(const TreeModel::Path& path);
   virtual void on_selection_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -115,7 +167,7 @@ public:
    * it before setting the new model.  If @a model  is <tt>0</tt>, then
    * it will unset the old model.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param model The model.
    */
   void set_model(const Glib::RefPtr<TreeModel>& model);
@@ -124,7 +176,7 @@ public:
    * model is unset.
    * @return A Gtk::TreeModel, or <tt>0</tt> if none is currently being used.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::RefPtr<TreeModel> get_model();
   
@@ -132,7 +184,7 @@ public:
    * model is unset.
    * @return A Gtk::TreeModel, or <tt>0</tt> if none is currently being used.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::RefPtr<const TreeModel> get_model() const;
 
@@ -140,7 +192,7 @@ public:
   /** Sets the column with text for @a icon_view  to be @a column . The text
    * column must be of type G::TYPE_STRING.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param column A column in the currently used model.
    */
   void set_text_column(int column);
@@ -148,7 +200,7 @@ public:
   /** Sets the column with text for @a icon_view  to be @a column . The text
    * column must be of type G::TYPE_STRING.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param column A column in the currently used model.
    */
   void set_text_column(const TreeModelColumnBase& model_column);
@@ -156,7 +208,7 @@ public:
   /** Returns the column with text for @a icon_view .
    * @return The text column, or -1 if it's unset.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   int get_text_column() const;
   
@@ -165,7 +217,7 @@ public:
    * If the markup column is set to something, it overrides
    * the text column set by set_text_column().
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param column A column in the currently used model.
    */
   void set_markup_column(int column);
@@ -175,7 +227,7 @@ public:
    * If the markup column is set to something, it overrides
    * the text column set by set_text_column().
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param column A column in the currently used model.
    */
   void set_markup_column(const TreeModelColumnBase& column); 
@@ -183,14 +235,14 @@ public:
   /** Returns the column with markup text for @a icon_view .
    * @return The markup column, or -1 if it's unset.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   int get_markup_column() const;
   
   /** Sets the column with pixbufs for @a icon_view  to be @a column . The pixbuf
    * column must be of type Gdk::TYPE_PIXBUF
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param column A column in the currently used model.
    */
   void set_pixbuf_column(int column);
@@ -198,7 +250,7 @@ public:
   /** Sets the column with pixbufs for @a icon_view  to be @a column . The pixbuf
    * column must be of type Gdk::TYPE_PIXBUF
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param column A column in the currently used model.
    */
   void set_pixbuf_column(const TreeModelColumnBase& column);  
@@ -206,7 +258,7 @@ public:
   /** Returns the column with pixbufs for @a icon_view .
    * @return The pixbuf column, or -1 if it's unset.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   int get_pixbuf_column() const;
 
@@ -214,7 +266,7 @@ public:
   /** Sets the ::orientation property which determines whether the labels 
    * are drawn beside the icons instead of below.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param orientation The relative position of texts and icons.
    */
   void set_orientation(Orientation orientation);
@@ -223,47 +275,162 @@ public:
    * whether the labels are drawn beside the icons instead of below.
    * @return The relative position of texts and icons 
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Orientation get_orientation() const;
 
   
+  /** Sets the ::columns property which determines in how
+   * many columns the icons are arranged. If @a columns  is
+   * -1, the number of columns will be chosen automatically 
+   * to fill the available area. 
+   * 
+   * @newin2p6
+   * @param columns The number of columns.
+   */
   void set_columns(int columns);
   
+  /** Returns the value of the ::columns property.
+   * @return The number of columns, or -1
+   * 
+   * @newin2p6.
+   */
   int get_columns() const;
   
+  /** Sets the ::item-width property which specifies the width 
+   * to use for each item. If it is set to -1, the icon view will 
+   * automatically determine a suitable item size.
+   * 
+   * @newin2p6
+   * @param item_width The width for each item.
+   */
   void set_item_width(int item_width);
   
+  /** Returns the value of the ::item-width property.
+   * @return The width of a single item, or -1
+   * 
+   * @newin2p6.
+   */
   int get_icon_width() const;
   
+  /** Sets the ::spacing property which specifies the space 
+   * which is inserted between the cells (i.e.\ the icon and 
+   * the text) of an item.
+   * 
+   * @newin2p6
+   * @param spacing The spacing.
+   */
   void set_spacing(int spacing);
   
+  /** Returns the value of the ::spacing property.
+   * @return The space between cells 
+   * 
+   * @newin2p6.
+   */
   int get_spacing() const;
   
+  /** Sets the ::row-spacing property which specifies the space 
+   * which is inserted between the rows of the icon view.
+   * 
+   * @newin2p6
+   * @param row_spacing The row spacing.
+   */
   void set_row_spacing(int row_spacing);
   
+  /** Returns the value of the ::row-spacing property.
+   * @return The space between rows
+   * 
+   * @newin2p6.
+   */
   gint get_row_spacing() const;
   
+  /** Sets the ::column-spacing property which specifies the space 
+   * which is inserted between the columns of the icon view.
+   * 
+   * @newin2p6
+   * @param column_spacing The column spacing.
+   */
   void set_column_spacing(int column_spacing);
   
+  /** Returns the value of the ::column-spacing property.
+   * @return The space between columns
+   * 
+   * @newin2p6.
+   */
   int get_column_spacing() const;
 
   
+  /** Sets the ::margin property which specifies the space 
+   * which is inserted at the top, bottom, left and right 
+   * of the icon view.
+   * 
+   * @newin2p6
+   * @param margin The margin.
+   */
   void set_margin(int margin);
   
+  /** Returns the value of the ::margin property.
+   * @return The space at the borders 
+   * 
+   * @newin2p6.
+   */
   int get_margin() const;
 
   
   /** Finds the path at the point ( @a x , @a y ), relative to widget coordinates.
+   * See get_item_at_pos(), if you are also interested in
+   * the cell at the specified position.
    * @param x The x position to be identified.
    * @param y The y position to be identified.
    * @return The Gtk::TreePath corresponding to the icon or <tt>0</tt>
    * if no icon exists at that position.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   TreeModel::Path get_path_at_pos(int x, int y) const;
 
+
+  /** Finds the path at the point (@a x, @a y), relative to widget coordinates.
+   *
+   * @param x The x position to be identified.
+   * @param y The y position to be identified.
+   * @param path The path.
+   * @param cell The renderer responsible for the cell at (@a x, @a y).
+   * 
+   * @result true if an item exists at the specified position.
+   *
+   * @newin2p6
+   */
+  bool get_item_at_pos(int x, int y, TreeModel::Path& path, CellRenderer*& cell) const;
+
+  /** Finds the path at the point (@a x, @a y), relative to widget coordinates.
+   *
+   * @param x The x position to be identified.
+   * @param y The y position to be identified.
+   * @param path The path.
+   * 
+   * @result true if an item exists at the specified position.
+   *
+   * @newin2p6
+   */
+  bool get_item_at_pos(int x, int y, TreeModel::Path& path) const;
+
+  /** Finds the path at the point (@a x, @a y), relative to widget coordinates.
+   *
+   * @param x The x position to be identified.
+   * @param y The y position to be identified.
+   * @param path The path.
+   * 
+   * @result true if an item exists at the specified position.
+   *
+   * @newin2p6
+   */
+  bool get_item_at_pos(int x, int y, CellRenderer*& cell) const;
+  
+
+  bool get_visible_range(TreeModel::Path& start_path, TreeModel::Path& end_path) const;
+  
+
   /** For instance, 
    * void on_foreach(const Gtk::TreeModel::Path& path);
    */
@@ -281,7 +448,7 @@ public:
   
   /** Sets the selection mode of the @a icon_view .
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param mode The selection mode.
    */
   void set_selection_mode(SelectionMode mode);
@@ -289,20 +456,20 @@ public:
   /** Gets the selection mode of the @a icon_view .
    * @return The current selection mode
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   SelectionMode get_selection_mode() const;
   
   /** Selects the row at @a path .
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param path The Gtk::TreePath to be selected.
    */
   void select_path(const TreeModel::Path& path);
   
   /** Unselects the row at @a path .
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param path The Gtk::TreePath to be unselected.
    */
   void unselect_path(const TreeModel::Path& path);
@@ -312,11 +479,11 @@ public:
    * @param path A Gtk::TreePath to check selection on.
    * @return <tt>true</tt> if @a path  is selected.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool path_is_selected(const TreeModel::Path& path) const;
-  
-  
+
+
   #ifndef DOXYGEN_SHOULD_SKIP_THIS
   //TODO: I'm not sure about these to_*() functions. murrayc.
   struct TreePathTraits
@@ -347,52 +514,270 @@ public:
    * @endcode
    * @return A G::List containing a Gtk::TreePath for each selected row.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   ArrayHandle_TreePaths get_selected_items() const;
-  
+
   
   /** Selects all the icons. @a icon_view  must has its selection mode set
    * to Gtk::SELECTION_MULTIPLE.
    * 
-   * Since: 2.6
+   * @newin2p6
    */
   void select_all();
   
   /** Unselects all the icons.
    * 
-   * Since: 2.6
+   * @newin2p6
    */
   void unselect_all();
   
   /** Activates the item determined by @a path .
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param path The Gtk::TreePath to be activated.
    */
   void item_activated(const TreeModel::Path& path);
 
+  void set_cursor(const TreeModel::Path& path, CellRenderer& cell, bool start_editing);
   
+
+  /** Fills in @a path and @a cell with the current cursor path and cell. 
+   * If the cursor isn't currently set, then @a path will be empty.
+   * If no cell currently has focus, then @a cell will be NULL.
+   *
+   * @param path The current cursor path.
+   * @param cell The current focus cell.
+   * @result true if the cursor is set.
+   *
+   * @newin2p8
+   */
+  bool get_cursor(TreeModel::Path& path, CellRenderer*& cell) const;
+
+  /** Fills in @a path and @a cell with the current cursor path and cell. 
+   * If the cursor isn't currently set, then @a path will be empty.
+   * If no cell currently has focus, then @a cell will be NULL.
+   *
+   * @param path The current cursor path.
+   * @result true if the cursor is set.
+   *
+   * @newin2p8
+   */
+  bool get_cursor(TreeModel::Path& path) const;
+
+  /** Fills in @a path and @a cell with the current cursor path and cell. 
+   * If the cursor isn't currently set, then @a path will be empty.
+   * If no cell currently has focus, then @a cell will be NULL.
+   *
+   * @param cell The current focus cell.
+   * @result true if the cursor is set.
+   *
+   * @newin2p8
+   */
+  bool get_cursor(CellRenderer*& cell) const;
+  
+
+  /** Moves the alignments of @a icon_view  to the position specified by @a path .  
+   *  @a row_align  determines where the row is placed, and @a col_align  determines where 
+   *  @a column  is placed.  Both are expected to be between 0.0 and 1.0. 
+   * 0.0 means left/top alignment, 1.0 means right/bottom alignment, 0.5 means center.
+   * 
+   * If @a use_align  is <tt>false</tt>, then the alignment arguments are ignored, and the
+   * tree does the minimum amount of work to scroll the item onto the screen.
+   * This means that the item will be scrolled to the edge closest to its current
+   * position.  If the item is currently visible on the screen, nothing is done.
+   * 
+   * This function only works if the model is set, and @a path  is a valid row on the
+   * model.  If the model changes before the @a icon_view  is realized, the centered
+   * path will be modified to reflect this change.
+   * 
+   * @newin2p8
+   * @param path The path of the item to move to.
+   * @param use_align Whether to use alignment arguments, or <tt>false</tt>.
+   * @param row_align The vertical alignment of the item specified by @a path .
+   * @param col_align The horizontal alignment of the item specified by @a path .
+   */
+  void scroll_to_path(const TreeModel::Path& path, bool use_align, gfloat row_align, gfloat col_align);
+
+/* Drag-and-Drop support */
+  /**
+   * Turns the IconView into a drag source for automatic DND.
+   *
+   * @param targets Standard container of targets that the drag will support.
+   * @param start_button_mask Mask of allowed buttons to start drag.
+   * @param actions The bitmask of possible actions for a drag from this widget.
+   */
+  void enable_model_drag_source(const ArrayHandle_TargetEntry& targets,
+                                Gdk::ModifierType start_button_mask = Gdk::MODIFIER_MASK,
+                                Gdk::DragAction actions = Gdk::ACTION_COPY | Gdk::ACTION_MOVE);
+  
+
+  /** Turns the IconView into a drop destination for automatic DND.
+   *
+   * @param targets The table of targets that the drag will support.
+   * @param actions The bitmask of possible actions for a drag from this widget.
+   */
+  void enable_model_drag_dest(const ArrayHandle_TargetEntry& targets, Gdk::DragAction actions = Gdk::ACTION_COPY | Gdk::ACTION_MOVE);
+  
+
+  /** Undoes the effect of enable_model_drag_source().
+   * 
+   * @newin2p8
+   */
+  void unset_model_drag_source();
+  
+  /** Undoes the effect of enable_model_drag_dest().
+   * 
+   * @newin2p8
+   */
+  void unset_model_drag_dest();
+
+  
+  /** This function is a convenience function to allow you to reorder models that
+   * support the Gtk::TreeDragSourceIface and the Gtk::TreeDragDestIface.  Both
+   * Gtk::TreeStore and Gtk::ListStore support these.  If @a reorderable  is <tt>true</tt>, then
+   * the user can reorder the model by dragging and dropping rows.  The
+   * developer can listen to these changes by connecting to the model's
+   * row_inserted and row_deleted signals.
+   * 
+   * This function does not give you any degree of control over the order -- any
+   * reordering is allowed.  If more control is needed, you should probably
+   * handle drag and drop manually.
+   * 
+   * @newin2p8
+   * @param reorderable <tt>true</tt>, if the list of items can be reordered.
+   */
+  void set_reorderable(bool reorderable = true);
+  
+  /** Retrieves whether the user can reorder the list via drag-and-drop. 
+   * See set_reorderable().
+   * @return <tt>true</tt> if the list can be reordered.
+   * 
+   * @newin2p8.
+   */
+  bool get_reorderable() const;
+
+
+/* These are useful to implement your own custom stuff. */
+  //TODO: Discover what arguments are output arguments:
+  
+  /** Sets the item that is highlighted for feedback.
+   * 
+   * @newin2p8
+   * @param path The path of the item to highlight, or <tt>0</tt>.
+   * @param pos Specifies where to drop, relative to the item.
+   */
+  void set_drag_dest_item(const TreeModel::Path& path, IconViewDropPosition pos);
+
+  /** Gets information about the item that is highlighted for feedback.
+   *
+   * @param path The highlighted item.
+   * @pos The drop position.
+   *
+   * @newin2p10
+   */
+  void get_drag_dest_item(TreeModel::Path& path, IconViewDropPosition& pos) const;
+
+  /** Gets information about the item that is highlighted for feedback.
+   *
+   * @param path The highlighted item.
+   *
+   * @newin2p10
+   */
+  void get_drag_dest_item(TreeModel::Path& path) const;
+
+  /** Gets information about the item that is highlighted for feedback.
+   *
+   * @pos The drop position.
+   *
+   * @newin2p10
+   */
+  void get_drag_dest_item(IconViewDropPosition& pos) const;
+  
+
+  /** Determines the destination item for a given position.
+   *
+   * @param drag_x The position to determine the destination item for.
+   * @param drag_y the position to determine the destination item for.
+   * @param path The path of the item.
+   * @param pos: The drop position.
+   * @result whether there is an item at the given position.
+   *
+   * @newin2p10
+   */
+  bool get_dest_item_at_pos(int drag_x, int drag_y, TreeModel::Path& path, IconViewDropPosition& pos) const;
+
+  /** Determines the destination item for a given position.
+   *
+   * @param drag_x The position to determine the destination item for.
+   * @param drag_y the position to determine the destination item for.
+   * @param path The path of the item.
+   * @result whether there is an item at the given position.
+   *
+   * @newin2p10
+   */
+  bool get_dest_item_at_pos(int drag_x, int drag_y, TreeModel::Path& path) const;
+
+  /** Determines the destination item for a given position.
+   * 
+   * @param drag_x The position to determine the destination item for.
+   * @param drag_y the position to determine the destination item for.
+   * @param pos: The drop position.
+   * @result whether there is an item at the given position.
+   *
+   * @newin2p10
+   */
+  bool get_dest_item_at_pos(int drag_x, int drag_y, IconViewDropPosition& pos) const;
+  
+
+  /** Creates a Gdk::Pixmap representation of the item at @a path .  
+   * This image is used for a drag icon.
+   * @param path A Gtk::TreePath in @a icon_view .
+   * @return A newly-allocated pixmap of the drag icon.
+   * 
+   * @newin2p8.
+   */
+  Glib::RefPtr<Gdk::Pixmap> create_drag_icon( const TreeModel::Path& path);
+
+
+/**
+   * @par Prototype:
+   * <tt>void %set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment)</tt>
+   */
+
   Glib::SignalProxy2< void,Adjustment*,Adjustment* > signal_set_scroll_adjustments();
  
   
+/**
+   * @par Prototype:
+   * <tt>void %item_activated(const TreeModel::Path& path)</tt>
+   */
+
   Glib::SignalProxy1< void,const TreeModel::Path& > signal_item_activated();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %selection_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_selection_changed();
 
 
   /* Key binding signals */
   
   
-  /** Model column used to retrieve the icon pixbuf from.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Model column used to retrieve the icon pixbuf from.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_pixbuf_column() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Model column used to retrieve the icon pixbuf from.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -400,15 +785,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_pixbuf_column() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Model column used to retrieve the text from.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Model column used to retrieve the text from.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_text_column() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Model column used to retrieve the text from.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -416,15 +805,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_text_column() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Model column used to retrieve the text if using Pango markup.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Model column used to retrieve the text if using Pango markup.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_markup_column() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Model column used to retrieve the text if using Pango markup.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -432,15 +825,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_markup_column() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The selection mode.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The selection mode.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<SelectionMode> property_selection_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The selection mode.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -448,15 +845,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<SelectionMode> property_selection_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** How the text and icon of each item are positioned relative to each other.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** How the text and icon of each item are positioned relative to each other.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Orientation> property_orientation() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** How the text and icon of each item are positioned relative to each other.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -464,15 +865,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Orientation> property_orientation() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The model for the icon view.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The model for the icon view.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<TreeModel> > property_model() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The model for the icon view.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -480,15 +885,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TreeModel> > property_model() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Number of columns to display.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Number of columns to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_columns() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Number of columns to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -496,15 +905,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_columns() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The width used for each item.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The width used for each item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_item_width() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The width used for each item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -512,15 +925,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_item_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Space which is inserted between cells of an item.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Space which is inserted between cells of an item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_spacing() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Space which is inserted between cells of an item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -528,15 +945,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_spacing() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Space which is inserted between grid rows.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Space which is inserted between grid rows.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_row_spacing() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Space which is inserted between grid rows.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -544,31 +965,39 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_row_spacing() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Space which is inserted between grid column.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Space which is inserted between grid columns.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_column_spacing() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Space which is inserted between grid column.
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Space which is inserted between grid columns.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_column_spacing() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Space which is inserted at the edges of the icon view.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Space which is inserted at the edges of the icon view.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_margin() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Space which is inserted at the edges of the icon view.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -576,6 +1005,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_margin() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -591,6 +1021,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::IconView* wrap(GtkIconView* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_ICONVIEW_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/image.cc b/libs/gtkmm2/gtk/gtkmm/image.cc
index 8152af1f7e..7a0a31b9e9 100644
--- a/libs/gtkmm2/gtk/gtkmm/image.cc
+++ b/libs/gtkmm2/gtk/gtkmm/image.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/image.h>
 #include <gtkmm/private/image_p.h>
 
@@ -96,11 +97,6 @@ void Image::get_icon_set(IconSet& icon_set, IconSize& size) const
   icon_set = Glib::wrap(pIconSet, true); //true = take_copy.
 }
 
-void Image::clear()
-{
-  gtk_image_set_from_pixbuf(gobj(), 0);
-}
-
 Glib::ustring Image::get_icon_name() const
 {
   const gchar* pchIconName = 0;
@@ -172,8 +168,19 @@ void Image_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Image_Class::wrap_new(GObject* o)
 {
@@ -251,42 +258,47 @@ Image::Image(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
 
 void Image::set(const Glib::RefPtr<Gdk::Pixmap>& pixmap, const Glib::RefPtr<Gdk::Bitmap>& mask)
 {
-  gtk_image_set_from_pixmap(gobj(), Glib::unwrap(pixmap), Glib::unwrap(mask));
+gtk_image_set_from_pixmap(gobj(), Glib::unwrap(pixmap), Glib::unwrap(mask)); 
 }
 
 void Image::set(const Glib::RefPtr<Gdk::Image>& gdk_image, const Glib::RefPtr<Gdk::Bitmap>& mask)
 {
-  gtk_image_set_from_image(gobj(), Glib::unwrap(gdk_image), Glib::unwrap(mask));
+gtk_image_set_from_image(gobj(), Glib::unwrap(gdk_image), Glib::unwrap(mask)); 
 }
 
 void Image::set(const std::string& filename)
 {
-  gtk_image_set_from_file(gobj(), filename.c_str());
+gtk_image_set_from_file(gobj(), filename.c_str()); 
 }
 
 void Image::set(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
 {
-  gtk_image_set_from_pixbuf(gobj(), Glib::unwrap(pixbuf));
+gtk_image_set_from_pixbuf(gobj(), Glib::unwrap(pixbuf)); 
 }
 
 void Image::set(const Gtk::StockID& stock_id, IconSize size)
 {
-  gtk_image_set_from_stock(gobj(), (stock_id).get_c_str(), static_cast<GtkIconSize>(int(size)));
+gtk_image_set_from_stock(gobj(), (stock_id).get_c_str(), static_cast<GtkIconSize>(int(size))); 
 }
 
 void Image::set(IconSet& icon_set, IconSize size)
 {
-  gtk_image_set_from_icon_set(gobj(), (icon_set).gobj(), static_cast<GtkIconSize>(int(size)));
+gtk_image_set_from_icon_set(gobj(), (icon_set).gobj(), static_cast<GtkIconSize>(int(size))); 
 }
 
 void Image::set(const Glib::RefPtr<Gdk::PixbufAnimation>& animation)
 {
-  gtk_image_set_from_animation(gobj(), Glib::unwrap(animation));
+gtk_image_set_from_animation(gobj(), Glib::unwrap(animation)); 
 }
 
 void Image::set_from_icon_name(const Glib::ustring& icon_name, IconSize size)
 {
-  gtk_image_set_from_icon_name(gobj(), icon_name.c_str(), static_cast<GtkIconSize>(int(size)));
+gtk_image_set_from_icon_name(gobj(), icon_name.c_str(), static_cast<GtkIconSize>(int(size))); 
+}
+
+void Image::clear()
+{
+gtk_image_clear(gobj()); 
 }
 
 ImageType Image::get_storage_type() const
@@ -298,40 +310,30 @@ Glib::RefPtr<Gdk::Pixbuf> Image::get_pixbuf()
 {
 
   Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_image_get_pixbuf(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Pixbuf> Image::get_pixbuf() const
 {
-
-  Glib::RefPtr<const Gdk::Pixbuf> retvalue = Glib::wrap(gtk_image_get_pixbuf(const_cast<GtkImage*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Image*>(this)->get_pixbuf();
 }
 
 Glib::RefPtr<Gdk::PixbufAnimation> Image::get_animation()
 {
 
   Glib::RefPtr<Gdk::PixbufAnimation> retvalue = Glib::wrap(gtk_image_get_animation(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::PixbufAnimation> Image::get_animation() const
 {
-
-  Glib::RefPtr<const Gdk::PixbufAnimation> retvalue = Glib::wrap(gtk_image_get_animation(const_cast<GtkImage*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Image*>(this)->get_animation();
 }
 
 int Image::get_pixel_size() const
@@ -341,104 +343,149 @@ int Image::get_pixel_size() const
 
 void Image::set_pixel_size(int pixel_size)
 {
-  gtk_image_set_pixel_size(gobj(), pixel_size);
+gtk_image_set_pixel_size(gobj(), pixel_size); 
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > Image::property_pixbuf() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> >(this, "pixbuf");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > Image::property_pixbuf() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> >(this, "pixbuf");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixmap> > Image::property_pixmap() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixmap> >(this, "pixmap");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixmap> > Image::property_pixmap() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixmap> >(this, "pixmap");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Image> > Image::property_image() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Image> >(this, "image");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Image> > Image::property_image() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Image> >(this, "image");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixmap> > Image::property_mask() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixmap> >(this, "mask");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixmap> > Image::property_mask() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixmap> >(this, "mask");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
-Glib::PropertyProxy_WriteOnly<Glib::ustring> Image::property_file() 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<Glib::ustring> Image::property_file() 
 {
-  return Glib::PropertyProxy_WriteOnly<Glib::ustring>(this, "file");
+  return Glib::PropertyProxy<Glib::ustring>(this, "file");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Image::property_file() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "file");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Image::property_stock() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "stock");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Image::property_stock() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "stock");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::IconSet> Image::property_icon_set() 
 {
   return Glib::PropertyProxy<Gtk::IconSet>(this, "icon-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::IconSet> Image::property_icon_set() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::IconSet>(this, "icon-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Image::property_icon_size() 
 {
   return Glib::PropertyProxy<int>(this, "icon-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Image::property_icon_size() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "icon-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::PixbufAnimation> > Image::property_pixbuf_animation() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::PixbufAnimation> >(this, "pixbuf-animation");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::PixbufAnimation> > Image::property_pixbuf_animation() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::PixbufAnimation> >(this, "pixbuf-animation");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ImageType> Image::property_storage_type() const
 {
   return Glib::PropertyProxy_ReadOnly<ImageType>(this, "storage-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/image.h b/libs/gtkmm2/gtk/gtkmm/image.h
index 13775a2c92..799be0c4d3 100644
--- a/libs/gtkmm2/gtk/gtkmm/image.h
+++ b/libs/gtkmm2/gtk/gtkmm/image.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_IMAGE_H
 #define _GTKMM_IMAGE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -142,11 +143,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -159,11 +166,20 @@ public:
   explicit Image(const Glib::RefPtr<Gdk::Image>& image, const Glib::RefPtr<Gdk::Bitmap>& mask);
   explicit Image(const std::string& file);
   explicit Image(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
+
+  /** Creates am Image displaying a stock icon.
+   * Sample stock icon identifiers are Gtk::Stock::OPEN, Gtk::Stock::EXIT. Sample stock sizes are Gtk::ICON_SIZE_MENU, Gtk::ICON_SIZE_SMALL_TOOLBAR.
+   * If the stock icon name isn't known, a "broken image" icon will be displayed instead.
+   * You can register your own stock icon names - see Gtk::IconFactory::add().
+   * @param stock_id A stock icon.
+   * @param size A stock icon size.
+   */
   Image(const Gtk::StockID& stock_id, IconSize size);
+
   Image(IconSet& icon_set, IconSize size);
   Image(const Glib::RefPtr<Gdk::PixbufAnimation>& animation);
-  
 
+  
   /** See new_from_pixmap() for details.
    * @param pixmap A Gdk::Pixmap or <tt>0</tt>.
    * @param mask A Gdk::Bitmap or <tt>0</tt>.
@@ -186,7 +202,7 @@ public:
    */
   void set(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
   
-  /** See new_from_stock() for details.
+  /** See the Image::Image(const Gtk::StockID& stock_id, IconSize size) constructor for details.
    * @param stock_id A stock icon name.
    * @param size A stock icon size.
    */
@@ -206,12 +222,17 @@ public:
   
   /** See new_from_icon_name() for details.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param icon_name An icon name.
    * @param size An icon size.
    */
   void set_from_icon_name(const Glib::ustring& icon_name, IconSize size);
 
+  
+  /** Resets the image to be empty.
+   * 
+   * @newin2p8
+   */
   void clear();
 
   
@@ -262,7 +283,7 @@ public:
    * @return The displayed animation, or <tt>0</tt> if the image is empty.
    */
   Glib::RefPtr<const Gdk::PixbufAnimation> get_animation() const;
-  
+
   Glib::ustring get_icon_name() const;
   Glib::ustring get_icon_name(IconSize& size);
   
@@ -270,7 +291,7 @@ public:
   /** Gets the pixel size used for named icons.
    * @return The pixel size used for named icons.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   int get_pixel_size() const;
  
@@ -278,19 +299,22 @@ public:
    * to a value != -1, it is used instead of the icon size set by
    * set_from_icon_name().
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param pixel_size The new pixel size.
    */
   void set_pixel_size(int pixel_size);
- 
-  /** A GdkPixbuf to display.
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A GdkPixbuf to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A GdkPixbuf to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -298,15 +322,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > property_pixbuf() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** A GdkPixmap to display.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A GdkPixmap to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixmap> > property_pixmap() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A GdkPixmap to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -314,15 +342,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixmap> > property_pixmap() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** A GdkImage to display.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A GdkImage to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Image> > property_image() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A GdkImage to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -330,15 +362,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Image> > property_image() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Mask bitmap to use with GdkImage or GdkPixmap.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Mask bitmap to use with GdkImage or GdkPixmap.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixmap> > property_mask() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Mask bitmap to use with GdkImage or GdkPixmap.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -346,15 +382,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixmap> > property_mask() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Filename to load and display.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Filename to load and display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
-  Glib::PropertyProxy_WriteOnly<Glib::ustring> property_file() ;
+  Glib::PropertyProxy<Glib::ustring> property_file() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Filename to load and display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -362,15 +402,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_file() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Stock ID for a stock image to display.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Stock ID for a stock image to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_stock() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Stock ID for a stock image to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -378,15 +422,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_stock() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Icon set to display.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Icon set to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gtk::IconSet> property_icon_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Icon set to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -394,15 +442,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gtk::IconSet> property_icon_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Symbolic size to use for stock icon
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Symbolic size to use for stock icon
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_icon_size() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Symbolic size to use for stock icon
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -410,15 +462,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_icon_size() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** GdkPixbufAnimation to display.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** GdkPixbufAnimation to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::PixbufAnimation> > property_pixbuf_animation() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** GdkPixbufAnimation to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -426,14 +482,17 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::PixbufAnimation> > property_pixbuf_animation() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The representation being used for image data.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The representation being used for image data.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ImageType> property_storage_type() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -449,6 +508,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Image* wrap(GtkImage* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_IMAGE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/imagemenuitem.cc b/libs/gtkmm2/gtk/gtkmm/imagemenuitem.cc
index 61abd691cd..7543a2ddd1 100644
--- a/libs/gtkmm2/gtk/gtkmm/imagemenuitem.cc
+++ b/libs/gtkmm2/gtk/gtkmm/imagemenuitem.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/private/imagemenuitem_p.h>
 
@@ -122,8 +123,19 @@ void ImageMenuItem_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* ImageMenuItem_Class::wrap_new(GObject* o)
 {
@@ -173,7 +185,7 @@ ImageMenuItem::ImageMenuItem()
 
 void ImageMenuItem::set_image(Widget& image)
 {
-  gtk_image_menu_item_set_image(gobj(), (image).gobj());
+gtk_image_menu_item_set_image(gobj(), (image).gobj()); 
 }
 
 Widget* ImageMenuItem::get_image()
@@ -183,10 +195,17 @@ Widget* ImageMenuItem::get_image()
 
 const Widget* ImageMenuItem::get_image() const
 {
-  return Glib::wrap(gtk_image_menu_item_get_image(const_cast<GtkImageMenuItem*>(gobj())));
+  return const_cast<ImageMenuItem*>(this)->get_image();
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/imagemenuitem.h b/libs/gtkmm2/gtk/gtkmm/imagemenuitem.h
index f9f21f8002..b5ba9d358a 100644
--- a/libs/gtkmm2/gtk/gtkmm/imagemenuitem.h
+++ b/libs/gtkmm2/gtk/gtkmm/imagemenuitem.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_IMAGEMENUITEM_H
 #define _GTKMM_IMAGEMENUITEM_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -93,11 +94,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -144,6 +151,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ImageMenuItem* wrap(GtkImageMenuItem* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_IMAGEMENUITEM_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/inputdialog.cc b/libs/gtkmm2/gtk/gtkmm/inputdialog.cc
index 9ccbf28a10..929a385f47 100644
--- a/libs/gtkmm2/gtk/gtkmm/inputdialog.cc
+++ b/libs/gtkmm2/gtk/gtkmm/inputdialog.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/inputdialog.h>
 #include <gtkmm/private/inputdialog_p.h>
 
@@ -31,11 +32,11 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/table.h>
 
-
 namespace
 {
 
-void InputDialog_signal_enable_device_callback(GtkInputDialog* self, GdkDevice* p0,void* data)
+
+static void InputDialog_signal_enable_device_callback(GtkInputDialog* self, GdkDevice* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Gdk::Device>& > SlotType;
@@ -43,20 +44,24 @@ void InputDialog_signal_enable_device_callback(GtkInputDialog* self, GdkDevice*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo InputDialog_signal_enable_device_info =
+static const Glib::SignalProxyInfo InputDialog_signal_enable_device_info =
 {
   "enable_device",
   (GCallback) &InputDialog_signal_enable_device_callback,
@@ -64,7 +69,7 @@ const Glib::SignalProxyInfo InputDialog_signal_enable_device_info =
 };
 
 
-void InputDialog_signal_disable_device_callback(GtkInputDialog* self, GdkDevice* p0,void* data)
+static void InputDialog_signal_disable_device_callback(GtkInputDialog* self, GdkDevice* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Gdk::Device>& > SlotType;
@@ -72,26 +77,31 @@ void InputDialog_signal_disable_device_callback(GtkInputDialog* self, GdkDevice*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo InputDialog_signal_disable_device_info =
+static const Glib::SignalProxyInfo InputDialog_signal_disable_device_info =
 {
   "disable_device",
   (GCallback) &InputDialog_signal_disable_device_callback,
   (GCallback) &InputDialog_signal_disable_device_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -136,11 +146,19 @@ void InputDialog_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->enable_device = &enable_device_callback;
   klass->disable_device = &disable_device_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void InputDialog_Class::enable_device_callback(GtkInputDialog* self, GdkDevice* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -153,16 +171,20 @@ void InputDialog_Class::enable_device_callback(GtkInputDialog* self, GdkDevice*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_enable_device(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -175,7 +197,6 @@ void InputDialog_Class::enable_device_callback(GtkInputDialog* self, GdkDevice*
       (*base->enable_device)(self, p0);
   }
 }
-
 void InputDialog_Class::disable_device_callback(GtkInputDialog* self, GdkDevice* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -188,16 +209,20 @@ void InputDialog_Class::disable_device_callback(GtkInputDialog* self, GdkDevice*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_disable_device(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -210,6 +235,7 @@ void InputDialog_Class::disable_device_callback(GtkInputDialog* self, GdkDevice*
       (*base->disable_device)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* InputDialog_Class::wrap_new(GObject* o)
@@ -258,7 +284,7 @@ InputDialog::InputDialog()
 {
   }
 
-Table* InputDialog::get_axis_list()
+ Table* InputDialog::get_axis_list()
 {
   return Glib::wrap((GtkTable*)(gobj()->axis_list));
 }
@@ -267,8 +293,8 @@ const Table* InputDialog::get_axis_list() const
 {
   return Glib::wrap((GtkTable*)(gobj()->axis_list));
 }
-
-ScrolledWindow* InputDialog::get_axis_box()
+ 
+ ScrolledWindow* InputDialog::get_axis_box()
 {
   return Glib::wrap((GtkScrolledWindow*)(gobj()->axis_listbox));
 }
@@ -277,8 +303,9 @@ const ScrolledWindow* InputDialog::get_axis_box() const
 {
   return Glib::wrap((GtkScrolledWindow*)(gobj()->axis_listbox));
 }
-
-OptionMenu* InputDialog::get_mode_optionmenu()
+ 
+#ifndef GTKMM_DISABLE_DEPRECATED
+   OptionMenu* InputDialog::get_mode_optionmenu()
 {
   return Glib::wrap((GtkOptionMenu*)(gobj()->mode_optionmenu));
 }
@@ -287,8 +314,9 @@ const OptionMenu* InputDialog::get_mode_optionmenu() const
 {
   return Glib::wrap((GtkOptionMenu*)(gobj()->mode_optionmenu));
 }
-
-Button* InputDialog::get_close_button()
+#endif // GTKMM_DISABLE_DEPRECATED
+   
+ Button* InputDialog::get_close_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->close_button));
 }
@@ -297,8 +325,8 @@ const Button* InputDialog::get_close_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->close_button));
 }
-
-Button* InputDialog::get_save_button()
+ 
+ Button* InputDialog::get_save_button()
 {
   return Glib::wrap((GtkButton*)(gobj()->save_button));
 }
@@ -307,8 +335,8 @@ const Button* InputDialog::get_save_button() const
 {
   return Glib::wrap((GtkButton*)(gobj()->save_button));
 }
-
-Glib::RefPtr<Gdk::Device> InputDialog::get_current_device()
+ 
+ Glib::RefPtr<Gdk::Device> InputDialog::get_current_device()
 {
   Glib::RefPtr<Gdk::Device> ref_ptr(Glib::wrap(gobj()->current_device));
 
@@ -327,8 +355,8 @@ Glib::RefPtr<const Gdk::Device> InputDialog::get_current_device() const
 
   return ref_ptr;
 }
-
-Table* InputDialog::get_keys_list()
+ 
+ Table* InputDialog::get_keys_list()
 {
   return Glib::wrap((GtkTable*)(gobj()->keys_list));
 }
@@ -337,8 +365,8 @@ const Table* InputDialog::get_keys_list() const
 {
   return Glib::wrap((GtkTable*)(gobj()->keys_list));
 }
-
-ScrolledWindow* InputDialog::get_keys_box()
+ 
+ ScrolledWindow* InputDialog::get_keys_box()
 {
   return Glib::wrap((GtkScrolledWindow*)(gobj()->keys_listbox));
 }
@@ -347,19 +375,21 @@ const ScrolledWindow* InputDialog::get_keys_box() const
 {
   return Glib::wrap((GtkScrolledWindow*)(gobj()->keys_listbox));
 }
-
+ 
 
 Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::Device>& > InputDialog::signal_enable_device()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::Device>& >(this, &InputDialog_signal_enable_device_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::Device>& > InputDialog::signal_disable_device()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::Device>& >(this, &InputDialog_signal_disable_device_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::InputDialog::on_enable_device(const Glib::RefPtr<Gdk::Device>& device)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -369,7 +399,6 @@ void Gtk::InputDialog::on_enable_device(const Glib::RefPtr<Gdk::Device>& device)
   if(base && base->enable_device)
     (*base->enable_device)(gobj(),Glib::unwrap(device));
 }
-
 void Gtk::InputDialog::on_disable_device(const Glib::RefPtr<Gdk::Device>& device)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -379,6 +408,10 @@ void Gtk::InputDialog::on_disable_device(const Glib::RefPtr<Gdk::Device>& device
   if(base && base->disable_device)
     (*base->disable_device)(gobj(),Glib::unwrap(device));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/inputdialog.h b/libs/gtkmm2/gtk/gtkmm/inputdialog.h
index d5306cb778..45bf5d7eca 100644
--- a/libs/gtkmm2/gtk/gtkmm/inputdialog.h
+++ b/libs/gtkmm2/gtk/gtkmm/inputdialog.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_INPUTDIALOG_H
 #define _GTKMM_INPUTDIALOG_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -42,7 +43,13 @@ namespace Gtk
 
 class Button;
 class Table;
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 class OptionMenu;
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
 class ScrolledWindow;
 
 // Don't list this in the documentation's Dialogs group because it isn't really useful
@@ -91,13 +98,19 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_enable_device(const Glib::RefPtr<Gdk::Device>& device);
   virtual void on_disable_device(const Glib::RefPtr<Gdk::Device>& device);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -108,32 +121,44 @@ public:
   InputDialog();
   
 
-  Table* get_axis_list();
+   Table* get_axis_list();
   const Table* get_axis_list() const;
-  ScrolledWindow* get_axis_box();
+    ScrolledWindow* get_axis_box();
   const ScrolledWindow* get_axis_box() const;
-  OptionMenu* get_mode_optionmenu();
+   #ifndef GTKMM_DISABLE_DEPRECATED
+   OptionMenu* get_mode_optionmenu();
   const OptionMenu* get_mode_optionmenu() const;
-
-  Button* get_close_button();
+#endif // GTKMM_DISABLE_DEPRECATED
+   
+   Button* get_close_button();
   const Button* get_close_button() const;
-  Button* get_save_button();
+    Button* get_save_button();
   const Button* get_save_button() const;
-
+ 
   //GtkWidget *axis_items[GDK_AXIS_LAST];
 
-  Glib::RefPtr<Gdk::Device> get_current_device();
+   Glib::RefPtr<Gdk::Device> get_current_device();
   Glib::RefPtr<const Gdk::Device> get_current_device() const;
-
-  Table* get_keys_list();
+ 
+   Table* get_keys_list();
   const Table* get_keys_list() const;
-  ScrolledWindow* get_keys_box();
+    ScrolledWindow* get_keys_box();
   const ScrolledWindow* get_keys_box() const;
-
+ 
   
+/**
+   * @par Prototype:
+   * <tt>void %enable_device(const Glib::RefPtr<Gdk::Device>& device)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::Device>& > signal_enable_device();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %disable_device(const Glib::RefPtr<Gdk::Device>& device)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::Device>& > signal_disable_device();
 
 
@@ -150,6 +175,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::InputDialog* wrap(GtkInputDialog* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_INPUTDIALOG_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/invisible.cc b/libs/gtkmm2/gtk/gtkmm/invisible.cc
index 3c54f190da..b237050cbf 100644
--- a/libs/gtkmm2/gtk/gtkmm/invisible.cc
+++ b/libs/gtkmm2/gtk/gtkmm/invisible.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/invisible.h>
 #include <gtkmm/private/invisible_p.h>
 
@@ -80,8 +81,19 @@ void Invisible_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Invisible_Class::wrap_new(GObject* o)
 {
@@ -140,28 +152,30 @@ Glib::RefPtr<Gdk::Screen> Invisible::get_screen()
 {
 
   Glib::RefPtr<Gdk::Screen> retvalue = Glib::wrap(gtk_invisible_get_screen(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Screen> Invisible::get_screen() const
 {
-
-  Glib::RefPtr<const Gdk::Screen> retvalue = Glib::wrap(gtk_invisible_get_screen(const_cast<GtkInvisible*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Invisible*>(this)->get_screen();
 }
 
 void Invisible::set_screen(const Glib::RefPtr<Gdk::Screen>& screen)
 {
-  gtk_invisible_set_screen(gobj(), Glib::unwrap(screen));
+gtk_invisible_set_screen(gobj(), Glib::unwrap(screen)); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/invisible.h b/libs/gtkmm2/gtk/gtkmm/invisible.h
index 7e22cba573..5c6112d21e 100644
--- a/libs/gtkmm2/gtk/gtkmm/invisible.h
+++ b/libs/gtkmm2/gtk/gtkmm/invisible.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_INVISIBLE_H
 #define _GTKMM_INVISIBLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -88,11 +89,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -105,20 +112,20 @@ public:
   /** Returns the Gdk::Screen object associated with @a invisible 
    * @return The associated Gdk::Screen.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Gdk::Screen> get_screen();
   
   /** Returns the Gdk::Screen object associated with @a invisible 
    * @return The associated Gdk::Screen.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Gdk::Screen> get_screen() const;
   
   /** Sets the Gdk::Screen where the Gtk::Invisible object will be displayed.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param screen A Gdk::Screen.
    */
   void set_screen(const Glib::RefPtr<Gdk::Screen>& screen);
@@ -137,6 +144,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Invisible* wrap(GtkInvisible* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_INVISIBLE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/item.cc b/libs/gtkmm2/gtk/gtkmm/item.cc
index 45e28f6fbc..0a8f2b122b 100644
--- a/libs/gtkmm2/gtk/gtkmm/item.cc
+++ b/libs/gtkmm2/gtk/gtkmm/item.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/item.h>
 #include <gtkmm/private/item_p.h>
 
@@ -31,7 +32,8 @@
 namespace
 {
 
-const Glib::SignalProxyInfo Item_signal_select_info =
+
+static const Glib::SignalProxyInfo Item_signal_select_info =
 {
   "select",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -39,7 +41,7 @@ const Glib::SignalProxyInfo Item_signal_select_info =
 };
 
 
-const Glib::SignalProxyInfo Item_signal_deselect_info =
+static const Glib::SignalProxyInfo Item_signal_deselect_info =
 {
   "deselect",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -47,13 +49,14 @@ const Glib::SignalProxyInfo Item_signal_deselect_info =
 };
 
 
-const Glib::SignalProxyInfo Item_signal_toggle_info =
+static const Glib::SignalProxyInfo Item_signal_toggle_info =
 {
   "toggle",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -98,12 +101,20 @@ void Item_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->select = &select_callback;
   klass->deselect = &deselect_callback;
   klass->toggle = &toggle_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Item_Class::select_callback(GtkItem* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -116,15 +127,19 @@ void Item_Class::select_callback(GtkItem* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_select();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -137,7 +152,6 @@ void Item_Class::select_callback(GtkItem* self)
       (*base->select)(self);
   }
 }
-
 void Item_Class::deselect_callback(GtkItem* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -150,15 +164,19 @@ void Item_Class::deselect_callback(GtkItem* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_deselect();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -171,7 +189,6 @@ void Item_Class::deselect_callback(GtkItem* self)
       (*base->deselect)(self);
   }
 }
-
 void Item_Class::toggle_callback(GtkItem* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -184,15 +201,19 @@ void Item_Class::toggle_callback(GtkItem* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_toggle();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -205,6 +226,7 @@ void Item_Class::toggle_callback(GtkItem* self)
       (*base->toggle)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Item_Class::wrap_new(GObject* o)
@@ -248,17 +270,17 @@ GType Item::get_base_type()
 
 void Item::select()
 {
-  gtk_item_select(gobj());
+gtk_item_select(gobj()); 
 }
 
 void Item::deselect()
 {
-  gtk_item_deselect(gobj());
+gtk_item_deselect(gobj()); 
 }
 
 void Item::toggle()
 {
-  gtk_item_toggle(gobj());
+gtk_item_toggle(gobj()); 
 }
 
 Item::Item()
@@ -274,17 +296,20 @@ Glib::SignalProxy0< void > Item::signal_select()
   return Glib::SignalProxy0< void >(this, &Item_signal_select_info);
 }
 
+
 Glib::SignalProxy0< void > Item::signal_deselect()
 {
   return Glib::SignalProxy0< void >(this, &Item_signal_deselect_info);
 }
 
+
 Glib::SignalProxy0< void > Item::signal_toggle()
 {
   return Glib::SignalProxy0< void >(this, &Item_signal_toggle_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Item::on_select()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -294,7 +319,6 @@ void Gtk::Item::on_select()
   if(base && base->select)
     (*base->select)(gobj());
 }
-
 void Gtk::Item::on_deselect()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -304,7 +328,6 @@ void Gtk::Item::on_deselect()
   if(base && base->deselect)
     (*base->deselect)(gobj());
 }
-
 void Gtk::Item::on_toggle()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -314,6 +337,10 @@ void Gtk::Item::on_toggle()
   if(base && base->toggle)
     (*base->toggle)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/item.h b/libs/gtkmm2/gtk/gtkmm/item.h
index 08405b5dd0..73f33101d8 100644
--- a/libs/gtkmm2/gtk/gtkmm/item.h
+++ b/libs/gtkmm2/gtk/gtkmm/item.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_ITEM_H
 #define _GTKMM_ITEM_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -90,14 +91,20 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_select();
   virtual void on_deselect();
   virtual void on_toggle();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -107,18 +114,30 @@ public:
   
   void select();
   
+/**
+   * @par Prototype:
+   * <tt>void %select()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_select();
 
 
   void deselect();
   
+/**
+   * @par Prototype:
+   * <tt>void %deselect()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_deselect();
 
 
   void toggle();
   
+/**
+   * @par Prototype:
+   * <tt>void %toggle()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_toggle();
 
@@ -140,6 +159,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Item* wrap(GtkItem* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_ITEM_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/label.cc b/libs/gtkmm2/gtk/gtkmm/label.cc
index 0de70b9b64..a594b621c4 100644
--- a/libs/gtkmm2/gtk/gtkmm/label.cc
+++ b/libs/gtkmm2/gtk/gtkmm/label.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/label.h>
 #include <gtkmm/private/label_p.h>
 
@@ -68,7 +69,8 @@ void Label::select_region(int start_offset)
 namespace
 {
 
-void Label_signal_populate_popup_callback(GtkLabel* self, GtkMenu* p0,void* data)
+
+static void Label_signal_populate_popup_callback(GtkLabel* self, GtkMenu* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Menu* > SlotType;
@@ -76,26 +78,31 @@ void Label_signal_populate_popup_callback(GtkLabel* self, GtkMenu* p0,void* data
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Label_signal_populate_popup_info =
+static const Glib::SignalProxyInfo Label_signal_populate_popup_info =
 {
   "populate_popup",
   (GCallback) &Label_signal_populate_popup_callback,
   (GCallback) &Label_signal_populate_popup_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -140,10 +147,18 @@ void Label_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->populate_popup = &populate_popup_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Label_Class::populate_popup_callback(GtkLabel* self, GtkMenu* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -156,16 +171,20 @@ void Label_Class::populate_popup_callback(GtkLabel* self, GtkMenu* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_populate_popup(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -178,6 +197,7 @@ void Label_Class::populate_popup_callback(GtkLabel* self, GtkMenu* p0)
       (*base->populate_popup)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Label_Class::wrap_new(GObject* o)
@@ -221,7 +241,7 @@ GType Label::get_base_type()
 
 void Label::set_text(const Glib::ustring & str)
 {
-  gtk_label_set_text(gobj(), str.c_str());
+gtk_label_set_text(gobj(), str.c_str()); 
 }
 
 Glib::ustring Label::get_text() const
@@ -231,7 +251,7 @@ Glib::ustring Label::get_text() const
 
 void Label::set_attributes(Pango::AttrList& attrs)
 {
-  gtk_label_set_attributes(gobj(), (attrs).gobj());
+gtk_label_set_attributes(gobj(), (attrs).gobj()); 
 }
 
 Pango::AttrList Label::get_attributes() const
@@ -241,7 +261,7 @@ Pango::AttrList Label::get_attributes() const
 
 void Label::set_label(const Glib::ustring& str)
 {
-  gtk_label_set_label(gobj(), str.c_str());
+gtk_label_set_label(gobj(), str.c_str()); 
 }
 
 Glib::ustring Label::get_label() const
@@ -251,12 +271,12 @@ Glib::ustring Label::get_label() const
 
 void Label::set_markup(const Glib::ustring& str)
 {
-  gtk_label_set_markup(gobj(), str.c_str());
+gtk_label_set_markup(gobj(), str.c_str()); 
 }
 
 void Label::set_use_markup(bool setting)
 {
-  gtk_label_set_use_markup(gobj(), static_cast<int>(setting));
+gtk_label_set_use_markup(gobj(), static_cast<int>(setting)); 
 }
 
 bool Label::get_use_markup() const
@@ -266,7 +286,7 @@ bool Label::get_use_markup() const
 
 void Label::set_use_underline(bool setting)
 {
-  gtk_label_set_use_underline(gobj(), static_cast<int>(setting));
+gtk_label_set_use_underline(gobj(), static_cast<int>(setting)); 
 }
 
 bool Label::get_use_underline() const
@@ -276,7 +296,7 @@ bool Label::get_use_underline() const
 
 void Label::set_markup_with_mnemonic(const Glib::ustring& str)
 {
-  gtk_label_set_markup_with_mnemonic(gobj(), str.c_str());
+gtk_label_set_markup_with_mnemonic(gobj(), str.c_str()); 
 }
 
 guint Label::get_mnemonic_keyval() const
@@ -286,7 +306,7 @@ guint Label::get_mnemonic_keyval() const
 
 void Label::set_mnemonic_widget(Widget& widget)
 {
-  gtk_label_set_mnemonic_widget(gobj(), (widget).gobj());
+gtk_label_set_mnemonic_widget(gobj(), (widget).gobj()); 
 }
 
 Widget* Label::get_mnemonic_widget()
@@ -301,12 +321,12 @@ const Widget* Label::get_mnemonic_widget() const
 
 void Label::set_text_with_mnemonic(const Glib::ustring& str)
 {
-  gtk_label_set_text_with_mnemonic(gobj(), str.c_str());
+gtk_label_set_text_with_mnemonic(gobj(), str.c_str()); 
 }
 
 void Label::set_justify(Justification jtype)
 {
-  gtk_label_set_justify(gobj(), ((GtkJustification)(jtype)));
+gtk_label_set_justify(gobj(), ((GtkJustification)(jtype))); 
 }
 
 Justification Label::get_justify() const
@@ -316,7 +336,7 @@ Justification Label::get_justify() const
 
 void Label::set_ellipsize(Pango::EllipsizeMode mode)
 {
-  gtk_label_set_ellipsize(gobj(), ((PangoEllipsizeMode)(mode)));
+gtk_label_set_ellipsize(gobj(), ((PangoEllipsizeMode)(mode))); 
 }
 
 Pango::EllipsizeMode Label::get_ellipsize() const
@@ -326,7 +346,7 @@ Pango::EllipsizeMode Label::get_ellipsize() const
 
 void Label::set_width_chars(int n_chars)
 {
-  gtk_label_set_width_chars(gobj(), n_chars);
+gtk_label_set_width_chars(gobj(), n_chars); 
 }
 
 int Label::get_width_chars() const
@@ -336,7 +356,7 @@ int Label::get_width_chars() const
 
 void Label::set_max_width_chars(int n_chars)
 {
-  gtk_label_set_max_width_chars(gobj(), n_chars);
+gtk_label_set_max_width_chars(gobj(), n_chars); 
 }
 
 int Label::get_max_width_chars() const
@@ -346,12 +366,12 @@ int Label::get_max_width_chars() const
 
 void Label::set_pattern(const Glib::ustring& pattern)
 {
-  gtk_label_set_pattern(gobj(), pattern.c_str());
+gtk_label_set_pattern(gobj(), pattern.c_str()); 
 }
 
 void Label::set_line_wrap(bool wrap)
 {
-  gtk_label_set_line_wrap(gobj(), static_cast<int>(wrap));
+gtk_label_set_line_wrap(gobj(), static_cast<int>(wrap)); 
 }
 
 bool Label::get_line_wrap() const
@@ -359,9 +379,19 @@ bool Label::get_line_wrap() const
   return gtk_label_get_line_wrap(const_cast<GtkLabel*>(gobj()));
 }
 
+void Label::set_line_wrap_mode(Pango::WrapMode wrap_mode)
+{
+gtk_label_set_line_wrap_mode(gobj(), ((PangoWrapMode)(wrap_mode))); 
+}
+
+Pango::WrapMode Label::get_line_wrap_mode() const
+{
+  return ((Pango::WrapMode)(gtk_label_get_line_wrap_mode(const_cast<GtkLabel*>(gobj()))));
+}
+
 void Label::set_selectable(bool setting)
 {
-  gtk_label_set_selectable(gobj(), static_cast<int>(setting));
+gtk_label_set_selectable(gobj(), static_cast<int>(setting)); 
 }
 
 bool Label::get_selectable() const
@@ -371,7 +401,7 @@ bool Label::get_selectable() const
 
 void Label::set_angle(double angle)
 {
-  gtk_label_set_angle(gobj(), angle);
+gtk_label_set_angle(gobj(), angle); 
 }
 
 double Label::get_angle() const
@@ -381,7 +411,7 @@ double Label::get_angle() const
 
 void Label::select_region(int start_offset, int end_offset)
 {
-  gtk_label_select_region(gobj(), start_offset, end_offset);
+gtk_label_select_region(gobj(), start_offset, end_offset); 
 }
 
 bool Label::get_selection_bounds(int& start, int& end) const
@@ -393,30 +423,25 @@ Glib::RefPtr<Pango::Layout> Label::get_layout()
 {
 
   Glib::RefPtr<Pango::Layout> retvalue = Glib::wrap(gtk_label_get_layout(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Pango::Layout> Label::get_layout() const
 {
-
-  Glib::RefPtr<const Pango::Layout> retvalue = Glib::wrap(gtk_label_get_layout(const_cast<GtkLabel*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Label*>(this)->get_layout();
 }
 
 void Label::get_layout_offsets(int& x, int& y) const
 {
-  gtk_label_get_layout_offsets(const_cast<GtkLabel*>(gobj()), &x, &y);
+gtk_label_get_layout_offsets(const_cast<GtkLabel*>(gobj()), &x, &y); 
 }
 
 void Label::set_single_line_mode(bool single_line_mode)
 {
-  gtk_label_set_single_line_mode(gobj(), static_cast<int>(single_line_mode));
+gtk_label_set_single_line_mode(gobj(), static_cast<int>(single_line_mode)); 
 }
 
 bool Label::get_single_line_mode() const
@@ -431,162 +456,232 @@ Glib::SignalProxy1< void,Menu* > Label::signal_populate_popup()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Label::property_label() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Label::property_label() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::AttrList> Label::property_attributes() 
 {
   return Glib::PropertyProxy<Pango::AttrList>(this, "attributes");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::AttrList> Label::property_attributes() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::AttrList>(this, "attributes");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Label::property_use_markup() 
 {
   return Glib::PropertyProxy<bool>(this, "use-markup");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Label::property_use_markup() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "use-markup");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Label::property_use_underline() 
 {
   return Glib::PropertyProxy<bool>(this, "use-underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Label::property_use_underline() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "use-underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Justification> Label::property_justify() 
 {
   return Glib::PropertyProxy<Justification>(this, "justify");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Justification> Label::property_justify() const
 {
   return Glib::PropertyProxy_ReadOnly<Justification>(this, "justify");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_WriteOnly<Glib::ustring> Label::property_pattern() 
 {
   return Glib::PropertyProxy_WriteOnly<Glib::ustring>(this, "pattern");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
-Glib::PropertyProxy_ReadOnly<Glib::ustring> Label::property_pattern() const
-{
-  return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "pattern");
-}
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Label::property_wrap() 
 {
   return Glib::PropertyProxy<bool>(this, "wrap");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Label::property_wrap() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "wrap");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<Pango::WrapMode> Label::property_wrap_mode() 
+{
+  return Glib::PropertyProxy<Pango::WrapMode>(this, "wrap-mode");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<Pango::WrapMode> Label::property_wrap_mode() const
+{
+  return Glib::PropertyProxy_ReadOnly<Pango::WrapMode>(this, "wrap-mode");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Label::property_selectable() 
 {
   return Glib::PropertyProxy<bool>(this, "selectable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Label::property_selectable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "selectable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Label::property_mnemonic_keyval() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "mnemonic-keyval");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Widget*> Label::property_mnemonic_widget() 
 {
   return Glib::PropertyProxy<Widget*>(this, "mnemonic-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Widget*> Label::property_mnemonic_widget() const
 {
   return Glib::PropertyProxy_ReadOnly<Widget*>(this, "mnemonic-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Label::property_cursor_position() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "cursor-position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Label::property_selection_bound() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "selection-bound");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::EllipsizeMode> Label::property_ellipsize() 
 {
   return Glib::PropertyProxy<Pango::EllipsizeMode>(this, "ellipsize");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::EllipsizeMode> Label::property_ellipsize() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::EllipsizeMode>(this, "ellipsize");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Label::property_width_chars() 
 {
   return Glib::PropertyProxy<int>(this, "width-chars");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Label::property_width_chars() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "width-chars");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Label::property_single_line_mode() 
 {
   return Glib::PropertyProxy<bool>(this, "single-line-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Label::property_single_line_mode() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "single-line-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> Label::property_angle() 
 {
   return Glib::PropertyProxy<double>(this, "angle");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> Label::property_angle() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "angle");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Label::property_max_width_chars() 
 {
   return Glib::PropertyProxy<int>(this, "max-width-chars");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Label::property_max_width_chars() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "max-width-chars");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Label::on_populate_popup(Menu* menu)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -596,6 +691,10 @@ void Gtk::Label::on_populate_popup(Menu* menu)
   if(base && base->populate_popup)
     (*base->populate_popup)(gobj(),(GtkMenu*)Glib::unwrap(menu));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/label.h b/libs/gtkmm2/gtk/gtkmm/label.h
index 83d3b68bf0..1536fe73c2 100644
--- a/libs/gtkmm2/gtk/gtkmm/label.h
+++ b/libs/gtkmm2/gtk/gtkmm/label.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_LABEL_H
 #define _GTKMM_LABEL_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -91,12 +92,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_populate_popup(Menu* menu);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -193,7 +200,7 @@ public:
    * @code
    * char *markup;
    * &lt;!-- --&gt;
-   * markup = g_markup_printf_escaped ("&lt;span style=\"italic\"&gt;%s&lt;/span&gt;", str);
+   * markup = g_markup_printf_escaped ("&lt;span style=\"italic\"&gt;&percnt;s&lt;/span&gt;", str);
    * gtk_label_set_markup (GTK_LABEL (label), markup);
    * g_free (markup);
    * @endcode
@@ -306,7 +313,7 @@ public:
   /** Sets the mode used to ellipsize (add an ellipsis: "...") to the text if there
    * is not enough space to render the entire string.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param mode A Pango::EllipsizeMode.
    */
   void set_ellipsize(Pango::EllipsizeMode mode);
@@ -314,14 +321,14 @@ public:
   /** Returns the ellipsizing position of the label. See set_ellipsize().
    * @return Pango::EllipsizeMode
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Pango::EllipsizeMode get_ellipsize() const;
 
   
   /** Sets the desired width in characters of @a label  to @a n_chars .
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param n_chars The new desired width, in characters.
    */
   void set_width_chars(int n_chars);
@@ -330,14 +337,14 @@ public:
    * set_width_chars().
    * @return The width of the label in characters.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   int get_width_chars() const;
 
   
   /** Sets the desired maximum width in characters of @a label  to @a n_chars .
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param n_chars The new desired maximum width, in characters.
    */
   void set_max_width_chars(int n_chars);
@@ -346,7 +353,7 @@ public:
    * set_width_chars().
    * @return The maximum width of the label in characters.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   int get_max_width_chars() const;
 
@@ -365,6 +372,10 @@ public:
    */
   bool get_line_wrap() const;
   
+  void set_line_wrap_mode(Pango::WrapMode wrap_mode);
+  
+  Pango::WrapMode get_line_wrap_mode() const;
+  
   /** Selectable labels allow the user to select text from the label, for
    * copy-and-paste.
    * @param setting <tt>true</tt> to allow selecting text in the label.
@@ -381,7 +392,7 @@ public:
    * setting for the label is ignored if the label is selectable,
    * wrapped, or ellipsized.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param angle The angle that the baseline of the label makes with
    * the horizontal, in degrees, measured counterclockwise.
    */
@@ -391,7 +402,7 @@ public:
    * gtk_label_set_angle.
    * @return The angle of rotation for the label
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   double get_angle() const;
   
@@ -453,7 +464,7 @@ public:
   
   /** Sets whether the label is in single line mode.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param single_line_mode <tt>true</tt> if the label should be in single line mode.
    */
   void set_single_line_mode(bool single_line_mode = true);
@@ -461,25 +472,33 @@ public:
   /** Returns whether the label is in single line mode.
    * @return <tt>true</tt> when the label is in single line mode.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool get_single_line_mode() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %populate_popup(Menu* menu)</tt>
+   */
+
   Glib::SignalProxy1< void,Menu* > signal_populate_popup();
 
 
   //Keybinding signals:
   
   
-  /** The text of the label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The text of the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_label() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The text of the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -487,15 +506,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_label() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** A list of style attributes to apply to the text of the label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A list of style attributes to apply to the text of the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::AttrList> property_attributes() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A list of style attributes to apply to the text of the label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -503,15 +526,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::AttrList> property_attributes() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The text of the label includes XML markup. See pango_parse_markup.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The text of the label includes XML markup. See pango_parse_markup.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_use_markup() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The text of the label includes XML markup. See pango_parse_markup.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -519,15 +546,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_use_markup() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If set
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_use_underline() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -535,15 +566,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_use_underline() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Justification> property_justify() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -551,47 +586,70 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Justification> property_justify() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** A string with _ characters in positions correspond to characters in the text to underline.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A string with _ characters in positions correspond to characters in the text to underline.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_WriteOnly<Glib::ustring> property_pattern() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** A string with _ characters in positions correspond to characters in the text to underline.
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
-  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_pattern() const;
+  Glib::PropertyProxy<bool> property_wrap() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If set
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
-  Glib::PropertyProxy<bool> property_wrap() ;
+  Glib::PropertyProxy_ReadOnly<bool> property_wrap() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** If set
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If wrap is set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
-  Glib::PropertyProxy_ReadOnly<bool> property_wrap() const;
+  Glib::PropertyProxy<Pango::WrapMode> property_wrap_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the label text can be selected with the mouse.
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** If wrap is set
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<Pango::WrapMode> property_wrap_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the label text can be selected with the mouse.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_selectable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the label text can be selected with the mouse.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -599,24 +657,30 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_selectable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The mnemonic accelerator key for this label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The mnemonic accelerator key for this label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_mnemonic_keyval() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The widget to be activated when the label's mnemonic key is pressed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The widget to be activated when the label's mnemonic key is pressed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Widget*> property_mnemonic_widget() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The widget to be activated when the label's mnemonic key is pressed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -624,33 +688,41 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Widget*> property_mnemonic_widget() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The current position of the insertion cursor in chars.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The current position of the insertion cursor in chars.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_cursor_position() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The position of the opposite end of the selection from the cursor in chars.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The position of the opposite end of the selection from the cursor in chars.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_selection_bound() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The preferred place to ellipsize the string
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The preferred place to ellipsize the string
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::EllipsizeMode> property_ellipsize() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The preferred place to ellipsize the string
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -658,15 +730,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::EllipsizeMode> property_ellipsize() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The desired width of the label
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The desired width of the label
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_width_chars() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The desired width of the label
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -674,15 +750,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_width_chars() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
     
-  /** Whether the label is in single line mode.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the label is in single line mode.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_single_line_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the label is in single line mode.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -690,15 +770,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_single_line_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Angle at which the label is rotated.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Angle at which the label is rotated.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_angle() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Angle at which the label is rotated.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -706,15 +790,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_angle() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The desired maximum width of the label
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The desired maximum width of the label
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_max_width_chars() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The desired maximum width of the label
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -722,6 +810,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_max_width_chars() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -737,6 +826,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Label* wrap(GtkLabel* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_LABEL_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/layout.cc b/libs/gtkmm2/gtk/gtkmm/layout.cc
index 366df0ea6f..ef96a49e85 100644
--- a/libs/gtkmm2/gtk/gtkmm/layout.cc
+++ b/libs/gtkmm2/gtk/gtkmm/layout.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/layout.h>
 #include <gtkmm/private/layout_p.h>
 
@@ -84,7 +85,8 @@ void Layout::set_vadjustment()
 namespace
 {
 
-void Layout_signal_set_scroll_adjustments_callback(GtkLayout* self, GtkAdjustment* p0,GtkAdjustment* p1,void* data)
+
+static void Layout_signal_set_scroll_adjustments_callback(GtkLayout* self, GtkAdjustment* p0,GtkAdjustment* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Adjustment*,Adjustment* > SlotType;
@@ -92,27 +94,32 @@ void Layout_signal_set_scroll_adjustments_callback(GtkLayout* self, GtkAdjustmen
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Layout_signal_set_scroll_adjustments_info =
+static const Glib::SignalProxyInfo Layout_signal_set_scroll_adjustments_info =
 {
   "set_scroll_adjustments",
   (GCallback) &Layout_signal_set_scroll_adjustments_callback,
   (GCallback) &Layout_signal_set_scroll_adjustments_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -157,10 +164,18 @@ void Layout_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->set_scroll_adjustments = &set_scroll_adjustments_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Layout_Class::set_scroll_adjustments_callback(GtkLayout* self, GtkAdjustment* p0, GtkAdjustment* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -173,17 +188,21 @@ void Layout_Class::set_scroll_adjustments_callback(GtkLayout* self, GtkAdjustmen
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_set_scroll_adjustments(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -196,6 +215,7 @@ void Layout_Class::set_scroll_adjustments_callback(GtkLayout* self, GtkAdjustmen
       (*base->set_scroll_adjustments)(self, p0, p1);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Layout_Class::wrap_new(GObject* o)
@@ -239,27 +259,27 @@ GType Layout::get_base_type()
 
 void Layout::put(Widget& child_widget, int x, int y)
 {
-  gtk_layout_put(gobj(), (child_widget).gobj(), x, y);
+gtk_layout_put(gobj(), (child_widget).gobj(), x, y); 
 }
 
 void Layout::move(Widget& child_widget, int x, int y)
 {
-  gtk_layout_move(gobj(), (child_widget).gobj(), x, y);
+gtk_layout_move(gobj(), (child_widget).gobj(), x, y); 
 }
 
 void Layout::set_size(guint width, guint height)
 {
-  gtk_layout_set_size(gobj(), width, height);
+gtk_layout_set_size(gobj(), width, height); 
 }
 
 void Layout::get_size(guint& width, guint& height) const
 {
-  gtk_layout_get_size(const_cast<GtkLayout*>(gobj()), &(width), &(height));
+gtk_layout_get_size(const_cast<GtkLayout*>(gobj()), &(width), &(height)); 
 }
 
 void Layout::set_hadjustment(Adjustment& adjustment)
 {
-  gtk_layout_set_hadjustment(gobj(), (adjustment).gobj());
+gtk_layout_set_hadjustment(gobj(), (adjustment).gobj()); 
 }
 
 Adjustment* Layout::get_hadjustment()
@@ -269,12 +289,12 @@ Adjustment* Layout::get_hadjustment()
 
 const Adjustment* Layout::get_hadjustment() const
 {
-  return Glib::wrap(gtk_layout_get_hadjustment(const_cast<GtkLayout*>(gobj())));
+  return const_cast<Layout*>(this)->get_hadjustment();
 }
 
 void Layout::set_vadjustment(Adjustment& adjustment)
 {
-  gtk_layout_set_vadjustment(gobj(), (adjustment).gobj());
+gtk_layout_set_vadjustment(gobj(), (adjustment).gobj()); 
 }
 
 Adjustment* Layout::get_vadjustment()
@@ -284,10 +304,10 @@ Adjustment* Layout::get_vadjustment()
 
 const Adjustment* Layout::get_vadjustment() const
 {
-  return Glib::wrap(gtk_layout_get_vadjustment(const_cast<GtkLayout*>(gobj())));
+  return const_cast<Layout*>(this)->get_vadjustment();
 }
 
-Glib::RefPtr<Gdk::Window> Layout::get_bin_window()
+ Glib::RefPtr<Gdk::Window> Layout::get_bin_window()
 {
   Glib::RefPtr<Gdk::Window> ref_ptr(Glib::wrap((GdkWindowObject*)(gobj()->bin_window)));
 
@@ -306,7 +326,7 @@ Glib::RefPtr<const Gdk::Window> Layout::get_bin_window() const
 
   return ref_ptr;
 }
-
+ 
 
 Glib::SignalProxy2< void,Adjustment*,Adjustment* > Layout::signal_set_scroll_adjustments()
 {
@@ -314,47 +334,64 @@ Glib::SignalProxy2< void,Adjustment*,Adjustment* > Layout::signal_set_scroll_adj
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Adjustment*> Layout::property_hadjustment() 
 {
   return Glib::PropertyProxy<Adjustment*>(this, "hadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Adjustment*> Layout::property_hadjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Adjustment*>(this, "hadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Adjustment*> Layout::property_vadjustment() 
 {
   return Glib::PropertyProxy<Adjustment*>(this, "vadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Adjustment*> Layout::property_vadjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Adjustment*>(this, "vadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Layout::property_width() 
 {
   return Glib::PropertyProxy<guint>(this, "width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Layout::property_width() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Layout::property_height() 
 {
   return Glib::PropertyProxy<guint>(this, "height");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Layout::property_height() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "height");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Layout::on_set_scroll_adjustments(Adjustment* hadj, Adjustment* vadj)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -364,6 +401,10 @@ void Gtk::Layout::on_set_scroll_adjustments(Adjustment* hadj, Adjustment* vadj)
   if(base && base->set_scroll_adjustments)
     (*base->set_scroll_adjustments)(gobj(),(GtkAdjustment*)Glib::unwrap(hadj),(GtkAdjustment*)Glib::unwrap(vadj));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/layout.h b/libs/gtkmm2/gtk/gtkmm/layout.h
index 107cf725ff..76dd9c2739 100644
--- a/libs/gtkmm2/gtk/gtkmm/layout.h
+++ b/libs/gtkmm2/gtk/gtkmm/layout.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_LAYOUT_H
 #define _GTKMM_LAYOUT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -102,12 +103,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_set_scroll_adjustments(Adjustment* hadj, Adjustment* vadj);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -208,23 +215,30 @@ public:
    */
   const Adjustment* get_vadjustment() const;
 
-  Glib::RefPtr<Gdk::Window> get_bin_window();
+   Glib::RefPtr<Gdk::Window> get_bin_window();
   Glib::RefPtr<const Gdk::Window> get_bin_window() const;
-
+ 
   // See Gtk::Widget::set_scroll_adjustments()
   
+/**
+   * @par Prototype:
+   * <tt>void %set_scroll_adjustments(Adjustment* hadj, Adjustment* vadj)</tt>
+   */
 
   Glib::SignalProxy2< void,Adjustment*,Adjustment* > signal_set_scroll_adjustments();
 
 
-  /** The GtkAdjustment for the horizontal position.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The GtkAdjustment for the horizontal position.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Adjustment*> property_hadjustment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The GtkAdjustment for the horizontal position.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -232,15 +246,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Adjustment*> property_hadjustment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The GtkAdjustment for the vertical position.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The GtkAdjustment for the vertical position.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Adjustment*> property_vadjustment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The GtkAdjustment for the vertical position.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -248,15 +266,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Adjustment*> property_vadjustment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The width of the layout.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The width of the layout.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_width() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The width of the layout.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -264,15 +286,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The height of the layout.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The height of the layout.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_height() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The height of the layout.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -280,6 +306,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_height() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -295,6 +322,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Layout* wrap(GtkLayout* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_LAYOUT_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/liststore.cc b/libs/gtkmm2/gtk/gtkmm/liststore.cc
index dadeb5f4f5..e79dbd3a02 100644
--- a/libs/gtkmm2/gtk/gtkmm/liststore.cc
+++ b/libs/gtkmm2/gtk/gtkmm/liststore.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/liststore.h>
 #include <gtkmm/private/liststore_p.h>
 
@@ -188,8 +189,19 @@ void ListStore_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* ListStore_Class::wrap_new(GObject* object)
 {
@@ -245,12 +257,12 @@ Glib::RefPtr<ListStore> ListStore::create(const TreeModelColumnRecord& columns)
 }
 void ListStore::iter_swap(const iterator& a, const iterator& b)
 {
-  gtk_list_store_swap(gobj(), const_cast<GtkTreeIter*>((a).gobj()), const_cast<GtkTreeIter*>((b).gobj()));
+gtk_list_store_swap(gobj(), const_cast<GtkTreeIter*>((a).gobj()), const_cast<GtkTreeIter*>((b).gobj())); 
 }
 
 void ListStore::clear()
 {
-  gtk_list_store_clear(gobj());
+gtk_list_store_clear(gobj()); 
 }
 
 bool ListStore::iter_is_valid(const iterator& iter) const
@@ -259,6 +271,13 @@ bool ListStore::iter_is_valid(const iterator& iter) const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/liststore.h b/libs/gtkmm2/gtk/gtkmm/liststore.h
index 9d2fe355e2..b0065ea51a 100644
--- a/libs/gtkmm2/gtk/gtkmm/liststore.h
+++ b/libs/gtkmm2/gtk/gtkmm/liststore.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_LISTSTORE_H
 #define _GTKMM_LISTSTORE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -176,7 +177,7 @@ public:
   /** Swaps @a a  and @a b  in @a store . Note that this function only works with
    * unsorted stores.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param a A Gtk::TreeIter.
    * @param b Another Gtk::TreeIter.
    */
@@ -207,7 +208,7 @@ public:
    * @param iter A Gtk::TreeIter.
    * @return <tt>true</tt> if the iter is valid, <tt>false</tt> if the iter is invalid.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   bool iter_is_valid(const iterator& iter) const;
 
@@ -219,11 +220,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/main.cc b/libs/gtkmm2/gtk/gtkmm/main.cc
index 9ff2be9aa7..38a9128c14 100644
--- a/libs/gtkmm2/gtk/gtkmm/main.cc
+++ b/libs/gtkmm2/gtk/gtkmm/main.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/main.h>
 #include <gtkmm/private/main_p.h>
 
@@ -31,7 +32,9 @@
 #include <gtkmm/window.h>
 #include <glibmm/init.h>
 #include <pangomm/wrap_init.h>
+#ifdef GTKMM_ATKMM_ENABLED
 #include <atkmm/wrap_init.h>
+#endif //GTKMM_ATKMM_ENABLED
 #include <gdkmm/wrap_init.h>
 #include <gtkmm/wrap_init.h>
 
@@ -230,16 +233,20 @@ gboolean RunSig::gtk_callback(gpointer data)
 
   if(GtkMainConnectionNode::list_remove(conn_node))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Recreate the specific SlotType from the generic slot_base.
       SlotType* pSlot = static_cast<SlotType*>(conn_node->get_slot());
       (*pSlot)();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
 
     // We don't need it anymore, since RunSig is a one-shot signal.
     GtkMainConnectionNode::destroy_notify_handler(conn_node);
@@ -267,17 +274,22 @@ sigc::connection QuitSig::connect(const QuitSig::SlotType& slot, guint main_leve
 // static
 gboolean QuitSig::gtk_callback(gpointer data)
 {
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     // Call the slot:
     GtkMainConnectionNode* node = static_cast<GtkMainConnectionNode*>(data);
     SlotType* pSlot = static_cast<SlotType*>(node->get_slot());
     (*pSlot)();
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+
   return 0;
 }
 
@@ -298,17 +310,22 @@ sigc::connection KeySnooperSig::connect(const KeySnooperSig::SlotType& slot)
 // static
 gint KeySnooperSig::gtk_callback(GtkWidget* widget, GdkEventKey* event, gpointer data)
 {
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     // Recreate the specific SlotType from the generic slot node.
     GtkMainConnectionNode* conn_node = static_cast<GtkMainConnectionNode*>(data);
     SlotType* pSlot = static_cast<SlotType*>(conn_node->get_slot());
     return (*pSlot)(Glib::wrap(widget), event);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+
   return 0;
 }
 
@@ -361,7 +378,10 @@ Main::~Main()
     instance_ = 0;
     GtkMainConnectionNode::list_notify_all();
 
-    Glib::init();
+    // Release the gtkmm type registration tables,
+    // allowing Main to be instantiated again:
+    Glib::wrap_register_cleanup();
+    Glib::Error::register_cleanup();
   }
 }
 
@@ -400,7 +420,16 @@ Main::Main(int& argc, char**& argv, Glib::OptionContext& option_context)
     //without calling check_setugid(), because that is not public API.
 
     add_gtk_option_group(option_context);
+
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     option_context.parse(argc, argv);
+    #else
+    std::auto_ptr<Glib::Error> ex;
+    option_context.parse(argc, argv, ex);
+    //if(ex.get())
+    //  std::cerr << ex->what() << std::endl;
+    //TODO: Pass the ex up to the caller?
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
@@ -420,7 +449,9 @@ void Main::init_gtkmm_internals()
 
     // Populate the map of GTypes to C++ wrap_new() functions.
     Pango::wrap_init();
+#ifdef GTKMM_ATKMM_ENABLED
     Atk::wrap_init();
+#endif //GTKMM_ATKMM_ENABLED
     Gdk::wrap_init();
     Gtk::wrap_init();
 
diff --git a/libs/gtkmm2/gtk/gtkmm/main.h b/libs/gtkmm2/gtk/gtkmm/main.h
index 027cbeff07..8177b2d66e 100644
--- a/libs/gtkmm2/gtk/gtkmm/main.h
+++ b/libs/gtkmm2/gtk/gtkmm/main.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_MAIN_H
 #define _GTKMM_MAIN_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -118,7 +119,7 @@ public:
   /** Scans the argument vector, and strips off all parameters parsed by GTK+ or your @a option_context.
    * Add a Glib::OptionGroup to the Glib::OptionContext to parse your own command-line arguments.  
    *
-   * Note:  The argument strings themselves won't be modified, although the
+   * Note:  The argument strings themself won't be modified, although the
    * pointers to them might change.  This makes it possible to create your
    * own argv of string literals, which have the type 'const char[]' in
    * standard C++.  (You might need to use const_cast<>, though.)
diff --git a/libs/gtkmm2/gtk/gtkmm/menu.cc b/libs/gtkmm2/gtk/gtkmm/menu.cc
index 9fdc254a21..c8bd5b3e47 100644
--- a/libs/gtkmm2/gtk/gtkmm/menu.cc
+++ b/libs/gtkmm2/gtk/gtkmm/menu.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/menu.h>
 #include <gtkmm/private/menu_p.h>
 
@@ -28,76 +29,48 @@
 #include <gtkmm/accelgroup.h>
 
 
-namespace
+static void SignalProxy_PopupPosition_gtk_callback(GtkMenu*, int* x, int* y, gboolean* push_in, void* data)
 {
-
-// This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_PopupPosition
-{
-public:
-  typedef Gtk::Menu::SlotPositionCalc SlotType;
-
-  SignalProxy_PopupPosition(const SlotType& slot);
-  ~SignalProxy_PopupPosition();
-
-  static void gtk_callback(GtkMenu* menu, int* x, int* y, gboolean* push_in, void* data);
-
-protected:
-  SlotType slot_;
-};
-
-SignalProxy_PopupPosition::SignalProxy_PopupPosition(const SlotType& slot)
-:
-  slot_ (slot)
-{}
-
-SignalProxy_PopupPosition::~SignalProxy_PopupPosition()
-{}
-
-void SignalProxy_PopupPosition::gtk_callback(GtkMenu*, int* x, int* y, gboolean* push_in, void* data)
-{
-  SignalProxy_PopupPosition *const self = static_cast<SignalProxy_PopupPosition*>(data);
+  Gtk::Menu::SlotPositionCalc* the_slot = static_cast<Gtk::Menu::SlotPositionCalc*>(data);
 
   int  temp_x = (x) ? *x : 0;
   int  temp_y = (y) ? *y : 0;
   bool temp_push_in = (push_in) ? bool(*push_in) : false;
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    (self->slot_)(temp_x, temp_y, temp_push_in);
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    (*the_slot)(temp_x, temp_y, temp_push_in);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   if(x) *x = temp_x;
   if(y) *y = temp_y;
   if(push_in) *push_in = temp_push_in;
 }
 
-} // anonymous namespace
-
 
 namespace Gtk
 {
 
 void Menu::popup(const SlotPositionCalc& position_calc_slot, guint button, guint32 activate_time)
 {
-  SignalProxy_PopupPosition proxy(position_calc_slot);
-
-  // Tell GTK+ to call the static function with Proxy's address as the extra
+  // Tell GTK+ to call the static function with the slot's address as the extra
   // data, so that the static function can then call the sigc::slot:
-  gtk_menu_popup(gobj(), 0, 0, &SignalProxy_PopupPosition::gtk_callback, &proxy, button, activate_time);
+  gtk_menu_popup(gobj(), 0, 0, &SignalProxy_PopupPosition_gtk_callback, const_cast<SlotPositionCalc*>(&position_calc_slot), button, activate_time);
 }
 
 void Menu::popup(MenuShell& parent_menu_shell, MenuItem& parent_menu_item, const SlotPositionCalc& position_calc_slot, guint button, guint32 activate_time)
 {
-  SignalProxy_PopupPosition proxy(position_calc_slot);
-
-  // Tell GTK+ to call the static function with Proxy's address as the extra
+  // Tell GTK+ to call the static function with the slot's address as the extra
   // data, so that the static function can then call the sigc::slot:
-  gtk_menu_popup(gobj(), parent_menu_shell.Gtk::Widget::gobj(), parent_menu_item.Gtk::Widget::gobj(), &SignalProxy_PopupPosition::gtk_callback, &proxy, button, activate_time);
+  gtk_menu_popup(gobj(), parent_menu_shell.Gtk::Widget::gobj(), parent_menu_item.Gtk::Widget::gobj(), &SignalProxy_PopupPosition_gtk_callback, const_cast<SlotPositionCalc*>(&position_calc_slot), button, activate_time);
 }
 
 void Menu::popup(guint button, guint32 activate_time)
@@ -123,6 +96,12 @@ void Menu::unset_title()
   gtk_menu_set_title(gobj(), 0);
 }
 
+void Menu::attach_to_widget(Widget& attach_widget)
+{
+  gtk_menu_attach_to_widget(gobj(), (attach_widget).gobj(), 0 /* allowed by the C docs. */);
+}
+
+
 } // namespace Gtk
 
 
@@ -172,8 +151,19 @@ void Menu_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Menu_Class::wrap_new(GObject* o)
 {
@@ -223,12 +213,12 @@ Menu::Menu()
 
 void Menu::reposition()
 {
-  gtk_menu_reposition(gobj());
+gtk_menu_reposition(gobj()); 
 }
 
 void Menu::popdown()
 {
-  gtk_menu_popdown(gobj());
+gtk_menu_popdown(gobj()); 
 }
 
 MenuItem* Menu::get_active()
@@ -238,47 +228,42 @@ MenuItem* Menu::get_active()
 
 const MenuItem* Menu::get_active() const
 {
-  return Glib::wrap((GtkMenuItem*)(gtk_menu_get_active(const_cast<GtkMenu*>(gobj()))));
+  return const_cast<Menu*>(this)->get_active();
 }
 
 void Menu::set_active(guint index)
 {
-  gtk_menu_set_active(gobj(), index);
+gtk_menu_set_active(gobj(), index); 
 }
 
 void Menu::set_accel_group(const Glib::RefPtr<AccelGroup>& accel_group)
 {
-  gtk_menu_set_accel_group(gobj(), Glib::unwrap(accel_group));
+gtk_menu_set_accel_group(gobj(), Glib::unwrap(accel_group)); 
 }
 
 Glib::RefPtr<AccelGroup> Menu::get_accel_group()
 {
 
   Glib::RefPtr<AccelGroup> retvalue = Glib::wrap(gtk_menu_get_accel_group(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const AccelGroup> Menu::get_accel_group() const
 {
-
-  Glib::RefPtr<const AccelGroup> retvalue = Glib::wrap(gtk_menu_get_accel_group(const_cast<GtkMenu*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Menu*>(this)->get_accel_group();
 }
 
 void Menu::set_accel_path(const Glib::ustring& accel_path)
 {
-  gtk_menu_set_accel_path(gobj(), accel_path.c_str());
+gtk_menu_set_accel_path(gobj(), accel_path.c_str()); 
 }
 
 void Menu::detach()
 {
-  gtk_menu_detach(gobj());
+gtk_menu_detach(gobj()); 
 }
 
 Widget* Menu::get_attach_widget()
@@ -288,12 +273,12 @@ Widget* Menu::get_attach_widget()
 
 const Widget* Menu::get_attach_widget() const
 {
-  return Glib::wrap(gtk_menu_get_attach_widget(const_cast<GtkMenu*>(gobj())));
+  return const_cast<Menu*>(this)->get_attach_widget();
 }
 
 void Menu::set_tearoff_state(bool torn_off)
 {
-  gtk_menu_set_tearoff_state(gobj(), static_cast<int>(torn_off));
+gtk_menu_set_tearoff_state(gobj(), static_cast<int>(torn_off)); 
 }
 
 bool Menu::get_tearoff_state() const
@@ -303,7 +288,7 @@ bool Menu::get_tearoff_state() const
 
 void Menu::set_title(const Glib::ustring& title)
 {
-  gtk_menu_set_title(gobj(), title.c_str());
+gtk_menu_set_title(gobj(), title.c_str()); 
 }
 
 Glib::ustring Menu::get_title() const
@@ -313,34 +298,45 @@ Glib::ustring Menu::get_title() const
 
 void Menu::set_screen(const Glib::RefPtr<Gdk::Screen>& screen)
 {
-  gtk_menu_set_screen(gobj(), Glib::unwrap(screen));
+gtk_menu_set_screen(gobj(), Glib::unwrap(screen)); 
 }
 
 void Menu::attach(Gtk::Widget& child, guint left_attach, guint right_attach, guint top_attach, guint bottom_attach)
 {
-  gtk_menu_attach(gobj(), (child).gobj(), left_attach, right_attach, top_attach, bottom_attach);
+gtk_menu_attach(gobj(), (child).gobj(), left_attach, right_attach, top_attach, bottom_attach); 
 }
 
 void Menu::set_monitor(int monitor_num)
 {
-  gtk_menu_set_monitor(gobj(), monitor_num);
+gtk_menu_set_monitor(gobj(), monitor_num); 
 }
 
-void Menu::attach_to_widget(Widget& widget, GtkMenuDetachFunc detacher)
+void Menu::attach_to_widget(Widget& attach_widget, GtkMenuDetachFunc detacher)
 {
-  gtk_menu_attach_to_widget(gobj(), (widget).gobj(), detacher);
+gtk_menu_attach_to_widget(gobj(), (attach_widget).gobj(), detacher); 
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Menu::property_tearoff_title() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "tearoff-title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Menu::property_tearoff_title() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "tearoff-title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/menu.h b/libs/gtkmm2/gtk/gtkmm/menu.h
index 26e78721be..a9f48ce3ee 100644
--- a/libs/gtkmm2/gtk/gtkmm/menu.h
+++ b/libs/gtkmm2/gtk/gtkmm/menu.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_MENU_H
 #define _GTKMM_MENU_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -96,11 +97,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -218,7 +225,7 @@ public:
   
   /** Sets the Gdk::Screen on which the menu will be displayed.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param screen A Gdk::Screen, or <tt>0</tt> if the screen should be
    * determined by the widget the menu is attached to.
    */
@@ -233,7 +240,7 @@ public:
    * 
    * Note that this function is not related to detach().
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param child A Gtk::MenuItem.
    * @param left_attach The column number to attach the left side of the item to.
    * @param right_attach The column number to attach the right side of the item to.
@@ -252,7 +259,7 @@ public:
    * by a Gtk::MenuPositionFunc, since, for very long menus, these coordinates 
    * may extend beyond the monitor boundaries or even the screen boundaries. 
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param monitor_num The number of the monitor on which the menu should
    * be popped up.
    */
@@ -261,14 +268,17 @@ public:
   void reorder_child(const MenuItem& child, int position);
   
 
-  /** A title that may be displayed by the window manager when this menu is torn-off.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A title that may be displayed by the window manager when this menu is torn-off.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_tearoff_title() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** A title that may be displayed by the window manager when this menu is torn-off.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -276,6 +286,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_tearoff_title() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
@@ -283,7 +294,16 @@ protected:
   //We can not wrap this as a slot because there is no data parameter, and no destroy callback to destroy that data.
   typedef void (*GtkMenuDetachFunc)   (GtkWidget *attach_widget, GtkMenu   *menu);
   
-  void attach_to_widget(Widget& widget, GtkMenuDetachFunc detacher);
+  void attach_to_widget(Widget& attach_widget, GtkMenuDetachFunc detacher);
+
+  //TODO: What does "attach" actually mean here? murrayc
+  /** Attaches the menu to the widget.
+   * 
+   * param @attach_widget: the Widget that the menu will be attached to.
+   *
+   * @newin2p10
+   */
+  void attach_to_widget(Widget& attach_widget);
 
 
 };
@@ -299,6 +319,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Menu* wrap(GtkMenu* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_MENU_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/menubar.cc b/libs/gtkmm2/gtk/gtkmm/menubar.cc
index 8b5ef04bbc..fc7e849af0 100644
--- a/libs/gtkmm2/gtk/gtkmm/menubar.cc
+++ b/libs/gtkmm2/gtk/gtkmm/menubar.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/menubar.h>
 #include <gtkmm/private/menubar_p.h>
 
@@ -100,8 +101,19 @@ void MenuBar_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* MenuBar_Class::wrap_new(GObject* o)
 {
@@ -142,6 +154,13 @@ GType MenuBar::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/menubar.h b/libs/gtkmm2/gtk/gtkmm/menubar.h
index f7d8dea03e..c636a12e93 100644
--- a/libs/gtkmm2/gtk/gtkmm/menubar.h
+++ b/libs/gtkmm2/gtk/gtkmm/menubar.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_MENUBAR_H
 #define _GTKMM_MENUBAR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -91,11 +92,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -123,6 +130,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::MenuBar* wrap(GtkMenuBar* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_MENUBAR_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/menuitem.cc b/libs/gtkmm2/gtk/gtkmm/menuitem.cc
index 44f86a9204..8a7892a6fa 100644
--- a/libs/gtkmm2/gtk/gtkmm/menuitem.cc
+++ b/libs/gtkmm2/gtk/gtkmm/menuitem.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/menuitem.h>
 #include <gtkmm/private/menuitem_p.h>
 
@@ -62,7 +63,12 @@ void MenuItem::add_accel_label(const Glib::ustring& label, bool mnemonic)
 {
   AccelLabel* pLabel = manage(new AccelLabel(label, mnemonic));
   //Labels are centered by default, but in menus they should be left-aligned.
-  pLabel->property_xalign() = 0.0; 
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+  pLabel->property_xalign() = 0.0;
+  #else
+  pLabel->set_property("xalign", 0.0f);
+  #endif //GLIBMM_PROPERTIES_ENABLED
 
   add(*pLabel);
 
@@ -117,7 +123,8 @@ void MenuItem::unset_accel_path()
 namespace
 {
 
-const Glib::SignalProxyInfo MenuItem_signal_activate_info =
+
+static const Glib::SignalProxyInfo MenuItem_signal_activate_info =
 {
   "activate",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -125,7 +132,7 @@ const Glib::SignalProxyInfo MenuItem_signal_activate_info =
 };
 
 
-const Glib::SignalProxyInfo MenuItem_signal_activate_item_info =
+static const Glib::SignalProxyInfo MenuItem_signal_activate_item_info =
 {
   "activate_item",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -133,7 +140,7 @@ const Glib::SignalProxyInfo MenuItem_signal_activate_item_info =
 };
 
 
-void MenuItem_signal_toggle_size_request_callback(GtkMenuItem* self, int* p0,void* data)
+static void MenuItem_signal_toggle_size_request_callback(GtkMenuItem* self, int* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,int* > SlotType;
@@ -141,19 +148,23 @@ void MenuItem_signal_toggle_size_request_callback(GtkMenuItem* self, int* p0,voi
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo MenuItem_signal_toggle_size_request_info =
+static const Glib::SignalProxyInfo MenuItem_signal_toggle_size_request_info =
 {
   "toggle_size_request",
   (GCallback) &MenuItem_signal_toggle_size_request_callback,
@@ -161,7 +172,7 @@ const Glib::SignalProxyInfo MenuItem_signal_toggle_size_request_info =
 };
 
 
-void MenuItem_signal_toggle_size_allocate_callback(GtkMenuItem* self, gint p0,void* data)
+static void MenuItem_signal_toggle_size_allocate_callback(GtkMenuItem* self, gint p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,int > SlotType;
@@ -169,26 +180,31 @@ void MenuItem_signal_toggle_size_allocate_callback(GtkMenuItem* self, gint p0,vo
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo MenuItem_signal_toggle_size_allocate_info =
+static const Glib::SignalProxyInfo MenuItem_signal_toggle_size_allocate_info =
 {
   "toggle_size_allocate",
   (GCallback) &MenuItem_signal_toggle_size_allocate_callback,
   (GCallback) &MenuItem_signal_toggle_size_allocate_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -233,13 +249,21 @@ void MenuItem_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->activate = &activate_callback;
   klass->activate_item = &activate_item_callback;
   klass->toggle_size_request = &toggle_size_request_callback;
   klass->toggle_size_allocate = &toggle_size_allocate_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void MenuItem_Class::activate_callback(GtkMenuItem* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -252,15 +276,19 @@ void MenuItem_Class::activate_callback(GtkMenuItem* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_activate();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -273,7 +301,6 @@ void MenuItem_Class::activate_callback(GtkMenuItem* self)
       (*base->activate)(self);
   }
 }
-
 void MenuItem_Class::activate_item_callback(GtkMenuItem* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -286,15 +313,19 @@ void MenuItem_Class::activate_item_callback(GtkMenuItem* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_activate_item();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -307,7 +338,6 @@ void MenuItem_Class::activate_item_callback(GtkMenuItem* self)
       (*base->activate_item)(self);
   }
 }
-
 void MenuItem_Class::toggle_size_request_callback(GtkMenuItem* self, int* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -320,15 +350,19 @@ void MenuItem_Class::toggle_size_request_callback(GtkMenuItem* self, int* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_toggle_size_request(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -341,7 +375,6 @@ void MenuItem_Class::toggle_size_request_callback(GtkMenuItem* self, int* p0)
       (*base->toggle_size_request)(self, p0);
   }
 }
-
 void MenuItem_Class::toggle_size_allocate_callback(GtkMenuItem* self, gint p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -354,16 +387,20 @@ void MenuItem_Class::toggle_size_allocate_callback(GtkMenuItem* self, gint p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_toggle_size_allocate(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -376,6 +413,7 @@ void MenuItem_Class::toggle_size_allocate_callback(GtkMenuItem* self, gint p0)
       (*base->toggle_size_allocate)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* MenuItem_Class::wrap_new(GObject* o)
@@ -426,7 +464,7 @@ MenuItem::MenuItem()
 
 void MenuItem::set_submenu(Menu& submenu)
 {
-  gtk_menu_item_set_submenu(gobj(), (submenu).Gtk::Widget::gobj());
+gtk_menu_item_set_submenu(gobj(), (submenu).Gtk::Widget::gobj()); 
 }
 
 Menu* MenuItem::get_submenu()
@@ -436,42 +474,42 @@ Menu* MenuItem::get_submenu()
 
 const Menu* MenuItem::get_submenu() const
 {
-  return Glib::wrap((GtkMenu*)(gtk_menu_item_get_submenu(const_cast<GtkMenuItem*>(gobj()))));
+  return const_cast<MenuItem*>(this)->get_submenu();
 }
 
 void MenuItem::remove_submenu()
 {
-  gtk_menu_item_remove_submenu(gobj());
+gtk_menu_item_remove_submenu(gobj()); 
 }
 
 void MenuItem::select()
 {
-  gtk_menu_item_select(gobj());
+gtk_menu_item_select(gobj()); 
 }
 
 void MenuItem::deselect()
 {
-  gtk_menu_item_deselect(gobj());
+gtk_menu_item_deselect(gobj()); 
 }
 
 void MenuItem::activate()
 {
-  gtk_menu_item_activate(gobj());
+gtk_menu_item_activate(gobj()); 
 }
 
 void MenuItem::toggle_size_request(int& requisition)
 {
-  gtk_menu_item_toggle_size_request(gobj(), &requisition);
+gtk_menu_item_toggle_size_request(gobj(), &requisition); 
 }
 
 void MenuItem::toggle_size_allocate(int allocation)
 {
-  gtk_menu_item_toggle_size_allocate(gobj(), allocation);
+gtk_menu_item_toggle_size_allocate(gobj(), allocation); 
 }
 
 void MenuItem::set_right_justified(bool right_justified)
 {
-  gtk_menu_item_set_right_justified(gobj(), static_cast<int>(right_justified));
+gtk_menu_item_set_right_justified(gobj(), static_cast<int>(right_justified)); 
 }
 
 bool MenuItem::get_right_justified() const
@@ -481,7 +519,7 @@ bool MenuItem::get_right_justified() const
 
 void MenuItem::set_accel_path(const Glib::ustring& accel_path)
 {
-  gtk_menu_item_set_accel_path(gobj(), accel_path.c_str());
+gtk_menu_item_set_accel_path(gobj(), accel_path.c_str()); 
 }
 
 
@@ -490,22 +528,26 @@ Glib::SignalProxy0< void > MenuItem::signal_activate()
   return Glib::SignalProxy0< void >(this, &MenuItem_signal_activate_info);
 }
 
+
 Glib::SignalProxy0< void > MenuItem::signal_activate_item()
 {
   return Glib::SignalProxy0< void >(this, &MenuItem_signal_activate_item_info);
 }
 
+
 Glib::SignalProxy1< void,int* > MenuItem::signal_toggle_size_request()
 {
   return Glib::SignalProxy1< void,int* >(this, &MenuItem_signal_toggle_size_request_info);
 }
 
+
 Glib::SignalProxy1< void,int > MenuItem::signal_toggle_size_allocate()
 {
   return Glib::SignalProxy1< void,int >(this, &MenuItem_signal_toggle_size_allocate_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::MenuItem::on_activate()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -515,7 +557,6 @@ void Gtk::MenuItem::on_activate()
   if(base && base->activate)
     (*base->activate)(gobj());
 }
-
 void Gtk::MenuItem::on_activate_item()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -525,7 +566,6 @@ void Gtk::MenuItem::on_activate_item()
   if(base && base->activate_item)
     (*base->activate_item)(gobj());
 }
-
 void Gtk::MenuItem::on_toggle_size_request(int* requisition)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -535,7 +575,6 @@ void Gtk::MenuItem::on_toggle_size_request(int* requisition)
   if(base && base->toggle_size_request)
     (*base->toggle_size_request)(gobj(),requisition);
 }
-
 void Gtk::MenuItem::on_toggle_size_allocate(int allocation)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -545,6 +584,10 @@ void Gtk::MenuItem::on_toggle_size_allocate(int allocation)
   if(base && base->toggle_size_allocate)
     (*base->toggle_size_allocate)(gobj(),allocation);
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/menuitem.h b/libs/gtkmm2/gtk/gtkmm/menuitem.h
index 50e2ccc610..1e5bb18c6a 100644
--- a/libs/gtkmm2/gtk/gtkmm/menuitem.h
+++ b/libs/gtkmm2/gtk/gtkmm/menuitem.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_MENUITEM_H
 #define _GTKMM_MENUITEM_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -96,15 +97,21 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_activate();
   virtual void on_activate_item();
   virtual void on_toggle_size_request(int* requisition);
   virtual void on_toggle_size_allocate(int allocation);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -187,15 +194,35 @@ public:
   void unset_accel_path();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %activate()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_activate();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %activate_item()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_activate_item();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %toggle_size_request(int* requisition)</tt>
+   */
+
   Glib::SignalProxy1< void,int* > signal_toggle_size_request();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %toggle_size_allocate(int allocation)</tt>
+   */
+
   Glib::SignalProxy1< void,int > signal_toggle_size_allocate();
 
 
@@ -228,6 +255,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::MenuItem* wrap(GtkMenuItem* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_MENUITEM_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/menushell.cc b/libs/gtkmm2/gtk/gtkmm/menushell.cc
index 60cc879572..3eb5a103d5 100644
--- a/libs/gtkmm2/gtk/gtkmm/menushell.cc
+++ b/libs/gtkmm2/gtk/gtkmm/menushell.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/menushell.h>
 #include <gtkmm/private/menushell_p.h>
 
@@ -91,8 +92,10 @@ const MenuShell::MenuList& MenuShell::items() const
 
 void MenuShell_Class::insert_vfunc_callback(GtkMenuShell* self, GtkWidget* child, int position)
 {
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     MenuShell *const obj = dynamic_cast<MenuShell*>(
         Glib::ObjectBase::_get_current_wrapper((GObject*) self));
 
@@ -101,11 +104,13 @@ void MenuShell_Class::insert_vfunc_callback(GtkMenuShell* self, GtkWidget* child
     {
       Glib::wrap((GtkMenuItem*) child)->accelerate(*obj->accel_window_);
     }
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   GtkMenuShellClass *const base = static_cast<GtkMenuShellClass*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)));
@@ -205,7 +210,8 @@ MenuList::iterator MenuList::erase(iterator position)
 namespace
 {
 
-const Glib::SignalProxyInfo MenuShell_signal_deactivate_info =
+
+static const Glib::SignalProxyInfo MenuShell_signal_deactivate_info =
 {
   "deactivate",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -213,13 +219,14 @@ const Glib::SignalProxyInfo MenuShell_signal_deactivate_info =
 };
 
 
-const Glib::SignalProxyInfo MenuShell_signal_selection_done_info =
+static const Glib::SignalProxyInfo MenuShell_signal_selection_done_info =
 {
   "selection_done",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -264,12 +271,20 @@ void MenuShell_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
     klass->insert = &insert_vfunc_callback;
-    klass->deactivate = &deactivate_callback;
+  #endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+  klass->deactivate = &deactivate_callback;
   klass->selection_done = &selection_done_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void MenuShell_Class::deactivate_callback(GtkMenuShell* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -282,15 +297,19 @@ void MenuShell_Class::deactivate_callback(GtkMenuShell* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_deactivate();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -303,7 +322,6 @@ void MenuShell_Class::deactivate_callback(GtkMenuShell* self)
       (*base->deactivate)(self);
   }
 }
-
 void MenuShell_Class::selection_done_callback(GtkMenuShell* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -316,15 +334,19 @@ void MenuShell_Class::selection_done_callback(GtkMenuShell* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_selection_done();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -337,6 +359,7 @@ void MenuShell_Class::selection_done_callback(GtkMenuShell* self)
       (*base->selection_done)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* MenuShell_Class::wrap_new(GObject* o)
@@ -411,47 +434,57 @@ MenuList::reference MenuList::operator[](size_type l) const
 
 void MenuShell::append(MenuItem& menu_item)
 {
-  gtk_menu_shell_append(gobj(), (menu_item).Gtk::Widget::gobj());
+gtk_menu_shell_append(gobj(), (menu_item).Gtk::Widget::gobj()); 
 }
 
 void MenuShell::prepend(MenuItem& menu_item)
 {
-  gtk_menu_shell_prepend(gobj(), (menu_item).Gtk::Widget::gobj());
+gtk_menu_shell_prepend(gobj(), (menu_item).Gtk::Widget::gobj()); 
 }
 
 void MenuShell::insert(MenuItem& menu_item, int position)
 {
-  gtk_menu_shell_insert(gobj(), (menu_item).Gtk::Widget::gobj(), position);
+gtk_menu_shell_insert(gobj(), (menu_item).Gtk::Widget::gobj(), position); 
 }
 
 void MenuShell::select_item(MenuItem& menu_item)
 {
-  gtk_menu_shell_select_item(gobj(), (menu_item).Gtk::Widget::gobj());
+gtk_menu_shell_select_item(gobj(), (menu_item).Gtk::Widget::gobj()); 
 }
 
 void MenuShell::deselect()
 {
-  gtk_menu_shell_deselect(gobj());
+gtk_menu_shell_deselect(gobj()); 
 }
 
 void MenuShell::activate_item(MenuItem& menu_item, bool force_deactivate)
 {
-  gtk_menu_shell_activate_item(gobj(), (menu_item).Gtk::Widget::gobj(), static_cast<int>(force_deactivate));
+gtk_menu_shell_activate_item(gobj(), (menu_item).Gtk::Widget::gobj(), static_cast<int>(force_deactivate)); 
 }
 
 void MenuShell::select_first(bool search_sensitive)
 {
-  gtk_menu_shell_select_first(gobj(), static_cast<int>(search_sensitive));
+gtk_menu_shell_select_first(gobj(), static_cast<int>(search_sensitive)); 
 }
 
 void MenuShell::deactivate()
 {
-  gtk_menu_shell_deactivate(gobj());
+gtk_menu_shell_deactivate(gobj()); 
 }
 
 void MenuShell::cancel()
 {
-  gtk_menu_shell_cancel(gobj());
+gtk_menu_shell_cancel(gobj()); 
+}
+
+bool MenuShell::get_take_focus() const
+{
+  return gtk_menu_shell_get_take_focus(const_cast<GtkMenuShell*>(gobj()));
+}
+
+void MenuShell::set_take_focus(bool take_focus)
+{
+gtk_menu_shell_set_take_focus(gobj(), static_cast<int>(take_focus)); 
 }
 
 
@@ -460,12 +493,29 @@ Glib::SignalProxy0< void > MenuShell::signal_deactivate()
   return Glib::SignalProxy0< void >(this, &MenuShell_signal_deactivate_info);
 }
 
+
 Glib::SignalProxy0< void > MenuShell::signal_selection_done()
 {
   return Glib::SignalProxy0< void >(this, &MenuShell_signal_selection_done_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> MenuShell::property_take_focus() 
+{
+  return Glib::PropertyProxy<bool>(this, "take-focus");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> MenuShell::property_take_focus() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "take-focus");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::MenuShell::on_deactivate()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -475,7 +525,6 @@ void Gtk::MenuShell::on_deactivate()
   if(base && base->deactivate)
     (*base->deactivate)(gobj());
 }
-
 void Gtk::MenuShell::on_selection_done()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -485,6 +534,10 @@ void Gtk::MenuShell::on_selection_done()
   if(base && base->selection_done)
     (*base->selection_done)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/menushell.h b/libs/gtkmm2/gtk/gtkmm/menushell.h
index c5ad744828..8a69512bf6 100644
--- a/libs/gtkmm2/gtk/gtkmm/menushell.h
+++ b/libs/gtkmm2/gtk/gtkmm/menushell.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_MENUSHELL_H
 #define _GTKMM_MENUSHELL_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -154,13 +155,19 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_deactivate();
   virtual void on_selection_done();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -192,7 +199,7 @@ public:
    * don't select tearoff items unless the only item is a tearoff
    * item.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param search_sensitive If <tt>true</tt>, search for the first selectable
    * menu item, otherwise select nothing if
    * the first item isn't sensitive. This
@@ -205,14 +212,24 @@ public:
   
   /** Cancels the selection within the menu shell.  
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void cancel();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %deactivate()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_deactivate();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %selection_done()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_selection_done();
 
 
@@ -259,6 +276,66 @@ public:
    */
   void accelerate(Widget& parent);
 
+  
+  /** Returns <tt>true</tt> if the menu shell will take the keyboard focus on popup.
+   * @return <tt>true</tt> if the menu shell will take the keyboard focus on popup.
+   * 
+   * @newin2p8.
+   */
+  bool get_take_focus() const;
+  
+  /** If @a take_focus  is <tt>true</tt> (the default) the menu shell will take the keyboard 
+   * focus so that it will receive all keyboard events which is needed to enable
+   * keyboard navigation in menus.
+   * 
+   * Setting @a take_focus  to <tt>false</tt> is useful only for special applications
+   * like virtual keyboard implementations which should not take keyboard
+   * focus.
+   * 
+   * The @a take_focus  state of a menu or menu bar is automatically propagated
+   * to submenus whenever a submenu is popped up, so you don't have to worry
+   * about recursively setting it for your entire menu hierarchy. Only when
+   * programmatically picking a submenu and popping it up manually, the
+   *  @a take_focus  property of the submenu needs to be set explicitely.
+   * 
+   * Note that setting it to <tt>false</tt> has side-effects:
+   * 
+   * If the focus is in some other app, it keeps the focus and keynav in
+   * the menu doesn't work. Consequently, keynav on the menu will only
+   * work if the focus is on some toplevel owned by the onscreen keyboard.
+   * 
+   * To avoid confusing the user, menus with @a take_focus  set to <tt>false</tt>
+   * should not display mnemonics or accelerators, since it cannot be
+   * guaranteed that they will work.
+   * 
+   * See also gdk_keyboard_grab()
+   * 
+   * @newin2p8
+   * @param take_focus <tt>true</tt> if the menu shell should take the keyboard focus on popup.
+   */
+  void set_take_focus(bool take_focus = true);
+  
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** A boolean that determines whether the menu grabs the keyboard focus.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_take_focus() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** A boolean that determines whether the menu grabs the keyboard focus.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_take_focus() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+
 protected:
   MenuShell();
   
@@ -283,6 +360,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::MenuShell* wrap(GtkMenuShell* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_MENUSHELL_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/menutoolbutton.cc b/libs/gtkmm2/gtk/gtkmm/menutoolbutton.cc
index 8cb38dca61..718dfdfb6a 100644
--- a/libs/gtkmm2/gtk/gtkmm/menutoolbutton.cc
+++ b/libs/gtkmm2/gtk/gtkmm/menutoolbutton.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/menutoolbutton.h>
 #include <gtkmm/private/menutoolbutton_p.h>
 
@@ -50,13 +51,15 @@ MenuToolButton::MenuToolButton(Widget& icon_widget, const Glib::ustring& label)
 namespace
 {
 
-const Glib::SignalProxyInfo MenuToolButton_signal_show_menu_info =
+
+static const Glib::SignalProxyInfo MenuToolButton_signal_show_menu_info =
 {
   "show_menu",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -101,10 +104,18 @@ void MenuToolButton_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->show_menu = &show_menu_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void MenuToolButton_Class::show_menu_callback(GtkMenuToolButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -117,15 +128,19 @@ void MenuToolButton_Class::show_menu_callback(GtkMenuToolButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_show_menu();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -138,6 +153,7 @@ void MenuToolButton_Class::show_menu_callback(GtkMenuToolButton* self)
       (*base->show_menu)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* MenuToolButton_Class::wrap_new(GObject* o)
@@ -195,7 +211,7 @@ MenuToolButton::MenuToolButton(const Gtk::StockID& stock_id)
 
 void MenuToolButton::set_menu(Menu& menu)
 {
-  gtk_menu_tool_button_set_menu(gobj(), (menu).Gtk::Widget::gobj());
+gtk_menu_tool_button_set_menu(gobj(), (menu).Gtk::Widget::gobj()); 
 }
 
 Menu* MenuToolButton::get_menu()
@@ -205,12 +221,12 @@ Menu* MenuToolButton::get_menu()
 
 const Menu* MenuToolButton::get_menu() const
 {
-  return Glib::wrap((GtkMenu*)(gtk_menu_tool_button_get_menu(const_cast<GtkMenuToolButton*>(gobj()))));
+  return const_cast<MenuToolButton*>(this)->get_menu();
 }
 
 void MenuToolButton::set_arrow_tooltip(Tooltips& tooltips, const Glib::ustring& tip_text, const Glib::ustring& tip_private)
 {
-  gtk_menu_tool_button_set_arrow_tooltip(gobj(), (tooltips).gobj(), tip_text.c_str(), tip_private.c_str());
+gtk_menu_tool_button_set_arrow_tooltip(gobj(), (tooltips).gobj(), tip_text.c_str(), tip_private.c_str()); 
 }
 
 
@@ -220,17 +236,22 @@ Glib::SignalProxy0< void > MenuToolButton::signal_show_menu()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Menu*> MenuToolButton::property_menu() 
 {
   return Glib::PropertyProxy<Menu*>(this, "menu");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Menu*> MenuToolButton::property_menu() const
 {
   return Glib::PropertyProxy_ReadOnly<Menu*>(this, "menu");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::MenuToolButton::on_show_menu()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -240,6 +261,10 @@ void Gtk::MenuToolButton::on_show_menu()
   if(base && base->show_menu)
     (*base->show_menu)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/menutoolbutton.h b/libs/gtkmm2/gtk/gtkmm/menutoolbutton.h
index a8d6be8055..94ecc13dd4 100644
--- a/libs/gtkmm2/gtk/gtkmm/menutoolbutton.h
+++ b/libs/gtkmm2/gtk/gtkmm/menutoolbutton.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_MENUTOOLBUTTON_H
 #define _GTKMM_MENUTOOLBUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -91,12 +92,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_show_menu();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -136,7 +143,7 @@ public:
   /** Sets the Gtk::Menu that is popped up when the user clicks on the arrow.
    * If @a menu  is <tt>0</tt>, the arrow button becomes insensitive.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param menu The Gtk::Menu associated with Gtk::MenuToolButton.
    */
   void set_menu(Menu& menu);
@@ -144,31 +151,48 @@ public:
   /** Gets the Gtk::Menu associated with Gtk::MenuToolButton.
    * @return The Gtk::Menu associated with Gtk::MenuToolButton
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Menu* get_menu();
   
   /** Gets the Gtk::Menu associated with Gtk::MenuToolButton.
    * @return The Gtk::Menu associated with Gtk::MenuToolButton
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   const Menu* get_menu() const;
 
   
+  /** Sets the Gtk::Tooltips object to be used for arrow button which
+   * pops up the menu. See Gtk::ToolItem::set_tooltip() for setting
+   * a tooltip on the whole Gtk::MenuToolButton.
+   * 
+   * @newin2p6
+   * @param tooltips The Gtk::Tooltips object to be used.
+   * @param tip_text Text to be used as tooltip text for tool_item.
+   * @param tip_private Text to be used as private tooltip text.
+   */
   void set_arrow_tooltip(Tooltips& tooltips, const Glib::ustring& tip_text, const Glib::ustring& tip_private);
 
   
+/**
+   * @par Prototype:
+   * <tt>void %show_menu()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_show_menu();
 
-  /** The dropdown menu.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The dropdown menu.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Menu*> property_menu() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The dropdown menu.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -176,6 +200,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Menu*> property_menu() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -191,6 +216,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::MenuToolButton* wrap(GtkMenuToolButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_MENUTOOLBUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/messagedialog.cc b/libs/gtkmm2/gtk/gtkmm/messagedialog.cc
index 4a86cc5f1f..cb40c6a920 100644
--- a/libs/gtkmm2/gtk/gtkmm/messagedialog.cc
+++ b/libs/gtkmm2/gtk/gtkmm/messagedialog.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/private/messagedialog_p.h>
 
@@ -136,8 +137,19 @@ void MessageDialog_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* MessageDialog_Class::wrap_new(GObject* o)
 {
@@ -178,10 +190,118 @@ GType MessageDialog::get_base_type()
 }
 
 
+void MessageDialog::set_image(Widget& image)
+{
+gtk_message_dialog_set_image(gobj(), (image).gobj()); 
+}
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void MessageDialog::set_markup(const Glib::ustring& str)
 {
-  gtk_message_dialog_set_markup(gobj(), str.c_str());
+gtk_message_dialog_set_markup(gobj(), str.c_str()); 
+}
+
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<MessageType> MessageDialog::property_message_type() 
+{
+  return Glib::PropertyProxy<MessageType>(this, "message-type");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<MessageType> MessageDialog::property_message_type() const
+{
+  return Glib::PropertyProxy_ReadOnly<MessageType>(this, "message-type");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<ButtonsType> MessageDialog::property_buttons() const
+{
+  return Glib::PropertyProxy_ReadOnly<ButtonsType>(this, "buttons");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<Glib::ustring> MessageDialog::property_text() 
+{
+  return Glib::PropertyProxy<Glib::ustring>(this, "text");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<Glib::ustring> MessageDialog::property_text() const
+{
+  return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "text");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> MessageDialog::property_use_markup() 
+{
+  return Glib::PropertyProxy<bool>(this, "use-markup");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> MessageDialog::property_use_markup() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "use-markup");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<Glib::ustring> MessageDialog::property_secondary_text() 
+{
+  return Glib::PropertyProxy<Glib::ustring>(this, "secondary-text");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<Glib::ustring> MessageDialog::property_secondary_text() const
+{
+  return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "secondary-text");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> MessageDialog::property_secondary_use_markup() 
+{
+  return Glib::PropertyProxy<bool>(this, "secondary-use-markup");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> MessageDialog::property_secondary_use_markup() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "secondary-use-markup");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<Widget*> MessageDialog::property_image() 
+{
+  return Glib::PropertyProxy<Widget*>(this, "image");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<Widget*> MessageDialog::property_image() const
+{
+  return Glib::PropertyProxy_ReadOnly<Widget*>(this, "image");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/messagedialog.h b/libs/gtkmm2/gtk/gtkmm/messagedialog.h
index 68519df606..154d24b942 100644
--- a/libs/gtkmm2/gtk/gtkmm/messagedialog.h
+++ b/libs/gtkmm2/gtk/gtkmm/messagedialog.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_MESSAGEDIALOG_H
 #define _GTKMM_MESSAGEDIALOG_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -51,7 +52,8 @@ enum MessageType
   MESSAGE_INFO,
   MESSAGE_WARNING,
   MESSAGE_QUESTION,
-  MESSAGE_ERROR
+  MESSAGE_ERROR,
+  MESSAGE_OTHER
 };
 
 } // namespace Gtk
@@ -164,11 +166,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -179,17 +187,22 @@ public:
   MessageDialog(Gtk::Window& parent, const Glib::ustring& message, bool use_markup = false, MessageType type = MESSAGE_INFO, ButtonsType buttons = BUTTONS_OK, bool modal = false);
   
 
-  /** @deprecated Use set_message(string, true);
-   */
+  void set_image(Widget& image);
+
   
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /** Sets the text of the message dialog to be @a str , which is marked
    * up with the Pango text markup
    * language.
    * 
-   * Since: 2.4
+   * @newin2p4
+   * @deprecated Use set_message(string, true).
    * @param str Markup string (see Pango markup format).
    */
   void set_markup(const Glib::ustring& str);
+#endif // GTKMM_DISABLE_DEPRECATED
+
 
   /** Sets the primary text of the message dialog.
    *
@@ -202,7 +215,7 @@ public:
   /** Sets the secondary text of the message dialog.
    * Note that setting a secondary text makes the primary text become bold, unless you have provided explicit markup.
    *
-   * Since 2.6.
+   * @newin2p6.
    *
    * @param text The message.
    * @param use_markup Whether @a message contains pango markup.
@@ -210,6 +223,138 @@ public:
   void set_secondary_text(const Glib::ustring& text, bool use_markup = false);
   
 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The type of message.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<MessageType> property_message_type() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The type of message.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<MessageType> property_message_type() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The buttons shown in the message dialog.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<ButtonsType> property_buttons() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The primary text of the message dialog.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<Glib::ustring> property_text() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The primary text of the message dialog.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_text() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The primary text of the title includes Pango markup.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_use_markup() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The primary text of the title includes Pango markup.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_use_markup() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The secondary text of the message dialog.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<Glib::ustring> property_secondary_text() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The secondary text of the message dialog.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_secondary_text() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The secondary text includes Pango markup.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_secondary_use_markup() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The secondary text includes Pango markup.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_secondary_use_markup() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The image.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<Widget*> property_image() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The image.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<Widget*> property_image() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+
 };
 
 } // namespace Gtk
@@ -223,6 +368,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::MessageDialog* wrap(GtkMessageDialog* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_MESSAGEDIALOG_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/misc.cc b/libs/gtkmm2/gtk/gtkmm/misc.cc
index e3b73f70c9..0d8743510c 100644
--- a/libs/gtkmm2/gtk/gtkmm/misc.cc
+++ b/libs/gtkmm2/gtk/gtkmm/misc.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/misc.h>
 #include <gtkmm/private/misc_p.h>
 
@@ -79,8 +80,19 @@ void Misc_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Misc_Class::wrap_new(GObject* o)
 {
@@ -130,69 +142,92 @@ Misc::Misc()
 
 void Misc::set_alignment(float xalign, float yalign)
 {
-  gtk_misc_set_alignment(gobj(), xalign, yalign);
+gtk_misc_set_alignment(gobj(), xalign, yalign); 
 }
 
 void Misc::set_alignment(AlignmentEnum xalign, AlignmentEnum yalign)
 {
-  gtk_misc_set_alignment(gobj(), _gtkmm_align_float_from_enum(xalign), _gtkmm_align_float_from_enum(yalign));
+gtk_misc_set_alignment(gobj(), _gtkmm_align_float_from_enum(xalign), _gtkmm_align_float_from_enum(yalign)); 
 }
 
 void Misc::get_alignment(float& xalign, float& yalign) const
 {
-  gtk_misc_get_alignment(const_cast<GtkMisc*>(gobj()), &(xalign), &(yalign));
+gtk_misc_get_alignment(const_cast<GtkMisc*>(gobj()), &(xalign), &(yalign)); 
 }
 
 void Misc::set_padding(int xpad, int ypad)
 {
-  gtk_misc_set_padding(gobj(), xpad, ypad);
+gtk_misc_set_padding(gobj(), xpad, ypad); 
 }
 
 void Misc::get_padding(int& xpad, int& ypad) const
 {
-  gtk_misc_get_padding(const_cast<GtkMisc*>(gobj()), &xpad, &ypad);
+gtk_misc_get_padding(const_cast<GtkMisc*>(gobj()), &xpad, &ypad); 
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Misc::property_xalign() 
 {
   return Glib::PropertyProxy<float>(this, "xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Misc::property_xalign() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "xalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> Misc::property_yalign() 
 {
   return Glib::PropertyProxy<float>(this, "yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> Misc::property_yalign() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "yalign");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Misc::property_xpad() 
 {
   return Glib::PropertyProxy<int>(this, "xpad");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Misc::property_xpad() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "xpad");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Misc::property_ypad() 
 {
   return Glib::PropertyProxy<int>(this, "ypad");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Misc::property_ypad() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "ypad");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/misc.h b/libs/gtkmm2/gtk/gtkmm/misc.h
index 1d1a32d794..2edfe51010 100644
--- a/libs/gtkmm2/gtk/gtkmm/misc.h
+++ b/libs/gtkmm2/gtk/gtkmm/misc.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_MISC_H
 #define _GTKMM_MISC_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -94,11 +95,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -129,14 +136,17 @@ public:
    */
   void get_padding(int& xpad, int& ypad) const;
 
-  /** The horizontal alignment
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The horizontal alignment
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_xalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The horizontal alignment
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -144,15 +154,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_xalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The vertical alignment
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The vertical alignment
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_yalign() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The vertical alignment
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -160,15 +174,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_yalign() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The amount of space to add on the left and right of the widget
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The amount of space to add on the left and right of the widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_xpad() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The amount of space to add on the left and right of the widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -176,15 +194,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_xpad() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The amount of space to add on the top and bottom of the widget
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The amount of space to add on the top and bottom of the widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_ypad() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The amount of space to add on the top and bottom of the widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -192,6 +214,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_ypad() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -207,6 +230,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Misc* wrap(GtkMisc* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_MISC_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/notebook.cc b/libs/gtkmm2/gtk/gtkmm/notebook.cc
index 7ff83da6d1..8ba16a6d38 100644
--- a/libs/gtkmm2/gtk/gtkmm/notebook.cc
+++ b/libs/gtkmm2/gtk/gtkmm/notebook.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/notebook.h>
 #include <gtkmm/private/notebook_p.h>
 
@@ -27,6 +28,38 @@
 #include <gtk/gtknotebook.h>
 #include <gtkmm/label.h>
 
+//We use a function instead of a static method, so we can make it static, so it is not exported.
+static GtkNotebook* SignalProxy_WindowCreation_gtk_callback(GtkNotebook* /* source */, GtkWidget* page, gint x, gint y, gpointer data)
+{
+  Gtk::Notebook::SlotWindowCreation* the_slot = static_cast<Gtk::Notebook::SlotWindowCreation*>(data);
+
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  try
+  {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    Gtk::Widget* pCppPage = Glib::wrap(page);
+
+    Gtk::Notebook* pCppNotebookResult = (*the_slot)(pCppPage, x, y);
+    if(pCppNotebookResult)
+      return pCppNotebookResult->gobj();
+    else
+      return 0;
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  }
+  catch(...)
+  {
+    Glib::exception_handlers_invoke();
+    return 0;
+  }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+}
+
+static void SignalProxy_WindowCreation_gtk_callback_destroy(void* data)
+{
+  Gtk::Notebook::SlotWindowCreation* the_slot = static_cast<Gtk::Notebook::SlotWindowCreation*>(data);
+  delete the_slot;
+}
+
 
 namespace Gtk
 {
@@ -433,13 +466,27 @@ int Notebook::insert_page(Widget& child, int position)
   return gtk_notebook_insert_page(gobj(), child.gobj(), 0 /* see GTK+ docs */, position);
 }
 
+  /** For instance,
+   * Notebook* on_window_creation(Widget* page, int x, int y);
+   */
+  typedef sigc::slot<Widget*, int, int> SlotWindowCreation;
+
+void Notebook::set_window_creation_hook(const SlotWindowCreation& slot)
+{
+  SlotWindowCreation* slot_copy = new SlotWindowCreation(slot);
+  //TODO: GTK+ needs a destroy callback so we can delete the slot later.
+  //See bug 344209
+  gtk_notebook_set_window_creation_hook(&SignalProxy_WindowCreation_gtk_callback, slot_copy, &SignalProxy_WindowCreation_gtk_callback_destroy);
+}
+
 } //namespace Gtk
 
 
 namespace
 {
 
-void Notebook_signal_switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0,guint p1,void* data)
+
+static void Notebook_signal_switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0,guint p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GtkNotebookPage*,guint > SlotType;
@@ -447,25 +494,129 @@ void Notebook_signal_switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0, p1);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Notebook_signal_switch_page_info =
+static const Glib::SignalProxyInfo Notebook_signal_switch_page_info =
 {
   "switch_page",
   (GCallback) &Notebook_signal_switch_page_callback,
   (GCallback) &Notebook_signal_switch_page_callback
 };
 
+
+static void Notebook_signal_page_reordered_callback(GtkNotebook* self, GtkWidget* p0,guint p1,void* data)
+{
+  using namespace Gtk;
+  typedef sigc::slot< void,Widget*,guint > SlotType;
+
+  // Do not try to call a signal on a disassociated wrapper.
+  if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
+  {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    try
+    {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+      if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
+        (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
+, p1);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    }
+    catch(...)
+    {
+      Glib::exception_handlers_invoke();
+    }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+  }
+}
+
+static const Glib::SignalProxyInfo Notebook_signal_page_reordered_info =
+{
+  "page_reordered",
+  (GCallback) &Notebook_signal_page_reordered_callback,
+  (GCallback) &Notebook_signal_page_reordered_callback
+};
+
+
+static void Notebook_signal_page_removed_callback(GtkNotebook* self, GtkWidget* p0,guint p1,void* data)
+{
+  using namespace Gtk;
+  typedef sigc::slot< void,Widget*,guint > SlotType;
+
+  // Do not try to call a signal on a disassociated wrapper.
+  if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
+  {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    try
+    {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+      if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
+        (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
+, p1);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    }
+    catch(...)
+    {
+      Glib::exception_handlers_invoke();
+    }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+  }
+}
+
+static const Glib::SignalProxyInfo Notebook_signal_page_removed_info =
+{
+  "page_removed",
+  (GCallback) &Notebook_signal_page_removed_callback,
+  (GCallback) &Notebook_signal_page_removed_callback
+};
+
+
+static void Notebook_signal_page_added_callback(GtkNotebook* self, GtkWidget* p0,guint p1,void* data)
+{
+  using namespace Gtk;
+  typedef sigc::slot< void,Widget*,guint > SlotType;
+
+  // Do not try to call a signal on a disassociated wrapper.
+  if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
+  {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    try
+    {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+      if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
+        (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
+, p1);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    }
+    catch(...)
+    {
+      Glib::exception_handlers_invoke();
+    }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+  }
+}
+
+static const Glib::SignalProxyInfo Notebook_signal_page_added_info =
+{
+  "page_added",
+  (GCallback) &Notebook_signal_page_added_callback,
+  (GCallback) &Notebook_signal_page_added_callback
+};
+
+
 } // anonymous namespace
 
 // static
@@ -516,10 +667,18 @@ void Notebook_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->switch_page = &switch_page_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Notebook_Class::switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0, guint p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -532,15 +691,19 @@ void Notebook_Class::switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_switch_page(p0, p1);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -553,6 +716,7 @@ void Notebook_Class::switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0
       (*base->switch_page)(self, p0, p1);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Notebook_Class::wrap_new(GObject* o)
@@ -633,7 +797,17 @@ int Notebook::insert_page(Widget& child, Widget& tab_label, Widget& menu_label,
 
 void Notebook::remove_page(int page_num)
 {
-  gtk_notebook_remove_page(gobj(), page_num);
+gtk_notebook_remove_page(gobj(), page_num); 
+}
+
+void Notebook::set_group_id(int group_id)
+{
+gtk_notebook_set_group_id(gobj(), group_id); 
+}
+
+int Notebook::get_group_id() const
+{
+  return gtk_notebook_get_group_id(const_cast<GtkNotebook*>(gobj()));
 }
 
 int Notebook::get_current_page() const
@@ -648,7 +822,7 @@ Widget* Notebook::get_nth_page(int page_num)
 
 const Widget* Notebook::get_nth_page(int page_num) const
 {
-  return Glib::wrap(gtk_notebook_get_nth_page(const_cast<GtkNotebook*>(gobj()), page_num));
+  return const_cast<Notebook*>(this)->get_nth_page(page_num);
 }
 
 int Notebook::get_n_pages()
@@ -663,22 +837,22 @@ int Notebook::page_num(const Widget& child)
 
 void Notebook::set_current_page(int page_num)
 {
-  gtk_notebook_set_current_page(gobj(), page_num);
+gtk_notebook_set_current_page(gobj(), page_num); 
 }
 
 void Notebook::next_page()
 {
-  gtk_notebook_next_page(gobj());
+gtk_notebook_next_page(gobj()); 
 }
 
 void Notebook::prev_page()
 {
-  gtk_notebook_prev_page(gobj());
+gtk_notebook_prev_page(gobj()); 
 }
 
 void Notebook::set_show_border(bool show_border)
 {
-  gtk_notebook_set_show_border(gobj(), static_cast<int>(show_border));
+gtk_notebook_set_show_border(gobj(), static_cast<int>(show_border)); 
 }
 
 bool Notebook::get_show_border() const
@@ -688,7 +862,7 @@ bool Notebook::get_show_border() const
 
 void Notebook::set_show_tabs(bool show_tabs)
 {
-  gtk_notebook_set_show_tabs(gobj(), static_cast<int>(show_tabs));
+gtk_notebook_set_show_tabs(gobj(), static_cast<int>(show_tabs)); 
 }
 
 bool Notebook::get_show_tabs() const
@@ -698,7 +872,7 @@ bool Notebook::get_show_tabs() const
 
 void Notebook::set_tab_pos(PositionType pos)
 {
-  gtk_notebook_set_tab_pos(gobj(), ((GtkPositionType)(pos)));
+gtk_notebook_set_tab_pos(gobj(), ((GtkPositionType)(pos))); 
 }
 
 PositionType Notebook::get_tab_pos() const
@@ -708,7 +882,7 @@ PositionType Notebook::get_tab_pos() const
 
 void Notebook::set_scrollable(bool scrollable)
 {
-  gtk_notebook_set_scrollable(gobj(), static_cast<int>(scrollable));
+gtk_notebook_set_scrollable(gobj(), static_cast<int>(scrollable)); 
 }
 
 bool Notebook::get_scrollable() const
@@ -718,12 +892,12 @@ bool Notebook::get_scrollable() const
 
 void Notebook::popup_enable()
 {
-  gtk_notebook_popup_enable(gobj());
+gtk_notebook_popup_enable(gobj()); 
 }
 
 void Notebook::popup_disable()
 {
-  gtk_notebook_popup_disable(gobj());
+gtk_notebook_popup_disable(gobj()); 
 }
 
 Widget* Notebook::get_tab_label(Widget& child)
@@ -733,17 +907,17 @@ Widget* Notebook::get_tab_label(Widget& child)
 
 const Widget* Notebook::get_tab_label(Widget& child) const
 {
-  return Glib::wrap(gtk_notebook_get_tab_label(const_cast<GtkNotebook*>(gobj()), (child).gobj()));
+  return const_cast<Notebook*>(this)->get_tab_label(child);
 }
 
 void Notebook::set_tab_label(Widget& child, Widget& tab_label)
 {
-  gtk_notebook_set_tab_label(gobj(), (child).gobj(), (tab_label).gobj());
+gtk_notebook_set_tab_label(gobj(), (child).gobj(), (tab_label).gobj()); 
 }
 
 void Notebook::set_tab_label_text(Widget& child, const Glib::ustring& tab_text)
 {
-  gtk_notebook_set_tab_label_text(gobj(), (child).gobj(), tab_text.c_str());
+gtk_notebook_set_tab_label_text(gobj(), (child).gobj(), tab_text.c_str()); 
 }
 
 Glib::ustring Notebook::get_tab_label_text(Widget& child) const
@@ -758,17 +932,17 @@ Widget* Notebook::get_menu_label(Widget& child)
 
 const Widget* Notebook::get_menu_label(Widget& child) const
 {
-  return Glib::wrap(gtk_notebook_get_menu_label(const_cast<GtkNotebook*>(gobj()), (child).gobj()));
+  return const_cast<Notebook*>(this)->get_menu_label(child);
 }
 
 void Notebook::set_menu_label(Widget& child, Widget& menu_label)
 {
-  gtk_notebook_set_menu_label(gobj(), (child).gobj(), (menu_label).gobj());
+gtk_notebook_set_menu_label(gobj(), (child).gobj(), (menu_label).gobj()); 
 }
 
 void Notebook::set_menu_label_text(Widget& child, const Glib::ustring& menu_text)
 {
-  gtk_notebook_set_menu_label_text(gobj(), (child).gobj(), menu_text.c_str());
+gtk_notebook_set_menu_label_text(gobj(), (child).gobj(), menu_text.c_str()); 
 }
 
 Glib::ustring Notebook::get_menu_label_text(Widget& child) const
@@ -778,12 +952,32 @@ Glib::ustring Notebook::get_menu_label_text(Widget& child) const
 
 void Notebook::set_tab_label_packing(Widget& child, bool expand, bool fill, PackType pack_type)
 {
-  gtk_notebook_set_tab_label_packing(gobj(), (child).gobj(), static_cast<int>(expand), static_cast<int>(fill), ((GtkPackType)(pack_type)));
+gtk_notebook_set_tab_label_packing(gobj(), (child).gobj(), static_cast<int>(expand), static_cast<int>(fill), ((GtkPackType)(pack_type))); 
 }
 
 void Notebook::reorder_child(Widget& child, int position)
 {
-  gtk_notebook_reorder_child(gobj(), (child).gobj(), position);
+gtk_notebook_reorder_child(gobj(), (child).gobj(), position); 
+}
+
+bool Notebook::get_tab_reorderable(Widget& child) const
+{
+  return gtk_notebook_get_tab_reorderable(const_cast<GtkNotebook*>(gobj()), (child).gobj());
+}
+
+void Notebook::set_tab_reorderable(Widget& child, bool reorderable)
+{
+gtk_notebook_set_tab_reorderable(gobj(), (child).gobj(), static_cast<int>(reorderable)); 
+}
+
+bool Notebook::get_tab_detachable(Widget& child) const
+{
+  return gtk_notebook_get_tab_detachable(const_cast<GtkNotebook*>(gobj()), (child).gobj());
+}
+
+void Notebook::set_tab_detachable(Widget& child, bool detachable)
+{
+gtk_notebook_set_tab_detachable(gobj(), (child).gobj(), static_cast<int>(detachable)); 
 }
 
 
@@ -793,107 +987,159 @@ Glib::SignalProxy2< void,GtkNotebookPage*,guint > Notebook::signal_switch_page()
 }
 
 
+Glib::SignalProxy2< void,Widget*,guint > Notebook::signal_page_reordered()
+{
+  return Glib::SignalProxy2< void,Widget*,guint >(this, &Notebook_signal_page_reordered_info);
+}
+
+
+Glib::SignalProxy2< void,Widget*,guint > Notebook::signal_page_removed()
+{
+  return Glib::SignalProxy2< void,Widget*,guint >(this, &Notebook_signal_page_removed_info);
+}
+
+
+Glib::SignalProxy2< void,Widget*,guint > Notebook::signal_page_added()
+{
+  return Glib::SignalProxy2< void,Widget*,guint >(this, &Notebook_signal_page_added_info);
+}
+
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<PositionType> Notebook::property_tab_pos() 
 {
   return Glib::PropertyProxy<PositionType>(this, "tab-pos");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<PositionType> Notebook::property_tab_pos() const
 {
   return Glib::PropertyProxy_ReadOnly<PositionType>(this, "tab-pos");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Notebook::property_show_tabs() 
 {
   return Glib::PropertyProxy<bool>(this, "show-tabs");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Notebook::property_show_tabs() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "show-tabs");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Notebook::property_show_border() 
 {
   return Glib::PropertyProxy<bool>(this, "show-border");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Notebook::property_show_border() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "show-border");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Notebook::property_scrollable() 
 {
   return Glib::PropertyProxy<bool>(this, "scrollable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Notebook::property_scrollable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "scrollable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_WriteOnly<guint> Notebook::property_tab_border() 
 {
   return Glib::PropertyProxy_WriteOnly<guint>(this, "tab-border");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
-Glib::PropertyProxy_ReadOnly<guint> Notebook::property_tab_border() const
-{
-  return Glib::PropertyProxy_ReadOnly<guint>(this, "tab-border");
-}
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Notebook::property_tab_hborder() 
 {
   return Glib::PropertyProxy<guint>(this, "tab-hborder");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Notebook::property_tab_hborder() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "tab-hborder");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Notebook::property_tab_vborder() 
 {
   return Glib::PropertyProxy<guint>(this, "tab-vborder");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Notebook::property_tab_vborder() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "tab-vborder");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Notebook::property_page() 
 {
   return Glib::PropertyProxy<int>(this, "page");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Notebook::property_page() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "page");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Notebook::property_enable_popup() 
 {
   return Glib::PropertyProxy<bool>(this, "enable-popup");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Notebook::property_enable_popup() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "enable-popup");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Notebook::property_homogeneous() 
 {
   return Glib::PropertyProxy<bool>(this, "homogeneous");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Notebook::property_homogeneous() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "homogeneous");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Notebook::on_switch_page(GtkNotebookPage* page, guint page_num)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -903,6 +1149,10 @@ void Gtk::Notebook::on_switch_page(GtkNotebookPage* page, guint page_num)
   if(base && base->switch_page)
     (*base->switch_page)(gobj(),page,page_num);
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/notebook.h b/libs/gtkmm2/gtk/gtkmm/notebook.h
index 47378df9ed..cb90d44ffc 100644
--- a/libs/gtkmm2/gtk/gtkmm/notebook.h
+++ b/libs/gtkmm2/gtk/gtkmm/notebook.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_NOTEBOOK_H
 #define _GTKMM_NOTEBOOK_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -368,12 +369,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_switch_page(GtkNotebookPage* page, guint page_num);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -464,6 +471,18 @@ public:
   void remove_page(int page_num = 0);
   void remove_page(Widget& child);
 
+  /** For instance,
+   * Notebook* on_window_creation(Widget* page, int x, int y);
+   */
+  typedef sigc::slot<Notebook*, Widget*, int, int> SlotWindowCreation;
+
+  static void set_window_creation_hook(const SlotWindowCreation& slot);
+  
+
+  void set_group_id(int group_id);
+  
+  int get_group_id() const;
+
   
   /** Returns the page number of the current page.
    * @return The index (starting from 0) of the current
@@ -491,7 +510,7 @@ public:
   /** Gets the number of pages in a notebook.
    * @return The number of pages in the notebook.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   int get_n_pages();
   /*Widget* get_current_page();*/ /*inconsistency with set_current_page*/
@@ -681,6 +700,15 @@ public:
    */
   void reorder_child(Widget& child, int position);
 
+  
+  bool get_tab_reorderable(Widget& child) const;
+  
+  void set_tab_reorderable(Widget& child, bool reorderable = true);
+  
+  bool get_tab_detachable(Widget& child) const;
+  
+  void set_tab_detachable(Widget& child, bool detachable = true);
+
 
   PageList::iterator get_current();
 
@@ -688,20 +716,52 @@ public:
   const PageList& pages() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %switch_page(GtkNotebookPage* page, guint page_num)</tt>
+   */
+
   Glib::SignalProxy2< void,GtkNotebookPage*,guint > signal_switch_page();
 
+  
+/**
+   * @par Prototype:
+   * <tt>void %page_reordered(Widget* page, guint page_num)</tt>
+   */
+
+  Glib::SignalProxy2< void,Widget*,guint > signal_page_reordered();
+
+  
+/**
+   * @par Prototype:
+   * <tt>void %page_removed(Widget* page, guint page_num)</tt>
+   */
+
+  Glib::SignalProxy2< void,Widget*,guint > signal_page_removed();
+
+  
+/**
+   * @par Prototype:
+   * <tt>void %page_added(Widget* page, guint page_num)</tt>
+   */
+
+  Glib::SignalProxy2< void,Widget*,guint > signal_page_added();
+
 
   //Key-binding signals:
   
   
-  /** Which side of the notebook holds the tabs.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Which side of the notebook holds the tabs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<PositionType> property_tab_pos() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Which side of the notebook holds the tabs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -709,15 +769,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<PositionType> property_tab_pos() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether tabs should be shown or not.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether tabs should be shown or not.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_show_tabs() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether tabs should be shown or not.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -725,15 +789,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_show_tabs() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the border should be shown or not.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the border should be shown or not.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_show_border() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the border should be shown or not.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -741,15 +809,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_show_border() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If TRUE
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_scrollable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -757,31 +829,30 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_scrollable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Width of the border around the tab labels.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Width of the border around the tab labels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_WriteOnly<guint> property_tab_border() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Width of the border around the tab labels.
-   *
-   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
-   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
-   * the value of the property changes.
-   */
-  Glib::PropertyProxy_ReadOnly<guint> property_tab_border() const;
 
-  /** Width of the horizontal border of tab labels.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Width of the horizontal border of tab labels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_tab_hborder() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Width of the horizontal border of tab labels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -789,15 +860,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_tab_hborder() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Width of the vertical border of tab labels.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Width of the vertical border of tab labels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_tab_vborder() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Width of the vertical border of tab labels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -805,15 +880,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_tab_vborder() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The index of the current page.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The index of the current page.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_page() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The index of the current page.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -821,15 +900,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_page() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If TRUE
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_enable_popup() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -837,15 +920,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_enable_popup() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether tabs should have homogeneous sizes.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether tabs should have homogeneous sizes.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_homogeneous() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether tabs should have homogeneous sizes.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -853,6 +940,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_homogeneous() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
@@ -898,6 +986,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Notebook* wrap(GtkNotebook* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_NOTEBOOK_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/object.cc b/libs/gtkmm2/gtk/gtkmm/object.cc
index b61a028949..cddd6759c2 100644
--- a/libs/gtkmm2/gtk/gtkmm/object.cc
+++ b/libs/gtkmm2/gtk/gtkmm/object.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/object.h>
 #include <gtkmm/private/object_p.h>
 
@@ -59,11 +60,10 @@ void Object::_init_unmanage(bool /* is_toplevel = false */)
 
     // Most GTK+ objects are floating, by default. This means that the container widget controls their lifetime.
     // We'll change this:
-    if(GTK_OBJECT_FLOATING (gobject_)) //Top-level Windows and Dialogs can not be manag()ed, so there is no need to do this.
+    if(g_object_is_floating (gobject_)) //Top-level Windows and Dialogs can not be manag()ed, so there is no need to do this.
     {
       GLIBMM_DEBUG_REFERENCE(this, gobject_);
-      g_object_ref(gobject_);  //Increase ref by 1 so that it doesn't get deleted when we sink() it (sink()ing does an unref)
-      gtk_object_sink((GtkObject*)gobject_); //Stops it from being floating - we will make this optional ( see Gtk::manage() ),
+      g_object_ref_sink(gobject_); //Stops it from being floating - we will make this optional ( see Gtk::manage() ),
 
       #ifdef GLIBMM_DEBUG_REFCOUNTING
       g_warning("gtkmm after sink: C++ instance: %p, C instance: %p, refcount=%d\n", (void*)(Glib::ObjectBase*)this, (void*)gobject_, G_OBJECT(gobject_)->ref_count);
@@ -75,7 +75,7 @@ void Object::_init_unmanage(bool /* is_toplevel = false */)
     else
     {
        //This widget is already not floating. It's probably already been added to a GTK+ container, and has just had Glib::wrap() called on it.
-       //It's not floating because containers call gtk_object_sink() on child widgets to take control of them.
+       //It's not floating because containers call g_object_sink() on child widgets to take control of them.
        //We just ref() it so that we can unref it later.
        //GLIBMM_DEBUG_REFERENCE(this, gobject_);
        //g_object_ref(gobject_);
@@ -285,7 +285,8 @@ void Object::set_manage()
       g_warning("Object::set_manage(): setting GTK_FLOATING: gobject_ = %p", (void*) gobj());
       g_warning("  gtypename=%s\n", G_OBJECT_TYPE_NAME(gobj()));
     #endif
-    GTK_OBJECT_SET_FLAGS(gobj(), GTK_FLOATING);
+    //deprecated: GTK_OBJECT_SET_FLAGS(gobj(), GTK_FLOATING);
+    g_object_force_floating(gobject_);
   }
   else
   {
@@ -366,8 +367,19 @@ void Object_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Object_Class::wrap_new(GObject* o)
 {
@@ -391,15 +403,26 @@ GType Object::get_base_type()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<void*> Object::property_user_data() 
 {
   return Glib::PropertyProxy<void*>(this, "user-data");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<void*> Object::property_user_data() const
 {
   return Glib::PropertyProxy_ReadOnly<void*>(this, "user-data");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/object.h b/libs/gtkmm2/gtk/gtkmm/object.h
index 3ca724d358..2f7f07c263 100644
--- a/libs/gtkmm2/gtk/gtkmm/object.h
+++ b/libs/gtkmm2/gtk/gtkmm/object.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_OBJECT_H
 #define _GTKMM_OBJECT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -42,6 +43,16 @@ namespace Gtk
 
 class Object;
 
+/** Mark a Gtk::Object as owned by its parent container widget, so you don't need to delete it manually.
+ * For instance,
+ * @code
+ * Gtk::Button* button = Gtk::manage( new Gtk::Button("Hello") );
+ * vbox.pack_start(*button); //vbox will delete button when vbox is deleted.
+ * @endcode
+ *
+ * @param obj A Gtk::Object, such as a gtkmm widget.
+ * @result The Gtk::Object passed as the @a obj parameter.
+ */
 template<class T>
 T* manage(T* obj)
 {
@@ -49,8 +60,16 @@ T* manage(T* obj)
   return obj;
 }
 
+/** Gtk::Object is the base class for all widgets, and for a few non-widget objects such as 
+ * Gtk::Adjustment. Gtk::Object predates Glib::Object; non-widgets that derive from Gtk::Object 
+ * rather than Glib::Object do so for backward compatibility reasons.
+ *
+ * The most interesting difference between Gtk::Object and Glib::Object is the ability to use Gtk::manage() to delegate memory management to the container widget. Gtk::Objects can also be 
+ * explicitly deleted at any time, instead of using only reference-counting, and container widgets 
+ * can respond when their child objects are being deleted (for instance by removing the widget).
+ */
 
-class Object : public Glib::Object
+class GTKMM_API Object : public Glib::Object
 {
   public:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -93,11 +112,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -110,16 +135,23 @@ public:
   //void set_user_data(gpointer data);
   //gpointer get_user_data();
 
+  #ifndef DOXYGEN_SHOULD_SKIP_THIS
+  /** Used by Gtk::manage(). You should not need to use this directly.
+   */
   virtual void set_manage();
+  #endif //DOXYGEN_SHOULD_SKIP_THIS
 
-  /** Anonymous User Data Pointer.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Anonymous User Data Pointer.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<void*> property_user_data() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Anonymous User Data Pointer.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -127,18 +159,28 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<void*> property_user_data() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
+  #ifndef DOXYGEN_SHOULD_SKIP_THIS
+  /** Private API.
+   */
   bool is_managed_() const;
+  #endif //DOXYGEN_SHOULD_SKIP_THIS
 
 protected:
 
+  #ifndef DOXYGEN_SHOULD_SKIP_THIS
+  /** Private API.
+   */
   void destroy_();
+  #endif //DOXYGEN_SHOULD_SKIP_THIS
 
   // If you need it, give me an example. murrayc. -- Me too. daniel.
   //_WRAP_SIGNAL(void destroy(), "destroy")
   
 
+  #ifndef DOXYGEN_SHOULD_SKIP_THIS
   void _init_unmanage(bool is_toplevel = false);
   virtual void destroy_notify_(); //override.
   void disconnect_cpp_wrapper();
@@ -148,6 +190,7 @@ protected:
   // set if flags used by derived classes.
   bool referenced_; // = not managed.
   bool gobject_disposed_;
+  #endif //DOXYGEN_SHOULD_SKIP_THIS
 
 
 };
@@ -163,6 +206,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Object* wrap(GtkObject* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_OBJECT_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/optionmenu.cc b/libs/gtkmm2/gtk/gtkmm/optionmenu.cc
index 6985768688..bf845e5833 100644
--- a/libs/gtkmm2/gtk/gtkmm/optionmenu.cc
+++ b/libs/gtkmm2/gtk/gtkmm/optionmenu.cc
@@ -1,5 +1,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
+
 #include <gtkmm/optionmenu.h>
 #include <gtkmm/private/optionmenu_p.h>
 
@@ -75,13 +78,15 @@ void OptionMenu::init_accels_handler_()
 namespace
 {
 
-const Glib::SignalProxyInfo OptionMenu_signal_changed_info =
+
+static const Glib::SignalProxyInfo OptionMenu_signal_changed_info =
 {
   "changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -126,10 +131,18 @@ void OptionMenu_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->changed = &changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void OptionMenu_Class::changed_callback(GtkOptionMenu* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -142,15 +155,19 @@ void OptionMenu_Class::changed_callback(GtkOptionMenu* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -163,6 +180,7 @@ void OptionMenu_Class::changed_callback(GtkOptionMenu* self)
       (*base->changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* OptionMenu_Class::wrap_new(GObject* o)
@@ -201,7 +219,7 @@ GType OptionMenu::get_base_type()
 
 void OptionMenu::set_menu(Menu& menu)
 {
-  gtk_option_menu_set_menu(gobj(), (menu).Gtk::Widget::gobj());
+gtk_option_menu_set_menu(gobj(), (menu).Gtk::Widget::gobj()); 
 }
 
 Menu* OptionMenu::get_menu()
@@ -211,12 +229,12 @@ Menu* OptionMenu::get_menu()
 
 const Menu* OptionMenu::get_menu() const
 {
-  return Glib::wrap((GtkMenu*)(gtk_option_menu_get_menu(const_cast<GtkOptionMenu*>(gobj()))));
+  return const_cast<OptionMenu*>(this)->get_menu();
 }
 
 void OptionMenu::remove_menu()
 {
-  gtk_option_menu_remove_menu(gobj());
+gtk_option_menu_remove_menu(gobj()); 
 }
 
 int OptionMenu::get_history() const
@@ -226,7 +244,7 @@ int OptionMenu::get_history() const
 
 void OptionMenu::set_history(guint index)
 {
-  gtk_option_menu_set_history(gobj(), index);
+gtk_option_menu_set_history(gobj(), index); 
 }
 
 
@@ -236,6 +254,7 @@ Glib::SignalProxy0< void > OptionMenu::signal_changed()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::OptionMenu::on_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -245,8 +264,14 @@ void Gtk::OptionMenu::on_changed()
   if(base && base->changed)
     (*base->changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
 
diff --git a/libs/gtkmm2/gtk/gtkmm/optionmenu.h b/libs/gtkmm2/gtk/gtkmm/optionmenu.h
index 6f9633a256..bd88612a02 100644
--- a/libs/gtkmm2/gtk/gtkmm/optionmenu.h
+++ b/libs/gtkmm2/gtk/gtkmm/optionmenu.h
@@ -3,6 +3,9 @@
 #ifndef _GTKMM_OPTIONMENU_H
 #define _GTKMM_OPTIONMENU_H
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -95,16 +98,23 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
 
+  
 public:
 
   OptionMenu();
@@ -128,6 +138,11 @@ public:
   void set_history(guint index);
 
   
+/**
+   * @par Prototype:
+   * <tt>void %changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_changed();
 	
 
@@ -148,6 +163,11 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::OptionMenu* wrap(GtkOptionMenu* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
 #endif /* _GTKMM_OPTIONMENU_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/paned.cc b/libs/gtkmm2/gtk/gtkmm/paned.cc
index 4b160994bc..94a884ce16 100644
--- a/libs/gtkmm2/gtk/gtkmm/paned.cc
+++ b/libs/gtkmm2/gtk/gtkmm/paned.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/paned.h>
 #include <gtkmm/private/paned_p.h>
 
@@ -97,8 +98,19 @@ void Paned_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Paned_Class::wrap_new(GObject* o)
 {
@@ -148,22 +160,22 @@ Paned::Paned()
 
 void Paned::add1(Widget& child)
 {
-  gtk_paned_add1(gobj(), (child).gobj());
+gtk_paned_add1(gobj(), (child).gobj()); 
 }
 
 void Paned::add2(Widget& child)
 {
-  gtk_paned_add2(gobj(), (child).gobj());
+gtk_paned_add2(gobj(), (child).gobj()); 
 }
 
 void Paned::pack1(Widget& child, bool resize, bool shrink)
 {
-  gtk_paned_pack1(gobj(), (child).gobj(), static_cast<int>(resize), static_cast<int>(shrink));
+gtk_paned_pack1(gobj(), (child).gobj(), static_cast<int>(resize), static_cast<int>(shrink)); 
 }
 
 void Paned::pack2(Widget& child, bool resize, bool shrink)
 {
-  gtk_paned_pack2(gobj(), (child).gobj(), static_cast<int>(resize), static_cast<int>(shrink));
+gtk_paned_pack2(gobj(), (child).gobj(), static_cast<int>(resize), static_cast<int>(shrink)); 
 }
 
 int Paned::get_position() const
@@ -173,7 +185,7 @@ int Paned::get_position() const
 
 void Paned::set_position(int position)
 {
-  gtk_paned_set_position(gobj(), position);
+gtk_paned_set_position(gobj(), position); 
 }
 
 Widget* Paned::get_child1()
@@ -183,7 +195,7 @@ Widget* Paned::get_child1()
 
 const Widget* Paned::get_child1() const
 {
-  return Glib::wrap(gtk_paned_get_child1(const_cast<GtkPaned*>(gobj())));
+  return const_cast<Paned*>(this)->get_child1();
 }
 
 Widget* Paned::get_child2()
@@ -193,39 +205,58 @@ Widget* Paned::get_child2()
 
 const Widget* Paned::get_child2() const
 {
-  return Glib::wrap(gtk_paned_get_child2(const_cast<GtkPaned*>(gobj())));
+  return const_cast<Paned*>(this)->get_child2();
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Paned::property_position() 
 {
   return Glib::PropertyProxy<int>(this, "position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Paned::property_position() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Paned::property_position_set() 
 {
   return Glib::PropertyProxy<bool>(this, "position-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Paned::property_position_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "position-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Paned::property_min_position() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "min-position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Paned::property_max_position() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "max-position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
@@ -272,8 +303,19 @@ void HPaned_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* HPaned_Class::wrap_new(GObject* o)
 {
@@ -321,6 +363,13 @@ HPaned::HPaned()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
@@ -365,8 +414,19 @@ void VPaned_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* VPaned_Class::wrap_new(GObject* o)
 {
@@ -414,6 +474,13 @@ VPaned::VPaned()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/paned.h b/libs/gtkmm2/gtk/gtkmm/paned.h
index 5616d261c5..45298ae9b5 100644
--- a/libs/gtkmm2/gtk/gtkmm/paned.h
+++ b/libs/gtkmm2/gtk/gtkmm/paned.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_PANED_H
 #define _GTKMM_PANED_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -128,11 +129,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -170,14 +177,14 @@ public:
   /** Obtains the first child of the paned widget.
    * @return First child, or <tt>0</tt> if it is not set.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Widget* get_child1();
   
   /** Obtains the first child of the paned widget.
    * @return First child, or <tt>0</tt> if it is not set.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const Widget* get_child1() const;
 
@@ -185,28 +192,31 @@ public:
   /** Obtains the second child of the paned widget.
    * @return Second child, or <tt>0</tt> if it is not set.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Widget* get_child2();
   
   /** Obtains the second child of the paned widget.
    * @return Second child, or <tt>0</tt> if it is not set.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const Widget* get_child2() const;
  
   //Keybinding signals:
   
   
-  /** Position of paned separator in pixels (0 means all the way to the left/top).
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Position of paned separator in pixels (0 means all the way to the left/top).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_position() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Position of paned separator in pixels (0 means all the way to the left/top).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -214,15 +224,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_position() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** TRUE if the Position property should be used.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** TRUE if the Position property should be used.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_position_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** TRUE if the Position property should be used.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -230,23 +244,28 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_position_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Smallest possible value for the position property.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Smallest possible value for the position property.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_min_position() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** Largest possible value for the position property.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Largest possible value for the position property.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_max_position() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -302,11 +321,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -368,11 +393,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -394,7 +425,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Paned* wrap(GtkPaned* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::HPaned
@@ -403,7 +436,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::HPaned* wrap(GtkHPaned* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::VPaned
@@ -412,6 +447,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::VPaned* wrap(GtkVPaned* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_PANED_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/plug.cc b/libs/gtkmm2/gtk/gtkmm/plug.cc
index befa8a4307..c11c8df831 100644
--- a/libs/gtkmm2/gtk/gtkmm/plug.cc
+++ b/libs/gtkmm2/gtk/gtkmm/plug.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/plug.h>
 #include <gtkmm/private/plug_p.h>
 
@@ -60,13 +61,15 @@ Plug::Plug(const Glib::RefPtr<Gdk::Display>& display, GdkNativeWindow socket_id)
 namespace
 {
 
-const Glib::SignalProxyInfo Plug_signal_embedded_info =
+
+static const Glib::SignalProxyInfo Plug_signal_embedded_info =
 {
   "embedded",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -111,10 +114,18 @@ void Plug_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->embedded = &embedded_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Plug_Class::embedded_callback(GtkPlug* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -127,15 +138,19 @@ void Plug_Class::embedded_callback(GtkPlug* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_embedded();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -148,6 +163,7 @@ void Plug_Class::embedded_callback(GtkPlug* self)
       (*base->embedded)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Plug_Class::wrap_new(GObject* o)
@@ -201,6 +217,7 @@ Glib::SignalProxy0< void > Plug::signal_embedded()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Plug::on_embedded()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -210,6 +227,10 @@ void Gtk::Plug::on_embedded()
   if(base && base->embedded)
     (*base->embedded)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/plug.h b/libs/gtkmm2/gtk/gtkmm/plug.h
index 030bdc63c5..7877848e10 100644
--- a/libs/gtkmm2/gtk/gtkmm/plug.h
+++ b/libs/gtkmm2/gtk/gtkmm/plug.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_PLUG_H
 #define _GTKMM_PLUG_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -82,12 +83,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_embedded();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -111,6 +118,11 @@ public:
   GdkNativeWindow get_id() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %embedded()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_embedded();
 
 
@@ -127,6 +139,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Plug* wrap(GtkPlug* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_PLUG_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/aboutdialog_p.h b/libs/gtkmm2/gtk/gtkmm/private/aboutdialog_p.h
index 60a53a69ba..6aa9bce748 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/aboutdialog_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/aboutdialog_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ABOUTDIALOG_P_H
 #define _GTKMM_ABOUTDIALOG_P_H
+
+
 #include <gtkmm/private/dialog_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ABOUTDIALOG_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/accelgroup_p.h b/libs/gtkmm2/gtk/gtkmm/private/accelgroup_p.h
index 6caa6d52e4..2b12fd4c10 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/accelgroup_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/accelgroup_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ACCELGROUP_P_H
 #define _GTKMM_ACCELGROUP_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void accel_changed_callback(GtkAccelGroup* self, guint p0, GdkModifierType p1, GClosure* p2);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ACCELGROUP_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/accellabel_p.h b/libs/gtkmm2/gtk/gtkmm/private/accellabel_p.h
index fea48d72d6..16f155b34d 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/accellabel_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/accellabel_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ACCELLABEL_P_H
 #define _GTKMM_ACCELLABEL_P_H
+
+
 #include <gtkmm/private/label_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ACCELLABEL_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/action_p.h b/libs/gtkmm2/gtk/gtkmm/private/action_p.h
index b143a7e57d..50cff0cc7c 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/action_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/action_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ACTION_P_H
 #define _GTKMM_ACTION_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,20 +32,25 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void activate_callback(GtkAction* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static GtkWidget* create_menu_item_vfunc_callback(GtkAction* self);
   static GtkWidget* create_tool_item_vfunc_callback(GtkAction* self);
   static void connect_proxy_vfunc_callback(GtkAction* self, GtkWidget* proxy);
   static void disconnect_proxy_vfunc_callback(GtkAction* self, GtkWidget* proxy);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ACTION_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/actiongroup_p.h b/libs/gtkmm2/gtk/gtkmm/private/actiongroup_p.h
index 468723aa92..36ae005e63 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/actiongroup_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/actiongroup_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ACTIONGROUP_P_H
 #define _GTKMM_ACTIONGROUP_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ACTIONGROUP_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/adjustment_p.h b/libs/gtkmm2/gtk/gtkmm/private/adjustment_p.h
index 4a13ed8c2b..13b1041b9f 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/adjustment_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/adjustment_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ADJUSTMENT_P_H
 #define _GTKMM_ADJUSTMENT_P_H
+
+
 #include <gtkmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,17 +32,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void changed_callback(GtkAdjustment* self);
   static void value_changed_callback(GtkAdjustment* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ADJUSTMENT_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/alignment_p.h b/libs/gtkmm2/gtk/gtkmm/private/alignment_p.h
index debf6ee966..dca8be1aec 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/alignment_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/alignment_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ALIGNMENT_P_H
 #define _GTKMM_ALIGNMENT_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ALIGNMENT_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/arrow_p.h b/libs/gtkmm2/gtk/gtkmm/private/arrow_p.h
index 7e3e5dd4b7..d833de7b09 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/arrow_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/arrow_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ARROW_P_H
 #define _GTKMM_ARROW_P_H
+
+
 #include <gtkmm/private/misc_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ARROW_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/aspectframe_p.h b/libs/gtkmm2/gtk/gtkmm/private/aspectframe_p.h
index 6e5e3ec8b9..50de94b4a6 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/aspectframe_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/aspectframe_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ASPECTFRAME_P_H
 #define _GTKMM_ASPECTFRAME_P_H
+
+
 #include <gtkmm/private/frame_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ASPECTFRAME_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/bin_p.h b/libs/gtkmm2/gtk/gtkmm/private/bin_p.h
index b81931b19e..09f64b7239 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/bin_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/bin_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_BIN_P_H
 #define _GTKMM_BIN_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_BIN_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/box_p.h b/libs/gtkmm2/gtk/gtkmm/private/box_p.h
index bf26cdbf7d..fd04647034 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/box_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/box_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_BOX_P_H
 #define _GTKMM_BOX_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,11 +32,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -67,11 +73,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -104,15 +114,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_BOX_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/button_p.h b/libs/gtkmm2/gtk/gtkmm/private/button_p.h
index 7fe15f9a48..4507ddd23c 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/button_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/button_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_BUTTON_P_H
 #define _GTKMM_BUTTON_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -30,6 +32,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -39,12 +42,16 @@ protected:
   static void enter_callback(GtkButton* self);
   static void leave_callback(GtkButton* self);
   static void activate_callback(GtkButton* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_BUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/buttonbox_p.h b/libs/gtkmm2/gtk/gtkmm/private/buttonbox_p.h
index 59a656dbb5..722d1c87e5 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/buttonbox_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/buttonbox_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_BUTTONBOX_P_H
 #define _GTKMM_BUTTONBOX_P_H
+
+
 #include <gtkmm/private/box_p.h>
 
 #include <glibmm/class.h>
@@ -30,11 +32,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -67,11 +73,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -104,15 +114,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_BUTTONBOX_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/calendar_p.h b/libs/gtkmm2/gtk/gtkmm/private/calendar_p.h
index f138739966..0b6e4717ab 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/calendar_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/calendar_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CALENDAR_P_H
 #define _GTKMM_CALENDAR_P_H
+
+
 #include <gtkmm/private/widget_p.h>
 
 #include <glibmm/class.h>
@@ -30,6 +32,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -40,12 +43,16 @@ protected:
   static void next_month_callback(GtkCalendar* self);
   static void prev_year_callback(GtkCalendar* self);
   static void next_year_callback(GtkCalendar* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CALENDAR_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/celleditable_p.h b/libs/gtkmm2/gtk/gtkmm/private/celleditable_p.h
index 31250f561b..6f49bf61d9 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/celleditable_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/celleditable_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CELLEDITABLE_P_H
 #define _GTKMM_CELLEDITABLE_P_H
+
+
 #include <glibmm/private/interface_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,18 +29,23 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void editing_done_callback(GtkCellEditable* self);
   static void remove_widget_callback(GtkCellEditable* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void start_editing_vfunc_callback(GtkCellEditable* self, GdkEvent* event);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CELLEDITABLE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/celllayout_p.h b/libs/gtkmm2/gtk/gtkmm/private/celllayout_p.h
index 1af5318448..f1856c6a23 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/celllayout_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/celllayout_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CELLLAYOUT_P_H
 #define _GTKMM_CELLLAYOUT_P_H
+
+
 #include <glibmm/private/interface_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,21 +29,26 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void pack_start_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, gboolean expand);
   static void pack_end_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, gboolean expand);
   static void clear_vfunc_callback(GtkCellLayout* self);
   static void add_attribute_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, const gchar* attribute, gint column);
   static void clear_attributes_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell);
   static void reorder_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, gint position);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CELLLAYOUT_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/cellrenderer_p.h b/libs/gtkmm2/gtk/gtkmm/private/cellrenderer_p.h
index c7fac80cb6..b2ea9f3057 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/cellrenderer_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/cellrenderer_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CELLRENDERER_P_H
 #define _GTKMM_CELLRENDERER_P_H
+
+
 #include <gtkmm/private/object_p.h>
 #include <gtk/gtkcellrenderer.h>
 
@@ -31,20 +33,25 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void editing_canceled_callback(GtkCellRenderer* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void get_size_vfunc_callback(GtkCellRenderer* self, GtkWidget* widget, GdkRectangle* cell_area, gint* x_offset, gint* y_offset, gint* width, gint* height);
   static void render_vfunc_callback(GtkCellRenderer* self, GdkDrawable* window, GtkWidget* widget, GdkRectangle* background_area, GdkRectangle* cell_area, GdkRectangle* expose_area, GtkCellRendererState flags);
   static gboolean activate_vfunc_callback(GtkCellRenderer* self, GdkEvent* event, GtkWidget* widget, const gchar* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags);
   static GtkCellEditable* start_editing_vfunc_callback(GtkCellRenderer* self, GdkEvent* event, GtkWidget* widget, const gchar* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CELLRENDERER_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/cellrenderercombo_p.h b/libs/gtkmm2/gtk/gtkmm/private/cellrenderercombo_p.h
index af5eda9c5f..3bb865fe85 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/cellrenderercombo_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/cellrenderercombo_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CELLRENDERERCOMBO_P_H
 #define _GTKMM_CELLRENDERERCOMBO_P_H
+
+
 #include <gtkmm/private/cellrenderertext_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CELLRENDERERCOMBO_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/cellrendererpixbuf_p.h b/libs/gtkmm2/gtk/gtkmm/private/cellrendererpixbuf_p.h
index 5bf100b376..bb9637648b 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/cellrendererpixbuf_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/cellrendererpixbuf_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CELLRENDERERPIXBUF_P_H
 #define _GTKMM_CELLRENDERERPIXBUF_P_H
+
+
 #include <gtkmm/private/cellrenderer_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CELLRENDERERPIXBUF_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/cellrendererprogress_p.h b/libs/gtkmm2/gtk/gtkmm/private/cellrendererprogress_p.h
index f95a9f133b..7e6f491be9 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/cellrendererprogress_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/cellrendererprogress_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CELLRENDERERPROGRESS_P_H
 #define _GTKMM_CELLRENDERERPROGRESS_P_H
+
+
 #include <gtkmm/private/cellrenderer_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CELLRENDERERPROGRESS_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/cellrenderertext_p.h b/libs/gtkmm2/gtk/gtkmm/private/cellrenderertext_p.h
index 1505a568f9..982bd5121c 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/cellrenderertext_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/cellrenderertext_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CELLRENDERERTEXT_P_H
 #define _GTKMM_CELLRENDERERTEXT_P_H
+
+
 #include <gtkmm/private/cellrenderer_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void edited_callback(GtkCellRendererText* self, const gchar* p0, const gchar* p1);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CELLRENDERERTEXT_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/cellrenderertoggle_p.h b/libs/gtkmm2/gtk/gtkmm/private/cellrenderertoggle_p.h
index 6566624b9d..5dae657ee1 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/cellrenderertoggle_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/cellrenderertoggle_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CELLRENDERERTOGGLE_P_H
 #define _GTKMM_CELLRENDERERTOGGLE_P_H
+
+
 #include <gtkmm/private/cellrenderer_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void toggled_callback(GtkCellRendererToggle* self, const gchar* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CELLRENDERERTOGGLE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/cellview_p.h b/libs/gtkmm2/gtk/gtkmm/private/cellview_p.h
index 6046537896..1fbe8887e2 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/cellview_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/cellview_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CELLVIEW_P_H
 #define _GTKMM_CELLVIEW_P_H
+
+
 #include <gtkmm/private/widget_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CELLVIEW_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/checkbutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/checkbutton_p.h
index 1e579d79b9..7addfe36b5 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/checkbutton_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/checkbutton_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CHECKBUTTON_P_H
 #define _GTKMM_CHECKBUTTON_P_H
+
+
 #include <gtkmm/private/togglebutton_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void draw_indicator_vfunc_callback(GtkCheckButton* self, GdkRectangle* area);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CHECKBUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/checkmenuitem_p.h b/libs/gtkmm2/gtk/gtkmm/private/checkmenuitem_p.h
index 8ae77c14b7..4c720e1207 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/checkmenuitem_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/checkmenuitem_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CHECKMENUITEM_P_H
 #define _GTKMM_CHECKMENUITEM_P_H
+
+
 #include <gtkmm/private/menuitem_p.h>
 
 #include <glibmm/class.h>
@@ -30,17 +32,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void toggled_callback(GtkCheckMenuItem* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void draw_indicator_vfunc_callback(GtkCheckMenuItem* self, GdkRectangle* area);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CHECKMENUITEM_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/clipboard_p.h b/libs/gtkmm2/gtk/gtkmm/private/clipboard_p.h
index 1bad952a67..b5e26cc290 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/clipboard_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/clipboard_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CLIPBOARD_P_H
 #define _GTKMM_CLIPBOARD_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CLIPBOARD_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/colorbutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/colorbutton_p.h
index 20b2dfb9e6..a46181fa2c 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/colorbutton_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/colorbutton_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_COLORBUTTON_P_H
 #define _GTKMM_COLORBUTTON_P_H
+
+
 #include <gtkmm/private/button_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void color_set_callback(GtkColorButton* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_COLORBUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/colorselection_p.h b/libs/gtkmm2/gtk/gtkmm/private/colorselection_p.h
index 662aca3486..d583cc3e7b 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/colorselection_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/colorselection_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_COLORSELECTION_P_H
 #define _GTKMM_COLORSELECTION_P_H
+
+
 #include <gtkmm/private/box_p.h>
 #include <gtkmm/private/dialog_p.h>
 
@@ -31,12 +33,16 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void color_changed_callback(GtkColorSelection* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -69,15 +75,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_COLORSELECTION_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/combo_p.h b/libs/gtkmm2/gtk/gtkmm/private/combo_p.h
index c272fe4afa..23c1aaf402 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/combo_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/combo_p.h
@@ -2,6 +2,9 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_COMBO_P_H
 #define _GTKMM_COMBO_P_H
+#ifndef GTKMM_DISABLE_DEPRECATED
+
+
 #include <gtkmm/private/box_p.h>
 #include <gtkmm/private/item_p.h>
 
@@ -31,13 +34,17 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void scroll_horizontal_callback(GtkListItem* self, GtkScrollType p0, gfloat p1);
   static void scroll_vertical_callback(GtkListItem* self, GtkScrollType p0, gfloat p1);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -70,14 +77,18 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void select_child_callback(GtkList* self, GtkWidget* p0);
   static void selection_changed_callback(GtkList* self);
   static void unselect_child_callback(GtkList* self, GtkWidget* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -110,15 +121,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
 #endif /* _GTKMM_COMBO_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/combobox_p.h b/libs/gtkmm2/gtk/gtkmm/private/combobox_p.h
index 242c755f70..d2ec16e76b 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/combobox_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/combobox_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_COMBOBOX_P_H
 #define _GTKMM_COMBOBOX_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void changed_callback(GtkComboBox* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_COMBOBOX_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/comboboxentry_p.h b/libs/gtkmm2/gtk/gtkmm/private/comboboxentry_p.h
index bbc8a5028a..01d4ba8ec2 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/comboboxentry_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/comboboxentry_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_COMBOBOXENTRY_P_H
 #define _GTKMM_COMBOBOXENTRY_P_H
+
+
 #include <gtkmm/private/combobox_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_COMBOBOXENTRY_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/container_p.h b/libs/gtkmm2/gtk/gtkmm/private/container_p.h
index 3f1b158887..0b917095dc 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/container_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/container_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CONTAINER_P_H
 #define _GTKMM_CONTAINER_P_H
+
+
 #include <gtkmm/private/widget_p.h>
 
 #include <glibmm/class.h>
@@ -30,6 +32,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -38,18 +41,22 @@ protected:
   static void check_resize_callback(GtkContainer* self);
   static void set_focus_child_callback(GtkContainer* self, GtkWidget* p0);
     static void destroy_callback(GtkObject* self);
-      static void remove_callback_custom(GtkContainer* self, GtkWidget* p0);
-  
+    static void remove_callback_normal(GtkContainer* self, GtkWidget* p0);
+  #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static GtkType child_type_vfunc_callback(GtkContainer* self);
   static void forall_vfunc_callback(GtkContainer* self, gboolean include_internals, GtkCallback callback, gpointer callback_data);
   static gchar* composite_name_vfunc_callback(GtkContainer* self, GtkWidget* child);
   static void set_child_property_vfunc_callback(GtkContainer* self, GtkWidget* child, guint property_id, const GValue* value, GParamSpec* pspec);
   static void get_child_property_vfunc_callback(GtkContainer* self, GtkWidget* child, guint property_id, GValue* value, GParamSpec* pspec);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CONTAINER_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/curve_p.h b/libs/gtkmm2/gtk/gtkmm/private/curve_p.h
index dc07066521..a99ce85c20 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/curve_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/curve_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_CURVE_P_H
 #define _GTKMM_CURVE_P_H
+
+
 #include <gtkmm/private/drawingarea_p.h>
 #include <gtkmm/private/box_p.h>
 
@@ -31,12 +33,16 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void curve_type_changed_callback(GtkCurve* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -69,15 +75,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_CURVE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/dialog_p.h b/libs/gtkmm2/gtk/gtkmm/private/dialog_p.h
index 9eeef1e8fe..b5f4515bc8 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/dialog_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/dialog_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_DIALOG_P_H
 #define _GTKMM_DIALOG_P_H
+
+
 #include <gtkmm/private/window_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void response_callback(GtkDialog* self, gint p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_DIALOG_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/drawingarea_p.h b/libs/gtkmm2/gtk/gtkmm/private/drawingarea_p.h
index cd639999b3..d1aaf767f7 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/drawingarea_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/drawingarea_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_DRAWINGAREA_P_H
 #define _GTKMM_DRAWINGAREA_P_H
+
+
 #include <gtkmm/private/widget_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_DRAWINGAREA_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/editable_p.h b/libs/gtkmm2/gtk/gtkmm/private/editable_p.h
index caf727830a..394b2f0ce9 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/editable_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/editable_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_EDITABLE_P_H
 #define _GTKMM_EDITABLE_P_H
+
+
 #include <glibmm/private/interface_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,14 +29,17 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void insert_text_callback(GtkEditable* self, const gchar* text, gint length, gint* position);
   static void delete_text_callback(GtkEditable* self, gint start_pos, gint end_pos);
   static void changed_callback(GtkEditable* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void do_insert_text_vfunc_callback(GtkEditable* self, const gchar* text, gint length, gint* position);
   static void do_delete_text_vfunc_callback(GtkEditable* self, gint start_pos, gint end_pos);
   static gchar* get_chars_vfunc_callback(GtkEditable* self, gint start_pos, gint end_pos);
@@ -42,10 +47,12 @@ protected:
   static gboolean get_selection_bounds_vfunc_callback(GtkEditable* self, gint* start_pos, gint* end_pos);
   static void set_position_vfunc_callback(GtkEditable* self, gint position);
   static gint get_position_vfunc_callback(GtkEditable* self);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_EDITABLE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/entry_p.h b/libs/gtkmm2/gtk/gtkmm/private/entry_p.h
index 5d25b64902..3a9c2f5749 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/entry_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/entry_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ENTRY_P_H
 #define _GTKMM_ENTRY_P_H
+
+
 #include <gtkmm/private/widget_p.h>
 
 #include <glibmm/class.h>
@@ -30,18 +32,23 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void populate_popup_callback(GtkEntry* self, GtkMenu* p0);
   static void insert_at_cursor_callback(GtkEntry* self, const gchar* p0);
   static void activate_callback(GtkEntry* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ENTRY_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/entrycompletion_p.h b/libs/gtkmm2/gtk/gtkmm/private/entrycompletion_p.h
index 2a9b97a3ad..79d484712d 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/entrycompletion_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/entrycompletion_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ENTRYCOMPLETION_P_H
 #define _GTKMM_ENTRYCOMPLETION_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,17 +32,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void action_activated_callback(GtkEntryCompletion* self, gint p0);
     static gboolean match_selected_callback_custom(GtkEntryCompletion* self, GtkTreeModel* c_model, GtkTreeIter* c_iter);
-  
+  #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ENTRYCOMPLETION_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/enums_p.h b/libs/gtkmm2/gtk/gtkmm/private/enums_p.h
index 68c26cc900..a615673112 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/enums_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/enums_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ENUMS_P_H
 #define _GTKMM_ENUMS_P_H
+
+
 #endif /* _GTKMM_ENUMS_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/eventbox_p.h b/libs/gtkmm2/gtk/gtkmm/private/eventbox_p.h
index 91b3303f1f..c77f337743 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/eventbox_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/eventbox_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_EVENTBOX_P_H
 #define _GTKMM_EVENTBOX_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_EVENTBOX_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/expander_p.h b/libs/gtkmm2/gtk/gtkmm/private/expander_p.h
index 674bf038cd..fa106764f7 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/expander_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/expander_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_EXPANDER_P_H
 #define _GTKMM_EXPANDER_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_EXPANDER_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/filechooser_p.h b/libs/gtkmm2/gtk/gtkmm/private/filechooser_p.h
index 9b864a7dda..3c3843a06a 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/filechooser_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/filechooser_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_FILECHOOSER_P_H
 #define _GTKMM_FILECHOOSER_P_H
+
+
 #include <glibmm/private/interface_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,15 +29,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_FILECHOOSER_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/filechooserbutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/filechooserbutton_p.h
index 60aa6eff06..c555b834a1 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/filechooserbutton_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/filechooserbutton_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_FILECHOOSERBUTTON_P_H
 #define _GTKMM_FILECHOOSERBUTTON_P_H
+
+
 #include <gtkmm/private/box_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_FILECHOOSERBUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/filechooserdialog_p.h b/libs/gtkmm2/gtk/gtkmm/private/filechooserdialog_p.h
index 38e4d9aa12..00d39137e7 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/filechooserdialog_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/filechooserdialog_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_FILECHOOSERDIALOG_P_H
 #define _GTKMM_FILECHOOSERDIALOG_P_H
+
+
 #include <gtkmm/private/dialog_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_FILECHOOSERDIALOG_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/filechooserwidget_p.h b/libs/gtkmm2/gtk/gtkmm/private/filechooserwidget_p.h
index 09e093dca1..c157717aa9 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/filechooserwidget_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/filechooserwidget_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_FILECHOOSERWIDGET_P_H
 #define _GTKMM_FILECHOOSERWIDGET_P_H
+
+
 #include <gtkmm/private/box_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_FILECHOOSERWIDGET_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/filefilter_p.h b/libs/gtkmm2/gtk/gtkmm/private/filefilter_p.h
index cfc5b84d36..dc6fada76d 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/filefilter_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/filefilter_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_FILEFILTER_P_H
 #define _GTKMM_FILEFILTER_P_H
+
+
 #include <gtkmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_FILEFILTER_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/fileselection_p.h b/libs/gtkmm2/gtk/gtkmm/private/fileselection_p.h
index 9ab7fc7c1f..6028f0e076 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/fileselection_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/fileselection_p.h
@@ -2,6 +2,9 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_FILESELECTION_P_H
 #define _GTKMM_FILESELECTION_P_H
+#ifndef GTKMM_DISABLE_DEPRECATED
+
+
 #include <gtkmm/private/dialog_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +33,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
 #endif /* _GTKMM_FILESELECTION_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/fixed_p.h b/libs/gtkmm2/gtk/gtkmm/private/fixed_p.h
index b1c4abe756..066e44408b 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/fixed_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/fixed_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_FIXED_P_H
 #define _GTKMM_FIXED_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_FIXED_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/fontbutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/fontbutton_p.h
index 746f160914..9234c1123a 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/fontbutton_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/fontbutton_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_FONTBUTTON_P_H
 #define _GTKMM_FONTBUTTON_P_H
+
+
 #include <gtkmm/private/button_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void font_set_callback(GtkFontButton* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_FONTBUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/fontselection_p.h b/libs/gtkmm2/gtk/gtkmm/private/fontselection_p.h
index 50da4e3401..a7737b28a9 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/fontselection_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/fontselection_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_FONTSELECTION_P_H
 #define _GTKMM_FONTSELECTION_P_H
+
+
 #include <gtkmm/private/box_p.h>
 #include <gtkmm/private/dialog_p.h>
 
@@ -31,11 +33,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -68,15 +74,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_FONTSELECTION_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/frame_p.h b/libs/gtkmm2/gtk/gtkmm/private/frame_p.h
index 297c7efbe7..daefa92adf 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/frame_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/frame_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_FRAME_P_H
 #define _GTKMM_FRAME_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void compute_child_allocation_vfunc_callback(GtkFrame* self, GtkAllocation* allocation);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_FRAME_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/handlebox_p.h b/libs/gtkmm2/gtk/gtkmm/private/handlebox_p.h
index d1e0b3c30d..b6d44d852f 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/handlebox_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/handlebox_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_HANDLEBOX_P_H
 #define _GTKMM_HANDLEBOX_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -30,17 +32,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void child_attached_callback(GtkHandleBox* self, GtkWidget* p0);
   static void child_detached_callback(GtkHandleBox* self, GtkWidget* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_HANDLEBOX_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/iconfactory_p.h b/libs/gtkmm2/gtk/gtkmm/private/iconfactory_p.h
index 8840e8abde..bfa19c2ca1 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/iconfactory_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/iconfactory_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ICONFACTORY_P_H
 #define _GTKMM_ICONFACTORY_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ICONFACTORY_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/iconinfo_p.h b/libs/gtkmm2/gtk/gtkmm/private/iconinfo_p.h
index e391510843..2aef33386c 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/iconinfo_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/iconinfo_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ICONINFO_P_H
 #define _GTKMM_ICONINFO_P_H
+
+
 #endif /* _GTKMM_ICONINFO_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/iconset_p.h b/libs/gtkmm2/gtk/gtkmm/private/iconset_p.h
index 1e861df94c..33da9a49f9 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/iconset_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/iconset_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ICONSET_P_H
 #define _GTKMM_ICONSET_P_H
+
+
 #endif /* _GTKMM_ICONSET_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/iconsource_p.h b/libs/gtkmm2/gtk/gtkmm/private/iconsource_p.h
index 304da67691..aeb78c2444 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/iconsource_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/iconsource_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ICONSOURCE_P_H
 #define _GTKMM_ICONSOURCE_P_H
+
+
 #endif /* _GTKMM_ICONSOURCE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/icontheme_p.h b/libs/gtkmm2/gtk/gtkmm/private/icontheme_p.h
index a54fdbc17e..b2e6c34188 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/icontheme_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/icontheme_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ICONTHEME_P_H
 #define _GTKMM_ICONTHEME_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void changed_callback(GtkIconTheme* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ICONTHEME_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/iconview_p.h b/libs/gtkmm2/gtk/gtkmm/private/iconview_p.h
index beed996eda..bfa816a3a1 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/iconview_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/iconview_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ICONVIEW_P_H
 #define _GTKMM_ICONVIEW_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,18 +32,23 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void set_scroll_adjustments_callback(GtkIconView* self, GtkAdjustment* p0, GtkAdjustment* p1);
   static void item_activated_callback(GtkIconView* self, GtkTreePath* p0);
   static void selection_changed_callback(GtkIconView* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ICONVIEW_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/image_p.h b/libs/gtkmm2/gtk/gtkmm/private/image_p.h
index c01599d6c7..c5b5be8943 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/image_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/image_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_IMAGE_P_H
 #define _GTKMM_IMAGE_P_H
+
+
 #include <gtkmm/private/misc_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_IMAGE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/imagemenuitem_p.h b/libs/gtkmm2/gtk/gtkmm/private/imagemenuitem_p.h
index 4099489f25..0b7aac5ce4 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/imagemenuitem_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/imagemenuitem_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_IMAGEMENUITEM_P_H
 #define _GTKMM_IMAGEMENUITEM_P_H
+
+
 #include <gtkmm/private/menuitem_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_IMAGEMENUITEM_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/inputdialog_p.h b/libs/gtkmm2/gtk/gtkmm/private/inputdialog_p.h
index 3197f6efb5..4614bbb0c9 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/inputdialog_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/inputdialog_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_INPUTDIALOG_P_H
 #define _GTKMM_INPUTDIALOG_P_H
+
+
 #include <gtkmm/private/dialog_p.h>
 
 #include <glibmm/class.h>
@@ -30,17 +32,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void enable_device_callback(GtkInputDialog* self, GdkDevice* p0);
   static void disable_device_callback(GtkInputDialog* self, GdkDevice* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_INPUTDIALOG_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/invisible_p.h b/libs/gtkmm2/gtk/gtkmm/private/invisible_p.h
index 0709dc8989..f40d446263 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/invisible_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/invisible_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_INVISIBLE_P_H
 #define _GTKMM_INVISIBLE_P_H
+
+
 #include <gtkmm/private/widget_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_INVISIBLE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/item_p.h b/libs/gtkmm2/gtk/gtkmm/private/item_p.h
index 2baa4fa0de..f2fdb82d98 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/item_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/item_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_ITEM_P_H
 #define _GTKMM_ITEM_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -30,18 +32,23 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void select_callback(GtkItem* self);
   static void deselect_callback(GtkItem* self);
   static void toggle_callback(GtkItem* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_ITEM_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/label_p.h b/libs/gtkmm2/gtk/gtkmm/private/label_p.h
index 5254aba319..9975ec5a69 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/label_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/label_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_LABEL_P_H
 #define _GTKMM_LABEL_P_H
+
+
 #include <gtkmm/private/misc_p.h>
 #include <gtk/gtkmenu.h>
 
@@ -31,16 +33,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void populate_popup_callback(GtkLabel* self, GtkMenu* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_LABEL_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/layout_p.h b/libs/gtkmm2/gtk/gtkmm/private/layout_p.h
index 1c4c2773c5..b2ba71311d 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/layout_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/layout_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_LAYOUT_P_H
 #define _GTKMM_LAYOUT_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void set_scroll_adjustments_callback(GtkLayout* self, GtkAdjustment* p0, GtkAdjustment* p1);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_LAYOUT_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/liststore_p.h b/libs/gtkmm2/gtk/gtkmm/private/liststore_p.h
index 522ec0b0ca..e2703acf31 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/liststore_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/liststore_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_LISTSTORE_P_H
 #define _GTKMM_LISTSTORE_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_LISTSTORE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/main_p.h b/libs/gtkmm2/gtk/gtkmm/private/main_p.h
index a911a52b39..bf8d4f1c14 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/main_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/main_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_MAIN_P_H
 #define _GTKMM_MAIN_P_H
+
+
 #endif /* _GTKMM_MAIN_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/menu_p.h b/libs/gtkmm2/gtk/gtkmm/private/menu_p.h
index 97d6e21f30..65094515e9 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/menu_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/menu_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_MENU_P_H
 #define _GTKMM_MENU_P_H
+
+
 #include <gtkmm/private/menushell_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_MENU_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/menubar_p.h b/libs/gtkmm2/gtk/gtkmm/private/menubar_p.h
index e36353f8c6..bb1654a33e 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/menubar_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/menubar_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_MENUBAR_P_H
 #define _GTKMM_MENUBAR_P_H
+
+
 #include <gtkmm/private/menushell_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_MENUBAR_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/menuitem_p.h b/libs/gtkmm2/gtk/gtkmm/private/menuitem_p.h
index c900ddc67f..176454115f 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/menuitem_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/menuitem_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_MENUITEM_P_H
 #define _GTKMM_MENUITEM_P_H
+
+
 #include <gtkmm/private/item_p.h>
 
 #include <glibmm/class.h>
@@ -30,6 +32,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -37,12 +40,16 @@ protected:
   static void activate_item_callback(GtkMenuItem* self);
   static void toggle_size_request_callback(GtkMenuItem* self, int* p0);
   static void toggle_size_allocate_callback(GtkMenuItem* self, gint p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_MENUITEM_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/menushell_p.h b/libs/gtkmm2/gtk/gtkmm/private/menushell_p.h
index 676e85d40e..0f61b21960 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/menushell_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/menushell_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_MENUSHELL_P_H
 #define _GTKMM_MENUSHELL_P_H
+
+
 #include <gtkmm/private/container_p.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/menubar.h>
@@ -33,18 +35,25 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void deactivate_callback(GtkMenuShell* self);
   static void selection_done_callback(GtkMenuShell* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED //We always need insert_vfunc_callback
     static void insert_vfunc_callback(GtkMenuShell* self, GtkWidget* child, int position);
-  };
+#ifdef GLIBMM_VFUNCS_ENABLED
+  #endif //GLIBMM_VFUNCS_ENABLED
+};
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_MENUSHELL_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/menutoolbutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/menutoolbutton_p.h
index 401e1b5242..406e62c66e 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/menutoolbutton_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/menutoolbutton_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_MENUTOOLBUTTON_P_H
 #define _GTKMM_MENUTOOLBUTTON_P_H
+
+
 #include <gtkmm/private/toolbutton_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void show_menu_callback(GtkMenuToolButton* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_MENUTOOLBUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/messagedialog_p.h b/libs/gtkmm2/gtk/gtkmm/private/messagedialog_p.h
index 829b79c77e..1008f62611 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/messagedialog_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/messagedialog_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_MESSAGEDIALOG_P_H
 #define _GTKMM_MESSAGEDIALOG_P_H
+
+
 #include <gtkmm/private/dialog_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_MESSAGEDIALOG_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/misc_p.h b/libs/gtkmm2/gtk/gtkmm/private/misc_p.h
index adeb898dfe..a91becd7d2 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/misc_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/misc_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_MISC_P_H
 #define _GTKMM_MISC_P_H
+
+
 #include <gtkmm/private/widget_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_MISC_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/notebook_p.h b/libs/gtkmm2/gtk/gtkmm/private/notebook_p.h
index de761d21c9..5b1195fb82 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/notebook_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/notebook_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_NOTEBOOK_P_H
 #define _GTKMM_NOTEBOOK_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0, guint p1);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_NOTEBOOK_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/object_p.h b/libs/gtkmm2/gtk/gtkmm/private/object_p.h
index dc4ba98bef..278007208a 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/object_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/object_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_OBJECT_P_H
 #define _GTKMM_OBJECT_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_OBJECT_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/optionmenu_p.h b/libs/gtkmm2/gtk/gtkmm/private/optionmenu_p.h
index 414d3e631d..c035a660e4 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/optionmenu_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/optionmenu_p.h
@@ -2,6 +2,9 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_OPTIONMENU_P_H
 #define _GTKMM_OPTIONMENU_P_H
+#ifndef GTKMM_DISABLE_DEPRECATED
+
+
 #include <gtkmm/private/button_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +33,23 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void changed_callback(GtkOptionMenu* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
 #endif /* _GTKMM_OPTIONMENU_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/paned_p.h b/libs/gtkmm2/gtk/gtkmm/private/paned_p.h
index 8d8af1f20d..7b17cccd0c 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/paned_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/paned_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_PANED_P_H
 #define _GTKMM_PANED_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,11 +32,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -67,11 +73,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -104,15 +114,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_PANED_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/plug_p.h b/libs/gtkmm2/gtk/gtkmm/private/plug_p.h
index 86c6e9b3f6..4e90a3d270 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/plug_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/plug_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_PLUG_P_H
 #define _GTKMM_PLUG_P_H
+
+
 #include <gtkmm/private/window_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void embedded_callback(GtkPlug* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_PLUG_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/progressbar_p.h b/libs/gtkmm2/gtk/gtkmm/private/progressbar_p.h
index 783de015ea..833faec7b6 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/progressbar_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/progressbar_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_PROGRESSBAR_P_H
 #define _GTKMM_PROGRESSBAR_P_H
+
+
 #include <gtkmm/private/widget_p.h>
 #include <gtk/gtkprogress.h>
 
@@ -31,15 +33,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_PROGRESSBAR_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/radioaction_p.h b/libs/gtkmm2/gtk/gtkmm/private/radioaction_p.h
index ab9ae13b95..9059f8a77e 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/radioaction_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/radioaction_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_RADIOACTION_P_H
 #define _GTKMM_RADIOACTION_P_H
+
+
 #include <gtkmm/private/toggleaction_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void changed_callback(GtkRadioAction* self, GtkRadioAction* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_RADIOACTION_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/radiobutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/radiobutton_p.h
index bb0797be6c..23512be033 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/radiobutton_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/radiobutton_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_RADIOBUTTON_P_H
 #define _GTKMM_RADIOBUTTON_P_H
+
+
 #include <gtkmm/private/checkbutton_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void group_changed_callback(GtkRadioButton* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_RADIOBUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/radiomenuitem_p.h b/libs/gtkmm2/gtk/gtkmm/private/radiomenuitem_p.h
index aa49592fc7..79874f966e 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/radiomenuitem_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/radiomenuitem_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_RADIOMENUITEM_P_H
 #define _GTKMM_RADIOMENUITEM_P_H
+
+
 #include <gtkmm/private/checkmenuitem_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void group_changed_callback(GtkRadioMenuItem* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_RADIOMENUITEM_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/radiotoolbutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/radiotoolbutton_p.h
index 034902a829..3d0e468fce 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/radiotoolbutton_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/radiotoolbutton_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_RADIOTOOLBUTTON_P_H
 #define _GTKMM_RADIOTOOLBUTTON_P_H
+
+
 #include <gtkmm/private/toggletoolbutton_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_RADIOTOOLBUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/range_p.h b/libs/gtkmm2/gtk/gtkmm/private/range_p.h
index 78c6b0c5a3..de5a8cd9fc 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/range_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/range_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_RANGE_P_H
 #define _GTKMM_RANGE_P_H
+
+
 #include <gtkmm/private/widget_p.h>
 
 #include <glibmm/class.h>
@@ -30,19 +32,24 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void value_changed_callback(GtkRange* self);
   static void adjust_bounds_callback(GtkRange* self, gdouble p0);
   static void move_slider_callback(GtkRange* self, GtkScrollType p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void get_range_border_vfunc_callback(GtkRange* self, GtkBorder* border);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_RANGE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/rc_p.h b/libs/gtkmm2/gtk/gtkmm/private/rc_p.h
index 963495fb4f..fd253522b1 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/rc_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/rc_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_RC_P_H
 #define _GTKMM_RC_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_RC_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/ruler_p.h b/libs/gtkmm2/gtk/gtkmm/private/ruler_p.h
index 9c44986646..1d66f88aa5 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/ruler_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/ruler_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_RULER_P_H
 #define _GTKMM_RULER_P_H
+
+
 #include <gtkmm/private/widget_p.h>
 
 #include <glibmm/class.h>
@@ -30,13 +32,17 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void draw_ticks_vfunc_callback(GtkRuler* self);
   static void draw_pos_vfunc_callback(GtkRuler* self);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -69,11 +75,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -106,15 +116,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_RULER_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/scale_p.h b/libs/gtkmm2/gtk/gtkmm/private/scale_p.h
index aa5dddf050..65f2e920cc 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/scale_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/scale_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SCALE_P_H
 #define _GTKMM_SCALE_P_H
+
+
 #include <gtkmm/private/range_p.h>
 
 #include <glibmm/class.h>
@@ -30,13 +32,17 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static gchar* format_value_callback(GtkScale* self, gdouble p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void draw_value_vfunc_callback(GtkScale* self);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -69,11 +75,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -106,15 +116,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_SCALE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/scrollbar_p.h b/libs/gtkmm2/gtk/gtkmm/private/scrollbar_p.h
index 4781e3f466..9f0e9c9564 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/scrollbar_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/scrollbar_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SCROLLBAR_P_H
 #define _GTKMM_SCROLLBAR_P_H
+
+
 #include <gtkmm/private/range_p.h>
 
 #include <glibmm/class.h>
@@ -30,11 +32,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -67,11 +73,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -104,15 +114,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_SCROLLBAR_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/scrolledwindow_p.h b/libs/gtkmm2/gtk/gtkmm/private/scrolledwindow_p.h
index f66dde8f03..d66d234b50 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/scrolledwindow_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/scrolledwindow_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SCROLLEDWINDOW_P_H
 #define _GTKMM_SCROLLEDWINDOW_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_SCROLLEDWINDOW_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/selectiondata_p.h b/libs/gtkmm2/gtk/gtkmm/private/selectiondata_p.h
index cb52061df2..0bd23e9909 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/selectiondata_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/selectiondata_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SELECTIONDATA_P_H
 #define _GTKMM_SELECTIONDATA_P_H
+
+
 #endif /* _GTKMM_SELECTIONDATA_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/separator_p.h b/libs/gtkmm2/gtk/gtkmm/private/separator_p.h
index a82c02557d..c6d996a891 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/separator_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/separator_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SEPARATOR_P_H
 #define _GTKMM_SEPARATOR_P_H
+
+
 #include <gtkmm/private/widget_p.h>
 
 #include <glibmm/class.h>
@@ -30,11 +32,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -67,11 +73,15 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
@@ -104,15 +114,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_SEPARATOR_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/separatormenuitem_p.h b/libs/gtkmm2/gtk/gtkmm/private/separatormenuitem_p.h
index 1987425009..c8179813fc 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/separatormenuitem_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/separatormenuitem_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SEPARATORMENUITEM_P_H
 #define _GTKMM_SEPARATORMENUITEM_P_H
+
+
 #include <gtkmm/private/menuitem_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_SEPARATORMENUITEM_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/separatortoolitem_p.h b/libs/gtkmm2/gtk/gtkmm/private/separatortoolitem_p.h
index 5de5fc7e88..10ffaf4f16 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/separatortoolitem_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/separatortoolitem_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SEPARATORTOOLITEM_P_H
 #define _GTKMM_SEPARATORTOOLITEM_P_H
+
+
 #include <gtkmm/private/toolitem_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_SEPARATORTOOLITEM_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/settings_p.h b/libs/gtkmm2/gtk/gtkmm/private/settings_p.h
index 72e13b447a..88a999a636 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/settings_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/settings_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SETTINGS_P_H
 #define _GTKMM_SETTINGS_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_SETTINGS_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/sizegroup_p.h b/libs/gtkmm2/gtk/gtkmm/private/sizegroup_p.h
index f33b8bdf58..0be9253e4f 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/sizegroup_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/sizegroup_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SIZEGROUP_P_H
 #define _GTKMM_SIZEGROUP_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_SIZEGROUP_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/socket_p.h b/libs/gtkmm2/gtk/gtkmm/private/socket_p.h
index 5689897e40..7ca7f82aab 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/socket_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/socket_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SOCKET_P_H
 #define _GTKMM_SOCKET_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,17 +32,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void plug_added_callback(GtkSocket* self);
   static gboolean plug_removed_callback(GtkSocket* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_SOCKET_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/spinbutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/spinbutton_p.h
index f69aee70cf..8c1fd3d490 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/spinbutton_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/spinbutton_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_SPINBUTTON_P_H
 #define _GTKMM_SPINBUTTON_P_H
+
+
 #include <gtkmm/private/entry_p.h>
 
 #include <glibmm/class.h>
@@ -30,18 +32,23 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
-  static gint input_callback(GtkSpinButton* self, gdouble* p0);
+  static gint input_callback(GtkSpinButton* self, double* p0);
   static gboolean output_callback(GtkSpinButton* self);
   static void value_changed_callback(GtkSpinButton* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_SPINBUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/statusbar_p.h b/libs/gtkmm2/gtk/gtkmm/private/statusbar_p.h
index 23efc95695..5dfb2fedb4 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/statusbar_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/statusbar_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_STATUSBAR_P_H
 #define _GTKMM_STATUSBAR_P_H
+
+
 #include <gtkmm/private/box_p.h>
 
 #include <glibmm/class.h>
@@ -30,17 +32,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void text_pushed_callback(GtkStatusbar* self, guint p0, const gchar* p1);
   static void text_popped_callback(GtkStatusbar* self, guint p0, const gchar* p1);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_STATUSBAR_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/stockitem_p.h b/libs/gtkmm2/gtk/gtkmm/private/stockitem_p.h
index 0ac19c3f37..7186456f86 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/stockitem_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/stockitem_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_STOCKITEM_P_H
 #define _GTKMM_STOCKITEM_P_H
+
+
 #endif /* _GTKMM_STOCKITEM_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/style_p.h b/libs/gtkmm2/gtk/gtkmm/private/style_p.h
index 8c10fca392..ffa0a49806 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/style_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/style_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_STYLE_P_H
 #define _GTKMM_STYLE_P_H
+
+
 #include <glibmm/private/object_p.h>
 #include <gtk/gtkrc.h>
 
@@ -31,13 +33,16 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void realize_callback(GtkStyle* self);
   static void unrealize_callback(GtkStyle* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static void realize_vfunc_callback(GtkStyle* self);
   static void unrealize_vfunc_callback(GtkStyle* self);
   static void copy_vfunc_callback(GtkStyle* self, GtkStyle* src);
@@ -66,10 +71,12 @@ protected:
   static void draw_expander_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, GtkExpanderStyle expander_style);
   static void draw_layout_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, gboolean use_text, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, PangoLayout* layout);
   static void draw_resize_grip_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, GdkWindowEdge edge, gint x, gint y, gint width, gint height);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_STYLE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/table_p.h b/libs/gtkmm2/gtk/gtkmm/private/table_p.h
index 8fae19b7cf..12d47b4091 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/table_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/table_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TABLE_P_H
 #define _GTKMM_TABLE_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TABLE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/targetlist_p.h b/libs/gtkmm2/gtk/gtkmm/private/targetlist_p.h
index 508f488cfd..1d3d041c07 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/targetlist_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/targetlist_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TARGETLIST_P_H
 #define _GTKMM_TARGETLIST_P_H
+
+
 #endif /* _GTKMM_TARGETLIST_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/tearoffmenuitem_p.h b/libs/gtkmm2/gtk/gtkmm/private/tearoffmenuitem_p.h
index e6378ac638..b3c479cc76 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/tearoffmenuitem_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/tearoffmenuitem_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TEAROFFMENUITEM_P_H
 #define _GTKMM_TEAROFFMENUITEM_P_H
+
+
 #include <gtkmm/private/menuitem_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TEAROFFMENUITEM_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/textattributes_p.h b/libs/gtkmm2/gtk/gtkmm/private/textattributes_p.h
index 4b922c4c44..462c8fedf3 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/textattributes_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/textattributes_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TEXTATTRIBUTES_P_H
 #define _GTKMM_TEXTATTRIBUTES_P_H
+
+
 #endif /* _GTKMM_TEXTATTRIBUTES_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/textbuffer_p.h b/libs/gtkmm2/gtk/gtkmm/private/textbuffer_p.h
index 59db070205..71dc9afc7c 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/textbuffer_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/textbuffer_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TEXTBUFFER_P_H
 #define _GTKMM_TEXTBUFFER_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,6 +32,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -45,12 +48,16 @@ protected:
   static void remove_tag_callback(GtkTextBuffer* self, GtkTextTag* p0, const GtkTextIter* p1, const GtkTextIter* p2);
   static void begin_user_action_callback(GtkTextBuffer* self);
   static void end_user_action_callback(GtkTextBuffer* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TEXTBUFFER_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/textchildanchor_p.h b/libs/gtkmm2/gtk/gtkmm/private/textchildanchor_p.h
index a3a9822c45..4073dac2a2 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/textchildanchor_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/textchildanchor_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TEXTCHILDANCHOR_P_H
 #define _GTKMM_TEXTCHILDANCHOR_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TEXTCHILDANCHOR_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/textiter_p.h b/libs/gtkmm2/gtk/gtkmm/private/textiter_p.h
index b234c358b0..591f3c94c5 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/textiter_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/textiter_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TEXTITER_P_H
 #define _GTKMM_TEXTITER_P_H
+
+
 #endif /* _GTKMM_TEXTITER_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/textmark_p.h b/libs/gtkmm2/gtk/gtkmm/private/textmark_p.h
index bba46d8c62..4841e5a2c0 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/textmark_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/textmark_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TEXTMARK_P_H
 #define _GTKMM_TEXTMARK_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TEXTMARK_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/texttag_p.h b/libs/gtkmm2/gtk/gtkmm/private/texttag_p.h
index 8cab5dac5b..9a3613fcd0 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/texttag_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/texttag_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TEXTTAG_P_H
 #define _GTKMM_TEXTTAG_P_H
+
+
 #include <glibmm/private/object_p.h>
 #include <gtk/gtktexttag.h>
 
@@ -31,16 +33,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static gboolean event_callback(GtkTextTag* self, GObject* p0, GdkEvent* p1, const GtkTextIter* p2);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TEXTTAG_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/texttagtable_p.h b/libs/gtkmm2/gtk/gtkmm/private/texttagtable_p.h
index 19964742d5..822d486a63 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/texttagtable_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/texttagtable_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TEXTTAGTABLE_P_H
 #define _GTKMM_TEXTTAGTABLE_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,18 +32,23 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void tag_changed_callback(GtkTextTagTable* self, GtkTextTag* p0, gboolean p1);
   static void tag_added_callback(GtkTextTagTable* self, GtkTextTag* p0);
   static void tag_removed_callback(GtkTextTagTable* self, GtkTextTag* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TEXTTAGTABLE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/textview_p.h b/libs/gtkmm2/gtk/gtkmm/private/textview_p.h
index 328d08f8d2..3ffd102f02 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/textview_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/textview_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TEXTVIEW_P_H
 #define _GTKMM_TEXTVIEW_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,6 +32,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -37,12 +40,16 @@ protected:
   static void populate_popup_callback(GtkTextView* self, GtkMenu* p0);
   static void set_anchor_callback(GtkTextView* self);
   static void insert_at_cursor_callback(GtkTextView* self, const gchar* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TEXTVIEW_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/toggleaction_p.h b/libs/gtkmm2/gtk/gtkmm/private/toggleaction_p.h
index 61de249561..15e741f172 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/toggleaction_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/toggleaction_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TOGGLEACTION_P_H
 #define _GTKMM_TOGGLEACTION_P_H
+
+
 #include <gtkmm/private/action_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void toggled_callback(GtkToggleAction* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TOGGLEACTION_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/togglebutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/togglebutton_p.h
index 73b571158f..ea6cf01afd 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/togglebutton_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/togglebutton_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TOGGLEBUTTON_P_H
 #define _GTKMM_TOGGLEBUTTON_P_H
+
+
 #include <gtkmm/private/button_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void toggled_callback(GtkToggleButton* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TOGGLEBUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/toggletoolbutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/toggletoolbutton_p.h
index 9ed1cd4da0..7e0365630e 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/toggletoolbutton_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/toggletoolbutton_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TOGGLETOOLBUTTON_P_H
 #define _GTKMM_TOGGLETOOLBUTTON_P_H
+
+
 #include <gtkmm/private/toolbutton_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void toggled_callback(GtkToggleToolButton* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TOGGLETOOLBUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/toolbar_p.h b/libs/gtkmm2/gtk/gtkmm/private/toolbar_p.h
index f2bb20e0d3..87312f849e 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/toolbar_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/toolbar_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TOOLBAR_P_H
 #define _GTKMM_TOOLBAR_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,18 +32,23 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void orientation_changed_callback(GtkToolbar* self, GtkOrientation p0);
   static void style_changed_callback(GtkToolbar* self, GtkToolbarStyle p0);
   static gboolean popup_context_menu_callback(GtkToolbar* self, gint p0, gint p1, gint p2);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TOOLBAR_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/toolbutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/toolbutton_p.h
index 2cac2dda6b..57798065fc 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/toolbutton_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/toolbutton_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TOOLBUTTON_P_H
 #define _GTKMM_TOOLBUTTON_P_H
+
+
 #include <gtkmm/private/toolitem_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void clicked_callback(GtkToolButton* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TOOLBUTTON_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/toolitem_p.h b/libs/gtkmm2/gtk/gtkmm/private/toolitem_p.h
index a35fb73560..715a50f04d 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/toolitem_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/toolitem_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TOOLITEM_P_H
 #define _GTKMM_TOOLITEM_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -30,17 +32,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static gboolean create_menu_proxy_callback(GtkToolItem* self);
   static void toolbar_reconfigured_callback(GtkToolItem* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TOOLITEM_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/tooltips_p.h b/libs/gtkmm2/gtk/gtkmm/private/tooltips_p.h
index 1872000504..f59792fdf8 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/tooltips_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/tooltips_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TOOLTIPS_P_H
 #define _GTKMM_TOOLTIPS_P_H
+
+
 #include <gtkmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TOOLTIPS_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treedragdest_p.h b/libs/gtkmm2/gtk/gtkmm/private/treedragdest_p.h
index 0486146e02..b8eb6b4268 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treedragdest_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treedragdest_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREEDRAGDEST_P_H
 #define _GTKMM_TREEDRAGDEST_P_H
+
+
 #include <glibmm/private/interface_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,17 +29,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static gboolean drag_data_received_vfunc_callback(GtkTreeDragDest* self, GtkTreePath* dest, GtkSelectionData* selection_data);
   static gboolean row_drop_possible_vfunc_callback(GtkTreeDragDest* self, GtkTreePath* dest_path, GtkSelectionData* selection_data);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TREEDRAGDEST_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treedragsource_p.h b/libs/gtkmm2/gtk/gtkmm/private/treedragsource_p.h
index 07f02f964f..9474f71661 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treedragsource_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treedragsource_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREEDRAGSOURCE_P_H
 #define _GTKMM_TREEDRAGSOURCE_P_H
+
+
 #include <glibmm/private/interface_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,18 +29,23 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
     static gboolean drag_data_get_vfunc_callback(GtkTreeDragSource* self, GtkTreePath* path, GtkSelectionData* selection_data);
     static gboolean row_draggable_vfunc_callback(GtkTreeDragSource* self, GtkTreePath* path);
   static gboolean drag_data_delete_vfunc_callback(GtkTreeDragSource* self, GtkTreePath* path);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TREEDRAGSOURCE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treeiter_p.h b/libs/gtkmm2/gtk/gtkmm/private/treeiter_p.h
index bc45469e97..0dc21a4a87 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treeiter_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treeiter_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREEITER_P_H
 #define _GTKMM_TREEITER_P_H
+
+
 #endif /* _GTKMM_TREEITER_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treemodel_p.h b/libs/gtkmm2/gtk/gtkmm/private/treemodel_p.h
index 401d707834..7737ebfbdd 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treemodel_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treemodel_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREEMODEL_P_H
 #define _GTKMM_TREEMODEL_P_H
+
+
 #include <glibmm/private/interface_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,6 +29,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -35,8 +38,10 @@ protected:
   static void row_has_child_toggled_callback(GtkTreeModel* self, GtkTreePath* path, GtkTreeIter* iter);
   static void row_deleted_callback(GtkTreeModel* self, GtkTreePath* path);
   static void rows_reordered_callback(GtkTreeModel* self, GtkTreePath* path, GtkTreeIter* iter, gint* new_order);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static GtkTreeModelFlags get_flags_vfunc_callback(GtkTreeModel* self);
   static gint get_n_columns_vfunc_callback(GtkTreeModel* self);
   static GType get_column_type_vfunc_callback(GtkTreeModel* self, gint index);
@@ -51,10 +56,12 @@ protected:
   static void unref_node_vfunc_callback(GtkTreeModel* self, GtkTreeIter* iter);
   static GtkTreePath* get_path_vfunc_callback(GtkTreeModel* self, GtkTreeIter* iter);
   static void get_value_vfunc_callback(GtkTreeModel* self, GtkTreeIter* iter, gint column, GValue* value);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TREEMODEL_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treemodelfilter_p.h b/libs/gtkmm2/gtk/gtkmm/private/treemodelfilter_p.h
index cd4f27a229..ced499eaab 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treemodelfilter_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treemodelfilter_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREEMODELFILTER_P_H
 #define _GTKMM_TREEMODELFILTER_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TREEMODELFILTER_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treemodelsort_p.h b/libs/gtkmm2/gtk/gtkmm/private/treemodelsort_p.h
index ce050925cb..80becc6980 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treemodelsort_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treemodelsort_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREEMODELSORT_P_H
 #define _GTKMM_TREEMODELSORT_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TREEMODELSORT_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treepath_p.h b/libs/gtkmm2/gtk/gtkmm/private/treepath_p.h
index 829820cfe5..8381046439 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treepath_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treepath_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREEPATH_P_H
 #define _GTKMM_TREEPATH_P_H
+
+
 #endif /* _GTKMM_TREEPATH_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treerowreference_p.h b/libs/gtkmm2/gtk/gtkmm/private/treerowreference_p.h
index 00bcc4b2fe..44aa245259 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treerowreference_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treerowreference_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREEROWREFERENCE_P_H
 #define _GTKMM_TREEROWREFERENCE_P_H
+
+
 #endif /* _GTKMM_TREEROWREFERENCE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treeselection_p.h b/libs/gtkmm2/gtk/gtkmm/private/treeselection_p.h
index ee7fcce1e7..dbe93b4891 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treeselection_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treeselection_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREESELECTION_P_H
 #define _GTKMM_TREESELECTION_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void changed_callback(GtkTreeSelection* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TREESELECTION_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treesortable_p.h b/libs/gtkmm2/gtk/gtkmm/private/treesortable_p.h
index f93f94c10d..82305bb6d0 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treesortable_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treesortable_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREESORTABLE_P_H
 #define _GTKMM_TREESORTABLE_P_H
+
+
 #include <glibmm/private/interface_p.h>
 
 #include <glibmm/private/interface_p.h>
@@ -27,22 +29,27 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void sort_column_changed_callback(GtkTreeSortable* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
   static gboolean get_sort_column_id_vfunc_callback(GtkTreeSortable* self, int* sort_column_id, GtkSortType* order);
   static void set_sort_column_id_vfunc_callback(GtkTreeSortable* self, int sort_column_id, GtkSortType order);
   static void set_sort_func_vfunc_callback(GtkTreeSortable* self, int sort_column_id, GtkTreeIterCompareFunc func, gpointer data, GtkDestroyNotify destroy);
   static void set_default_sort_func_vfunc_callback(GtkTreeSortable* self, GtkTreeIterCompareFunc func, gpointer data, GtkDestroyNotify destroy);
   static gboolean has_default_sort_func_vfunc_callback(GtkTreeSortable* self);
   static void sort_column_changed_vfunc_callback(GtkTreeSortable* self);
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TREESORTABLE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treestore_p.h b/libs/gtkmm2/gtk/gtkmm/private/treestore_p.h
index fb1c7bc681..a18b3166e2 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treestore_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treestore_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREESTORE_P_H
 #define _GTKMM_TREESTORE_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TREESTORE_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treeview_p.h b/libs/gtkmm2/gtk/gtkmm/private/treeview_p.h
index 127465f857..b2b4668e69 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treeview_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treeview_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREEVIEW_P_H
 #define _GTKMM_TREEVIEW_P_H
+
+
 #include <gtkmm/private/container_p.h>
 
 #include <glibmm/class.h>
@@ -30,6 +32,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -41,12 +44,16 @@ protected:
   static void row_collapsed_callback(GtkTreeView* self, GtkTreeIter* p0, GtkTreePath* p1);
   static void cursor_changed_callback(GtkTreeView* self);
   static void columns_changed_callback(GtkTreeView* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TREEVIEW_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/treeviewcolumn_p.h b/libs/gtkmm2/gtk/gtkmm/private/treeviewcolumn_p.h
index f47a4a3279..7d3a975e4d 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/treeviewcolumn_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/treeviewcolumn_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_TREEVIEWCOLUMN_P_H
 #define _GTKMM_TREEVIEWCOLUMN_P_H
+
+
 #include <gtkmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void clicked_callback(GtkTreeViewColumn* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_TREEVIEWCOLUMN_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/uimanager_p.h b/libs/gtkmm2/gtk/gtkmm/private/uimanager_p.h
index 6932d4f791..ab4d67bb9c 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/uimanager_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/uimanager_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_UIMANAGER_P_H
 #define _GTKMM_UIMANAGER_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,17 +32,22 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void add_widget_callback(GtkUIManager* self, GtkWidget* p0);
   static void actions_changed_callback(GtkUIManager* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_UIMANAGER_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/viewport_p.h b/libs/gtkmm2/gtk/gtkmm/private/viewport_p.h
index 18fce1d06c..e6178502da 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/viewport_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/viewport_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_VIEWPORT_P_H
 #define _GTKMM_VIEWPORT_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -30,16 +32,21 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
   static void set_scroll_adjustments_callback(GtkViewport* self, GtkAdjustment* p0, GtkAdjustment* p1);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_VIEWPORT_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/widget_p.h b/libs/gtkmm2/gtk/gtkmm/private/widget_p.h
index ce8df67d36..cbcb16d1a7 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/widget_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/widget_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_WIDGET_P_H
 #define _GTKMM_WIDGET_P_H
+
+
 #include <gtkmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,6 +32,7 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -87,21 +90,31 @@ protected:
   static gboolean drag_motion_callback(GtkWidget* self, GdkDragContext* p0, gint p1, gint p2, guint p3);
   static gboolean drag_drop_callback(GtkWidget* self, GdkDragContext* p0, gint p1, gint p2, guint p3);
   static void drag_data_received_callback(GtkWidget* self, GdkDragContext* p0, gint p1, gint p2, GtkSelectionData* p3, guint p4, guint p5);
+#ifdef GTKMM_ATKMM_ENABLED
   static AtkObject* get_accessible_callback(GtkWidget* self);
+#endif // GTKMM_ATKMM_ENABLED
   static void screen_changed_callback(GtkWidget* self, GdkScreen* p0);
     static void hierarchy_changed_callback_custom(GtkWidget* self, GtkWidget* p0);
       static void parent_set_callback_custom(GtkWidget* self, GtkWidget* p0);
-  
+  #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED //We always need dispose_vfunc_callback
     static void dispose_vfunc_callback(GObject* self);
+#ifdef GLIBMM_VFUNCS_ENABLED
     static void dispatch_child_properties_changed_vfunc_callback(GtkWidget* self, guint n_pspecs, GParamSpec** pspecs);
   static void show_all_vfunc_callback(GtkWidget* self);
   static void hide_all_vfunc_callback(GtkWidget* self);
+#ifdef GTKMM_ATKMM_ENABLED
   static AtkObject* get_accessible_vfunc_callback(GtkWidget* self);
+#endif // GTKMM_ATKMM_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_WIDGET_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/private/window_p.h b/libs/gtkmm2/gtk/gtkmm/private/window_p.h
index 5413a7284a..381c247f01 100644
--- a/libs/gtkmm2/gtk/gtkmm/private/window_p.h
+++ b/libs/gtkmm2/gtk/gtkmm/private/window_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _GTKMM_WINDOW_P_H
 #define _GTKMM_WINDOW_P_H
+
+
 #include <gtkmm/private/bin_p.h>
 
 #include <glibmm/class.h>
@@ -9,17 +11,17 @@
 namespace Gtk
 {
 
-class Window_Class : public Glib::Class
+class WindowGroup_Class : public Glib::Class
 {
 public:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-  typedef Window CppObjectType;
-  typedef GtkWindow BaseObjectType;
-  typedef GtkWindowClass BaseClassType;
-  typedef Gtk::Bin_Class CppClassParent;
-  typedef GtkBinClass BaseClassParent;
+  typedef WindowGroup CppObjectType;
+  typedef GtkWindowGroup BaseObjectType;
+  typedef GtkWindowGroupClass BaseClassType;
+  typedef Glib::Object_Class CppClassParent;
+  typedef GObjectClass BaseClassParent;
 
-  friend class Window;
+  friend class WindowGroup;
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
   const Glib::Class& init();
@@ -30,15 +32,16 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
-  static void set_focus_callback(GtkWindow* self, GtkWidget* p0);
-  static gboolean frame_event_callback(GtkWindow* self, GdkEvent* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
-    static void dispose_vfunc_callback(GObject* self);
-  };
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+};
 
 
 } // namespace Gtk
@@ -49,17 +52,17 @@ protected:
 namespace Gtk
 {
 
-class WindowGroup_Class : public Glib::Class
+class Window_Class : public Glib::Class
 {
 public:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-  typedef WindowGroup CppObjectType;
-  typedef GtkWindowGroup BaseObjectType;
-  typedef GtkWindowGroupClass BaseClassType;
-  typedef Glib::Object_Class CppClassParent;
-  typedef GObjectClass BaseClassParent;
+  typedef Window CppObjectType;
+  typedef GtkWindow BaseObjectType;
+  typedef GtkWindowClass BaseClassType;
+  typedef Gtk::Bin_Class CppClassParent;
+  typedef GtkBinClass BaseClassParent;
 
-  friend class WindowGroup;
+  friend class Window;
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
   const Glib::Class& init();
@@ -70,15 +73,25 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+  static void set_focus_callback(GtkWindow* self, GtkWidget* p0);
+  static gboolean frame_event_callback(GtkWindow* self, GdkEvent* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED //We always need dispose_vfunc_callback
+    static void dispose_vfunc_callback(GObject* self);
+#ifdef GLIBMM_VFUNCS_ENABLED
+  #endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Gtk
 
+
 #endif /* _GTKMM_WINDOW_P_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/progressbar.cc b/libs/gtkmm2/gtk/gtkmm/progressbar.cc
index fb515e88ad..e5ec87dfea 100644
--- a/libs/gtkmm2/gtk/gtkmm/progressbar.cc
+++ b/libs/gtkmm2/gtk/gtkmm/progressbar.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/progressbar.h>
 #include <gtkmm/private/progressbar_p.h>
 
@@ -29,7 +30,6 @@
 #include <gtkmm/adjustment.h>
 #include <gtk/gtkprogressbar.h>
 
-
 namespace
 {
 } // anonymous namespace
@@ -88,8 +88,19 @@ void ProgressBar_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* ProgressBar_Class::wrap_new(GObject* o)
 {
@@ -139,7 +150,7 @@ ProgressBar::ProgressBar()
 
 void ProgressBar::pulse()
 {
-  gtk_progress_bar_pulse(gobj());
+gtk_progress_bar_pulse(gobj()); 
 }
 
 Glib::ustring ProgressBar::get_text() const
@@ -149,7 +160,7 @@ Glib::ustring ProgressBar::get_text() const
 
 void ProgressBar::set_text(const Glib::ustring& text)
 {
-  gtk_progress_bar_set_text(gobj(), text.c_str());
+gtk_progress_bar_set_text(gobj(), text.c_str()); 
 }
 
 double ProgressBar::get_fraction() const
@@ -159,7 +170,7 @@ double ProgressBar::get_fraction() const
 
 void ProgressBar::set_fraction(double fraction)
 {
-  gtk_progress_bar_set_fraction(gobj(), fraction);
+gtk_progress_bar_set_fraction(gobj(), fraction); 
 }
 
 double ProgressBar::get_pulse_step() const
@@ -169,12 +180,12 @@ double ProgressBar::get_pulse_step() const
 
 void ProgressBar::set_pulse_step(double fraction)
 {
-  gtk_progress_bar_set_pulse_step(gobj(), fraction);
+gtk_progress_bar_set_pulse_step(gobj(), fraction); 
 }
 
 void ProgressBar::set_orientation(ProgressBarOrientation orientation)
 {
-  gtk_progress_bar_set_orientation(gobj(), ((GtkProgressBarOrientation)(orientation)));
+gtk_progress_bar_set_orientation(gobj(), ((GtkProgressBarOrientation)(orientation))); 
 }
 
 ProgressBarOrientation ProgressBar::get_orientation() const
@@ -184,7 +195,7 @@ ProgressBarOrientation ProgressBar::get_orientation() const
 
 void ProgressBar::set_ellipsize(Pango::EllipsizeMode mode)
 {
-  gtk_progress_bar_set_ellipsize(gobj(), ((PangoEllipsizeMode)(mode)));
+gtk_progress_bar_set_ellipsize(gobj(), ((PangoEllipsizeMode)(mode))); 
 }
 
 Pango::EllipsizeMode ProgressBar::get_ellipsize() const
@@ -193,55 +204,82 @@ Pango::EllipsizeMode ProgressBar::get_ellipsize() const
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> ProgressBar::property_fraction() 
 {
   return Glib::PropertyProxy<double>(this, "fraction");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> ProgressBar::property_fraction() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "fraction");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> ProgressBar::property_pulse_step() 
 {
   return Glib::PropertyProxy<double>(this, "pulse-step");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> ProgressBar::property_pulse_step() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "pulse-step");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ProgressBarOrientation> ProgressBar::property_orientation() 
 {
   return Glib::PropertyProxy<ProgressBarOrientation>(this, "orientation");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ProgressBarOrientation> ProgressBar::property_orientation() const
 {
   return Glib::PropertyProxy_ReadOnly<ProgressBarOrientation>(this, "orientation");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> ProgressBar::property_text() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "text");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> ProgressBar::property_text() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "text");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ProgressBar::property_ellipsize() 
 {
   return Glib::PropertyProxy<bool>(this, "ellipsize");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ProgressBar::property_ellipsize() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "ellipsize");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/progressbar.h b/libs/gtkmm2/gtk/gtkmm/progressbar.h
index d79db97633..1a2401a63e 100644
--- a/libs/gtkmm2/gtk/gtkmm/progressbar.h
+++ b/libs/gtkmm2/gtk/gtkmm/progressbar.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_PROGRESSBAR_H
 #define _GTKMM_PROGRESSBAR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -177,11 +178,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -201,11 +208,8 @@ public:
 
   
   /** Retrieves the text displayed superimposed on the progress bar,
-   * if any, otherwise <tt>0</tt>. The return value is a reference
-   * to the text, not a copy of it, so will become invalid
-   * if you change the text in the progress bar.
-   * @return Text, or <tt>0</tt>; this string is owned by the widget
-   * and should not be modified or freed.
+   * if any.
+   * @return Text.
    */
   Glib::ustring get_text() const;
   
@@ -255,21 +259,30 @@ public:
   /** Sets the mode used to ellipsize (add an ellipsis: "...") the text 
    * if there is not enough space to render the entire string.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param mode A Pango::EllipsizeMode.
    */
   void set_ellipsize(Pango::EllipsizeMode mode);
   
+  /** Returns the ellipsizing position of the progressbar. 
+   * See set_ellipsize().
+   * @return Pango::EllipsizeMode
+   * 
+   * @newin2p6.
+   */
   Pango::EllipsizeMode get_ellipsize() const;
 
-  /** The fraction of total work that has been completed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The fraction of total work that has been completed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_fraction() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The fraction of total work that has been completed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -277,15 +290,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_fraction() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The fraction of total progress to move the bouncing block when pulsed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The fraction of total progress to move the bouncing block when pulsed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_pulse_step() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The fraction of total progress to move the bouncing block when pulsed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -293,15 +310,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_pulse_step() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Orientation and growth direction of the progress bar.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Orientation and growth direction of the progress bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ProgressBarOrientation> property_orientation() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Orientation and growth direction of the progress bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -309,15 +330,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ProgressBarOrientation> property_orientation() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Text to be displayed in the progress bar.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Text to be displayed in the progress bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_text() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Text to be displayed in the progress bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -325,15 +350,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_text() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The preferred place to ellipsize the string
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The preferred place to ellipsize the string
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_ellipsize() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The preferred place to ellipsize the string
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -341,6 +370,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_ellipsize() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -356,6 +386,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ProgressBar* wrap(GtkProgressBar* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_PROGRESSBAR_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/radioaction.cc b/libs/gtkmm2/gtk/gtkmm/radioaction.cc
index bac64f9dc4..8d20b23fe6 100644
--- a/libs/gtkmm2/gtk/gtkmm/radioaction.cc
+++ b/libs/gtkmm2/gtk/gtkmm/radioaction.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/radioaction.h>
 #include <gtkmm/private/radioaction_p.h>
 
@@ -64,7 +65,8 @@ void RadioAction::set_group(Group& group)
 namespace
 {
 
-void RadioAction_signal_changed_callback(GtkRadioAction* self, GtkRadioAction* p0,void* data)
+
+static void RadioAction_signal_changed_callback(GtkRadioAction* self, GtkRadioAction* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<RadioAction>& > SlotType;
@@ -72,26 +74,31 @@ void RadioAction_signal_changed_callback(GtkRadioAction* self, GtkRadioAction* p
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo RadioAction_signal_changed_info =
+static const Glib::SignalProxyInfo RadioAction_signal_changed_info =
 {
   "changed",
   (GCallback) &RadioAction_signal_changed_callback,
   (GCallback) &RadioAction_signal_changed_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -138,10 +145,18 @@ void RadioAction_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->changed = &changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void RadioAction_Class::changed_callback(GtkRadioAction* self, GtkRadioAction* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -154,16 +169,20 @@ void RadioAction_Class::changed_callback(GtkRadioAction* self, GtkRadioAction* p
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_changed(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -176,6 +195,7 @@ void RadioAction_Class::changed_callback(GtkRadioAction* self, GtkRadioAction* p
       (*base->changed)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* RadioAction_Class::wrap_new(GObject* object)
@@ -240,6 +260,11 @@ int RadioAction::get_current_value() const
   return gtk_radio_action_get_current_value(const_cast<GtkRadioAction*>(gobj()));
 }
 
+void RadioAction::set_current_value(int current_value)
+{
+gtk_radio_action_set_current_value(gobj(), current_value); 
+}
+
 
 Glib::SignalProxy1< void,const Glib::RefPtr<RadioAction>& > RadioAction::signal_changed()
 {
@@ -247,17 +272,36 @@ Glib::SignalProxy1< void,const Glib::RefPtr<RadioAction>& > RadioAction::signal_
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> RadioAction::property_value() 
 {
   return Glib::PropertyProxy<int>(this, "value");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> RadioAction::property_value() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "value");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<int> RadioAction::property_current_value() 
+{
+  return Glib::PropertyProxy<int>(this, "current-value");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<int> RadioAction::property_current_value() const
+{
+  return Glib::PropertyProxy_ReadOnly<int>(this, "current-value");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::RadioAction::on_changed(const Glib::RefPtr<RadioAction>& current)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -267,6 +311,10 @@ void Gtk::RadioAction::on_changed(const Glib::RefPtr<RadioAction>& current)
   if(base && base->changed)
     (*base->changed)(gobj(),Glib::unwrap(current));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/radioaction.h b/libs/gtkmm2/gtk/gtkmm/radioaction.h
index 7c4366c123..20673cf1de 100644
--- a/libs/gtkmm2/gtk/gtkmm/radioaction.h
+++ b/libs/gtkmm2/gtk/gtkmm/radioaction.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_RADIOACTION_H
 #define _GTKMM_RADIOACTION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -99,35 +100,67 @@ public:
   static Glib::RefPtr<RadioAction> create(Group& group, const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip =  Glib::ustring());
 
   
-  /** Returns the list representing the radio group for this object
+  /** Returns the list representing the radio group for this object.
+   * Note that the returned list is only valid until the next change
+   * to the group. 
+   * 
+   * A common way to set up a group of radio group is the following:
+   * @code
+   * GSList *group = <tt>0</tt>;
+   * GtkRadioAction *action;
+   * 
+   * while (/&lt;!-- --&gt;* more actions to add *&lt;!-- --&gt;/)
+   * {
+   * action = gtk_radio_action_new (...);
+   * 
+   * gtk_radio_action_set_group (action, group);
+   * group = gtk_radio_action_get_group (action);
+   * }
+   * @endcode
    * @return The list representing the radio group for this object
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Group get_group();
    void set_group(Group& group);
   
   
-  /** Obtains the value property of the the currently active member of 
+  /** Obtains the value property of the currently active member of 
    * the group to which @a action  belongs.
    * @return The value of the currently active group member
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   int get_current_value() const;
+  
+  void set_current_value(int current_value);
 
+  /** The changed signal is emitted on every member of a radio group when the
+   * active member is changed. The signal is emitted after the activate signals
+   * for the previous and current active members.
+   *
+   * @param current the member of this action's group which has just been activated.
+   */
   
+/**
+   * @par Prototype:
+   * <tt>void %changed(const Glib::RefPtr<RadioAction>& current)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<RadioAction>& > signal_changed();
 
 
-  /** The value returned by gtk_radio_action_get_current_value when this action is the current action of its group.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The value returned by gtk_radio_action_get_current_value when this action is the current action of its group.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_value() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The value returned by gtk_radio_action_get_current_value when this action is the current action of its group.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -135,18 +168,45 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_value() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The value property of the currently active member of the group to which this action belongs.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<int> property_current_value() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The value property of the currently active member of the group to which this action belongs.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<int> property_current_value() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_changed(const Glib::RefPtr<RadioAction>& current);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/radiobutton.cc b/libs/gtkmm2/gtk/gtkmm/radiobutton.cc
index 6fb1b2985f..6883e36fd8 100644
--- a/libs/gtkmm2/gtk/gtkmm/radiobutton.cc
+++ b/libs/gtkmm2/gtk/gtkmm/radiobutton.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/private/radiobutton_p.h>
 
@@ -79,13 +80,15 @@ void RadioButton::reset_group()
 namespace
 {
 
-const Glib::SignalProxyInfo RadioButton_signal_group_changed_info =
+
+static const Glib::SignalProxyInfo RadioButton_signal_group_changed_info =
 {
   "group_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -130,10 +133,18 @@ void RadioButton_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->group_changed = &group_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void RadioButton_Class::group_changed_callback(GtkRadioButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -146,15 +157,19 @@ void RadioButton_Class::group_changed_callback(GtkRadioButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_group_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -167,6 +182,7 @@ void RadioButton_Class::group_changed_callback(GtkRadioButton* self)
       (*base->group_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* RadioButton_Class::wrap_new(GObject* o)
@@ -220,6 +236,7 @@ Glib::SignalProxy0< void > RadioButton::signal_group_changed()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::RadioButton::on_group_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -229,6 +246,10 @@ void Gtk::RadioButton::on_group_changed()
   if(base && base->group_changed)
     (*base->group_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/radiobutton.h b/libs/gtkmm2/gtk/gtkmm/radiobutton.h
index f81a6e624f..19d5ae323f 100644
--- a/libs/gtkmm2/gtk/gtkmm/radiobutton.h
+++ b/libs/gtkmm2/gtk/gtkmm/radiobutton.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_RADIOBUTTON_H
 #define _GTKMM_RADIOBUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -92,12 +93,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_group_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -125,11 +132,31 @@ public:
   RadioButton(Group& group, const Glib::ustring& label, bool mnemonic = false);
   
 
+  /** Get the radio button's group.
+   * This group may be passed to the constructors of other radio buttons, or used with set_group().
+   *
+   * @result The group to which the radio button belongs.
+   */
+  
   Group get_group();
+
+ /** Set the radio button's group.
+   * You can obtain a suitable group from another radio button by using get_group().
+   *
+   * @result The group to which the radio button should belong.
+   */
   void set_group(Group& group);
+
+  /** Remove the radio button from the group.
+   */
   void reset_group();
   
 
+/**
+   * @par Prototype:
+   * <tt>void %group_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_group_changed();
 
 
@@ -146,6 +173,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::RadioButton* wrap(GtkRadioButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_RADIOBUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/radiomenuitem.cc b/libs/gtkmm2/gtk/gtkmm/radiomenuitem.cc
index 15bff44cc2..ecbbd8ca96 100644
--- a/libs/gtkmm2/gtk/gtkmm/radiomenuitem.cc
+++ b/libs/gtkmm2/gtk/gtkmm/radiomenuitem.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/private/radiomenuitem_p.h>
 
@@ -71,13 +72,15 @@ void RadioMenuItem::reset_group()
 namespace
 {
 
-const Glib::SignalProxyInfo RadioMenuItem_signal_group_changed_info =
+
+static const Glib::SignalProxyInfo RadioMenuItem_signal_group_changed_info =
 {
   "group_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -122,10 +125,18 @@ void RadioMenuItem_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->group_changed = &group_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void RadioMenuItem_Class::group_changed_callback(GtkRadioMenuItem* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -138,15 +149,19 @@ void RadioMenuItem_Class::group_changed_callback(GtkRadioMenuItem* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_group_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -159,6 +174,7 @@ void RadioMenuItem_Class::group_changed_callback(GtkRadioMenuItem* self)
       (*base->group_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* RadioMenuItem_Class::wrap_new(GObject* o)
@@ -212,6 +228,7 @@ Glib::SignalProxy0< void > RadioMenuItem::signal_group_changed()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::RadioMenuItem::on_group_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -221,6 +238,10 @@ void Gtk::RadioMenuItem::on_group_changed()
   if(base && base->group_changed)
     (*base->group_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/radiomenuitem.h b/libs/gtkmm2/gtk/gtkmm/radiomenuitem.h
index 364a088131..c8ea9078c0 100644
--- a/libs/gtkmm2/gtk/gtkmm/radiomenuitem.h
+++ b/libs/gtkmm2/gtk/gtkmm/radiomenuitem.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_RADIOMENUITEM_H
 #define _GTKMM_RADIOMENUITEM_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -92,12 +93,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_group_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -119,7 +126,19 @@ public:
   void set_group(Group& group);
   void reset_group();
 
+  /** Emitted when the group of radio menu items that a radio menu item belongs
+   * to changes. This is emitted when a radio menu item switches from
+   * being alone to being part of a group of 2 or more menu items, or
+   * vice-versa, and when a buttton is moved from one group of 2 or
+   * more menu items to a different one, but not when the composition
+   * of the group that a menu item belongs to changes.
+   */
   
+/**
+   * @par Prototype:
+   * <tt>void %group_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_group_changed();
 
 
@@ -140,6 +159,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::RadioMenuItem* wrap(GtkRadioMenuItem* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_RADIOMENUITEM_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.cc b/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.cc
index 19f716a33b..24c358810e 100644
--- a/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.cc
+++ b/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/radiotoolbutton.h>
 #include <gtkmm/private/radiotoolbutton_p.h>
 
@@ -118,8 +119,19 @@ void RadioToolButton_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* RadioToolButton_Class::wrap_new(GObject* o)
 {
@@ -174,10 +186,17 @@ Group RadioToolButton::get_group()
 
 void RadioToolButton::set_group(Group& group)
 {
-  gtk_radio_tool_button_set_group(gobj(), group.group_);
+gtk_radio_tool_button_set_group(gobj(), group.group_); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.h b/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.h
index 02eec24f74..38200eede3 100644
--- a/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.h
+++ b/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_RADIOTOOLBUTTON_H
 #define _GTKMM_RADIOTOOLBUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -93,11 +94,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -111,7 +118,7 @@ public:
    * Use get_group() to retrieve this group and pass it to other radio buttons to assign
    * them to this group.
    *
-   * Since: 2.4
+   * @newin2p4
    */
   RadioToolButton();
   
@@ -123,7 +130,7 @@ public:
    * @param group The existing group which will be used for this RadioButton.
    * @param label The string used to display the label for this RadioToolButton.
    *
-   * Since: 2.4
+   * @newin2p4
    */
   explicit RadioToolButton(Group& group, const Glib::ustring& label = Glib::ustring());
   
@@ -136,7 +143,7 @@ public:
    * @param group The existing group which will be used for this RadioButton.
    * @param stock_id The StockID which determines the look of the RadioToolButton.
    *
-   * Since: 2.4
+   * @newin2p4
    */
   RadioToolButton(Group& group, const Gtk::StockID& stock_id);
   
@@ -157,7 +164,7 @@ public:
    * @param icon_widget The widget placed as the RadioToolButton's icon.
    * @param label The string used to display the label for this RadioToolButton.
    *
-   * Since: 2.4
+   * @newin2p4
    */
   explicit RadioToolButton(Widget& icon_widget, const Glib::ustring& label = Glib::ustring());
 
@@ -165,13 +172,13 @@ public:
   /** Returns the radio button group @a button  belongs to.
    * @return The group @a button  belongs to.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Group get_group();
   
   /** Adds @a button  to @a group , removing it from the group it belonged to before.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param group An existing radio button group.
    */
   void set_group(Group& group);
@@ -190,6 +197,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::RadioToolButton* wrap(GtkRadioToolButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_RADIOTOOLBUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/range.cc b/libs/gtkmm2/gtk/gtkmm/range.cc
index f7bf958b2e..b6a1f2cf41 100644
--- a/libs/gtkmm2/gtk/gtkmm/range.cc
+++ b/libs/gtkmm2/gtk/gtkmm/range.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/range.h>
 #include <gtkmm/private/range_p.h>
 
@@ -40,7 +41,8 @@ void Range::unset_adjustment()
 namespace
 {
 
-const Glib::SignalProxyInfo Range_signal_value_changed_info =
+
+static const Glib::SignalProxyInfo Range_signal_value_changed_info =
 {
   "value_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -48,7 +50,7 @@ const Glib::SignalProxyInfo Range_signal_value_changed_info =
 };
 
 
-void Range_signal_adjust_bounds_callback(GtkRange* self, gdouble p0,void* data)
+static void Range_signal_adjust_bounds_callback(GtkRange* self, gdouble p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,double > SlotType;
@@ -56,20 +58,24 @@ void Range_signal_adjust_bounds_callback(GtkRange* self, gdouble p0,void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Range_signal_adjust_bounds_info =
+static const Glib::SignalProxyInfo Range_signal_adjust_bounds_info =
 {
   "adjust_bounds",
   (GCallback) &Range_signal_adjust_bounds_callback,
@@ -77,7 +83,7 @@ const Glib::SignalProxyInfo Range_signal_adjust_bounds_info =
 };
 
 
-void Range_signal_move_slider_callback(GtkRange* self, GtkScrollType p0,void* data)
+static void Range_signal_move_slider_callback(GtkRange* self, GtkScrollType p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,ScrollType > SlotType;
@@ -85,20 +91,24 @@ void Range_signal_move_slider_callback(GtkRange* self, GtkScrollType p0,void* da
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(((ScrollType)(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Range_signal_move_slider_info =
+static const Glib::SignalProxyInfo Range_signal_move_slider_info =
 {
   "move_slider",
   (GCallback) &Range_signal_move_slider_callback,
@@ -106,7 +116,7 @@ const Glib::SignalProxyInfo Range_signal_move_slider_info =
 };
 
 
-gboolean Range_signal_change_value_callback(GtkRange* self, GtkScrollType p0,gdouble p1,void* data)
+static gboolean Range_signal_change_value_callback(GtkRange* self, GtkScrollType p0,gdouble p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,ScrollType,double > SlotType;
@@ -114,24 +124,28 @@ gboolean Range_signal_change_value_callback(GtkRange* self, GtkScrollType p0,gdo
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(((ScrollType)(p0))
 , p1
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Range_signal_change_value_notify_callback(GtkRange* self, GtkScrollType p0,gdouble p1, void* data)
+static gboolean Range_signal_change_value_notify_callback(GtkRange* self, GtkScrollType p0,gdouble p1, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,ScrollType,double > SlotType;
@@ -139,32 +153,43 @@ gboolean Range_signal_change_value_notify_callback(GtkRange* self, GtkScrollType
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(((ScrollType)(p0))
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Range_signal_change_value_info =
+static const Glib::SignalProxyInfo Range_signal_change_value_info =
 {
   "change_value",
   (GCallback) &Range_signal_change_value_callback,
   (GCallback) &Range_signal_change_value_notify_callback
 };
 
+
 } // anonymous namespace
 
+// static
+GType Glib::Value<Gtk::SensitivityType>::value_type()
+{
+  return gtk_sensitivity_type_get_type();
+}
+
 
 namespace Glib
 {
@@ -207,12 +232,18 @@ void Range_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->get_range_border = &get_range_border_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->value_changed = &value_changed_callback;
   klass->adjust_bounds = &adjust_bounds_callback;
   klass->move_slider = &move_slider_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Range_Class::get_range_border_vfunc_callback(GtkRange* self, GtkBorder* border)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -225,15 +256,19 @@ void Range_Class::get_range_border_vfunc_callback(GtkRange* self, GtkBorder* bor
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_range_border_vfunc(border);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -246,8 +281,9 @@ void Range_Class::get_range_border_vfunc_callback(GtkRange* self, GtkBorder* bor
       (*base->get_range_border)(self, border);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Range_Class::value_changed_callback(GtkRange* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -260,15 +296,19 @@ void Range_Class::value_changed_callback(GtkRange* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_value_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -281,7 +321,6 @@ void Range_Class::value_changed_callback(GtkRange* self)
       (*base->value_changed)(self);
   }
 }
-
 void Range_Class::adjust_bounds_callback(GtkRange* self, gdouble p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -294,16 +333,20 @@ void Range_Class::adjust_bounds_callback(GtkRange* self, gdouble p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_adjust_bounds(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -316,7 +359,6 @@ void Range_Class::adjust_bounds_callback(GtkRange* self, gdouble p0)
       (*base->adjust_bounds)(self, p0);
   }
 }
-
 void Range_Class::move_slider_callback(GtkRange* self, GtkScrollType p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -329,16 +371,20 @@ void Range_Class::move_slider_callback(GtkRange* self, GtkScrollType p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_move_slider(((ScrollType)(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -351,6 +397,7 @@ void Range_Class::move_slider_callback(GtkRange* self, GtkScrollType p0)
       (*base->move_slider)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Range_Class::wrap_new(GObject* o)
@@ -401,7 +448,7 @@ Range::Range()
 
 void Range::set_update_policy(UpdateType policy)
 {
-  gtk_range_set_update_policy(gobj(), ((GtkUpdateType)(policy)));
+gtk_range_set_update_policy(gobj(), ((GtkUpdateType)(policy))); 
 }
 
 UpdateType Range::get_update_policy() const
@@ -411,7 +458,7 @@ UpdateType Range::get_update_policy() const
 
 void Range::set_adjustment(Gtk::Adjustment& adjustment)
 {
-  gtk_range_set_adjustment(gobj(), (adjustment).gobj());
+gtk_range_set_adjustment(gobj(), (adjustment).gobj()); 
 }
 
 Gtk::Adjustment* Range::get_adjustment()
@@ -421,12 +468,12 @@ Gtk::Adjustment* Range::get_adjustment()
 
 const Gtk::Adjustment* Range::get_adjustment() const
 {
-  return Glib::wrap(gtk_range_get_adjustment(const_cast<GtkRange*>(gobj())));
+  return const_cast<Range*>(this)->get_adjustment();
 }
 
 void Range::set_inverted(bool setting)
 {
-  gtk_range_set_inverted(gobj(), static_cast<int>(setting));
+gtk_range_set_inverted(gobj(), static_cast<int>(setting)); 
 }
 
 bool Range::get_inverted() const
@@ -434,19 +481,39 @@ bool Range::get_inverted() const
   return gtk_range_get_inverted(const_cast<GtkRange*>(gobj()));
 }
 
+void Range::set_lower_stepper_sensitivity(SensitivityType sensitivity)
+{
+gtk_range_set_lower_stepper_sensitivity(gobj(), ((GtkSensitivityType)(sensitivity))); 
+}
+
+SensitivityType Range::get_lower_stepper_sensitivity() const
+{
+  return ((SensitivityType)(gtk_range_get_lower_stepper_sensitivity(const_cast<GtkRange*>(gobj()))));
+}
+
+void Range::set_upper_stepper_sensitivity(SensitivityType sensitivity)
+{
+gtk_range_set_upper_stepper_sensitivity(gobj(), ((GtkSensitivityType)(sensitivity))); 
+}
+
+SensitivityType Range::get_upper_stepper_sensitivity() const
+{
+  return ((SensitivityType)(gtk_range_get_upper_stepper_sensitivity(const_cast<GtkRange*>(gobj()))));
+}
+
 void Range::set_increments(double step, double page)
 {
-  gtk_range_set_increments(gobj(), step, page);
+gtk_range_set_increments(gobj(), step, page); 
 }
 
 void Range::set_range(double min, double max)
 {
-  gtk_range_set_range(gobj(), min, max);
+gtk_range_set_range(gobj(), min, max); 
 }
 
 void Range::set_value(double value)
 {
-  gtk_range_set_value(gobj(), value);
+gtk_range_set_value(gobj(), value); 
 }
 
 double Range::get_value() const
@@ -460,53 +527,97 @@ Glib::SignalProxy0< void > Range::signal_value_changed()
   return Glib::SignalProxy0< void >(this, &Range_signal_value_changed_info);
 }
 
+
 Glib::SignalProxy1< void,double > Range::signal_adjust_bounds()
 {
   return Glib::SignalProxy1< void,double >(this, &Range_signal_adjust_bounds_info);
 }
 
+
 Glib::SignalProxy1< void,ScrollType > Range::signal_move_slider()
 {
   return Glib::SignalProxy1< void,ScrollType >(this, &Range_signal_move_slider_info);
 }
 
+
 Glib::SignalProxy2< bool,ScrollType,double > Range::signal_change_value()
 {
   return Glib::SignalProxy2< bool,ScrollType,double >(this, &Range_signal_change_value_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<UpdateType> Range::property_update_policy() 
 {
   return Glib::PropertyProxy<UpdateType>(this, "update-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<UpdateType> Range::property_update_policy() const
 {
   return Glib::PropertyProxy_ReadOnly<UpdateType>(this, "update-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Adjustment*> Range::property_adjustment() 
 {
   return Glib::PropertyProxy<Adjustment*>(this, "adjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Adjustment*> Range::property_adjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Adjustment*>(this, "adjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Range::property_inverted() 
 {
   return Glib::PropertyProxy<bool>(this, "inverted");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Range::property_inverted() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "inverted");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<SensitivityType> Range::property_lower_stepper_sensitivity() 
+{
+  return Glib::PropertyProxy<SensitivityType>(this, "lower-stepper-sensitivity");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<SensitivityType> Range::property_lower_stepper_sensitivity() const
+{
+  return Glib::PropertyProxy_ReadOnly<SensitivityType>(this, "lower-stepper-sensitivity");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<SensitivityType> Range::property_upper_stepper_sensitivity() 
+{
+  return Glib::PropertyProxy<SensitivityType>(this, "upper-stepper-sensitivity");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<SensitivityType> Range::property_upper_stepper_sensitivity() const
+{
+  return Glib::PropertyProxy_ReadOnly<SensitivityType>(this, "upper-stepper-sensitivity");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Range::on_value_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -516,7 +627,6 @@ void Gtk::Range::on_value_changed()
   if(base && base->value_changed)
     (*base->value_changed)(gobj());
 }
-
 void Gtk::Range::on_adjust_bounds(double new_value)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -526,7 +636,6 @@ void Gtk::Range::on_adjust_bounds(double new_value)
   if(base && base->adjust_bounds)
     (*base->adjust_bounds)(gobj(),new_value);
 }
-
 void Gtk::Range::on_move_slider(ScrollType scroll)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -536,8 +645,9 @@ void Gtk::Range::on_move_slider(ScrollType scroll)
   if(base && base->move_slider)
     (*base->move_slider)(gobj(),((GtkScrollType)(scroll)));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::Range::get_range_border_vfunc(GtkBorder* border) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -547,6 +657,7 @@ void Gtk::Range::get_range_border_vfunc(GtkBorder* border) const
   if(base && base->get_range_border)
     (*base->get_range_border)(const_cast<GtkRange*>(gobj()),border);
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/range.h b/libs/gtkmm2/gtk/gtkmm/range.h
index f84118bb65..ec67da392c 100644
--- a/libs/gtkmm2/gtk/gtkmm/range.h
+++ b/libs/gtkmm2/gtk/gtkmm/range.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_RANGE_H
 #define _GTKMM_RANGE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -38,6 +39,40 @@ namespace Gtk
 namespace Gtk
 {
 
+/** @addtogroup gtkmmEnums Enums and Flags */
+
+/**
+ * @ingroup gtkmmEnums
+ */
+enum SensitivityType
+{
+  SENSITIVITY_AUTO,
+  SENSITIVITY_ON,
+  SENSITIVITY_OFF
+};
+
+} // namespace Gtk
+
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+namespace Glib
+{
+
+template <>
+class Value<Gtk::SensitivityType> : public Glib::Value_Enum<Gtk::SensitivityType>
+{
+public:
+  static GType value_type() G_GNUC_CONST;
+};
+
+} // namespace Glib
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
+
+namespace Gtk
+{
+
+
 class Adjustment;
 
 /** Base class for widgets which visualize an adjustment.
@@ -88,14 +123,20 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_value_changed();
   virtual void on_adjust_bounds(double new_value);
   virtual void on_move_slider(ScrollType scroll);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -163,6 +204,16 @@ public:
    * @return <tt>true</tt> if the range is inverted.
    */
   bool get_inverted() const;
+
+  
+  void set_lower_stepper_sensitivity(SensitivityType sensitivity);
+  
+  SensitivityType get_lower_stepper_sensitivity() const;
+  
+  void set_upper_stepper_sensitivity(SensitivityType sensitivity);
+  
+  SensitivityType get_upper_stepper_sensitivity() const;
+
   
   /** Sets the step and page sizes for the range.
    * The step size is used when the user clicks the Gtk::Scrollbar
@@ -195,30 +246,73 @@ public:
   double get_value() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %value_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_value_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %adjust_bounds(double new_value)</tt>
+   */
+
   Glib::SignalProxy1< void,double > signal_adjust_bounds();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %move_slider(ScrollType scroll)</tt>
+   */
+
   Glib::SignalProxy1< void,ScrollType > signal_move_slider();
 
   
   //We use no_default_handler for this, because we can not add a new vfunc to 2.5 without breaking ABI.
   //TODO: Remove no_default_handler when we do an ABI-break-with-parallel-install.
+  /** The change_value signal is emitted when a scroll action is
+   * performed on a range.  It allows an application to determine the
+   * type of scroll event that occurred and the resultant new value.
+   * The application can handle the event itself and return true to
+   * prevent further processing.  Or, by returning false, it can pass
+   * the event to other handlers until the default GTK+ handler is
+   * reached.
+   *
+   * The value parameter is unrounded.  An application that overrides
+   * the change_value signal is responsible for clamping the value to
+   * the desired number of decimal digits; the default handler 
+   * clamps the value based on range->round_digits.
+   *
+   * It is not possible to use delayed update policies in an overridden
+   * change_value handler.
+   *
+   * @param scroll the type of scroll action that was performed.
+   * @param new_value the new value resulting from the scroll action.
+   * @result true to prevent other handlers from being invoked for the
+   * signal, or false to propagate the signal further.
+   */
   
+/**
+   * @par Prototype:
+   * <tt>bool %change_value(ScrollType scroll, double new_value)</tt>
+   */
 
   Glib::SignalProxy2< bool,ScrollType,double > signal_change_value();
 
 
-  /** How the range should be updated on the screen.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** How the range should be updated on the screen.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<UpdateType> property_update_policy() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** How the range should be updated on the screen.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -226,15 +320,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<UpdateType> property_update_policy() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The GtkAdjustment that contains the current value of this range object.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The GtkAdjustment that contains the current value of this range object.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Adjustment*> property_adjustment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The GtkAdjustment that contains the current value of this range object.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -242,15 +340,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Adjustment*> property_adjustment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Invert direction slider moves to increase range value.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Invert direction slider moves to increase range value.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_inverted() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Invert direction slider moves to increase range value.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -258,10 +360,53 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_inverted() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The sensitivity policy for the stepper that points to the adjustment's lower side.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<SensitivityType> property_lower_stepper_sensitivity() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The sensitivity policy for the stepper that points to the adjustment's lower side.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<SensitivityType> property_lower_stepper_sensitivity() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The sensitivity policy for the stepper that points to the adjustment's upper side.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<SensitivityType> property_upper_stepper_sensitivity() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The sensitivity policy for the stepper that points to the adjustment's upper side.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<SensitivityType> property_upper_stepper_sensitivity() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
   
 protected:
-    virtual void get_range_border_vfunc(GtkBorder* border) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_range_border_vfunc(GtkBorder* border) const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 };
@@ -277,6 +422,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Range* wrap(GtkRange* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_RANGE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/rc.cc b/libs/gtkmm2/gtk/gtkmm/rc.cc
index 7fcb207764..e4e4a8c999 100644
--- a/libs/gtkmm2/gtk/gtkmm/rc.cc
+++ b/libs/gtkmm2/gtk/gtkmm/rc.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/rc.h>
 #include <gtkmm/private/rc_p.h>
 
@@ -236,8 +237,19 @@ void RcStyle_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* RcStyle_Class::wrap_new(GObject* object)
 {
@@ -296,11 +308,11 @@ Glib::RefPtr<RcStyle> RcStyle::copy() const
   return Glib::wrap(gtk_rc_style_copy(const_cast<GtkRcStyle*>(gobj())));
 }
 
-Glib::ustring RcStyle::get_name() const
+ Glib::ustring RcStyle::get_name() const
 {
   return Glib::convert_const_gchar_ptr_to_ustring(gobj()->name);
 }
-
+ 
 void RcStyle::set_fg(StateType state, const Gdk::Color& color)
 {
   gobj()->fg[state] = *color.gobj();
@@ -341,15 +353,22 @@ Gdk::Color RcStyle::get_base(StateType state) const
   return Gdk::Color(const_cast<GdkColor*>(&gobj()->base[state]), true);
 }
 
-int RcStyle::get_xthickness() const
+ int RcStyle::get_xthickness() const
 {
   return gobj()->xthickness;
 }
-
-int RcStyle::get_ythickness() const
+ 
+ int RcStyle::get_ythickness() const
 {
   return gobj()->ythickness;
 }
+ 
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/rc.h b/libs/gtkmm2/gtk/gtkmm/rc.h
index 003fd91c15..778a4ed7c8 100644
--- a/libs/gtkmm2/gtk/gtkmm/rc.h
+++ b/libs/gtkmm2/gtk/gtkmm/rc.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_RC_H
 #define _GTKMM_RC_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -177,8 +178,8 @@ public:
   Glib::RefPtr<RcStyle> copy() const;
 
   void set_name(const Glib::ustring& name);
-  Glib::ustring get_name() const;
-
+   Glib::ustring get_name() const;
+ 
   void set_bg_pixmap_name(Gtk::StateType state, const Glib::ustring& name);
   Glib::ustring get_bg_pixmap_name(Gtk::StateType state) const;
 
@@ -203,21 +204,27 @@ public:
 
 
   void set_xthickness(int xthickness);
-  int get_xthickness() const;
-
+   int get_xthickness() const;
+ 
   void set_ythickness(int ythickness);
-  int get_ythickness() const;
-
+   int get_ythickness() const;
+ 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -289,7 +296,7 @@ public:
    *
    * @param settings a Gtk::Settings
    *
-   * Since: 2.4
+   * @newin2p4
    */
   static void reset_styles(const Glib::RefPtr<Settings>& settings);
 
diff --git a/libs/gtkmm2/gtk/gtkmm/ruler.cc b/libs/gtkmm2/gtk/gtkmm/ruler.cc
index 0983eb0210..f104c64455 100644
--- a/libs/gtkmm2/gtk/gtkmm/ruler.cc
+++ b/libs/gtkmm2/gtk/gtkmm/ruler.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/ruler.h>
 #include <gtkmm/private/ruler_p.h>
 
@@ -93,10 +94,16 @@ void Ruler_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->draw_ticks = &draw_ticks_vfunc_callback;
   klass->draw_pos = &draw_pos_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Ruler_Class::draw_ticks_vfunc_callback(GtkRuler* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -109,15 +116,19 @@ void Ruler_Class::draw_ticks_vfunc_callback(GtkRuler* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_ticks_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -130,7 +141,6 @@ void Ruler_Class::draw_ticks_vfunc_callback(GtkRuler* self)
       (*base->draw_ticks)(self);
   }
 }
-
 void Ruler_Class::draw_pos_vfunc_callback(GtkRuler* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -143,15 +153,19 @@ void Ruler_Class::draw_pos_vfunc_callback(GtkRuler* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_pos_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -164,6 +178,10 @@ void Ruler_Class::draw_pos_vfunc_callback(GtkRuler* self)
       (*base->draw_pos)(self);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Ruler_Class::wrap_new(GObject* o)
@@ -214,7 +232,7 @@ Ruler::Ruler()
 
 void Ruler::set_metric(MetricType metric)
 {
-  gtk_ruler_set_metric(gobj(), ((GtkMetricType)(metric)));
+gtk_ruler_set_metric(gobj(), ((GtkMetricType)(metric))); 
 }
 
 MetricType Ruler::get_metric()
@@ -222,78 +240,98 @@ MetricType Ruler::get_metric()
   return ((MetricType)(gtk_ruler_get_metric(gobj())));
 }
 
-double Ruler::get_range_lower() const
+ double Ruler::get_range_lower() const
 {
   return gobj()->lower;
 }
-
-double Ruler::get_range_upper() const
+ 
+ double Ruler::get_range_upper() const
 {
   return gobj()->upper;
 }
-
+ 
 void Ruler::set_range(double lower, double upper, double position, double max_size)
 {
-  gtk_ruler_set_range(gobj(), lower, upper, position, max_size);
+gtk_ruler_set_range(gobj(), lower, upper, position, max_size); 
 }
 
 void Ruler::get_range(double& lower, double& upper, double& position, double& max_size)
 {
-  gtk_ruler_get_range(gobj(), &(lower), &(upper), &(position), &(max_size));
+gtk_ruler_get_range(gobj(), &(lower), &(upper), &(position), &(max_size)); 
 }
 
 void Ruler::draw_ticks()
 {
-  gtk_ruler_draw_ticks(gobj());
+gtk_ruler_draw_ticks(gobj()); 
 }
 
 void Ruler::draw_pos()
 {
-  gtk_ruler_draw_pos(gobj());
+gtk_ruler_draw_pos(gobj()); 
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> Ruler::property_lower() 
 {
   return Glib::PropertyProxy<double>(this, "lower");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> Ruler::property_lower() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "lower");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> Ruler::property_upper() 
 {
   return Glib::PropertyProxy<double>(this, "upper");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> Ruler::property_upper() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "upper");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> Ruler::property_position() 
 {
   return Glib::PropertyProxy<double>(this, "position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> Ruler::property_position() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> Ruler::property_max_size() 
 {
   return Glib::PropertyProxy<double>(this, "max-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> Ruler::property_max_size() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "max-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::Ruler::draw_ticks_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -303,7 +341,6 @@ void Gtk::Ruler::draw_ticks_vfunc()
   if(base && base->draw_ticks)
     (*base->draw_ticks)(gobj());
 }
-
 void Gtk::Ruler::draw_pos_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -313,6 +350,7 @@ void Gtk::Ruler::draw_pos_vfunc()
   if(base && base->draw_pos)
     (*base->draw_pos)(gobj());
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
@@ -359,8 +397,19 @@ void VRuler_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* VRuler_Class::wrap_new(GObject* o)
 {
@@ -408,6 +457,13 @@ VRuler::VRuler()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
@@ -452,8 +508,19 @@ void HRuler_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* HRuler_Class::wrap_new(GObject* o)
 {
@@ -501,6 +568,13 @@ HRuler::HRuler()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/ruler.h b/libs/gtkmm2/gtk/gtkmm/ruler.h
index 510df8c7b4..3afec185d1 100644
--- a/libs/gtkmm2/gtk/gtkmm/ruler.h
+++ b/libs/gtkmm2/gtk/gtkmm/ruler.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_RULER_H
 #define _GTKMM_RULER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -110,11 +111,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -141,9 +148,9 @@ public:
    */
   MetricType get_metric();
 
-  double get_range_lower() const;
-  double get_range_upper() const;
-
+   double get_range_lower() const;
+    double get_range_upper() const;
+ 
   /** sets the range of the ruler.
    * <i>upper</i> and <i>lower</i> arguments denote the extents of the Ruler.
    * <i>max_size</i> is the largest number displayed by the ruler.
@@ -171,17 +178,26 @@ public:
   
   void draw_pos();
 
-    virtual void draw_ticks_vfunc();
-    virtual void draw_pos_vfunc();
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_ticks_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_pos_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
-  /** Lower limit of ruler.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Lower limit of ruler.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_lower() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Lower limit of ruler.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -189,15 +205,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_lower() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Upper limit of ruler.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Upper limit of ruler.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_upper() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Upper limit of ruler.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -205,15 +225,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_upper() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Position of mark on the ruler.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Position of mark on the ruler.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_position() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Position of mark on the ruler.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -221,15 +245,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_position() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Maximum size of the ruler.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Maximum size of the ruler.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_max_size() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Maximum size of the ruler.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -237,6 +265,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_max_size() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -290,11 +319,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -354,11 +389,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -380,7 +421,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Ruler* wrap(GtkRuler* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::VRuler
@@ -389,7 +432,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::VRuler* wrap(GtkVRuler* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::HRuler
@@ -398,6 +443,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::HRuler* wrap(GtkHRuler* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_RULER_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/scale.cc b/libs/gtkmm2/gtk/gtkmm/scale.cc
index 6b7042daa7..e3ca69c1f1 100644
--- a/libs/gtkmm2/gtk/gtkmm/scale.cc
+++ b/libs/gtkmm2/gtk/gtkmm/scale.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/scale.h>
 #include <gtkmm/private/scale_p.h>
 
@@ -120,7 +121,8 @@ HScale::HScale(Adjustment& adjustment)
 namespace
 {
 
-gchar* Scale_signal_format_value_callback(GtkScale* self, gdouble p0,void* data)
+
+static gchar* Scale_signal_format_value_callback(GtkScale* self, gdouble p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< Glib::ustring,double > SlotType;
@@ -128,24 +130,28 @@ gchar* Scale_signal_format_value_callback(GtkScale* self, gdouble p0,void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return (strlen((*static_cast<SlotType*>(slot))(p0
 ).c_str()) ? g_strdup((*static_cast<SlotType*>(slot))(p0
 ).c_str()) : 0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gchar* RType;
   return RType();
 }
 
-gchar* Scale_signal_format_value_notify_callback(GtkScale* self, gdouble p0, void* data)
+static gchar* Scale_signal_format_value_notify_callback(GtkScale* self, gdouble p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,double > SlotType;
@@ -153,29 +159,34 @@ gchar* Scale_signal_format_value_notify_callback(GtkScale* self, gdouble p0, voi
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gchar* RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Scale_signal_format_value_info =
+static const Glib::SignalProxyInfo Scale_signal_format_value_info =
 {
   "format_value",
   (GCallback) &Scale_signal_format_value_callback,
   (GCallback) &Scale_signal_format_value_notify_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -220,10 +231,16 @@ void Scale_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->draw_value = &draw_value_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->format_value = &format_value_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Scale_Class::draw_value_vfunc_callback(GtkScale* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -236,15 +253,19 @@ void Scale_Class::draw_value_vfunc_callback(GtkScale* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_value_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -257,8 +278,9 @@ void Scale_Class::draw_value_vfunc_callback(GtkScale* self)
       (*base->draw_value)(self);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 gchar* Scale_Class::format_value_callback(GtkScale* self, gdouble p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -271,17 +293,21 @@ gchar* Scale_Class::format_value_callback(GtkScale* self, gdouble p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return (strlen(obj->on_format_value(p0
 ).c_str()) ? g_strdup(obj->on_format_value(p0
 ).c_str()) : 0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -297,6 +323,7 @@ gchar* Scale_Class::format_value_callback(GtkScale* self, gdouble p0)
   typedef gchar* RType;
   return RType();
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Scale_Class::wrap_new(GObject* o)
@@ -347,7 +374,7 @@ Scale::Scale()
 
 void Scale::set_digits(int digits)
 {
-  gtk_scale_set_digits(gobj(), digits);
+gtk_scale_set_digits(gobj(), digits); 
 }
 
 int Scale::get_digits() const
@@ -357,7 +384,7 @@ int Scale::get_digits() const
 
 void Scale::set_draw_value(bool draw_value)
 {
-  gtk_scale_set_draw_value(gobj(), static_cast<int>(draw_value));
+gtk_scale_set_draw_value(gobj(), static_cast<int>(draw_value)); 
 }
 
 bool Scale::get_draw_value() const
@@ -367,7 +394,7 @@ bool Scale::get_draw_value() const
 
 void Scale::set_value_pos(PositionType pos)
 {
-  gtk_scale_set_value_pos(gobj(), ((GtkPositionType)(pos)));
+gtk_scale_set_value_pos(gobj(), ((GtkPositionType)(pos))); 
 }
 
 PositionType Scale::get_value_pos() const
@@ -379,25 +406,20 @@ Glib::RefPtr<Pango::Layout> Scale::get_layout()
 {
 
   Glib::RefPtr<Pango::Layout> retvalue = Glib::wrap(gtk_scale_get_layout(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Pango::Layout> Scale::get_layout() const
 {
-
-  Glib::RefPtr<const Pango::Layout> retvalue = Glib::wrap(gtk_scale_get_layout(const_cast<GtkScale*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Scale*>(this)->get_layout();
 }
 
 void Scale::get_layout_offsets(int& x, int& y) const
 {
-  gtk_scale_get_layout_offsets(const_cast<GtkScale*>(gobj()), &x, &y);
+gtk_scale_get_layout_offsets(const_cast<GtkScale*>(gobj()), &x, &y); 
 }
 
 
@@ -407,37 +429,50 @@ Glib::SignalProxy1< Glib::ustring,double > Scale::signal_format_value()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Scale::property_digits() 
 {
   return Glib::PropertyProxy<int>(this, "digits");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Scale::property_digits() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "digits");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Scale::property_draw_value() 
 {
   return Glib::PropertyProxy<bool>(this, "draw-value");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Scale::property_draw_value() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "draw-value");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<PositionType> Scale::property_value_pos() 
 {
   return Glib::PropertyProxy<PositionType>(this, "value-pos");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<PositionType> Scale::property_value_pos() const
 {
   return Glib::PropertyProxy_ReadOnly<PositionType>(this, "value-pos");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 Glib::ustring Gtk::Scale::on_format_value(double value)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -450,8 +485,9 @@ Glib::ustring Gtk::Scale::on_format_value(double value)
   typedef Glib::ustring RType;
   return RType();
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::Scale::draw_value_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -461,6 +497,7 @@ void Gtk::Scale::draw_value_vfunc()
   if(base && base->draw_value)
     (*base->draw_value)(gobj());
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
@@ -507,8 +544,19 @@ void VScale_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* VScale_Class::wrap_new(GObject* o)
 {
@@ -549,6 +597,13 @@ GType VScale::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
@@ -593,8 +648,19 @@ void HScale_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* HScale_Class::wrap_new(GObject* o)
 {
@@ -635,6 +701,13 @@ GType HScale::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/scale.h b/libs/gtkmm2/gtk/gtkmm/scale.h
index fb4d39dbad..3313552d20 100644
--- a/libs/gtkmm2/gtk/gtkmm/scale.h
+++ b/libs/gtkmm2/gtk/gtkmm/scale.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_SCALE_H
 #define _GTKMM_SCALE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -114,12 +115,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual Glib::ustring on_format_value(double value);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -169,7 +176,7 @@ public:
    * @return The Pango::Layout for this scale, or <tt>0</tt> if the draw_value property
    * is <tt>false</tt>.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<Pango::Layout> get_layout();
   
@@ -178,7 +185,7 @@ public:
    * @return The Pango::Layout for this scale, or <tt>0</tt> if the draw_value property
    * is <tt>false</tt>.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<const Pango::Layout> get_layout() const;
   
@@ -190,7 +197,7 @@ public:
    * If the draw_value property is <tt>false</tt>, the return values are 
    * undefined.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param x Location to store X offset of layout, or <tt>0</tt>.
    * @param y Location to store Y offset of layout, or <tt>0</tt>.
    */
@@ -204,6 +211,10 @@ public:
    * as a double and should return the representation of it as a Glib::ustring.
    */ 
   
+/**
+   * @par Prototype:
+   * <tt>Glib::ustring %format_value(double value)</tt>
+   */
 
   Glib::SignalProxy1< Glib::ustring,double > signal_format_value();
 
@@ -213,14 +224,17 @@ public:
 
   /** Number of displayed decimal digits.
    */
-  /** The number of decimal places that are displayed in the value.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The number of decimal places that are displayed in the value.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_digits() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The number of decimal places that are displayed in the value.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -228,18 +242,22 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_digits() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
   /** Whether to draw the value as a string next to slider.
    */
-  /** Whether the current value is displayed as a string next to the slider.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the current value is displayed as a string next to the slider.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_draw_value() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the current value is displayed as a string next to the slider.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -247,18 +265,22 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_draw_value() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
   /** The position in which the value is displayed.
    */
-  /** The position in which the current value is displayed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The position in which the current value is displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<PositionType> property_value_pos() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The position in which the current value is displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -266,11 +288,15 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<PositionType> property_value_pos() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
 
-    virtual void draw_value_vfunc();
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_value_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
   
   virtual int calc_digits_(double step) const;
 
@@ -329,11 +355,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -404,11 +436,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -437,7 +475,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Scale* wrap(GtkScale* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::VScale
@@ -446,7 +486,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::VScale* wrap(GtkVScale* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::HScale
@@ -455,6 +497,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::HScale* wrap(GtkHScale* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_SCALE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/scrollbar.cc b/libs/gtkmm2/gtk/gtkmm/scrollbar.cc
index 1bf19b3cb8..5650494b98 100644
--- a/libs/gtkmm2/gtk/gtkmm/scrollbar.cc
+++ b/libs/gtkmm2/gtk/gtkmm/scrollbar.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/scrollbar.h>
 #include <gtkmm/private/scrollbar_p.h>
 
@@ -122,8 +123,19 @@ void Scrollbar_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Scrollbar_Class::wrap_new(GObject* o)
 {
@@ -164,6 +176,13 @@ GType Scrollbar::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
@@ -208,8 +227,19 @@ void VScrollbar_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* VScrollbar_Class::wrap_new(GObject* o)
 {
@@ -250,6 +280,13 @@ GType VScrollbar::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
@@ -294,8 +331,19 @@ void HScrollbar_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* HScrollbar_Class::wrap_new(GObject* o)
 {
@@ -336,6 +384,13 @@ GType HScrollbar::get_base_type()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/scrollbar.h b/libs/gtkmm2/gtk/gtkmm/scrollbar.h
index 36c7d1b8f8..e18a0243a0 100644
--- a/libs/gtkmm2/gtk/gtkmm/scrollbar.h
+++ b/libs/gtkmm2/gtk/gtkmm/scrollbar.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_SCROLLBAR_H
 #define _GTKMM_SCROLLBAR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -115,11 +116,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -185,11 +192,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -256,11 +269,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -284,7 +303,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Scrollbar* wrap(GtkScrollbar* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::VScrollbar
@@ -293,7 +314,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::VScrollbar* wrap(GtkVScrollbar* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::HScrollbar
@@ -302,6 +325,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::HScrollbar* wrap(GtkHScrollbar* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_SCROLLBAR_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc b/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc
index aa297a6daa..8319f9d821 100644
--- a/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc
+++ b/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/private/scrolledwindow_p.h>
 
@@ -100,8 +101,19 @@ void ScrolledWindow_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* ScrolledWindow_Class::wrap_new(GObject* o)
 {
@@ -158,22 +170,22 @@ ScrolledWindow::ScrolledWindow(Adjustment& hadjustment, Adjustment& vadjustment)
 
 void ScrolledWindow::set_hadjustment(Gtk::Adjustment* hadjustment)
 {
-  gtk_scrolled_window_set_hadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(hadjustment));
+gtk_scrolled_window_set_hadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(hadjustment)); 
 }
 
 void ScrolledWindow::set_vadjustment(Gtk::Adjustment* vadjustment)
 {
-  gtk_scrolled_window_set_vadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(vadjustment));
+gtk_scrolled_window_set_vadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(vadjustment)); 
 }
 
 void ScrolledWindow::set_hadjustment(Gtk::Adjustment& hadjustment)
 {
-  gtk_scrolled_window_set_hadjustment(gobj(), (hadjustment).gobj());
+gtk_scrolled_window_set_hadjustment(gobj(), (hadjustment).gobj()); 
 }
 
 void ScrolledWindow::set_vadjustment(Gtk::Adjustment& vadjustment)
 {
-  gtk_scrolled_window_set_vadjustment(gobj(), (vadjustment).gobj());
+gtk_scrolled_window_set_vadjustment(gobj(), (vadjustment).gobj()); 
 }
 
 Gtk::Adjustment* ScrolledWindow::get_hadjustment()
@@ -183,7 +195,7 @@ Gtk::Adjustment* ScrolledWindow::get_hadjustment()
 
 const Gtk::Adjustment* ScrolledWindow::get_hadjustment() const
 {
-  return Glib::wrap(gtk_scrolled_window_get_hadjustment(const_cast<GtkScrolledWindow*>(gobj())));
+  return const_cast<ScrolledWindow*>(this)->get_hadjustment();
 }
 
 Gtk::Adjustment* ScrolledWindow::get_vadjustment()
@@ -193,22 +205,27 @@ Gtk::Adjustment* ScrolledWindow::get_vadjustment()
 
 const Gtk::Adjustment* ScrolledWindow::get_vadjustment() const
 {
-  return Glib::wrap(gtk_scrolled_window_get_vadjustment(const_cast<GtkScrolledWindow*>(gobj())));
+  return const_cast<ScrolledWindow*>(this)->get_vadjustment();
 }
 
 void ScrolledWindow::set_policy(PolicyType hscrollbar_policy, PolicyType vscrollbar_policy)
 {
-  gtk_scrolled_window_set_policy(gobj(), ((GtkPolicyType)(hscrollbar_policy)), ((GtkPolicyType)(vscrollbar_policy)));
+gtk_scrolled_window_set_policy(gobj(), ((GtkPolicyType)(hscrollbar_policy)), ((GtkPolicyType)(vscrollbar_policy))); 
 }
 
 void ScrolledWindow::get_policy(PolicyType& hscrollbar_policy, PolicyType& vscrollbar_policy) const
 {
-  gtk_scrolled_window_get_policy(const_cast<GtkScrolledWindow*>(gobj()), ((GtkPolicyType*) &(hscrollbar_policy)), ((GtkPolicyType*) &(vscrollbar_policy)));
+gtk_scrolled_window_get_policy(const_cast<GtkScrolledWindow*>(gobj()), ((GtkPolicyType*) &(hscrollbar_policy)), ((GtkPolicyType*) &(vscrollbar_policy))); 
 }
 
 void ScrolledWindow::set_placement(CornerType window_placement)
 {
-  gtk_scrolled_window_set_placement(gobj(), ((GtkCornerType)(window_placement)));
+gtk_scrolled_window_set_placement(gobj(), ((GtkCornerType)(window_placement))); 
+}
+
+void ScrolledWindow::unset_placement()
+{
+gtk_scrolled_window_unset_placement(gobj()); 
 }
 
 CornerType ScrolledWindow::get_placement() const
@@ -218,7 +235,7 @@ CornerType ScrolledWindow::get_placement() const
 
 void ScrolledWindow::set_shadow_type(ShadowType type)
 {
-  gtk_scrolled_window_set_shadow_type(gobj(), ((GtkShadowType)(type)));
+gtk_scrolled_window_set_shadow_type(gobj(), ((GtkShadowType)(type))); 
 }
 
 ShadowType ScrolledWindow::get_shadow_type() const
@@ -226,96 +243,127 @@ ShadowType ScrolledWindow::get_shadow_type() const
   return ((ShadowType)(gtk_scrolled_window_get_shadow_type(const_cast<GtkScrolledWindow*>(gobj()))));
 }
 
-bool ScrolledWindow::get_vscrollbar_visible() const
+VScrollbar* ScrolledWindow::get_vscrollbar()
 {
-  return gobj()->hscrollbar_visible;
+  return Glib::wrap((GtkVScrollbar*)gtk_scrolled_window_get_vscrollbar(gobj()));
 }
 
-bool ScrolledWindow::get_hscrollbar_visible() const
+const VScrollbar* ScrolledWindow::get_vscrollbar() const
 {
-  return gobj()->vscrollbar_visible;
+  return Glib::wrap((GtkVScrollbar*)gtk_scrolled_window_get_vscrollbar(const_cast<GtkScrolledWindow*>(gobj())));
 }
 
-Gtk::HScrollbar* ScrolledWindow::get_hscrollbar()
+HScrollbar* ScrolledWindow::get_hscrollbar()
 {
-  return Glib::wrap((GtkHScrollbar*)(gobj()->hscrollbar));
+  return Glib::wrap((GtkHScrollbar*)gtk_scrolled_window_get_hscrollbar(gobj()));
 }
 
-const Gtk::HScrollbar* ScrolledWindow::get_hscrollbar() const
+const HScrollbar* ScrolledWindow::get_hscrollbar() const
 {
-  return Glib::wrap((GtkHScrollbar*)(gobj()->hscrollbar));
+  return Glib::wrap((GtkHScrollbar*)gtk_scrolled_window_get_hscrollbar(const_cast<GtkScrolledWindow*>(gobj())));
 }
 
-Gtk::VScrollbar* ScrolledWindow::get_vscrollbar()
+ bool ScrolledWindow::get_vscrollbar_visible() const
 {
-  return Glib::wrap((GtkVScrollbar*)(gobj()->vscrollbar));
+  return gobj()->vscrollbar_visible;
 }
-
-const Gtk::VScrollbar* ScrolledWindow::get_vscrollbar() const
+ 
+ bool ScrolledWindow::get_hscrollbar_visible() const
 {
-  return Glib::wrap((GtkVScrollbar*)(gobj()->vscrollbar));
+  return gobj()->hscrollbar_visible;
 }
+ 
 
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::Adjustment*> ScrolledWindow::property_hadjustment() 
 {
   return Glib::PropertyProxy<Gtk::Adjustment*>(this, "hadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> ScrolledWindow::property_hadjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*>(this, "hadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::Adjustment*> ScrolledWindow::property_vadjustment() 
 {
   return Glib::PropertyProxy<Gtk::Adjustment*>(this, "vadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> ScrolledWindow::property_vadjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*>(this, "vadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<PolicyType> ScrolledWindow::property_hscrollbar_policy() 
 {
   return Glib::PropertyProxy<PolicyType>(this, "hscrollbar-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<PolicyType> ScrolledWindow::property_hscrollbar_policy() const
 {
   return Glib::PropertyProxy_ReadOnly<PolicyType>(this, "hscrollbar-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<PolicyType> ScrolledWindow::property_vscrollbar_policy() 
 {
   return Glib::PropertyProxy<PolicyType>(this, "vscrollbar-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<PolicyType> ScrolledWindow::property_vscrollbar_policy() const
 {
   return Glib::PropertyProxy_ReadOnly<PolicyType>(this, "vscrollbar-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<CornerType> ScrolledWindow::property_window_placement() 
 {
   return Glib::PropertyProxy<CornerType>(this, "window-placement");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<CornerType> ScrolledWindow::property_window_placement() const
 {
   return Glib::PropertyProxy_ReadOnly<CornerType>(this, "window-placement");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ShadowType> ScrolledWindow::property_shadow_type() 
 {
   return Glib::PropertyProxy<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ShadowType> ScrolledWindow::property_shadow_type() const
 {
   return Glib::PropertyProxy_ReadOnly<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/scrolledwindow.h b/libs/gtkmm2/gtk/gtkmm/scrolledwindow.h
index 8bb8c66230..fdd7860ffa 100644
--- a/libs/gtkmm2/gtk/gtkmm/scrolledwindow.h
+++ b/libs/gtkmm2/gtk/gtkmm/scrolledwindow.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_SCROLLEDWINDOW_H
 #define _GTKMM_SCROLLEDWINDOW_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -105,11 +106,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -150,6 +157,8 @@ public:
   
   void set_placement(CornerType window_placement);
   
+  void unset_placement();
+  
   /** Gets the placement of the scrollbars for the scrolled window. See 
    * set_placement().
    * @return The current placement value.
@@ -173,24 +182,56 @@ public:
   virtual void add(Gtk::Widget& widget);
   
 
-  bool get_vscrollbar_visible() const;
-  bool get_hscrollbar_visible() const;
-  Gtk::HScrollbar* get_hscrollbar();
-  const Gtk::HScrollbar* get_hscrollbar() const;
-  Gtk::VScrollbar* get_vscrollbar();
-  const Gtk::VScrollbar* get_vscrollbar() const;
+  /** Returns the vertical scrollbar of @a scrolled_window .
+   * @return The vertical scrollbar of the scrolled window, or
+   * <tt>0</tt> if it does not have one.
+   * 
+   * @newin2p8.
+   */
+  VScrollbar* get_vscrollbar();
+  
+  /** Returns the vertical scrollbar of @a scrolled_window .
+   * @return The vertical scrollbar of the scrolled window, or
+   * <tt>0</tt> if it does not have one.
+   * 
+   * @newin2p8.
+   */
+  const VScrollbar* get_vscrollbar() const;
 
+  
+  /** Returns the horizontal scrollbar of @a scrolled_window .
+   * @return The horizontal scrollbar of the scrolled window, or 
+   * <tt>0</tt> if it does not have one.
+   * 
+   * @newin2p8.
+   */
+  HScrollbar* get_hscrollbar();
+  
+  /** Returns the horizontal scrollbar of @a scrolled_window .
+   * @return The horizontal scrollbar of the scrolled window, or 
+   * <tt>0</tt> if it does not have one.
+   * 
+   * @newin2p8.
+   */
+  const HScrollbar* get_hscrollbar() const;
+
+   bool get_vscrollbar_visible() const;
+    bool get_hscrollbar_visible() const;
+ 
   //Keybinding signals:
   
   
-  /** The GtkAdjustment for the horizontal position.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The GtkAdjustment for the horizontal position.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gtk::Adjustment*> property_hadjustment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The GtkAdjustment for the horizontal position.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -198,15 +239,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> property_hadjustment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The GtkAdjustment for the vertical position.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The GtkAdjustment for the vertical position.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gtk::Adjustment*> property_vadjustment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The GtkAdjustment for the vertical position.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -214,15 +259,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> property_vadjustment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** When the horizontal scrollbar is displayed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** When the horizontal scrollbar is displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<PolicyType> property_hscrollbar_policy() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** When the horizontal scrollbar is displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -230,15 +279,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<PolicyType> property_hscrollbar_policy() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** When the vertical scrollbar is displayed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** When the vertical scrollbar is displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<PolicyType> property_vscrollbar_policy() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** When the vertical scrollbar is displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -246,31 +299,39 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<PolicyType> property_vscrollbar_policy() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Where the contents are located with respect to the scrollbars.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Where the contents are located with respect to the scrollbars. This property only takes effect if window-placement-set is TRUE.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<CornerType> property_window_placement() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Where the contents are located with respect to the scrollbars.
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Where the contents are located with respect to the scrollbars. This property only takes effect if window-placement-set is TRUE.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<CornerType> property_window_placement() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Style of bevel around the contents.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Style of bevel around the contents.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ShadowType> property_shadow_type() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Style of bevel around the contents.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -278,6 +339,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ShadowType> property_shadow_type() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -293,6 +355,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ScrolledWindow* wrap(GtkScrolledWindow* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_SCROLLEDWINDOW_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/selectiondata.cc b/libs/gtkmm2/gtk/gtkmm/selectiondata.cc
index 4770c896fc..f550cedbb9 100644
--- a/libs/gtkmm2/gtk/gtkmm/selectiondata.cc
+++ b/libs/gtkmm2/gtk/gtkmm/selectiondata.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/selectiondata.h>
 #include <gtkmm/private/selectiondata_p.h>
 
@@ -23,6 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <gtkmm/textbuffer.h>
 #include <gdkmm/pixbuf.h>
 #include <glibmm/utility.h> //For ScopedPtr<>.
 #include <gtk/gtkselection.h>
@@ -192,7 +194,7 @@ Glib::RefPtr<Gdk::Pixbuf> SelectionData::get_pixbuf()
 
 Glib::RefPtr<const Gdk::Pixbuf> SelectionData::get_pixbuf() const
 {
-  return Glib::wrap(gtk_selection_data_get_pixbuf(const_cast<GtkSelectionData*>(gobj())));
+  return const_cast<SelectionData*>(this)->get_pixbuf();
 }
 
 bool SelectionData::set_uris(const Glib::StringArrayHandle& uris)
@@ -205,27 +207,27 @@ Glib::StringArrayHandle SelectionData::get_uris() const
   return Glib::StringArrayHandle(gtk_selection_data_get_uris(const_cast<GtkSelectionData*>(gobj())));
 }
 
-const guint8* SelectionData::get_data() const
+ const guint8* SelectionData::get_data() const
 {
   return gobj()->data;
 }
-
-int SelectionData::get_length() const
+ 
+ int SelectionData::get_length() const
 {
   return gobj()->length;
 }
-
-GdkAtom SelectionData::get_selection() const
+ 
+ GdkAtom SelectionData::get_selection() const
 {
   return gobj()->selection;
 }
-
-int SelectionData::get_format() const
+ 
+ int SelectionData::get_format() const
 {
   return gobj()->format;
 }
-
-Glib::RefPtr<Gdk::Display> SelectionData::get_display()
+ 
+ Glib::RefPtr<Gdk::Display> SelectionData::get_display()
 {
   Glib::RefPtr<Gdk::Display> ref_ptr(Glib::wrap(gobj()->display));
 
@@ -244,12 +246,22 @@ Glib::RefPtr<const Gdk::Display> SelectionData::get_display() const
 
   return ref_ptr;
 }
+ 
+bool SelectionData::targets_include_uri() const
+{
+  return gtk_selection_data_targets_include_uri(const_cast<GtkSelectionData*>(gobj()));
+}
 
 bool SelectionData::targets_include_text() const
 {
   return gtk_selection_data_targets_include_text(const_cast<GtkSelectionData*>(gobj()));
 }
 
+bool SelectionData::targets_include_rich_text(const Glib::RefPtr<TextBuffer>& buffer) const
+{
+  return gtk_selection_data_targets_include_rich_text(const_cast<GtkSelectionData*>(gobj()), Glib::unwrap(buffer));
+}
+
 bool SelectionData::targets_include_image(bool writable) const
 {
   return gtk_selection_data_targets_include_image(const_cast<GtkSelectionData*>(gobj()), static_cast<int>(writable));
diff --git a/libs/gtkmm2/gtk/gtkmm/selectiondata.h b/libs/gtkmm2/gtk/gtkmm/selectiondata.h
index b76bda790a..b3192a24c4 100644
--- a/libs/gtkmm2/gtk/gtkmm/selectiondata.h
+++ b/libs/gtkmm2/gtk/gtkmm/selectiondata.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_SELECTIONDATA_H
 #define _GTKMM_SELECTIONDATA_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -35,6 +36,10 @@ extern "C" { typedef struct _GtkSelectionData GtkSelectionData; }
 namespace Gtk
 {
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+class TextBuffer;
+#endif //DOXYGEN_SHOULD_SKIP_THIS
+
 class SelectionData
 {
   public:
@@ -121,7 +126,7 @@ public:
    * @return <tt>true</tt> if the selection was successfully set,
    * otherwise <tt>false</tt>.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool set_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
   
@@ -131,7 +136,7 @@ public:
    * newly allocated pixbuf is returned, otherwise <tt>0</tt>.
    * If the result is non-<tt>0</tt> it must be freed with Glib::object_unref().
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::RefPtr<Gdk::Pixbuf> get_pixbuf();
   
@@ -141,7 +146,7 @@ public:
    * newly allocated pixbuf is returned, otherwise <tt>0</tt>.
    * If the result is non-<tt>0</tt> it must be freed with Glib::object_unref().
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::RefPtr<const Gdk::Pixbuf> get_pixbuf() const;
   
@@ -155,7 +160,7 @@ public:
    * @return <tt>true</tt> if the selection was successfully set,
    * otherwise <tt>false</tt>.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool set_uris(const Glib::StringArrayHandle& uris);
   
@@ -165,13 +170,13 @@ public:
    * containing the URIs, otherwise <tt>0</tt>. If the result is 
    * non-<tt>0</tt> it must be freed with Glib::strfreev().
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   Glib::StringArrayHandle get_uris() const;
 
-  const guint8* get_data() const;
-  int get_length() const;
-
+   const guint8* get_data() const;
+    int get_length() const;
+ 
   std::string get_data_as_string() const;
 
   std::string get_target() const;
@@ -182,16 +187,18 @@ public:
 
   /** Returns the ID of the selection.
    */
-  GdkAtom get_selection() const;
-
+   GdkAtom get_selection() const;
+ 
   /** Returns the type of the data as set by SelectionData::set().
    */
   std::string get_data_type() const; // get_type() already exists
 
-  int get_format() const;
-  Glib::RefPtr<Gdk::Display> get_display();
+   int get_format() const;
+    Glib::RefPtr<Gdk::Display> get_display();
   Glib::RefPtr<const Gdk::Display> get_display() const;
-
+ 
+  
+  bool targets_include_uri() const;
   
   /** Given a Gtk::SelectionData object holding a list of targets,
    * determines if any of the targets in @a targets  can be used to
@@ -201,6 +208,8 @@ public:
    */
   bool targets_include_text() const;
   
+  bool targets_include_rich_text(const Glib::RefPtr<TextBuffer>& buffer) const;
+  
   /** Given a Gtk::SelectionData object holding a list of targets,
    * determines if any of the targets in @a targets  can be used to
    * provide a Gdk::Pixbuf.
@@ -209,7 +218,7 @@ public:
    * @return <tt>true</tt> if @a selection_data  holds a list of targets,
    * and a suitable target for images is included, otherwise <tt>false</tt>.
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool targets_include_image(bool writable = true) const;
 
@@ -249,5 +258,6 @@ class Value<Gtk::SelectionData> : public Glib::Value_Boxed<Gtk::SelectionData>
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_SELECTIONDATA_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/separator.cc b/libs/gtkmm2/gtk/gtkmm/separator.cc
index 8f2b72cba6..808bd68eb5 100644
--- a/libs/gtkmm2/gtk/gtkmm/separator.cc
+++ b/libs/gtkmm2/gtk/gtkmm/separator.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/separator.h>
 #include <gtkmm/private/separator_p.h>
 
@@ -29,7 +30,6 @@
 #include <gtk/gtkhseparator.h>
 #include <gtk/gtkvseparator.h>
 
-
 namespace
 {
 } // anonymous namespace
@@ -76,8 +76,19 @@ void Separator_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Separator_Class::wrap_new(GObject* o)
 {
@@ -126,6 +137,13 @@ Separator::Separator()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
@@ -170,8 +188,19 @@ void VSeparator_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* VSeparator_Class::wrap_new(GObject* o)
 {
@@ -219,6 +248,13 @@ VSeparator::VSeparator()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
@@ -263,8 +299,19 @@ void HSeparator_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* HSeparator_Class::wrap_new(GObject* o)
 {
@@ -312,6 +359,13 @@ HSeparator::HSeparator()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/separator.h b/libs/gtkmm2/gtk/gtkmm/separator.h
index 914fe80308..11475c8514 100644
--- a/libs/gtkmm2/gtk/gtkmm/separator.h
+++ b/libs/gtkmm2/gtk/gtkmm/separator.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_SEPARATOR_H
 #define _GTKMM_SEPARATOR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -103,11 +104,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -171,11 +178,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -237,11 +250,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -263,7 +282,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Separator* wrap(GtkSeparator* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::VSeparator
@@ -272,7 +293,9 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::VSeparator* wrap(GtkVSeparator* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 namespace Glib
 {
   /** @relates Gtk::HSeparator
@@ -281,6 +304,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::HSeparator* wrap(GtkHSeparator* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_SEPARATOR_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/separatormenuitem.cc b/libs/gtkmm2/gtk/gtkmm/separatormenuitem.cc
index 1b06d797c6..a11e043625 100644
--- a/libs/gtkmm2/gtk/gtkmm/separatormenuitem.cc
+++ b/libs/gtkmm2/gtk/gtkmm/separatormenuitem.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/separatormenuitem.h>
 #include <gtkmm/private/separatormenuitem_p.h>
 
@@ -27,7 +28,6 @@
 
 #include <gtk/gtkseparatormenuitem.h>
 
-
 namespace
 {
 } // anonymous namespace
@@ -74,8 +74,19 @@ void SeparatorMenuItem_Class::class_init_function(void* g_class, void* class_dat
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* SeparatorMenuItem_Class::wrap_new(GObject* o)
 {
@@ -124,6 +135,13 @@ SeparatorMenuItem::SeparatorMenuItem()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/separatormenuitem.h b/libs/gtkmm2/gtk/gtkmm/separatormenuitem.h
index 614bb98d78..9d36c664d0 100644
--- a/libs/gtkmm2/gtk/gtkmm/separatormenuitem.h
+++ b/libs/gtkmm2/gtk/gtkmm/separatormenuitem.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_SEPARATORMENUITEM_H
 #define _GTKMM_SEPARATORMENUITEM_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -90,11 +91,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -116,6 +123,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::SeparatorMenuItem* wrap(GtkSeparatorMenuItem* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_SEPARATORMENUITEM_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/separatortoolitem.cc b/libs/gtkmm2/gtk/gtkmm/separatortoolitem.cc
index 4949789d2e..8c03d4e827 100644
--- a/libs/gtkmm2/gtk/gtkmm/separatortoolitem.cc
+++ b/libs/gtkmm2/gtk/gtkmm/separatortoolitem.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/separatortoolitem.h>
 #include <gtkmm/private/separatortoolitem_p.h>
 
@@ -79,8 +80,19 @@ void SeparatorToolItem_Class::class_init_function(void* g_class, void* class_dat
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* SeparatorToolItem_Class::wrap_new(GObject* o)
 {
@@ -129,6 +141,13 @@ SeparatorToolItem::SeparatorToolItem()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/separatortoolitem.h b/libs/gtkmm2/gtk/gtkmm/separatortoolitem.h
index 00f27cc12e..6e4739594f 100644
--- a/libs/gtkmm2/gtk/gtkmm/separatortoolitem.h
+++ b/libs/gtkmm2/gtk/gtkmm/separatortoolitem.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_SEPARATORTOOLITEM_H
 #define _GTKMM_SEPARATORTOOLITEM_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -94,11 +95,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -120,6 +127,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::SeparatorToolItem* wrap(GtkSeparatorToolItem* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_SEPARATORTOOLITEM_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/settings.cc b/libs/gtkmm2/gtk/gtkmm/settings.cc
index 7cf9c0738a..717110285b 100644
--- a/libs/gtkmm2/gtk/gtkmm/settings.cc
+++ b/libs/gtkmm2/gtk/gtkmm/settings.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/settings.h>
 #include <gtkmm/private/settings_p.h>
 
@@ -30,13 +31,6 @@
 namespace Gtk
 {
 
-Glib::RefPtr<Settings> Settings::get_default()
-{
-  Glib::RefPtr<Settings> result = Glib::RefPtr<Settings>( new Settings( gtk_settings_get_default() ) );
-  result->reference(); //gtk_settings_get_default() does not give a reference, so we take one.
-  return result;
-}
-
 
 } //namespace Gtk
 
@@ -89,8 +83,19 @@ void Settings_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Settings_Class::wrap_new(GObject* object)
 {
@@ -133,6 +138,17 @@ GType Settings::get_base_type()
 }
 
 
+Glib::RefPtr<Settings> Settings::get_default()
+{
+
+  Glib::RefPtr<Settings> retvalue = Glib::wrap(gtk_settings_get_default());
+
+  if(retvalue)
+    retvalue->reference(); //The function does not do a ref for us.
+  return retvalue;
+}
+
+
 Glib::RefPtr<Settings> Settings::get_for_screen(const Glib::RefPtr<Gdk::Screen>& screen)
 {
 
@@ -144,235 +160,334 @@ Glib::RefPtr<Settings> Settings::get_for_screen(const Glib::RefPtr<Gdk::Screen>&
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Settings::property_gtk_double_click_time() 
 {
   return Glib::PropertyProxy<int>(this, "gtk-double-click-time");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Settings::property_gtk_double_click_time() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "gtk-double-click-time");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Settings::property_gtk_double_click_distance() 
 {
   return Glib::PropertyProxy<int>(this, "gtk-double-click-distance");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Settings::property_gtk_double_click_distance() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "gtk-double-click-distance");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Settings::property_gtk_cursor_blink() 
 {
   return Glib::PropertyProxy<bool>(this, "gtk-cursor-blink");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Settings::property_gtk_cursor_blink() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "gtk-cursor-blink");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Settings::property_gtk_cursor_blink_time() 
 {
   return Glib::PropertyProxy<int>(this, "gtk-cursor-blink-time");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Settings::property_gtk_cursor_blink_time() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "gtk-cursor-blink-time");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Settings::property_gtk_split_cursor() 
 {
   return Glib::PropertyProxy<bool>(this, "gtk-split-cursor");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Settings::property_gtk_split_cursor() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "gtk-split-cursor");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Settings::property_gtk_theme_name() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "gtk-theme-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Settings::property_gtk_theme_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "gtk-theme-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Settings::property_gtk_key_theme_name() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "gtk-key-theme-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Settings::property_gtk_key_theme_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "gtk-key-theme-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Settings::property_gtk_menu_bar_accel() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "gtk-menu-bar-accel");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Settings::property_gtk_menu_bar_accel() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "gtk-menu-bar-accel");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Settings::property_gtk_dnd_drag_threshold() 
 {
   return Glib::PropertyProxy<int>(this, "gtk-dnd-drag-threshold");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Settings::property_gtk_dnd_drag_threshold() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "gtk-dnd-drag-threshold");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Settings::property_gtk_font_name() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "gtk-font-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Settings::property_gtk_font_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "gtk-font-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Settings::property_gtk_xft_antialias() 
 {
   return Glib::PropertyProxy<int>(this, "gtk-xft-antialias");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Settings::property_gtk_xft_antialias() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "gtk-xft-antialias");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Settings::property_gtk_xft_hinting() 
 {
   return Glib::PropertyProxy<int>(this, "gtk-xft-hinting");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Settings::property_gtk_xft_hinting() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "gtk-xft-hinting");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Settings::property_gtk_xft_hintstyle() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "gtk-xft-hintstyle");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Settings::property_gtk_xft_hintstyle() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "gtk-xft-hintstyle");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Settings::property_gtk_xft_rgba() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "gtk-xft-rgba");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Settings::property_gtk_xft_rgba() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "gtk-xft-rgba");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Settings::property_gtk_xft_dpi() 
 {
   return Glib::PropertyProxy<int>(this, "gtk-xft-dpi");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Settings::property_gtk_xft_dpi() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "gtk-xft-dpi");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ToolbarStyle> Settings::property_gtk_toolbar_style() 
 {
   return Glib::PropertyProxy<ToolbarStyle>(this, "gtk-toolbar-style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ToolbarStyle> Settings::property_gtk_toolbar_style() const
 {
   return Glib::PropertyProxy_ReadOnly<ToolbarStyle>(this, "gtk-toolbar-style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<IconSize> Settings::property_gtk_toolbar_icon_size() 
 {
   return Glib::PropertyProxy<IconSize>(this, "gtk-toolbar-icon-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<IconSize> Settings::property_gtk_toolbar_icon_size() const
 {
   return Glib::PropertyProxy_ReadOnly<IconSize>(this, "gtk-toolbar-icon-size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Settings::property_gtk_can_change_accels() 
 {
   return Glib::PropertyProxy<bool>(this, "gtk-can-change-accels");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Settings::property_gtk_can_change_accels() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "gtk-can-change-accels");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Settings::property_gtk_entry_select_on_focus() 
 {
   return Glib::PropertyProxy<bool>(this, "gtk-entry-select-on-focus");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Settings::property_gtk_entry_select_on_focus() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "gtk-entry-select-on-focus");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Settings::property_gtk_color_palette() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "gtk-color-palette");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Settings::property_gtk_color_palette() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "gtk-color-palette");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Settings::property_gtk_button_images() 
 {
   return Glib::PropertyProxy<bool>(this, "gtk-button-images");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Settings::property_gtk_button_images() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "gtk-button-images");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Settings::property_gtk_icon_theme_name() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "gtk-icon-theme-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Settings::property_gtk_icon_theme_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "gtk-icon-theme-name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Settings::property_gtk_icon_sizes() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "gtk-icon-sizes");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Settings::property_gtk_icon_sizes() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "gtk-icon-sizes");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/settings.h b/libs/gtkmm2/gtk/gtkmm/settings.h
index 08cd78d90d..836c3d846b 100644
--- a/libs/gtkmm2/gtk/gtkmm/settings.h
+++ b/libs/gtkmm2/gtk/gtkmm/settings.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_SETTINGS_H
 #define _GTKMM_SETTINGS_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -92,6 +93,12 @@ protected:
 
 public:
 
+  
+  /** Gets the Gtk::Settings object for the default GDK screen, creating
+   * it if necessary. See get_for_screen().
+   * @return A Gtk::Settings object. If there is no default
+   * screen, then returns <tt>0</tt>.
+   */
   static Glib::RefPtr<Settings> get_default();
 
   
@@ -99,18 +106,21 @@ public:
    * @param screen A Gdk::Screen.
    * @return A Gtk::Settings object.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   static Glib::RefPtr<Settings> get_for_screen(const Glib::RefPtr<Gdk::Screen>& screen);
 
-  /** Maximum time allowed between two clicks for them to be considered a double click (in milliseconds).
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Maximum time allowed between two clicks for them to be considered a double click (in milliseconds).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_gtk_double_click_time() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Maximum time allowed between two clicks for them to be considered a double click (in milliseconds).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -118,15 +128,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_gtk_double_click_time() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Maximum distance allowed between two clicks for them to be considered a double click (in pixels).
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Maximum distance allowed between two clicks for them to be considered a double click (in pixels).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_gtk_double_click_distance() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Maximum distance allowed between two clicks for them to be considered a double click (in pixels).
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -134,15 +148,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_gtk_double_click_distance() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the cursor should blink.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the cursor should blink.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_gtk_cursor_blink() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the cursor should blink.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -150,15 +168,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_gtk_cursor_blink() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Length of the cursor blink cycle
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Length of the cursor blink cycle
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_gtk_cursor_blink_time() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Length of the cursor blink cycle
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -166,15 +188,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_gtk_cursor_blink_time() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether two cursors should be displayed for mixed left-to-right and right-to-left text.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether two cursors should be displayed for mixed left-to-right and right-to-left text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_gtk_split_cursor() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether two cursors should be displayed for mixed left-to-right and right-to-left text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -182,15 +208,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_gtk_split_cursor() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Name of theme RC file to load.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Name of theme RC file to load.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_gtk_theme_name() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Name of theme RC file to load.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -198,15 +228,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_gtk_theme_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Name of key theme RC file to load.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Name of key theme RC file to load.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_gtk_key_theme_name() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Name of key theme RC file to load.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -214,15 +248,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_gtk_key_theme_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Keybinding to activate the menu bar.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Keybinding to activate the menu bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_gtk_menu_bar_accel() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Keybinding to activate the menu bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -230,15 +268,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_gtk_menu_bar_accel() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Number of pixels the cursor can move before dragging.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Number of pixels the cursor can move before dragging.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_gtk_dnd_drag_threshold() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Number of pixels the cursor can move before dragging.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -246,15 +288,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_gtk_dnd_drag_threshold() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Name of default font to use.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Name of default font to use.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_gtk_font_name() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Name of default font to use.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -262,15 +308,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_gtk_font_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether to antialias Xft fonts; 0=no
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to antialias Xft fonts; 0=no
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_gtk_xft_antialias() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether to antialias Xft fonts; 0=no
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -278,15 +328,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_gtk_xft_antialias() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether to hint Xft fonts; 0=no
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to hint Xft fonts; 0=no
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_gtk_xft_hinting() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether to hint Xft fonts; 0=no
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -294,31 +348,39 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_gtk_xft_hinting() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** What degree of hinting to use; none
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** What degree of hinting to use; hintnone
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_gtk_xft_hintstyle() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** What degree of hinting to use; none
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** What degree of hinting to use; hintnone
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_gtk_xft_hintstyle() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Type of subpixel antialiasing; none
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Type of subpixel antialiasing; none
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_gtk_xft_rgba() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Type of subpixel antialiasing; none
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -326,15 +388,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_gtk_xft_rgba() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Resolution for Xft
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Resolution for Xft
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_gtk_xft_dpi() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Resolution for Xft
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -342,17 +408,21 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_gtk_xft_dpi() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
   // from GtkToolbar
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ToolbarStyle> property_gtk_toolbar_style() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -360,15 +430,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ToolbarStyle> property_gtk_toolbar_style() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<IconSize> property_gtk_toolbar_icon_size() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -376,17 +450,21 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<IconSize> property_gtk_toolbar_icon_size() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
   // from GtkMenu
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_gtk_can_change_accels() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -394,17 +472,21 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_gtk_can_change_accels() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
   // from GtkEntry
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_gtk_entry_select_on_focus() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -412,17 +494,21 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_gtk_entry_select_on_focus() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
   // from GtkColorSelection
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_gtk_color_palette() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -430,17 +516,21 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_gtk_color_palette() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
   // from GtkButton
-  /** 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_gtk_button_images() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** 
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -448,17 +538,21 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_gtk_button_images() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
   // from GtkIconTheme
-  /** Name of icon theme to use.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Name of icon theme to use.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_gtk_icon_theme_name() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Name of icon theme to use.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -466,33 +560,44 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_gtk_icon_theme_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** List of icon sizes gtk-menu=16
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** List of icon sizes: gtk-menu=16
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_gtk_icon_sizes() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** List of icon sizes gtk-menu=16
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** List of icon sizes: gtk-menu=16
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_gtk_icon_sizes() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/sizegroup.cc b/libs/gtkmm2/gtk/gtkmm/sizegroup.cc
index 40c350749f..94ee095ebb 100644
--- a/libs/gtkmm2/gtk/gtkmm/sizegroup.cc
+++ b/libs/gtkmm2/gtk/gtkmm/sizegroup.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/sizegroup.h>
 #include <gtkmm/private/sizegroup_p.h>
 
@@ -94,8 +95,19 @@ void SizeGroup_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* SizeGroup_Class::wrap_new(GObject* object)
 {
@@ -144,7 +156,7 @@ Glib::RefPtr<SizeGroup> SizeGroup::create(SizeGroupMode mode)
 }
 void SizeGroup::set_mode(SizeGroupMode mode)
 {
-  gtk_size_group_set_mode(gobj(), ((GtkSizeGroupMode)(mode)));
+gtk_size_group_set_mode(gobj(), ((GtkSizeGroupMode)(mode))); 
 }
 
 SizeGroupMode SizeGroup::get_mode() const
@@ -152,26 +164,71 @@ SizeGroupMode SizeGroup::get_mode() const
   return ((SizeGroupMode)(gtk_size_group_get_mode(const_cast<GtkSizeGroup*>(gobj()))));
 }
 
+void SizeGroup::set_ignore_hidden(bool ignore_hidden)
+{
+gtk_size_group_set_ignore_hidden(gobj(), static_cast<int>(ignore_hidden)); 
+}
+
+bool SizeGroup::get_ignore_hidden() const
+{
+  return gtk_size_group_get_ignore_hidden(const_cast<GtkSizeGroup*>(gobj()));
+}
+
 void SizeGroup::add_widget(Widget& widget)
 {
-  gtk_size_group_add_widget(gobj(), (widget).gobj());
+gtk_size_group_add_widget(gobj(), (widget).gobj()); 
 }
 
 void SizeGroup::remove_widget(Widget& widget)
 {
-  gtk_size_group_remove_widget(gobj(), (widget).gobj());
+gtk_size_group_remove_widget(gobj(), (widget).gobj()); 
 }
 
+Glib::SListHandle<Widget*> SizeGroup::get_widgets()
+{
+  return Glib::SListHandle<Widget*>(gtk_size_group_get_widgets(gobj()), Glib::OWNERSHIP_SHALLOW);
+}
 
+Glib::SListHandle<const Widget*> SizeGroup::get_widgets() const
+{
+  return Glib::SListHandle<const Widget*>(gtk_size_group_get_widgets(const_cast<GtkSizeGroup*>(gobj())), Glib::OWNERSHIP_SHALLOW);
+}
+
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<SizeGroupMode> SizeGroup::property_mode() 
 {
   return Glib::PropertyProxy<SizeGroupMode>(this, "mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<SizeGroupMode> SizeGroup::property_mode() const
 {
   return Glib::PropertyProxy_ReadOnly<SizeGroupMode>(this, "mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> SizeGroup::property_ignore_hidden() 
+{
+  return Glib::PropertyProxy<bool>(this, "ignore-hidden");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> SizeGroup::property_ignore_hidden() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "ignore-hidden");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/sizegroup.h b/libs/gtkmm2/gtk/gtkmm/sizegroup.h
index d3fb6991eb..03d4723f12 100644
--- a/libs/gtkmm2/gtk/gtkmm/sizegroup.h
+++ b/libs/gtkmm2/gtk/gtkmm/sizegroup.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_SIZEGROUP_H
 #define _GTKMM_SIZEGROUP_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -77,6 +78,24 @@ namespace Gtk
 {
 
 
+/** Gtk::SizeGroup provides a mechanism for grouping a number of widgets together so they all request the same amount of space. 
+ * This is typically useful when you want a column of widgets to have the same size, but you can't use a Gtk::Table widget.
+ * 
+ * In detail, the size requested for each widget in a Gtk::SizeGroup is the maximum of the sizes that would have been 
+ * requested for each widget in the size group if they were not in the size group. The mode of the size group (see 
+ * set_mode()) determines whether this applies to the horizontal size, the vertical size, or both sizes.
+ *
+ * Note that size groups only affect the amount of space requested, not the size that the widgets finally receive. If 
+ * you want the widgets in a GtkSizeGroup to actually be the same size, you need to pack them in such a way that they 
+ * get the size they request and not more. For example, if you are packing your widgets into a table, you would not 
+ * include the Gtk::FILL flag.
+ * 
+ * Widgets can be part of multiple size groups; GTK+ will compute the horizontal size of a widget from the horizontal 
+ * requisition of all widgets that can be reached from the widget by a chain of size groups of type 
+ * Gtk::SIZE_GROUP_HORIZONTAL or Gtk::SIZE_GROUP_BOTH, and the vertical size from the vertical requisition of all widgets  
+ * that can be reached from the widget by a chain of size groups of type Gtk::SIZE_GROUP_VERTICAL or Gtk::SIZE_GROUP_BOTH.
+ */
+
 class SizeGroup : public Glib::Object
 {
   
@@ -144,6 +163,24 @@ public:
    * @return The current mode of the size group.
    */
   SizeGroupMode get_mode() const;
+
+  
+  /** Sets whether invisible widgets should be ignored when
+   * calculating the size.
+   * 
+   * @newin2p8
+   * @param ignore_hidden Whether hidden widgets should be ignored
+   * when calculating the size.
+   */
+  void set_ignore_hidden(bool ignore_hidden = true);
+  
+  /** Returns if invisible widgets are ignored when calculating the size.
+   * @return <tt>true</tt> if invisible widgets are ignored.
+   * 
+   * @newin2p8.
+   */
+  bool get_ignore_hidden() const;
+
   
   /** Adds a widget to a Gtk::SizeGroup. In the future, the requisition
    * of the widget will be determined as the maximum of its requisition
@@ -159,32 +196,67 @@ public:
    */
   void remove_widget(Widget& widget);
 
-  /** The directions in which the size group effects the requested sizes of its component widgets.
+  
+  Glib::SListHandle<Widget*> get_widgets();
+  
+  Glib::SListHandle<const Widget*> get_widgets() const;
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The directions in which the size group affects the requested sizes of its component widgets.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<SizeGroupMode> property_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** The directions in which the size group effects the requested sizes of its component widgets.
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** The directions in which the size group affects the requested sizes of its component widgets.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<SizeGroupMode> property_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_ignore_hidden() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_ignore_hidden() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/socket.cc b/libs/gtkmm2/gtk/gtkmm/socket.cc
index 050d5a2dcd..b6566cf7f6 100644
--- a/libs/gtkmm2/gtk/gtkmm/socket.cc
+++ b/libs/gtkmm2/gtk/gtkmm/socket.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/socket.h>
 #include <gtkmm/private/socket_p.h>
 
@@ -29,7 +30,8 @@
 namespace
 {
 
-const Glib::SignalProxyInfo Socket_signal_plug_added_info =
+
+static const Glib::SignalProxyInfo Socket_signal_plug_added_info =
 {
   "plug_added",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -37,7 +39,7 @@ const Glib::SignalProxyInfo Socket_signal_plug_added_info =
 };
 
 
-gboolean Socket_signal_plug_removed_callback(GtkSocket* self, void* data)
+static gboolean Socket_signal_plug_removed_callback(GtkSocket* self, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool > SlotType;
@@ -45,22 +47,26 @@ gboolean Socket_signal_plug_removed_callback(GtkSocket* self, void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Socket_signal_plug_removed_notify_callback(GtkSocket* self,  void* data)
+static gboolean Socket_signal_plug_removed_notify_callback(GtkSocket* self,  void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void > SlotType;
@@ -68,28 +74,33 @@ gboolean Socket_signal_plug_removed_notify_callback(GtkSocket* self,  void* data
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Socket_signal_plug_removed_info =
+static const Glib::SignalProxyInfo Socket_signal_plug_removed_info =
 {
   "plug_removed",
   (GCallback) &Socket_signal_plug_removed_callback,
   (GCallback) &Socket_signal_plug_removed_notify_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -134,11 +145,19 @@ void Socket_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->plug_added = &plug_added_callback;
   klass->plug_removed = &plug_removed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Socket_Class::plug_added_callback(GtkSocket* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -151,15 +170,19 @@ void Socket_Class::plug_added_callback(GtkSocket* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_plug_added();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -172,7 +195,6 @@ void Socket_Class::plug_added_callback(GtkSocket* self)
       (*base->plug_added)(self);
   }
 }
-
 gboolean Socket_Class::plug_removed_callback(GtkSocket* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -185,15 +207,19 @@ gboolean Socket_Class::plug_removed_callback(GtkSocket* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_plug_removed());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -209,6 +235,7 @@ gboolean Socket_Class::plug_removed_callback(GtkSocket* self)
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Socket_Class::wrap_new(GObject* o)
@@ -259,7 +286,7 @@ Socket::Socket()
 
 void Socket::add_id(Gdk::NativeWindow window_id)
 {
-  gtk_socket_add_id(gobj(), (GdkNativeWindow)(window_id));
+gtk_socket_add_id(gobj(), (GdkNativeWindow)(window_id)); 
 }
 
 Gdk::NativeWindow Socket::get_id() const
@@ -273,12 +300,14 @@ Glib::SignalProxy0< void > Socket::signal_plug_added()
   return Glib::SignalProxy0< void >(this, &Socket_signal_plug_added_info);
 }
 
+
 Glib::SignalProxy0< bool > Socket::signal_plug_removed()
 {
   return Glib::SignalProxy0< bool >(this, &Socket_signal_plug_removed_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Socket::on_plug_added()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -288,7 +317,6 @@ void Gtk::Socket::on_plug_added()
   if(base && base->plug_added)
     (*base->plug_added)(gobj());
 }
-
 bool Gtk::Socket::on_plug_removed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -301,6 +329,10 @@ bool Gtk::Socket::on_plug_removed()
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/socket.h b/libs/gtkmm2/gtk/gtkmm/socket.h
index 3b6d58aa96..259466f16d 100644
--- a/libs/gtkmm2/gtk/gtkmm/socket.h
+++ b/libs/gtkmm2/gtk/gtkmm/socket.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_SOCKET_H
 #define _GTKMM_SOCKET_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -129,13 +130,19 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_plug_added();
   virtual bool on_plug_removed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -176,9 +183,19 @@ public:
   Gdk::NativeWindow get_id() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %plug_added()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_plug_added();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %plug_removed()</tt>
+   */
+
   Glib::SignalProxy0< bool > signal_plug_removed();
 
 
@@ -195,6 +212,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Socket* wrap(GtkSocket* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_SOCKET_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/spinbutton.cc b/libs/gtkmm2/gtk/gtkmm/spinbutton.cc
index d82f8baab4..766c34d2df 100644
--- a/libs/gtkmm2/gtk/gtkmm/spinbutton.cc
+++ b/libs/gtkmm2/gtk/gtkmm/spinbutton.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/private/spinbutton_p.h>
 
@@ -47,7 +48,8 @@ void SpinButton::unset_adjustment()
 namespace
 {
 
-gint SpinButton_signal_input_callback(GtkSpinButton* self, gdouble* p0,void* data)
+
+static gint SpinButton_signal_input_callback(GtkSpinButton* self, double* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< int,double* > SlotType;
@@ -55,23 +57,26 @@ gint SpinButton_signal_input_callback(GtkSpinButton* self, gdouble* p0,void* dat
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
-        return (*static_cast<SlotType*>(slot))(p0
-);
+        return (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gint RType;
   return RType();
 }
 
-gint SpinButton_signal_input_notify_callback(GtkSpinButton* self, gdouble* p0, void* data)
+static gint SpinButton_signal_input_notify_callback(GtkSpinButton* self, double* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,double* > SlotType;
@@ -79,23 +84,26 @@ gint SpinButton_signal_input_notify_callback(GtkSpinButton* self, gdouble* p0, v
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
-        (*static_cast<SlotType*>(slot))(p0
-);
+        (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gint RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo SpinButton_signal_input_info =
+static const Glib::SignalProxyInfo SpinButton_signal_input_info =
 {
   "input",
   (GCallback) &SpinButton_signal_input_callback,
@@ -103,7 +111,7 @@ const Glib::SignalProxyInfo SpinButton_signal_input_info =
 };
 
 
-gboolean SpinButton_signal_output_callback(GtkSpinButton* self, void* data)
+static gboolean SpinButton_signal_output_callback(GtkSpinButton* self, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool > SlotType;
@@ -111,22 +119,26 @@ gboolean SpinButton_signal_output_callback(GtkSpinButton* self, void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean SpinButton_signal_output_notify_callback(GtkSpinButton* self,  void* data)
+static gboolean SpinButton_signal_output_notify_callback(GtkSpinButton* self,  void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void > SlotType;
@@ -134,22 +146,26 @@ gboolean SpinButton_signal_output_notify_callback(GtkSpinButton* self,  void* da
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo SpinButton_signal_output_info =
+static const Glib::SignalProxyInfo SpinButton_signal_output_info =
 {
   "output",
   (GCallback) &SpinButton_signal_output_callback,
@@ -157,13 +173,46 @@ const Glib::SignalProxyInfo SpinButton_signal_output_info =
 };
 
 
-const Glib::SignalProxyInfo SpinButton_signal_value_changed_info =
+static void SpinButton_signal_wrapped_callback(GtkSpinButton* self, void* data)
+{
+  using namespace Gtk;
+  typedef sigc::slot< bool > SlotType;
+
+  // Do not try to call a signal on a disassociated wrapper.
+  if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
+  {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    try
+    {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+      if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
+        (*static_cast<SlotType*>(slot))();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
+    }
+    catch(...)
+    {
+      Glib::exception_handlers_invoke();
+    }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
+  }
+}
+
+static const Glib::SignalProxyInfo SpinButton_signal_wrapped_info =
+{
+  "wrapped",
+  (GCallback) &SpinButton_signal_wrapped_callback,
+  (GCallback) &SpinButton_signal_wrapped_callback
+};
+
+
+static const Glib::SignalProxyInfo SpinButton_signal_value_changed_info =
 {
   "value_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 // static
@@ -221,13 +270,21 @@ void SpinButton_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->input = &input_callback;
   klass->output = &output_callback;
   klass->value_changed = &value_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
-gint SpinButton_Class::input_callback(GtkSpinButton* self, gdouble* p0)
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+gint SpinButton_Class::input_callback(GtkSpinButton* self, double* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
       Glib::ObjectBase::_get_current_wrapper((GObject*)self));
@@ -239,16 +296,19 @@ gint SpinButton_Class::input_callback(GtkSpinButton* self, gdouble* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
-      return obj->on_input(p0
-);
+      return obj->on_input(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -264,7 +324,6 @@ gint SpinButton_Class::input_callback(GtkSpinButton* self, gdouble* p0)
   typedef gint RType;
   return RType();
 }
-
 gboolean SpinButton_Class::output_callback(GtkSpinButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -277,15 +336,19 @@ gboolean SpinButton_Class::output_callback(GtkSpinButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_output());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -301,7 +364,6 @@ gboolean SpinButton_Class::output_callback(GtkSpinButton* self)
   typedef gboolean RType;
   return RType();
 }
-
 void SpinButton_Class::value_changed_callback(GtkSpinButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -314,15 +376,19 @@ void SpinButton_Class::value_changed_callback(GtkSpinButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_value_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -335,6 +401,7 @@ void SpinButton_Class::value_changed_callback(GtkSpinButton* self)
       (*base->value_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* SpinButton_Class::wrap_new(GObject* o)
@@ -385,12 +452,12 @@ SpinButton::SpinButton(Adjustment& adjustment, double climb_rate, guint digits)
 
 void SpinButton::configure(Adjustment& adjustment, double climb_rate, guint digits)
 {
-  gtk_spin_button_configure(gobj(), (adjustment).gobj(), climb_rate, digits);
+gtk_spin_button_configure(gobj(), (adjustment).gobj(), climb_rate, digits); 
 }
 
 void SpinButton::set_adjustment(Adjustment& adjustment)
 {
-  gtk_spin_button_set_adjustment(gobj(), (adjustment).gobj());
+gtk_spin_button_set_adjustment(gobj(), (adjustment).gobj()); 
 }
 
 Gtk::Adjustment* SpinButton::get_adjustment()
@@ -400,12 +467,12 @@ Gtk::Adjustment* SpinButton::get_adjustment()
 
 const Gtk::Adjustment* SpinButton::get_adjustment() const
 {
-  return Glib::wrap(gtk_spin_button_get_adjustment(const_cast<GtkSpinButton*>(gobj())));
+  return const_cast<SpinButton*>(this)->get_adjustment();
 }
 
 void SpinButton::set_digits(guint digits)
 {
-  gtk_spin_button_set_digits(gobj(), digits);
+gtk_spin_button_set_digits(gobj(), digits); 
 }
 
 guint SpinButton::get_digits() const
@@ -415,22 +482,22 @@ guint SpinButton::get_digits() const
 
 void SpinButton::set_increments(double step, double page)
 {
-  gtk_spin_button_set_increments(gobj(), step, page);
+gtk_spin_button_set_increments(gobj(), step, page); 
 }
 
 void SpinButton::get_increments(double& step, double& page) const
 {
-  gtk_spin_button_get_increments(const_cast<GtkSpinButton*>(gobj()), &(step), &(page));
+gtk_spin_button_get_increments(const_cast<GtkSpinButton*>(gobj()), &(step), &(page)); 
 }
 
 void SpinButton::set_range(double min, double max)
 {
-  gtk_spin_button_set_range(gobj(), min, max);
+gtk_spin_button_set_range(gobj(), min, max); 
 }
 
 void SpinButton::get_range(double& min, double& max) const
 {
-  gtk_spin_button_get_range(const_cast<GtkSpinButton*>(gobj()), &(min), &(max));
+gtk_spin_button_get_range(const_cast<GtkSpinButton*>(gobj()), &(min), &(max)); 
 }
 
 double SpinButton::get_value() const
@@ -445,12 +512,12 @@ int SpinButton::get_value_as_int() const
 
 void SpinButton::set_value(double value)
 {
-  gtk_spin_button_set_value(gobj(), value);
+gtk_spin_button_set_value(gobj(), value); 
 }
 
 void SpinButton::set_update_policy(SpinButtonUpdatePolicy policy)
 {
-  gtk_spin_button_set_update_policy(gobj(), ((GtkSpinButtonUpdatePolicy)(policy)));
+gtk_spin_button_set_update_policy(gobj(), ((GtkSpinButtonUpdatePolicy)(policy))); 
 }
 
 SpinButtonUpdatePolicy SpinButton::get_update_policy() const
@@ -460,7 +527,7 @@ SpinButtonUpdatePolicy SpinButton::get_update_policy() const
 
 void SpinButton::set_numeric(bool numeric)
 {
-  gtk_spin_button_set_numeric(gobj(), static_cast<int>(numeric));
+gtk_spin_button_set_numeric(gobj(), static_cast<int>(numeric)); 
 }
 
 bool SpinButton::get_numeric() const
@@ -470,12 +537,12 @@ bool SpinButton::get_numeric() const
 
 void SpinButton::spin(SpinType direction, double increment)
 {
-  gtk_spin_button_spin(gobj(), ((GtkSpinType)(direction)), increment);
+gtk_spin_button_spin(gobj(), ((GtkSpinType)(direction)), increment); 
 }
 
 void SpinButton::set_wrap(bool wrap)
 {
-  gtk_spin_button_set_wrap(gobj(), static_cast<int>(wrap));
+gtk_spin_button_set_wrap(gobj(), static_cast<int>(wrap)); 
 }
 
 bool SpinButton::get_wrap() const
@@ -485,7 +552,7 @@ bool SpinButton::get_wrap() const
 
 void SpinButton::set_snap_to_ticks(bool snap_to_ticks)
 {
-  gtk_spin_button_set_snap_to_ticks(gobj(), static_cast<int>(snap_to_ticks));
+gtk_spin_button_set_snap_to_ticks(gobj(), static_cast<int>(snap_to_ticks)); 
 }
 
 bool SpinButton::get_snap_to_ticks() const
@@ -495,7 +562,7 @@ bool SpinButton::get_snap_to_ticks() const
 
 void SpinButton::update()
 {
-  gtk_spin_button_update(gobj());
+gtk_spin_button_update(gobj()); 
 }
 
 
@@ -504,98 +571,139 @@ Glib::SignalProxy1< int,double* > SpinButton::signal_input()
   return Glib::SignalProxy1< int,double* >(this, &SpinButton_signal_input_info);
 }
 
+
 Glib::SignalProxy0< bool > SpinButton::signal_output()
 {
   return Glib::SignalProxy0< bool >(this, &SpinButton_signal_output_info);
 }
 
+
+Glib::SignalProxy0< bool > SpinButton::signal_wrapped()
+{
+  return Glib::SignalProxy0< bool >(this, &SpinButton_signal_wrapped_info);
+}
+
+
 Glib::SignalProxy0< void > SpinButton::signal_value_changed()
 {
   return Glib::SignalProxy0< void >(this, &SpinButton_signal_value_changed_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::Adjustment*> SpinButton::property_adjustment() 
 {
   return Glib::PropertyProxy<Gtk::Adjustment*>(this, "adjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> SpinButton::property_adjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*>(this, "adjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> SpinButton::property_climb_rate() 
 {
   return Glib::PropertyProxy<double>(this, "climb-rate");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> SpinButton::property_climb_rate() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "climb-rate");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> SpinButton::property_digits() 
 {
   return Glib::PropertyProxy<guint>(this, "digits");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> SpinButton::property_digits() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "digits");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> SpinButton::property_snap_to_ticks() 
 {
   return Glib::PropertyProxy<bool>(this, "snap-to-ticks");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> SpinButton::property_snap_to_ticks() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "snap-to-ticks");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> SpinButton::property_numeric() 
 {
   return Glib::PropertyProxy<bool>(this, "numeric");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> SpinButton::property_numeric() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "numeric");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> SpinButton::property_wrap() 
 {
   return Glib::PropertyProxy<bool>(this, "wrap");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> SpinButton::property_wrap() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "wrap");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<SpinButtonUpdatePolicy> SpinButton::property_update_policy() 
 {
   return Glib::PropertyProxy<SpinButtonUpdatePolicy>(this, "update-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<SpinButtonUpdatePolicy> SpinButton::property_update_policy() const
 {
   return Glib::PropertyProxy_ReadOnly<SpinButtonUpdatePolicy>(this, "update-policy");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> SpinButton::property_value() 
 {
   return Glib::PropertyProxy<double>(this, "value");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> SpinButton::property_value() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "value");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 int Gtk::SpinButton::on_input(double* new_value)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -608,7 +716,6 @@ int Gtk::SpinButton::on_input(double* new_value)
   typedef int RType;
   return RType();
 }
-
 bool Gtk::SpinButton::on_output()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -621,7 +728,6 @@ bool Gtk::SpinButton::on_output()
   typedef bool RType;
   return RType();
 }
-
 void Gtk::SpinButton::on_value_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -631,6 +737,10 @@ void Gtk::SpinButton::on_value_changed()
   if(base && base->value_changed)
     (*base->value_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/spinbutton.h b/libs/gtkmm2/gtk/gtkmm/spinbutton.h
index d679054425..7544668d64 100644
--- a/libs/gtkmm2/gtk/gtkmm/spinbutton.h
+++ b/libs/gtkmm2/gtk/gtkmm/spinbutton.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_SPINBUTTON_H
 #define _GTKMM_SPINBUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -162,14 +163,20 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual int on_input(double* new_value);
   virtual bool on_output();
   virtual void on_value_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -335,6 +342,10 @@ public:
    * @li <tt>Gtk::INPUT_ERROR</tt>: Conversion failed, don't call default handler.
    */
   
+/**
+   * @par Prototype:
+   * <tt>int %input(double* new_value)</tt>
+   */
 
   Glib::SignalProxy1< int,double* > signal_input();
 
@@ -346,24 +357,44 @@ public:
    * @li <tt>true</tt>: Conversion successful, don't call default handler.
    */
   
+/**
+   * @par Prototype:
+   * <tt>bool %output()</tt>
+   */
 
   Glib::SignalProxy0< bool > signal_output();
 
 
+/**
+   * @par Prototype:
+   * <tt>bool %wrapped()</tt>
+   */
+
+  Glib::SignalProxy0< bool > signal_wrapped();
+
+
+/**
+   * @par Prototype:
+   * <tt>void %value_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_value_changed();
 
 
   //Keybinding signals:
   
 
-  /** The adjustment that holds the value of the spinbutton.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The adjustment that holds the value of the spinbutton.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gtk::Adjustment*> property_adjustment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The adjustment that holds the value of the spinbutton.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -371,15 +402,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> property_adjustment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The acceleration rate when you hold down a button.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The acceleration rate when you hold down a button.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_climb_rate() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The acceleration rate when you hold down a button.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -387,15 +422,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_climb_rate() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The number of decimal places to display.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The number of decimal places to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_digits() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The number of decimal places to display.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -403,15 +442,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_digits() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether erroneous values are automatically changed to a spin button's nearest step increment.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether erroneous values are automatically changed to a spin button's nearest step increment.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_snap_to_ticks() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether erroneous values are automatically changed to a spin button's nearest step increment.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -419,15 +462,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_snap_to_ticks() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether non-numeric characters should be ignored.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether non-numeric characters should be ignored.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_numeric() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether non-numeric characters should be ignored.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -435,15 +482,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_numeric() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether a spin button should wrap upon reaching its limits.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether a spin button should wrap upon reaching its limits.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_wrap() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether a spin button should wrap upon reaching its limits.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -451,15 +502,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_wrap() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the spin button should update always
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the spin button should update always
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<SpinButtonUpdatePolicy> property_update_policy() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the spin button should update always
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -467,15 +522,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<SpinButtonUpdatePolicy> property_update_policy() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Reads the current value
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Reads the current value
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_value() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Reads the current value
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -483,6 +542,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_value() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -498,6 +558,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::SpinButton* wrap(GtkSpinButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_SPINBUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/statusbar.cc b/libs/gtkmm2/gtk/gtkmm/statusbar.cc
index 1e6e28071e..b53aec1645 100644
--- a/libs/gtkmm2/gtk/gtkmm/statusbar.cc
+++ b/libs/gtkmm2/gtk/gtkmm/statusbar.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/statusbar.h>
 #include <gtkmm/private/statusbar_p.h>
 
@@ -46,7 +47,8 @@ void Statusbar::remove_message(guint message_id, guint context_id /* = 0 */)
 namespace
 {
 
-void Statusbar_signal_text_pushed_callback(GtkStatusbar* self, guint p0,const gchar* p1,void* data)
+
+static void Statusbar_signal_text_pushed_callback(GtkStatusbar* self, guint p0,const gchar* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,guint,const Glib::ustring& > SlotType;
@@ -54,20 +56,24 @@ void Statusbar_signal_text_pushed_callback(GtkStatusbar* self, guint p0,const gc
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0, Glib::convert_const_gchar_ptr_to_ustring(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Statusbar_signal_text_pushed_info =
+static const Glib::SignalProxyInfo Statusbar_signal_text_pushed_info =
 {
   "text_pushed",
   (GCallback) &Statusbar_signal_text_pushed_callback,
@@ -75,7 +81,7 @@ const Glib::SignalProxyInfo Statusbar_signal_text_pushed_info =
 };
 
 
-void Statusbar_signal_text_popped_callback(GtkStatusbar* self, guint p0,const gchar* p1,void* data)
+static void Statusbar_signal_text_popped_callback(GtkStatusbar* self, guint p0,const gchar* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,guint,const Glib::ustring& > SlotType;
@@ -83,26 +89,31 @@ void Statusbar_signal_text_popped_callback(GtkStatusbar* self, guint p0,const gc
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0, Glib::convert_const_gchar_ptr_to_ustring(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Statusbar_signal_text_popped_info =
+static const Glib::SignalProxyInfo Statusbar_signal_text_popped_info =
 {
   "text_popped",
   (GCallback) &Statusbar_signal_text_popped_callback,
   (GCallback) &Statusbar_signal_text_popped_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -147,11 +158,19 @@ void Statusbar_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->text_pushed = &text_pushed_callback;
   klass->text_popped = &text_popped_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Statusbar_Class::text_pushed_callback(GtkStatusbar* self, guint p0, const gchar* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -164,16 +183,20 @@ void Statusbar_Class::text_pushed_callback(GtkStatusbar* self, guint p0, const g
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_text_pushed(p0, Glib::convert_const_gchar_ptr_to_ustring(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -186,7 +209,6 @@ void Statusbar_Class::text_pushed_callback(GtkStatusbar* self, guint p0, const g
       (*base->text_pushed)(self, p0, p1);
   }
 }
-
 void Statusbar_Class::text_popped_callback(GtkStatusbar* self, guint p0, const gchar* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -199,16 +221,20 @@ void Statusbar_Class::text_popped_callback(GtkStatusbar* self, guint p0, const g
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_text_popped(p0, Glib::convert_const_gchar_ptr_to_ustring(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -221,6 +247,7 @@ void Statusbar_Class::text_popped_callback(GtkStatusbar* self, guint p0, const g
       (*base->text_popped)(self, p0, p1);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Statusbar_Class::wrap_new(GObject* o)
@@ -276,12 +303,12 @@ guint Statusbar::get_context_id(const Glib::ustring& context_description)
 
 void Statusbar::pop(guint context_id)
 {
-  gtk_statusbar_pop(gobj(), context_id);
+gtk_statusbar_pop(gobj(), context_id); 
 }
 
 void Statusbar::set_has_resize_grip(bool setting)
 {
-  gtk_statusbar_set_has_resize_grip(gobj(), static_cast<int>(setting));
+gtk_statusbar_set_has_resize_grip(gobj(), static_cast<int>(setting)); 
 }
 
 bool Statusbar::get_has_resize_grip() const
@@ -295,23 +322,29 @@ Glib::SignalProxy2< void,guint,const Glib::ustring& > Statusbar::signal_text_pus
   return Glib::SignalProxy2< void,guint,const Glib::ustring& >(this, &Statusbar_signal_text_pushed_info);
 }
 
+
 Glib::SignalProxy2< void,guint,const Glib::ustring& > Statusbar::signal_text_popped()
 {
   return Glib::SignalProxy2< void,guint,const Glib::ustring& >(this, &Statusbar_signal_text_popped_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Statusbar::property_has_resize_grip() 
 {
   return Glib::PropertyProxy<bool>(this, "has-resize-grip");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Statusbar::property_has_resize_grip() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "has-resize-grip");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Statusbar::on_text_pushed(guint context_id, const Glib::ustring& text)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -321,7 +354,6 @@ void Gtk::Statusbar::on_text_pushed(guint context_id, const Glib::ustring& text)
   if(base && base->text_pushed)
     (*base->text_pushed)(gobj(),context_id,text.c_str());
 }
-
 void Gtk::Statusbar::on_text_popped(guint context_id, const Glib::ustring& text)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -331,6 +363,10 @@ void Gtk::Statusbar::on_text_popped(guint context_id, const Glib::ustring& text)
   if(base && base->text_popped)
     (*base->text_popped)(gobj(),context_id,text.c_str());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/statusbar.h b/libs/gtkmm2/gtk/gtkmm/statusbar.h
index 6bade10932..a1eff80471 100644
--- a/libs/gtkmm2/gtk/gtkmm/statusbar.h
+++ b/libs/gtkmm2/gtk/gtkmm/statusbar.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_STATUSBAR_H
 #define _GTKMM_STATUSBAR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -95,13 +96,19 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_text_pushed(guint context_id, const Glib::ustring& text);
   virtual void on_text_popped(guint context_id, const Glib::ustring& text);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -122,20 +129,33 @@ public:
   bool get_has_resize_grip() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %text_pushed(guint context_id, const Glib::ustring& text)</tt>
+   */
+
   Glib::SignalProxy2< void,guint,const Glib::ustring& > signal_text_pushed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %text_popped(guint context_id, const Glib::ustring& text)</tt>
+   */
+
   Glib::SignalProxy2< void,guint,const Glib::ustring& > signal_text_popped();
 
 
-  /** Whether the statusbar has a grip for resizing the toplevel.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the statusbar has a grip for resizing the toplevel.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_has_resize_grip() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the statusbar has a grip for resizing the toplevel.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -143,6 +163,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_has_resize_grip() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -158,6 +179,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Statusbar* wrap(GtkStatusbar* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_STATUSBAR_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/stock.cc b/libs/gtkmm2/gtk/gtkmm/stock.cc
index eb13cc0ef8..26ba2305a5 100644
--- a/libs/gtkmm2/gtk/gtkmm/stock.cc
+++ b/libs/gtkmm2/gtk/gtkmm/stock.cc
@@ -63,6 +63,8 @@ const Gtk::BuiltinStockID FILE = { GTK_STOCK_FILE };
 const Gtk::BuiltinStockID FIND = { GTK_STOCK_FIND };
 const Gtk::BuiltinStockID FIND_AND_REPLACE = { GTK_STOCK_FIND_AND_REPLACE };
 const Gtk::BuiltinStockID FLOPPY = { GTK_STOCK_FLOPPY };
+const Gtk::BuiltinStockID FULLSCREEN = { GTK_STOCK_FULLSCREEN };
+const Gtk::BuiltinStockID LEAVE_FULLSCREEN = { GTK_STOCK_LEAVE_FULLSCREEN };
 const Gtk::BuiltinStockID GOTO_BOTTOM = { GTK_STOCK_GOTO_BOTTOM };
 const Gtk::BuiltinStockID GOTO_FIRST = { GTK_STOCK_GOTO_FIRST };
 const Gtk::BuiltinStockID GOTO_LAST = { GTK_STOCK_GOTO_LAST };
@@ -75,6 +77,7 @@ const Gtk::BuiltinStockID HARDDISK = { GTK_STOCK_HARDDISK };
 const Gtk::BuiltinStockID HELP = { GTK_STOCK_HELP };
 const Gtk::BuiltinStockID HOME = { GTK_STOCK_HOME };
 const Gtk::BuiltinStockID INDEX = { GTK_STOCK_INDEX };
+const Gtk::BuiltinStockID INFO = { GTK_STOCK_INFO };
 const Gtk::BuiltinStockID INDENT = { GTK_STOCK_INDENT };
 const Gtk::BuiltinStockID UNINDENT = { GTK_STOCK_UNINDENT };
 const Gtk::BuiltinStockID ITALIC = { GTK_STOCK_ITALIC };
diff --git a/libs/gtkmm2/gtk/gtkmm/stock.h b/libs/gtkmm2/gtk/gtkmm/stock.h
index e7f3888241..28d312b45e 100644
--- a/libs/gtkmm2/gtk/gtkmm/stock.h
+++ b/libs/gtkmm2/gtk/gtkmm/stock.h
@@ -86,6 +86,8 @@ extern GTKMM_API const Gtk::BuiltinStockID FILE;             /*!< @image html st
 extern GTKMM_API const Gtk::BuiltinStockID FIND;             /*!< @image html stock_search_24.png              */
 extern GTKMM_API const Gtk::BuiltinStockID FIND_AND_REPLACE; /*!< @image html stock_search_replace_24.png      */
 extern GTKMM_API const Gtk::BuiltinStockID FLOPPY;           /*!< @image html stock_save_24.png                */
+extern GTKMM_API const Gtk::BuiltinStockID FULLSCREEN;       /*!< @image html stock_fullscreen_24.png                */
+extern GTKMM_API const Gtk::BuiltinStockID LEAVE_FULLSCREEN; /*!< @image html stock_leave_fullscreen_24.png                */
 extern GTKMM_API const Gtk::BuiltinStockID GOTO_BOTTOM;      /*!< @image html stock_bottom_24.png              */
 extern GTKMM_API const Gtk::BuiltinStockID GOTO_FIRST;       /*!< @image html stock_first_24.png               */
 extern GTKMM_API const Gtk::BuiltinStockID GOTO_LAST;        /*!< @image html stock_last_24.png                */
@@ -98,6 +100,7 @@ extern GTKMM_API const Gtk::BuiltinStockID HARDDISK;         /*!< @image html st
 extern GTKMM_API const Gtk::BuiltinStockID HELP;             /*!< @image html stock_help_24.png                */
 extern GTKMM_API const Gtk::BuiltinStockID HOME;             /*!< @image html stock_home_24.png                */
 extern GTKMM_API const Gtk::BuiltinStockID INDEX;            /*!< @image html stock_index_24.png               */
+extern GTKMM_API const Gtk::BuiltinStockID INFO;            /*!< @image html stock_info_24.png               */
 extern GTKMM_API const Gtk::BuiltinStockID INDENT;           /*!< @image html stock_indent_24.png              */
 extern GTKMM_API const Gtk::BuiltinStockID UNINDENT;         /*!< @image html stock_unindent_24.png            */
 extern GTKMM_API const Gtk::BuiltinStockID ITALIC;           /*!< @image html stock_text_italic_24.png         */
diff --git a/libs/gtkmm2/gtk/gtkmm/stockitem.cc b/libs/gtkmm2/gtk/gtkmm/stockitem.cc
index 3a2c10687e..03b0dd13d2 100644
--- a/libs/gtkmm2/gtk/gtkmm/stockitem.cc
+++ b/libs/gtkmm2/gtk/gtkmm/stockitem.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/stockitem.h>
 #include <gtkmm/private/stockitem_p.h>
 
@@ -135,31 +136,31 @@ GtkStockItem* StockItem::gobj_copy() const
 }
 
 
-StockID StockItem::get_stock_id() const
+ StockID StockItem::get_stock_id() const
 {
   return StockID(gobj()->stock_id);
 }
-
-Glib::ustring StockItem::get_label() const
+ 
+ Glib::ustring StockItem::get_label() const
 {
   return Glib::convert_const_gchar_ptr_to_ustring(gobj()->label);
 }
-
-Gdk::ModifierType StockItem::get_modifier() const
+ 
+ Gdk::ModifierType StockItem::get_modifier() const
 {
   return ((Gdk::ModifierType)(gobj()->modifier));
 }
-
-guint StockItem::get_keyval() const
+ 
+ guint StockItem::get_keyval() const
 {
   return gobj()->keyval;
 }
-
-Glib::ustring StockItem::get_translation_domain() const
+ 
+ Glib::ustring StockItem::get_translation_domain() const
 {
   return Glib::convert_const_gchar_ptr_to_ustring(gobj()->translation_domain);
 }
-
+ 
 
 } // namespace Gtk
 
diff --git a/libs/gtkmm2/gtk/gtkmm/stockitem.h b/libs/gtkmm2/gtk/gtkmm/stockitem.h
index f500c0f12a..d674f99ced 100644
--- a/libs/gtkmm2/gtk/gtkmm/stockitem.h
+++ b/libs/gtkmm2/gtk/gtkmm/stockitem.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_STOCKITEM_H
 #define _GTKMM_STOCKITEM_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -73,12 +74,12 @@ public:
             Gdk::ModifierType modifier = Gdk::ModifierType(0), unsigned int keyval = 0,
             const Glib::ustring& translation_domain = Glib::ustring());
 
-  StockID get_stock_id() const;
-  Glib::ustring get_label() const;
-  Gdk::ModifierType get_modifier() const;
-  guint get_keyval() const;
-  Glib::ustring get_translation_domain() const;
-
+   StockID get_stock_id() const;
+    Glib::ustring get_label() const;
+    Gdk::ModifierType get_modifier() const;
+    guint get_keyval() const;
+    Glib::ustring get_translation_domain() const;
+ 
   static bool lookup(const Gtk::StockID& stock_id, Gtk::StockItem& item);
 
 
@@ -99,5 +100,6 @@ Gtk::StockItem wrap(GtkStockItem* object, bool take_copy = false);
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_STOCKITEM_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/style.cc b/libs/gtkmm2/gtk/gtkmm/style.cc
index ed4d97fcbc..a6cc2a2cb5 100644
--- a/libs/gtkmm2/gtk/gtkmm/style.cc
+++ b/libs/gtkmm2/gtk/gtkmm/style.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/style.h>
 #include <gtkmm/private/style_p.h>
 
@@ -153,6 +154,8 @@ Glib::RefPtr<const Gdk::GC> Style::get_base_gc(StateType state_type) const
   return Glib::wrap(gobj()->base_gc[state_type], true);
 }
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 Gdk::Color Style::get_background(StateType state_type) const
 {
   GdkColor* pGdkColor = const_cast<GdkColor*>(&(gobj()->bg[state_type]));
@@ -172,6 +175,18 @@ void Style::set_bg_pixmap(StateType state_type, const Glib::RefPtr<Gdk::Pixmap>&
   if(old_pixmap)
     g_object_unref(old_pixmap);
 }
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
+void Style::set_bg_pixmap(StateType state_type, const Glib::RefPtr<const Gdk::Pixmap>& pixmap)
+{
+  GdkPixmap *const old_pixmap = gobj()->bg_pixmap[state_type];
+  Glib::RefPtr<Gdk::Pixmap> pixmap_unconst = Glib::RefPtr<Gdk::Pixmap>::cast_const(pixmap);
+  gobj()->bg_pixmap[state_type] = Glib::unwrap_copy(pixmap_unconst); //unwrap_copy() needs a non-const.
+
+  if(old_pixmap)
+    g_object_unref(old_pixmap);
+}
 
 Glib::RefPtr<Gdk::Pixmap> Style::get_bg_pixmap(StateType state_type)
 {
@@ -215,13 +230,21 @@ void Style::paint_polygon(const Glib::RefPtr<Gdk::Window>&      window,
       fill);
 }
 
+IconSet Style::lookup_icon_set(const Gtk::StockID& stock_id)
+{
+  GtkIconSet* pIconSet = gtk_style_lookup_icon_set(gobj(), stock_id.get_c_str());
+  return IconSet(pIconSet, true); //true = take_copy.
+
+}
+
 } // namespace Gtk
 
 
 namespace
 {
 
-const Glib::SignalProxyInfo Style_signal_realize_info =
+
+static const Glib::SignalProxyInfo Style_signal_realize_info =
 {
   "realize",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -229,13 +252,14 @@ const Glib::SignalProxyInfo Style_signal_realize_info =
 };
 
 
-const Glib::SignalProxyInfo Style_signal_unrealize_info =
+static const Glib::SignalProxyInfo Style_signal_unrealize_info =
 {
   "unrealize",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -282,6 +306,7 @@ void Style_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->realize = &realize_vfunc_callback;
   klass->unrealize = &unrealize_vfunc_callback;
   klass->copy = &copy_vfunc_callback;
@@ -310,10 +335,15 @@ void Style_Class::class_init_function(void* g_class, void* class_data)
   klass->draw_expander = &draw_expander_vfunc_callback;
   klass->draw_layout = &draw_layout_vfunc_callback;
   klass->draw_resize_grip = &draw_resize_grip_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->realize = &realize_callback;
   klass->unrealize = &unrealize_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Style_Class::realize_vfunc_callback(GtkStyle* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -326,15 +356,19 @@ void Style_Class::realize_vfunc_callback(GtkStyle* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->realize_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -347,7 +381,6 @@ void Style_Class::realize_vfunc_callback(GtkStyle* self)
       (*base->realize)(self);
   }
 }
-
 void Style_Class::unrealize_vfunc_callback(GtkStyle* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -360,15 +393,19 @@ void Style_Class::unrealize_vfunc_callback(GtkStyle* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->unrealize_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -381,7 +418,6 @@ void Style_Class::unrealize_vfunc_callback(GtkStyle* self)
       (*base->unrealize)(self);
   }
 }
-
 void Style_Class::copy_vfunc_callback(GtkStyle* self, GtkStyle* src)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -394,16 +430,20 @@ void Style_Class::copy_vfunc_callback(GtkStyle* self, GtkStyle* src)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->copy_vfunc(Glib::wrap(src, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -416,7 +456,6 @@ void Style_Class::copy_vfunc_callback(GtkStyle* self, GtkStyle* src)
       (*base->copy)(self, src);
   }
 }
-
 GtkStyle* Style_Class::clone_vfunc_callback(GtkStyle* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -429,15 +468,19 @@ GtkStyle* Style_Class::clone_vfunc_callback(GtkStyle* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->clone_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -453,7 +496,6 @@ GtkStyle* Style_Class::clone_vfunc_callback(GtkStyle* self)
   typedef GtkStyle* RType;
   return RType();
 }
-
 void Style_Class::init_from_rc_vfunc_callback(GtkStyle* self, GtkRcStyle* rc_style)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -466,16 +508,20 @@ void Style_Class::init_from_rc_vfunc_callback(GtkStyle* self, GtkRcStyle* rc_sty
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->init_from_rc_vfunc(Glib::wrap(rc_style)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -488,7 +534,6 @@ void Style_Class::init_from_rc_vfunc_callback(GtkStyle* self, GtkRcStyle* rc_sty
       (*base->init_from_rc)(self, rc_style);
   }
 }
-
 void Style_Class::set_background_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -501,17 +546,21 @@ void Style_Class::set_background_vfunc_callback(GtkStyle* self, GdkWindow* windo
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_background_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -524,7 +573,6 @@ void Style_Class::set_background_vfunc_callback(GtkStyle* self, GdkWindow* windo
       (*base->set_background)(self, window, state_type);
   }
 }
-
 GdkPixbuf* Style_Class::render_icon_vfunc_callback(GtkStyle* self, const GtkIconSource* source, GtkTextDirection direction, GtkStateType state, GtkIconSize size, GtkWidget* widget, const gchar* detail)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -537,8 +585,10 @@ GdkPixbuf* Style_Class::render_icon_vfunc_callback(GtkStyle* self, const GtkIcon
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->render_icon_vfunc(Glib::wrap(const_cast<GtkIconSource*>(source), true)
 , ((TextDirection)(direction))
@@ -547,11 +597,13 @@ GdkPixbuf* Style_Class::render_icon_vfunc_callback(GtkStyle* self, const GtkIcon
 , Glib::wrap(widget)
 , Glib::convert_const_gchar_ptr_to_ustring(detail)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -567,7 +619,6 @@ GdkPixbuf* Style_Class::render_icon_vfunc_callback(GtkStyle* self, const GtkIcon
   typedef GdkPixbuf* RType;
   return RType();
 }
-
 void Style_Class::draw_hline_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x1, gint x2, gint y)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -580,8 +631,10 @@ void Style_Class::draw_hline_vfunc_callback(GtkStyle* self, GdkWindow* window, G
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_hline_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -592,11 +645,13 @@ void Style_Class::draw_hline_vfunc_callback(GtkStyle* self, GdkWindow* window, G
 , x2
 , y
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -609,7 +664,6 @@ void Style_Class::draw_hline_vfunc_callback(GtkStyle* self, GdkWindow* window, G
       (*base->draw_hline)(self, window, state_type, area, widget, detail, x1, x2, y);
   }
 }
-
 void Style_Class::draw_vline_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint y1, gint y2, gint x)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -622,8 +676,10 @@ void Style_Class::draw_vline_vfunc_callback(GtkStyle* self, GdkWindow* window, G
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_vline_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -634,11 +690,13 @@ void Style_Class::draw_vline_vfunc_callback(GtkStyle* self, GdkWindow* window, G
 , y2
 , x
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -651,7 +709,6 @@ void Style_Class::draw_vline_vfunc_callback(GtkStyle* self, GdkWindow* window, G
       (*base->draw_vline)(self, window, state_type, area, widget, detail, y1, y2, x);
   }
 }
-
 void Style_Class::draw_shadow_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -664,8 +721,10 @@ void Style_Class::draw_shadow_vfunc_callback(GtkStyle* self, GdkWindow* window,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_shadow_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -678,11 +737,13 @@ void Style_Class::draw_shadow_vfunc_callback(GtkStyle* self, GdkWindow* window,
 , width
 , height
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -695,7 +756,6 @@ void Style_Class::draw_shadow_vfunc_callback(GtkStyle* self, GdkWindow* window,
       (*base->draw_shadow)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
   }
 }
-
 void Style_Class::draw_polygon_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, GdkPoint* point, gint npoints, gboolean fill)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -708,8 +768,10 @@ void Style_Class::draw_polygon_vfunc_callback(GtkStyle* self, GdkWindow* window,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_polygon_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -720,11 +782,13 @@ void Style_Class::draw_polygon_vfunc_callback(GtkStyle* self, GdkWindow* window,
 , point, npoints
 , fill
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -737,7 +801,6 @@ void Style_Class::draw_polygon_vfunc_callback(GtkStyle* self, GdkWindow* window,
       (*base->draw_polygon)(self, window, state_type, shadow_type, area, widget, detail, point, npoints, fill);
   }
 }
-
 void Style_Class::draw_arrow_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, GtkArrowType arrow_type, gboolean fill, gint x, gint y, gint width, gint height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -750,8 +813,10 @@ void Style_Class::draw_arrow_vfunc_callback(GtkStyle* self, GdkWindow* window, G
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_arrow_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -766,11 +831,13 @@ void Style_Class::draw_arrow_vfunc_callback(GtkStyle* self, GdkWindow* window, G
 , width
 , height
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -783,7 +850,6 @@ void Style_Class::draw_arrow_vfunc_callback(GtkStyle* self, GdkWindow* window, G
       (*base->draw_arrow)(self, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
   }
 }
-
 void Style_Class::draw_diamond_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -796,8 +862,10 @@ void Style_Class::draw_diamond_vfunc_callback(GtkStyle* self, GdkWindow* window,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_diamond_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -810,11 +878,13 @@ void Style_Class::draw_diamond_vfunc_callback(GtkStyle* self, GdkWindow* window,
 , width
 , height
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -827,7 +897,6 @@ void Style_Class::draw_diamond_vfunc_callback(GtkStyle* self, GdkWindow* window,
       (*base->draw_diamond)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
   }
 }
-
 void Style_Class::draw_string_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, const gchar* string)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -840,8 +909,10 @@ void Style_Class::draw_string_vfunc_callback(GtkStyle* self, GdkWindow* window,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_string_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -852,11 +923,13 @@ void Style_Class::draw_string_vfunc_callback(GtkStyle* self, GdkWindow* window,
 , y
 , Glib::convert_const_gchar_ptr_to_ustring(string)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -869,7 +942,6 @@ void Style_Class::draw_string_vfunc_callback(GtkStyle* self, GdkWindow* window,
       (*base->draw_string)(self, window, state_type, area, widget, detail, x, y, string);
   }
 }
-
 void Style_Class::draw_box_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -882,8 +954,10 @@ void Style_Class::draw_box_vfunc_callback(GtkStyle* self, GdkWindow* window, Gtk
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_box_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -896,11 +970,13 @@ void Style_Class::draw_box_vfunc_callback(GtkStyle* self, GdkWindow* window, Gtk
 , width
 , height
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -913,7 +989,6 @@ void Style_Class::draw_box_vfunc_callback(GtkStyle* self, GdkWindow* window, Gtk
       (*base->draw_box)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
   }
 }
-
 void Style_Class::draw_flat_box_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -926,8 +1001,10 @@ void Style_Class::draw_flat_box_vfunc_callback(GtkStyle* self, GdkWindow* window
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_flat_box_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -940,11 +1017,13 @@ void Style_Class::draw_flat_box_vfunc_callback(GtkStyle* self, GdkWindow* window
 , width
 , height
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -957,7 +1036,6 @@ void Style_Class::draw_flat_box_vfunc_callback(GtkStyle* self, GdkWindow* window
       (*base->draw_flat_box)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
   }
 }
-
 void Style_Class::draw_check_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -970,8 +1048,10 @@ void Style_Class::draw_check_vfunc_callback(GtkStyle* self, GdkWindow* window, G
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_check_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -984,11 +1064,13 @@ void Style_Class::draw_check_vfunc_callback(GtkStyle* self, GdkWindow* window, G
 , width
 , height
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1001,7 +1083,6 @@ void Style_Class::draw_check_vfunc_callback(GtkStyle* self, GdkWindow* window, G
       (*base->draw_check)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
   }
 }
-
 void Style_Class::draw_option_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1014,8 +1095,10 @@ void Style_Class::draw_option_vfunc_callback(GtkStyle* self, GdkWindow* window,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_option_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -1028,11 +1111,13 @@ void Style_Class::draw_option_vfunc_callback(GtkStyle* self, GdkWindow* window,
 , width
 , height
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1045,7 +1130,6 @@ void Style_Class::draw_option_vfunc_callback(GtkStyle* self, GdkWindow* window,
       (*base->draw_option)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
   }
 }
-
 void Style_Class::draw_tab_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1058,8 +1142,10 @@ void Style_Class::draw_tab_vfunc_callback(GtkStyle* self, GdkWindow* window, Gtk
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_tab_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -1072,11 +1158,13 @@ void Style_Class::draw_tab_vfunc_callback(GtkStyle* self, GdkWindow* window, Gtk
 , width
 , height
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1089,7 +1177,6 @@ void Style_Class::draw_tab_vfunc_callback(GtkStyle* self, GdkWindow* window, Gtk
       (*base->draw_tab)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
   }
 }
-
 void Style_Class::draw_shadow_gap_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height, GtkPositionType gap_side, gint gap_x, gint gap_width)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1102,8 +1189,10 @@ void Style_Class::draw_shadow_gap_vfunc_callback(GtkStyle* self, GdkWindow* wind
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_shadow_gap_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -1119,11 +1208,13 @@ void Style_Class::draw_shadow_gap_vfunc_callback(GtkStyle* self, GdkWindow* wind
 , gap_x
 , gap_width
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1136,7 +1227,6 @@ void Style_Class::draw_shadow_gap_vfunc_callback(GtkStyle* self, GdkWindow* wind
       (*base->draw_shadow_gap)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
   }
 }
-
 void Style_Class::draw_box_gap_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height, GtkPositionType gap_side, gint gap_x, gint gap_width)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1149,8 +1239,10 @@ void Style_Class::draw_box_gap_vfunc_callback(GtkStyle* self, GdkWindow* window,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_box_gap_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -1166,11 +1258,13 @@ void Style_Class::draw_box_gap_vfunc_callback(GtkStyle* self, GdkWindow* window,
 , gap_x
 , gap_width
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1183,7 +1277,6 @@ void Style_Class::draw_box_gap_vfunc_callback(GtkStyle* self, GdkWindow* window,
       (*base->draw_box_gap)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
   }
 }
-
 void Style_Class::draw_extension_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height, GtkPositionType gap_side)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1196,8 +1289,10 @@ void Style_Class::draw_extension_vfunc_callback(GtkStyle* self, GdkWindow* windo
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_extension_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -1211,11 +1306,13 @@ void Style_Class::draw_extension_vfunc_callback(GtkStyle* self, GdkWindow* windo
 , height
 , ((PositionType)(gap_side))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1228,7 +1325,6 @@ void Style_Class::draw_extension_vfunc_callback(GtkStyle* self, GdkWindow* windo
       (*base->draw_extension)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
   }
 }
-
 void Style_Class::draw_focus_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1241,8 +1337,10 @@ void Style_Class::draw_focus_vfunc_callback(GtkStyle* self, GdkWindow* window, G
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_focus_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -1254,11 +1352,13 @@ void Style_Class::draw_focus_vfunc_callback(GtkStyle* self, GdkWindow* window, G
 , width
 , height
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1271,7 +1371,6 @@ void Style_Class::draw_focus_vfunc_callback(GtkStyle* self, GdkWindow* window, G
       (*base->draw_focus)(self, window, state_type, area, widget, detail, x, y, width, height);
   }
 }
-
 void Style_Class::draw_slider_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height, GtkOrientation orientation)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1284,8 +1383,10 @@ void Style_Class::draw_slider_vfunc_callback(GtkStyle* self, GdkWindow* window,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_slider_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -1299,11 +1400,13 @@ void Style_Class::draw_slider_vfunc_callback(GtkStyle* self, GdkWindow* window,
 , height
 , ((Orientation)(orientation))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1316,7 +1419,6 @@ void Style_Class::draw_slider_vfunc_callback(GtkStyle* self, GdkWindow* window,
       (*base->draw_slider)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
   }
 }
-
 void Style_Class::draw_handle_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height, GtkOrientation orientation)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1329,8 +1431,10 @@ void Style_Class::draw_handle_vfunc_callback(GtkStyle* self, GdkWindow* window,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_handle_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -1344,11 +1448,13 @@ void Style_Class::draw_handle_vfunc_callback(GtkStyle* self, GdkWindow* window,
 , height
 , ((Orientation)(orientation))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1361,7 +1467,6 @@ void Style_Class::draw_handle_vfunc_callback(GtkStyle* self, GdkWindow* window,
       (*base->draw_handle)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
   }
 }
-
 void Style_Class::draw_expander_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, GtkExpanderStyle expander_style)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1374,8 +1479,10 @@ void Style_Class::draw_expander_vfunc_callback(GtkStyle* self, GdkWindow* window
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_expander_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -1386,11 +1493,13 @@ void Style_Class::draw_expander_vfunc_callback(GtkStyle* self, GdkWindow* window
 , y
 , ((ExpanderStyle)(expander_style))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1403,7 +1512,6 @@ void Style_Class::draw_expander_vfunc_callback(GtkStyle* self, GdkWindow* window
       (*base->draw_expander)(self, window, state_type, area, widget, detail, x, y, expander_style);
   }
 }
-
 void Style_Class::draw_layout_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, gboolean use_text, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, PangoLayout* layout)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1416,8 +1524,10 @@ void Style_Class::draw_layout_vfunc_callback(GtkStyle* self, GdkWindow* window,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_layout_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -1429,11 +1539,13 @@ void Style_Class::draw_layout_vfunc_callback(GtkStyle* self, GdkWindow* window,
 , y
 , Glib::wrap(layout)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1446,7 +1558,6 @@ void Style_Class::draw_layout_vfunc_callback(GtkStyle* self, GdkWindow* window,
       (*base->draw_layout)(self, window, state_type, use_text, area, widget, detail, x, y, layout);
   }
 }
-
 void Style_Class::draw_resize_grip_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, GdkWindowEdge edge, gint x, gint y, gint width, gint height)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1459,8 +1570,10 @@ void Style_Class::draw_resize_grip_vfunc_callback(GtkStyle* self, GdkWindow* win
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->draw_resize_grip_vfunc(Glib::wrap((GdkWindowObject*)(window), true)
 , ((Gtk::StateType)(state_type))
@@ -1473,11 +1586,13 @@ void Style_Class::draw_resize_grip_vfunc_callback(GtkStyle* self, GdkWindow* win
 , width
 , height
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1490,8 +1605,9 @@ void Style_Class::draw_resize_grip_vfunc_callback(GtkStyle* self, GdkWindow* win
       (*base->draw_resize_grip)(self, window, state_type, area, widget, detail, edge, x, y, width, height);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Style_Class::realize_callback(GtkStyle* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1504,15 +1620,19 @@ void Style_Class::realize_callback(GtkStyle* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_realize();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1525,7 +1645,6 @@ void Style_Class::realize_callback(GtkStyle* self)
       (*base->realize)(self);
   }
 }
-
 void Style_Class::unrealize_callback(GtkStyle* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1538,15 +1657,19 @@ void Style_Class::unrealize_callback(GtkStyle* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_unrealize();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1559,6 +1682,7 @@ void Style_Class::unrealize_callback(GtkStyle* self)
       (*base->unrealize)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Style_Class::wrap_new(GObject* object)
@@ -1693,37 +1817,37 @@ Gdk::Color Style::get_text_aa(StateType state) const
   return Gdk::Color(const_cast<GdkColor*>(&gobj()->text_aa[state]), true);
 }
 
-void Style::set_black(const Gdk::Color& value)
+ void Style::set_black(const Gdk::Color& value)
 {
   gobj()->black = (*(value).gobj());
 }
-
-Gdk::Color Style::get_black() const
+ 
+ Gdk::Color Style::get_black() const
 {
   return Gdk::Color(const_cast<GdkColor*>(&(gobj()->black)), true);
 }
-
-void Style::set_white(const Gdk::Color& value)
+ 
+ void Style::set_white(const Gdk::Color& value)
 {
   gobj()->white = (*(value).gobj());
 }
-
-Gdk::Color Style::get_white() const
+ 
+ Gdk::Color Style::get_white() const
 {
   return Gdk::Color(const_cast<GdkColor*>(&(gobj()->white)), true);
 }
-
-int Style::get_xthickness() const
+ 
+ int Style::get_xthickness() const
 {
   return gobj()->xthickness;
 }
-
-int Style::get_ythickness() const
+ 
+ int Style::get_ythickness() const
 {
   return gobj()->ythickness;
 }
-
-Glib::RefPtr<Gdk::GC> Style::get_black_gc()
+ 
+ Glib::RefPtr<Gdk::GC> Style::get_black_gc()
 {
   Glib::RefPtr<Gdk::GC> ref_ptr(Glib::wrap(gobj()->black_gc));
 
@@ -1742,8 +1866,8 @@ Glib::RefPtr<const Gdk::GC> Style::get_black_gc() const
 
   return ref_ptr;
 }
-
-Glib::RefPtr<Gdk::GC> Style::get_white_gc()
+ 
+ Glib::RefPtr<Gdk::GC> Style::get_white_gc()
 {
   Glib::RefPtr<Gdk::GC> ref_ptr(Glib::wrap(gobj()->white_gc));
 
@@ -1762,100 +1886,100 @@ Glib::RefPtr<const Gdk::GC> Style::get_white_gc() const
 
   return ref_ptr;
 }
-
+ 
 void Style::paint_arrow(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, ArrowType arrow_type, bool fill, int x, int y, int width, int height) const
 {
-  gtk_paint_arrow(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), ((GtkArrowType)(arrow_type)), static_cast<int>(fill), x, y, width, height);
+gtk_paint_arrow(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), ((GtkArrowType)(arrow_type)), static_cast<int>(fill), x, y, width, height); 
 }
 
 void Style::paint_box(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height) const
 {
-  gtk_paint_box(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height);
+gtk_paint_box(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height); 
 }
 
 void Style::paint_box_gap(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height, PositionType gap_side, int gap_x, int gap_width) const
 {
-  gtk_paint_box_gap(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), const_cast<gchar*>(detail.c_str()), x, y, width, height, ((GtkPositionType)(gap_side)), gap_x, gap_width);
+gtk_paint_box_gap(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), const_cast<gchar*>(detail.c_str()), x, y, width, height, ((GtkPositionType)(gap_side)), gap_x, gap_width); 
 }
 
 void Style::paint_check(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height) const
 {
-  gtk_paint_check(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height);
+gtk_paint_check(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height); 
 }
 
 void Style::paint_diamond(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height) const
 {
-  gtk_paint_diamond(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height);
+gtk_paint_diamond(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height); 
 }
 
 void Style::paint_extension(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height, PositionType gap_side) const
 {
-  gtk_paint_extension(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), const_cast<gchar*>(detail.c_str()), x, y, width, height, ((GtkPositionType)(gap_side)));
+gtk_paint_extension(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), const_cast<gchar*>(detail.c_str()), x, y, width, height, ((GtkPositionType)(gap_side))); 
 }
 
 void Style::paint_flat_box(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height) const
 {
-  gtk_paint_flat_box(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height);
+gtk_paint_flat_box(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height); 
 }
 
 void Style::paint_focus(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height) const
 {
-  gtk_paint_focus(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height);
+gtk_paint_focus(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height); 
 }
 
 void Style::paint_handle(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height, Orientation orientation) const
 {
-  gtk_paint_handle(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height, ((GtkOrientation)(orientation)));
+gtk_paint_handle(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height, ((GtkOrientation)(orientation))); 
 }
 
 void Style::paint_hline(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x1, int x2, int y) const
 {
-  gtk_paint_hline(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x1, x2, y);
+gtk_paint_hline(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x1, x2, y); 
 }
 
 void Style::paint_option(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height) const
 {
-  gtk_paint_option(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height);
+gtk_paint_option(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height); 
 }
 
 void Style::paint_shadow(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height) const
 {
-  gtk_paint_shadow(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height);
+gtk_paint_shadow(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height); 
 }
 
 void Style::paint_shadow_gap(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height, PositionType gap_side, int gap_x, int gap_width) const
 {
-  gtk_paint_shadow_gap(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), const_cast<gchar*>(detail.c_str()), x, y, width, height, ((GtkPositionType)(gap_side)), gap_x, gap_width);
+gtk_paint_shadow_gap(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), const_cast<gchar*>(detail.c_str()), x, y, width, height, ((GtkPositionType)(gap_side)), gap_x, gap_width); 
 }
 
 void Style::paint_slider(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height, Orientation orientation) const
 {
-  gtk_paint_slider(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height, ((GtkOrientation)(orientation)));
+gtk_paint_slider(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height, ((GtkOrientation)(orientation))); 
 }
 
 void Style::paint_tab(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, int width, int height) const
 {
-  gtk_paint_tab(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height);
+gtk_paint_tab(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), ((GtkShadowType)(shadow_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, width, height); 
 }
 
 void Style::paint_vline(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int y1, int y2, int x) const
 {
-  gtk_paint_vline(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), y1, y2, x);
+gtk_paint_vline(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), y1, y2, x); 
 }
 
 void Style::paint_expander(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, ExpanderStyle expander_style) const
 {
-  gtk_paint_expander(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, ((GtkExpanderStyle)(expander_style)));
+gtk_paint_expander(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, ((GtkExpanderStyle)(expander_style))); 
 }
 
 void Style::paint_layout(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, bool use_text, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, int x, int y, const Glib::RefPtr<Pango::Layout>& layout) const
 {
-  gtk_paint_layout(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), static_cast<int>(use_text), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, Glib::unwrap(layout));
+gtk_paint_layout(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), static_cast<int>(use_text), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), x, y, Glib::unwrap(layout)); 
 }
 
 void Style::paint_resize_grip(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget& widget, const Glib::ustring& detail, Gdk::WindowEdge edge, int x, int y, int width, int height) const
 {
-  gtk_paint_resize_grip(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), ((GdkWindowEdge)(edge)), x, y, width, height);
+gtk_paint_resize_grip(const_cast<GtkStyle*>(gobj()), Glib::unwrap(window), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), (widget).gobj(), detail.c_str(), ((GdkWindowEdge)(edge)), x, y, width, height); 
 }
 
 Glib::RefPtr<Style> Style::copy()
@@ -1865,17 +1989,17 @@ Glib::RefPtr<Style> Style::copy()
 
 void Style::set_background(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type)
 {
-  gtk_style_set_background(gobj(), Glib::unwrap(window), ((GtkStateType)(state_type)));
+gtk_style_set_background(gobj(), Glib::unwrap(window), ((GtkStateType)(state_type))); 
 }
 
 void Style::apply_default_background(const Glib::RefPtr<Gdk::Window>& window, bool set_bg, Gtk::StateType state_type, const Gdk::Rectangle& area, int x, int y, int width, int height)
 {
-  gtk_style_apply_default_background(gobj(), Glib::unwrap(window), static_cast<int>(set_bg), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), x, y, width, height);
+gtk_style_apply_default_background(gobj(), Glib::unwrap(window), static_cast<int>(set_bg), ((GtkStateType)(state_type)), const_cast<GdkRectangle*>(area.gobj()), x, y, width, height); 
 }
 
-IconSet Style::lookup_icon_set(const Gtk::StockID& stock_id)
+bool Style::lookup_color(const Glib::ustring& color_name, Gdk::Color& color) const
 {
-  return Glib::wrap(gtk_style_lookup_icon_set(gobj(), (stock_id).get_c_str()));
+  return gtk_style_lookup_color(const_cast<GtkStyle*>(gobj()), color_name.c_str(), (color).gobj());
 }
 
 Glib::RefPtr<Gdk::Pixbuf> Style::render_icon(const IconSource& source, Gtk::TextDirection direction, Gtk::StateType state, Gtk::IconSize size, Gtk::Widget& widget, const Glib::ustring& detail)
@@ -1889,12 +2013,14 @@ Glib::SignalProxy0< void > Style::signal_realize()
   return Glib::SignalProxy0< void >(this, &Style_signal_realize_info);
 }
 
+
 Glib::SignalProxy0< void > Style::signal_unrealize()
 {
   return Glib::SignalProxy0< void >(this, &Style_signal_unrealize_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Style::on_realize()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1904,7 +2030,6 @@ void Gtk::Style::on_realize()
   if(base && base->realize)
     (*base->realize)(gobj());
 }
-
 void Gtk::Style::on_unrealize()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1914,8 +2039,9 @@ void Gtk::Style::on_unrealize()
   if(base && base->unrealize)
     (*base->unrealize)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::Style::realize_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1925,7 +2051,6 @@ void Gtk::Style::realize_vfunc()
   if(base && base->realize)
     (*base->realize)(gobj());
 }
-
 void Gtk::Style::unrealize_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1935,7 +2060,6 @@ void Gtk::Style::unrealize_vfunc()
   if(base && base->unrealize)
     (*base->unrealize)(gobj());
 }
-
 void Gtk::Style::copy_vfunc(const Glib::RefPtr<Style>& src) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1945,7 +2069,6 @@ void Gtk::Style::copy_vfunc(const Glib::RefPtr<Style>& src)
   if(base && base->copy)
     (*base->copy)(gobj(),Glib::unwrap(src));
 }
-
 Glib::RefPtr<Style> Gtk::Style::clone_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1958,7 +2081,6 @@ Glib::RefPtr<Style> Gtk::Style::clone_vfunc()
   typedef Glib::RefPtr<Style> RType;
   return RType();
 }
-
 void Gtk::Style::init_from_rc_vfunc(const Glib::RefPtr<RcStyle>& rc_style) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1968,7 +2090,6 @@ void Gtk::Style::init_from_rc_vfunc(const Glib::RefPtr<RcStyle>& rc_style)
   if(base && base->init_from_rc)
     (*base->init_from_rc)(gobj(),Glib::unwrap(rc_style));
 }
-
 void Gtk::Style::set_background_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1978,7 +2099,6 @@ void Gtk::Style::set_background_vfunc(const Glib::RefPtr<Gdk::Window>& window, G
   if(base && base->set_background)
     (*base->set_background)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)));
 }
-
 Glib::RefPtr<Gdk::Pixbuf> Gtk::Style::render_icon_vfunc(const IconSource& source, TextDirection direction, Gtk::StateType state, IconSize size, Widget* widget, const Glib::ustring& detail) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1991,7 +2111,6 @@ Glib::RefPtr<Gdk::Pixbuf> Gtk::Style::render_icon_vfunc(const IconSource& source
   typedef Glib::RefPtr<Gdk::Pixbuf> RType;
   return RType();
 }
-
 void Gtk::Style::draw_hline_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x1, int x2, int y) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2001,7 +2120,6 @@ void Gtk::Style::draw_hline_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::
   if(base && base->draw_hline)
     (*base->draw_hline)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x1,x2,y);
 }
-
 void Gtk::Style::draw_vline_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int y1, int y2, int x) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2011,7 +2129,6 @@ void Gtk::Style::draw_vline_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::
   if(base && base->draw_vline)
     (*base->draw_vline)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),y1,y2,x);
 }
-
 void Gtk::Style::draw_shadow_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2021,7 +2138,6 @@ void Gtk::Style::draw_shadow_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk:
   if(base && base->draw_shadow)
     (*base->draw_shadow)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height);
 }
-
 void Gtk::Style::draw_polygon_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, GdkPoint* point, int npoints, bool fill) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2031,7 +2147,6 @@ void Gtk::Style::draw_polygon_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk
   if(base && base->draw_polygon)
     (*base->draw_polygon)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),point,npoints,static_cast<int>(fill));
 }
-
 void Gtk::Style::draw_arrow_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, Gtk::ArrowType arrow_type, bool fill, int x, int y, int width, int height) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2041,7 +2156,6 @@ void Gtk::Style::draw_arrow_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::
   if(base && base->draw_arrow)
     (*base->draw_arrow)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),((GtkArrowType)(arrow_type)),static_cast<int>(fill),x,y,width,height);
 }
-
 void Gtk::Style::draw_diamond_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2051,7 +2165,6 @@ void Gtk::Style::draw_diamond_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk
   if(base && base->draw_diamond)
     (*base->draw_diamond)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height);
 }
-
 void Gtk::Style::draw_string_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, const Glib::ustring& string) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2061,7 +2174,6 @@ void Gtk::Style::draw_string_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk:
   if(base && base->draw_string)
     (*base->draw_string)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,string.c_str());
 }
-
 void Gtk::Style::draw_box_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2071,7 +2183,6 @@ void Gtk::Style::draw_box_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::St
   if(base && base->draw_box)
     (*base->draw_box)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height);
 }
-
 void Gtk::Style::draw_flat_box_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2081,7 +2192,6 @@ void Gtk::Style::draw_flat_box_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gt
   if(base && base->draw_flat_box)
     (*base->draw_flat_box)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height);
 }
-
 void Gtk::Style::draw_check_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2091,7 +2201,6 @@ void Gtk::Style::draw_check_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::
   if(base && base->draw_check)
     (*base->draw_check)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height);
 }
-
 void Gtk::Style::draw_option_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2101,7 +2210,6 @@ void Gtk::Style::draw_option_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk:
   if(base && base->draw_option)
     (*base->draw_option)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height);
 }
-
 void Gtk::Style::draw_tab_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2111,7 +2219,6 @@ void Gtk::Style::draw_tab_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::St
   if(base && base->draw_tab)
     (*base->draw_tab)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height);
 }
-
 void Gtk::Style::draw_shadow_gap_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Gtk::PositionType gap_side, int gap_x, int gap_width) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2121,7 +2228,6 @@ void Gtk::Style::draw_shadow_gap_vfunc(const Glib::RefPtr<Gdk::Window>& window,
   if(base && base->draw_shadow_gap)
     (*base->draw_shadow_gap)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height,((GtkPositionType)(gap_side)),gap_x,gap_width);
 }
-
 void Gtk::Style::draw_box_gap_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Gtk::PositionType gap_side, int gap_x, int gap_width) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2131,7 +2237,6 @@ void Gtk::Style::draw_box_gap_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk
   if(base && base->draw_box_gap)
     (*base->draw_box_gap)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height,((GtkPositionType)(gap_side)),gap_x,gap_width);
 }
-
 void Gtk::Style::draw_extension_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, PositionType gap_side) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2141,7 +2246,6 @@ void Gtk::Style::draw_extension_vfunc(const Glib::RefPtr<Gdk::Window>& window, G
   if(base && base->draw_extension)
     (*base->draw_extension)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height,((GtkPositionType)(gap_side)));
 }
-
 void Gtk::Style::draw_focus_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2151,7 +2255,6 @@ void Gtk::Style::draw_focus_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::
   if(base && base->draw_focus)
     (*base->draw_focus)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height);
 }
-
 void Gtk::Style::draw_slider_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Orientation orientation) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2161,7 +2264,6 @@ void Gtk::Style::draw_slider_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk:
   if(base && base->draw_slider)
     (*base->draw_slider)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height,((GtkOrientation)(orientation)));
 }
-
 void Gtk::Style::draw_handle_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Orientation orientation) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2171,7 +2273,6 @@ void Gtk::Style::draw_handle_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk:
   if(base && base->draw_handle)
     (*base->draw_handle)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),((GtkShadowType)(shadow_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,width,height,((GtkOrientation)(orientation)));
 }
-
 void Gtk::Style::draw_expander_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, ExpanderStyle expander_style) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2181,7 +2282,6 @@ void Gtk::Style::draw_expander_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gt
   if(base && base->draw_expander)
     (*base->draw_expander)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,((GtkExpanderStyle)(expander_style)));
 }
-
 void Gtk::Style::draw_layout_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, bool use_text, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, const Glib::RefPtr<Pango::Layout>& layout) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2191,7 +2291,6 @@ void Gtk::Style::draw_layout_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk:
   if(base && base->draw_layout)
     (*base->draw_layout)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),static_cast<int>(use_text),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),x,y,Glib::unwrap(layout));
 }
-
 void Gtk::Style::draw_resize_grip_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, Gdk::WindowEdge edge, int x, int y, int width, int height) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -2201,6 +2300,7 @@ void Gtk::Style::draw_resize_grip_vfunc(const Glib::RefPtr<Gdk::Window>& window,
   if(base && base->draw_resize_grip)
     (*base->draw_resize_grip)(gobj(),Glib::unwrap(window),((GtkStateType)(state_type)),const_cast<GdkRectangle*>(area.gobj()),(GtkWidget*)Glib::unwrap(widget),detail.c_str(),((GdkWindowEdge)(edge)),x,y,width,height);
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/style.h b/libs/gtkmm2/gtk/gtkmm/style.h
index d460abdc61..ba8059149f 100644
--- a/libs/gtkmm2/gtk/gtkmm/style.h
+++ b/libs/gtkmm2/gtk/gtkmm/style.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_STYLE_H
 #define _GTKMM_STYLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -133,22 +134,22 @@ public:
   Gdk::Color get_text_aa(Gtk::StateType state) const;
 
 
-  void set_black(const Gdk::Color& value);
-  Gdk::Color get_black() const;
-  void set_white(const Gdk::Color& value);
-  Gdk::Color get_white() const;
-
+   void set_black(const Gdk::Color& value);
+    Gdk::Color get_black() const;
+    void set_white(const Gdk::Color& value);
+    Gdk::Color get_white() const;
+ 
   void set_font(const Pango::FontDescription& font_desc);
 
   // These are only available after being attached to a window.
   Pango::FontDescription get_font() const;
 
   void set_xthickness(int xthickness);
-  int get_xthickness() const;
-
+   int get_xthickness() const;
+ 
   void set_ythickness(int ythickness);
-  int get_ythickness() const;
-
+   int get_ythickness() const;
+ 
   Glib::RefPtr<Gdk::GC> get_fg_gc(Gtk::StateType state_type);
   Glib::RefPtr<const Gdk::GC> get_fg_gc(Gtk::StateType state_type) const;
 
@@ -170,23 +171,29 @@ public:
   Glib::RefPtr<Gdk::GC> get_base_gc(Gtk::StateType state_type);
   Glib::RefPtr<const Gdk::GC> get_base_gc(Gtk::StateType state_type) const;
 
-  Glib::RefPtr<Gdk::GC> get_black_gc();
+   Glib::RefPtr<Gdk::GC> get_black_gc();
   Glib::RefPtr<const Gdk::GC> get_black_gc() const;
-  Glib::RefPtr<Gdk::GC> get_white_gc();
+    Glib::RefPtr<Gdk::GC> get_white_gc();
   Glib::RefPtr<const Gdk::GC> get_white_gc() const;
+ 
+  #ifndef GTKMM_DISABLE_DEPRECATED
 
-  /* Deprecated in gtkmm 2.2 -- use get_bg() instead.
-   * Honestly, I have absolutely no idea why this method was added
-   * in the first place.  It's basically just confusing since it's
-   * absolutely unrelated to set_background().  Sigh.
+  /* @deprecated use get_bg() instead.
    */
   Gdk::Color get_background(Gtk::StateType state_type) const;
 
-  /* Deprecated in gtkmm 2.2 -- use get_bg_pixmap() instead.
+  /*@deprecated use get_bg() instead.
    */
   Glib::RefPtr<Gdk::Pixmap> get_background_pixmap(Gtk::StateType state_type);
 
+  /** @deprecated Use set_bg_pixmap(Gtk::StateType state_type, const Glib::RefPtr<const Gdk::Pixmap>& pixmap)
+   */
   void set_bg_pixmap(Gtk::StateType state_type, const Glib::RefPtr<Gdk::Pixmap>& pixmap);
+  #endif // GTKMM_DISABLE_DEPRECATED
+
+
+  void set_bg_pixmap(Gtk::StateType state_type, const Glib::RefPtr<const Gdk::Pixmap>& pixmap);
+
   Glib::RefPtr<Gdk::Pixmap>       get_bg_pixmap(Gtk::StateType state_type);
   Glib::RefPtr<const Gdk::Pixmap> get_bg_pixmap(Gtk::StateType state_type) const;
 
@@ -196,9 +203,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type The type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param arrow_type The type of arrow to draw.
    * @param fill <tt>true</tt> if the arrow tip should be filled.
    * @param x X origin of the rectangle to draw the arrow in.
@@ -225,9 +233,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type The type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x X origin of the box.
    * @param y Y origin of the box.
    * @param width The width of the box.
@@ -251,9 +260,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type Type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x X origin of the rectangle.
    * @param y Y origin of the rectangle.
    * @param width Width of the rectangle.
@@ -283,9 +293,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type The type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x X origin of the rectangle to draw the check in.
    * @param y Y origin of the rectangle to draw the check in.
    * @param width The width of the rectangle to draw the check in.
@@ -309,9 +320,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type The type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x X origin of the rectangle to draw the diamond in.
    * @param y Y origin of the rectangle to draw the diamond in.
    * @param width Width of the rectangle to draw the diamond in.
@@ -334,9 +346,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type Type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x X origin of the extension.
    * @param y Y origin of the extension.
    * @param width Width of the extension.
@@ -361,9 +374,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type The type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x X origin of the box.
    * @param y Y origin of the box.
    * @param width The width of the box.
@@ -386,9 +400,10 @@ public:
    * given style.
    * @param window A Gdk::Window.
    * @param state_type A state.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x The x origin of the rectangle around which to draw a focus indicator.
    * @param y The y origin of the rectangle around which to draw a focus indicator.
    * @param width The width of the rectangle around which to draw a focus indicator.
@@ -410,9 +425,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type Type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x X origin of the handle.
    * @param y Y origin of the handle.
    * @param width With of the handle.
@@ -437,9 +453,10 @@ public:
    * using the given style and state.
    * @param window A Gdk::Window.
    * @param state_type A state.
-   * @param area Rectangle to which the output is clipped.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Rectangle to which the output is clipped, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x1 The starting x coordinate.
    * @param x2 The ending x coordinate.
    * @param y The y coordinate.
@@ -460,9 +477,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type The type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x X origin of the rectangle to draw the option in.
    * @param y Y origin of the rectangle to draw the option in.
    * @param width The width of the rectangle to draw the option in.
@@ -496,9 +514,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type Type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x X origin of the rectangle.
    * @param y Y origin of the rectangle.
    * @param width Width of the rectangle.
@@ -523,9 +542,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type Type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x X origin of the rectangle.
    * @param y Y origin of the rectangle.
    * @param width Width of the rectangle.
@@ -571,9 +591,10 @@ public:
    * @param window A Gdk::Window.
    * @param state_type A state.
    * @param shadow_type The type of shadow to draw.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x X origin of the rectangle to draw the tab in.
    * @param y Y origin of the rectangle to draw the tab in.
    * @param width The width of the rectangle to draw the tab in.
@@ -596,9 +617,10 @@ public:
    * using the given style and state.
    * @param window A Gdk::Window.
    * @param state_type A state.
-   * @param area Rectangle to which the output is clipped.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Rectangle to which the output is clipped, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param y1 The starting y coordinate.
    * @param y2 The ending y coordinate.
    * @param x The x coordinate.
@@ -614,15 +636,26 @@ public:
                   int                               x) const;
 
   
-  /** Draws an expander as used in Gtk::TreeView.
+  /** Draws an expander as used in Gtk::TreeView. @a x  and @a y  specify the
+   * center the expander. The size of the expander is determined by the
+   * "expander-size" style property of @a widget .  (If widget is not
+   * specified or doesn't have an "expander-size" property, an
+   * unspecified default size will be used, since the caller doesn't
+   * have sufficient information to position the expander, this is
+   * likely not useful.) The expander is expander_size pixels tall
+   * in the collapsed position and expander_size pixels wide in the
+   * expanded position.
    * @param window A Gdk::Window.
    * @param state_type A state.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param x The x position to draw the expander at.
    * @param y The y position to draw the expander at.
-   * @param expander_style The style to draw the expander in.
+   * @param expander_style The style to draw the expander in; determines
+   * whether the expander is collapsed, expanded, or in an
+   * intermediate state.
    */
   void paint_expander(
                   const Glib::RefPtr<Gdk::Window>&  window,
@@ -653,9 +686,10 @@ public:
    * parameters.
    * @param window A Gdk::Window.
    * @param state_type A state.
-   * @param area Clip rectangle.
-   * @param widget The widget.
-   * @param detail A style detail.
+   * @param area Clip rectangle, or <tt>0</tt> if the
+   * output should not be clipped.
+   * @param widget The widget (may be <tt>0</tt>).
+   * @param detail A style detail (may be <tt>0</tt>).
    * @param edge The edge in which to draw the resize grip.
    * @param x The x origin of the rectangle in which to draw the resize grip.
    * @param y The y origin of the rectangle in which to draw the resize grip.
@@ -699,6 +733,9 @@ public:
   IconSet lookup_icon_set(const Gtk::StockID& stock_id);
 
   
+  bool lookup_color(const Glib::ustring& color_name, Gdk::Color& color) const;
+
+
   /** Renders the icon specified by @a source  at the given @a size  
    * according to the given parameters and returns the result in a 
    * pixbuf.
@@ -716,40 +753,133 @@ public:
                                        Gtk::Widget& widget, const Glib::ustring& detail);
 
 protected:
-    virtual void realize_vfunc();
-    virtual void unrealize_vfunc();
-    virtual void copy_vfunc(const Glib::RefPtr<Style>& src);
-    virtual Glib::RefPtr<Style> clone_vfunc();
-    virtual void init_from_rc_vfunc(const Glib::RefPtr<RcStyle>& rc_style);
-    virtual void set_background_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type);
-
-    virtual Glib::RefPtr<Gdk::Pixbuf> render_icon_vfunc(const IconSource& source, TextDirection direction, Gtk::StateType state, IconSize size, Widget* widget, const Glib::ustring& detail);
-    virtual void draw_hline_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x1, int x2, int y);
-    virtual void draw_vline_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int y1, int y2, int x);
-    virtual void draw_shadow_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
-    virtual void draw_polygon_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, GdkPoint* point, int npoints, bool fill);
-    virtual void draw_arrow_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, Gtk::ArrowType arrow_type, bool fill, int x, int y, int width, int height);
-    virtual void draw_diamond_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
-    virtual void draw_string_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, const Glib::ustring& string);
-    virtual void draw_box_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
-    virtual void draw_flat_box_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
-    virtual void draw_check_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
-    virtual void draw_option_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
-    virtual void draw_tab_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
-    virtual void draw_shadow_gap_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Gtk::PositionType gap_side, int gap_x, int gap_width);
-    virtual void draw_box_gap_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Gtk::PositionType gap_side, int gap_x, int gap_width);
-    virtual void draw_extension_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, PositionType gap_side);
-    virtual void draw_focus_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
-    virtual void draw_slider_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Orientation orientation);
-    virtual void draw_handle_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Orientation orientation);
-    virtual void draw_expander_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, ExpanderStyle expander_style);
-    virtual void draw_layout_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, bool use_text, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, const Glib::RefPtr<Pango::Layout>& layout);
-    virtual void draw_resize_grip_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, Gdk::WindowEdge edge, int x, int y, int width, int height);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void realize_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void unrealize_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void copy_vfunc(const Glib::RefPtr<Style>& src);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Style> clone_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void init_from_rc_vfunc(const Glib::RefPtr<RcStyle>& rc_style);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_background_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual Glib::RefPtr<Gdk::Pixbuf> render_icon_vfunc(const IconSource& source, TextDirection direction, Gtk::StateType state, IconSize size, Widget* widget, const Glib::ustring& detail);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_hline_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x1, int x2, int y);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_vline_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int y1, int y2, int x);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_shadow_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_polygon_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, GdkPoint* point, int npoints, bool fill);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_arrow_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, Gtk::ArrowType arrow_type, bool fill, int x, int y, int width, int height);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_diamond_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_string_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, const Glib::ustring& string);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_box_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_flat_box_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_check_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_option_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_tab_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_shadow_gap_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Gtk::PositionType gap_side, int gap_x, int gap_width);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_box_gap_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Gtk::PositionType gap_side, int gap_x, int gap_width);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_extension_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, PositionType gap_side);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_focus_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_slider_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Orientation orientation);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_handle_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, ShadowType shadow_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, int width, int height, Orientation orientation);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_expander_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, ExpanderStyle expander_style);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_layout_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, bool use_text, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, int x, int y, const Glib::RefPtr<Pango::Layout>& layout);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void draw_resize_grip_vfunc(const Glib::RefPtr<Gdk::Window>& window, Gtk::StateType state_type, const Gdk::Rectangle& area, Widget* widget, const Glib::ustring& detail, Gdk::WindowEdge edge, int x, int y, int width, int height);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
+/**
+   * @par Prototype:
+   * <tt>void %realize()</tt>
+   */
 
-  
   Glib::SignalProxy0< void > signal_realize();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %unrealize()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_unrealize();
 
 
@@ -757,13 +887,19 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_realize();
   virtual void on_unrealize();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/table.cc b/libs/gtkmm2/gtk/gtkmm/table.cc
index 7fd5cb8292..f92e74413d 100644
--- a/libs/gtkmm2/gtk/gtkmm/table.cc
+++ b/libs/gtkmm2/gtk/gtkmm/table.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/table.h>
 #include <gtkmm/private/table_p.h>
 
@@ -170,8 +171,19 @@ void Table_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Table_Class::wrap_new(GObject* o)
 {
@@ -218,7 +230,7 @@ namespace Table_Helpers
 void TableList::remove(const_reference child)
 {
   gtk_container_remove(GTK_CONTAINER(gparent_),
-                       (GtkWidget*)(child.gobj()));
+                       (GtkWidget*)(child.get_widget ()->gobj()));
 }
 
 void TableList::remove(Widget& widget)
@@ -237,7 +249,7 @@ TableList::iterator TableList::erase(iterator position)
   next++;
 
   //Use GTK+ C function to remove it, by providing the GtkWidget*:
-  gtk_container_remove( GTK_CONTAINER(gparent_), (GtkWidget*)(position->gobj()) );
+  gtk_container_remove( GTK_CONTAINER(gparent_), (GtkWidget*)(position->get_widget ()->gobj()) );
   return next;
 }
 
@@ -301,17 +313,17 @@ Table::Table(guint n_rows, guint n_columns, bool homogeneous)
 
 void Table::attach(Widget& child, guint left_attach, guint right_attach, guint top_attach, guint bottom_attach, AttachOptions xoptions, AttachOptions yoptions, guint xpadding, guint ypadding)
 {
-  gtk_table_attach(gobj(), (child).gobj(), left_attach, right_attach, top_attach, bottom_attach, ((GtkAttachOptions)(xoptions)), ((GtkAttachOptions)(yoptions)), xpadding, ypadding);
+gtk_table_attach(gobj(), (child).gobj(), left_attach, right_attach, top_attach, bottom_attach, ((GtkAttachOptions)(xoptions)), ((GtkAttachOptions)(yoptions)), xpadding, ypadding); 
 }
 
 void Table::resize(guint rows, guint columns)
 {
-  gtk_table_resize(gobj(), rows, columns);
+gtk_table_resize(gobj(), rows, columns); 
 }
 
 void Table::set_row_spacing(guint row, guint spacing)
 {
-  gtk_table_set_row_spacing(gobj(), row, spacing);
+gtk_table_set_row_spacing(gobj(), row, spacing); 
 }
 
 guint Table::get_row_spacing(guint row) const
@@ -321,7 +333,7 @@ guint Table::get_row_spacing(guint row) const
 
 void Table::set_col_spacing(guint column, guint spacing)
 {
-  gtk_table_set_col_spacing(gobj(), column, spacing);
+gtk_table_set_col_spacing(gobj(), column, spacing); 
 }
 
 guint Table::get_col_spacing(guint column) const
@@ -331,12 +343,12 @@ guint Table::get_col_spacing(guint column) const
 
 void Table::set_row_spacings(guint spacing)
 {
-  gtk_table_set_row_spacings(gobj(), spacing);
+gtk_table_set_row_spacings(gobj(), spacing); 
 }
 
 void Table::set_col_spacings(guint spacing)
 {
-  gtk_table_set_col_spacings(gobj(), spacing);
+gtk_table_set_col_spacings(gobj(), spacing); 
 }
 
 guint Table::get_default_row_spacing()
@@ -351,7 +363,7 @@ guint Table::get_default_col_spacing()
 
 void Table::set_homogeneous(bool homogeneous)
 {
-  gtk_table_set_homogeneous(gobj(), static_cast<int>(homogeneous));
+gtk_table_set_homogeneous(gobj(), static_cast<int>(homogeneous)); 
 }
 
 bool Table::get_homogeneous() const
@@ -360,45 +372,68 @@ bool Table::get_homogeneous() const
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Table::property_n_rows() 
 {
   return Glib::PropertyProxy<guint>(this, "n-rows");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Table::property_n_rows() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "n-rows");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Table::property_n_columns() 
 {
   return Glib::PropertyProxy<guint>(this, "n-columns");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Table::property_n_columns() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "n-columns");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Table::property_column_spacing() 
 {
   return Glib::PropertyProxy<guint>(this, "column-spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Table::property_column_spacing() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "column-spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<guint> Table::property_row_spacing() 
 {
   return Glib::PropertyProxy<guint>(this, "row-spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<guint> Table::property_row_spacing() const
 {
   return Glib::PropertyProxy_ReadOnly<guint>(this, "row-spacing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/table.h b/libs/gtkmm2/gtk/gtkmm/table.h
index 5dd6a8987e..73ce84fd3e 100644
--- a/libs/gtkmm2/gtk/gtkmm/table.h
+++ b/libs/gtkmm2/gtk/gtkmm/table.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TABLE_H
 #define _GTKMM_TABLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -209,11 +210,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -279,7 +286,7 @@ public:
   void set_homogeneous(bool homogeneous = true);
   
   /** Returns whether the table cells are all constrained to the same
-   * width and height. (See gtk_table_set_homogenous())
+   * width and height. (See set_homogenous())
    * @return <tt>true</tt> if the cells are all constrained to the same size.
    */
   bool get_homogeneous() const;
@@ -290,14 +297,17 @@ public:
   TableList& children();
   const TableList& children() const;
 
-  /** The number of rows in the table.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The number of rows in the table.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_n_rows() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The number of rows in the table.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -305,15 +315,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_n_rows() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The number of columns in the table.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The number of columns in the table.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_n_columns() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The number of columns in the table.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -321,15 +335,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_n_columns() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The amount of space between two consecutive columns.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The amount of space between two consecutive columns.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_column_spacing() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The amount of space between two consecutive columns.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -337,15 +355,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_column_spacing() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The amount of space between two consecutive rows.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The amount of space between two consecutive rows.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<guint> property_row_spacing() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The amount of space between two consecutive rows.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -353,6 +375,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<guint> property_row_spacing() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
@@ -374,6 +397,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Table* wrap(GtkTable* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_TABLE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/targetlist.cc b/libs/gtkmm2/gtk/gtkmm/targetlist.cc
index 8629b4f1a9..2633080e70 100644
--- a/libs/gtkmm2/gtk/gtkmm/targetlist.cc
+++ b/libs/gtkmm2/gtk/gtkmm/targetlist.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/targetlist.h>
 #include <gtkmm/private/targetlist_p.h>
 
@@ -110,12 +111,12 @@ GtkTargetList* TargetList::gobj_copy() const
 
 void TargetList::add(const Glib::ustring& target, TargetFlags flags, guint info)
 {
-  gtk_target_list_add(gobj(), Gdk::AtomString::to_c_type(target), (guint)(flags), info);
+gtk_target_list_add(gobj(), Gdk::AtomString::to_c_type(target), (guint)(flags), info); 
 }
 
 void TargetList::remove(const Glib::ustring& target)
 {
-  gtk_target_list_remove(gobj(), Gdk::AtomString::to_c_type(target));
+gtk_target_list_remove(gobj(), Gdk::AtomString::to_c_type(target)); 
 }
 
 bool TargetList::find(const Glib::ustring& target, guint* info) const
diff --git a/libs/gtkmm2/gtk/gtkmm/targetlist.h b/libs/gtkmm2/gtk/gtkmm/targetlist.h
index 286d533ee1..4c14339fc3 100644
--- a/libs/gtkmm2/gtk/gtkmm/targetlist.h
+++ b/libs/gtkmm2/gtk/gtkmm/targetlist.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TARGETLIST_H
 #define _GTKMM_TARGETLIST_H
 
+
 #include <glibmm.h>
 
 /* Copyright(C) 2002 The gtkmm Development Team
@@ -68,11 +69,24 @@ public:
   static Glib::RefPtr<Gtk::TargetList> create(const ArrayHandle_TargetEntry& targets);
   
  
+  /** Appends another target to a Gtk::TargetList.
+   * @param target The interned atom representing the target.
+   * @param flags The flags for this target.
+   * @param info An ID that will be passed back to the application.
+   */
   void add(const Glib::ustring& target, TargetFlags flags = TargetFlags(0), guint info = 0);
   void add(const ArrayHandle_TargetEntry& targets);
   
+  /** Removes a target from a target list.
+   * @param target The interned atom representing the target.
+   */
   void remove(const Glib::ustring& target);
   
+  /** Looks up a given target in a Gtk::TargetList.
+   * @param target An interned atom representing the target to search for.
+   * @param info A pointer to the location to store application info for target.
+   * @return <tt>true</tt> if the target was found, otherwise <tt>false</tt>.
+   */
   bool find(const Glib::ustring& target, guint* info) const;
 
 
@@ -93,5 +107,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_TARGETLIST_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/tearoffmenuitem.cc b/libs/gtkmm2/gtk/gtkmm/tearoffmenuitem.cc
index fbcc26f2cd..920c9a9d28 100644
--- a/libs/gtkmm2/gtk/gtkmm/tearoffmenuitem.cc
+++ b/libs/gtkmm2/gtk/gtkmm/tearoffmenuitem.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/tearoffmenuitem.h>
 #include <gtkmm/private/tearoffmenuitem_p.h>
 
@@ -36,7 +37,6 @@ bool TearoffMenuItem::is_torn_off() const
 }
 
 } /* namespace Gtk */
-
 namespace
 {
 } // anonymous namespace
@@ -83,8 +83,19 @@ void TearoffMenuItem_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* TearoffMenuItem_Class::wrap_new(GObject* o)
 {
@@ -133,6 +144,13 @@ TearoffMenuItem::TearoffMenuItem()
   }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/tearoffmenuitem.h b/libs/gtkmm2/gtk/gtkmm/tearoffmenuitem.h
index f2c619c0ee..9033151bcc 100644
--- a/libs/gtkmm2/gtk/gtkmm/tearoffmenuitem.h
+++ b/libs/gtkmm2/gtk/gtkmm/tearoffmenuitem.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TEAROFFMENUITEM_H
 #define _GTKMM_TEAROFFMENUITEM_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -91,11 +92,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -119,6 +126,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::TearoffMenuItem* wrap(GtkTearoffMenuItem* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_TEAROFFMENUITEM_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/textattributes.cc b/libs/gtkmm2/gtk/gtkmm/textattributes.cc
index ff1e647a08..1e4c7b469d 100644
--- a/libs/gtkmm2/gtk/gtkmm/textattributes.cc
+++ b/libs/gtkmm2/gtk/gtkmm/textattributes.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/textattributes.h>
 #include <gtkmm/private/textattributes_p.h>
 
diff --git a/libs/gtkmm2/gtk/gtkmm/textattributes.h b/libs/gtkmm2/gtk/gtkmm/textattributes.h
index 6deef34cab..960be8b300 100644
--- a/libs/gtkmm2/gtk/gtkmm/textattributes.h
+++ b/libs/gtkmm2/gtk/gtkmm/textattributes.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TEXTATTRIBUTES_H
 #define _GTKMM_TEXTATTRIBUTES_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -110,5 +111,6 @@ class Value<Gtk::TextAttributes> : public Glib::Value_Boxed<Gtk::TextAttributes>
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_TEXTATTRIBUTES_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/textbuffer.cc b/libs/gtkmm2/gtk/gtkmm/textbuffer.cc
index ab66089ba8..a0ae07616c 100644
--- a/libs/gtkmm2/gtk/gtkmm/textbuffer.cc
+++ b/libs/gtkmm2/gtk/gtkmm/textbuffer.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/textbuffer.h>
 #include <gtkmm/private/textbuffer_p.h>
 
@@ -24,11 +25,73 @@
  */
 
 #include <gtk/gtktextbuffer.h>
+#include <gtk/gtktextbufferrichtext.h>
 #include <glib/gslist.h>
 #include <gtkmm/textmark.h>
 #include <gtkmm/textiter.h>
 
 
+/*
+static guint8* SignalProxy_Serialize(GtkTextBuffer* , GtkTextBuffer* content_buffer,
+                                                   const GtkTextIter* start, const GtkTextIter* end,
+                                                   gsize* length,
+                                                   gpointer user_data)
+{
+  Gtk::TextBuffer::SlotSerialize* the_slot = static_cast<Gtk::TextBuffer::SlotSerialize*>(user_data);
+
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  try
+  {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    return (*the_slot)(Glib::wrap(content_buffer), Glib::wrap(start), Glib::wrap(end), *length);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  }
+  catch(...)
+  {
+    Glib::exception_handlers_invoke();
+  }
+
+  return 0; // arbitrary value
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+}
+
+static void SignalProxy_Serialize_gtk_callback_destroy(void* user_data)
+{
+  delete static_cast<Gtk::TextBuffer::SlotSerialize*>(user_data);
+}
+
+static gboolean SignalProxy_Deserialize(GtkTextBuffer* , GtkTextBuffer* content_buffer,
+                                                   GtkTextIter* iter, const guint8* data,
+                                                   gsize length, gboolean create_tags,
+                                                   gpointer user_data,
+                                                   GError** )
+{
+  Gtk::TextBuffer::SlotDeserialize* the_slot = static_cast<Gtk::TextBuffer::SlotDeserialize*>(user_data);
+
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  try
+  {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    (*the_slot)(Glib::wrap(content_buffer, true), Glib::wrap(iter), data, length, create_tags);
+
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  }
+  catch(...)
+  {
+    //TODO: Fill the error parameter.
+    Glib::exception_handlers_invoke();
+  }
+
+  return 0; // arbitrary value
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+}
+
+static void SignalProxy_Deserialize_gtk_callback_destroy(void* user_data)
+{
+  delete static_cast<Gtk::TextBuffer::SlotDeserialize*>(user_data);
+}
+*/
+
 namespace Gtk
 {
 
@@ -128,17 +191,19 @@ void TextBuffer::set_text(const char* text_begin, const char* text_end)
   gtk_text_buffer_set_text(gobj(), text_begin, text_end - text_begin);
 }
 
-//deprecated:
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void TextBuffer::assign(const Glib::ustring& text)
 {
   gtk_text_buffer_set_text(gobj(), text.data(), text.bytes());
 }
 
-//deprecated:
 void TextBuffer::assign(const char* text_begin, const char* text_end)
 {
   gtk_text_buffer_set_text(gobj(), text_begin, text_end - text_begin);
 }
+#endif // GTKMM_DISABLE_DEPRECATED
+
 
 TextBuffer::iterator TextBuffer::insert(const iterator& pos, const Glib::ustring& text)
 {
@@ -453,18 +518,100 @@ int TextBuffer::size() const
   return get_char_count();
 }
 
+//This is not public API:
+//(and it is copy/pasted from clipboard.ccg)
+typedef std::list<Glib::ustring> listStrings;
+static listStrings util_convert_atoms_to_strings(GdkAtom* targets, int n_targets)
+{
+  listStrings listTargets;
+
+  //Add the targets to the C++ container:
+  for(int i = 0; i < n_targets; i++)
+  {
+    //Convert the atom to a string:
+    char* atom_name = gdk_atom_name(targets[i]);
+    if(atom_name)
+    {
+      listTargets.push_back( Glib::ustring(atom_name) );
+      g_free(atom_name);
+    }
+  }
+
+  return listTargets;
+}
+
 Glib::ustring TextBuffer::get_text(bool include_hidden_chars)
 {
   return get_text(begin(), end(), include_hidden_chars);
 }
 
+Glib::StringArrayHandle TextBuffer::get_serialize_formats() const
+{
+  int n_atoms = 0;
+  GdkAtom* atoms = gtk_text_buffer_get_serialize_formats(const_cast<GtkTextBuffer*>(gobj()), &n_atoms);
+  return util_convert_atoms_to_strings(atoms, n_atoms);
+}
+
+Glib::StringArrayHandle TextBuffer::get_deserialize_formats() const
+{
+  int n_atoms = 0;
+  GdkAtom* atoms = gtk_text_buffer_get_deserialize_formats(const_cast<GtkTextBuffer*>(gobj()), &n_atoms);
+  return util_convert_atoms_to_strings(atoms, n_atoms);
+}
+
+/*
+Glib::ustring TextBuffer::register_serialize_format(const Glib::ustring& mime_type, const SlotSerialize& slot)
+{
+  SlotSerialize* slot_copy = new SlotSerialize(slot);
+  GdkAtom atom = gtk_text_buffer_register_serialize_format(gobj(), mime_type.c_str(), 
+                &SignalProxy_Serialize, slot_copy, &SignalProxy_Serialize_gtk_callback_destroy);
+
+  //Convert the atom to a string:
+  Glib::ustring atom_as_string;
+  char* atom_name = gdk_atom_name(atom);
+  if(atom_name)
+  {
+    atom_as_string = atom_name;
+    g_free(atom_name);
+  }
+
+  return atom_as_string;
+}
+
+Glib::ustring TextBuffer::register_deserialize_format(const Glib::ustring& mime_type, const SlotDeserialize& slot)
+{
+  SlotDeserialize* slot_copy = new SlotDeserialize(slot);
+  GdkAtom atom = gtk_text_buffer_register_deserialize_format(gobj(), mime_type.c_str(), 
+                &SignalProxy_Deserialize, slot_copy, &SignalProxy_Deserialize_gtk_callback_destroy);
+
+  //Convert the atom to a string:
+  Glib::ustring atom_as_string;
+  char* atom_name = gdk_atom_name(atom);
+  if(atom_name)
+  {
+    atom_as_string = atom_name;
+    g_free(atom_name);
+  }
+
+  return atom_as_string;
+}
+*/
+
+#ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED
+void TextBuffer::set_rich_text_format_all()
+{
+  gtk_text_buffer_set_rich_text_format(gobj(), NULL);
+}
+#endif //GTKMM_MAEMO_EXTENSIONS_ENABLED
+
 } // namespace Gtk
 
 
 namespace
 {
 
-void TextBuffer_signal_insert_callback(GtkTextBuffer* self, GtkTextIter* p0,const gchar* p1,gint p2,void* data)
+
+static void TextBuffer_signal_insert_callback(GtkTextBuffer* self, GtkTextIter* p0,const gchar* p1,gint p2,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TextBuffer::iterator&,const Glib::ustring&,int > SlotType;
@@ -472,22 +619,26 @@ void TextBuffer_signal_insert_callback(GtkTextBuffer* self, GtkTextIter* p0,cons
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::ustring(p1, p1 + p2)
 , p2
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextBuffer_signal_insert_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_insert_info =
 {
   "insert_text",
   (GCallback) &TextBuffer_signal_insert_callback,
@@ -495,7 +646,7 @@ const Glib::SignalProxyInfo TextBuffer_signal_insert_info =
 };
 
 
-void TextBuffer_signal_insert_pixbuf_callback(GtkTextBuffer* self, GtkTextIter* p0,GdkPixbuf* p1,void* data)
+static void TextBuffer_signal_insert_pixbuf_callback(GtkTextBuffer* self, GtkTextIter* p0,GdkPixbuf* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TextBuffer::iterator&,const Glib::RefPtr<Gdk::Pixbuf>& > SlotType;
@@ -503,21 +654,25 @@ void TextBuffer_signal_insert_pixbuf_callback(GtkTextBuffer* self, GtkTextIter*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::wrap(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextBuffer_signal_insert_pixbuf_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_insert_pixbuf_info =
 {
   "insert_pixbuf",
   (GCallback) &TextBuffer_signal_insert_pixbuf_callback,
@@ -525,7 +680,7 @@ const Glib::SignalProxyInfo TextBuffer_signal_insert_pixbuf_info =
 };
 
 
-void TextBuffer_signal_insert_child_anchor_callback(GtkTextBuffer* self, GtkTextIter* p0,GtkTextChildAnchor* p1,void* data)
+static void TextBuffer_signal_insert_child_anchor_callback(GtkTextBuffer* self, GtkTextIter* p0,GtkTextChildAnchor* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TextBuffer::iterator&,const Glib::RefPtr<ChildAnchor>& > SlotType;
@@ -533,21 +688,25 @@ void TextBuffer_signal_insert_child_anchor_callback(GtkTextBuffer* self, GtkText
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::wrap(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextBuffer_signal_insert_child_anchor_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_insert_child_anchor_info =
 {
   "insert_child_anchor",
   (GCallback) &TextBuffer_signal_insert_child_anchor_callback,
@@ -555,7 +714,7 @@ const Glib::SignalProxyInfo TextBuffer_signal_insert_child_anchor_info =
 };
 
 
-void TextBuffer_signal_erase_callback(GtkTextBuffer* self, GtkTextIter* p0,GtkTextIter* p1,void* data)
+static void TextBuffer_signal_erase_callback(GtkTextBuffer* self, GtkTextIter* p0,GtkTextIter* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TextBuffer::iterator&,const TextBuffer::iterator& > SlotType;
@@ -563,21 +722,25 @@ void TextBuffer_signal_erase_callback(GtkTextBuffer* self, GtkTextIter* p0,GtkTe
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextBuffer_signal_erase_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_erase_info =
 {
   "delete_range",
   (GCallback) &TextBuffer_signal_erase_callback,
@@ -585,7 +748,7 @@ const Glib::SignalProxyInfo TextBuffer_signal_erase_info =
 };
 
 
-const Glib::SignalProxyInfo TextBuffer_signal_changed_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_changed_info =
 {
   "changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -593,7 +756,7 @@ const Glib::SignalProxyInfo TextBuffer_signal_changed_info =
 };
 
 
-const Glib::SignalProxyInfo TextBuffer_signal_modified_changed_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_modified_changed_info =
 {
   "modified_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -601,7 +764,7 @@ const Glib::SignalProxyInfo TextBuffer_signal_modified_changed_info =
 };
 
 
-void TextBuffer_signal_mark_set_callback(GtkTextBuffer* self, const GtkTextIter* p0,GtkTextMark* p1,void* data)
+static void TextBuffer_signal_mark_set_callback(GtkTextBuffer* self, const GtkTextIter* p0,GtkTextMark* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TextBuffer::iterator&,const Glib::RefPtr<TextBuffer::Mark>& > SlotType;
@@ -609,21 +772,25 @@ void TextBuffer_signal_mark_set_callback(GtkTextBuffer* self, const GtkTextIter*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::wrap(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextBuffer_signal_mark_set_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_mark_set_info =
 {
   "mark_set",
   (GCallback) &TextBuffer_signal_mark_set_callback,
@@ -631,7 +798,7 @@ const Glib::SignalProxyInfo TextBuffer_signal_mark_set_info =
 };
 
 
-void TextBuffer_signal_mark_deleted_callback(GtkTextBuffer* self, GtkTextMark* p0,void* data)
+static void TextBuffer_signal_mark_deleted_callback(GtkTextBuffer* self, GtkTextMark* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<TextBuffer::Mark>& > SlotType;
@@ -639,20 +806,24 @@ void TextBuffer_signal_mark_deleted_callback(GtkTextBuffer* self, GtkTextMark* p
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextBuffer_signal_mark_deleted_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_mark_deleted_info =
 {
   "mark_deleted",
   (GCallback) &TextBuffer_signal_mark_deleted_callback,
@@ -660,7 +831,7 @@ const Glib::SignalProxyInfo TextBuffer_signal_mark_deleted_info =
 };
 
 
-void TextBuffer_signal_apply_tag_callback(GtkTextBuffer* self, GtkTextTag* p0,const GtkTextIter* p1,const GtkTextIter* p2,void* data)
+static void TextBuffer_signal_apply_tag_callback(GtkTextBuffer* self, GtkTextTag* p0,const GtkTextIter* p1,const GtkTextIter* p2,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<TextBuffer::Tag>&,const TextBuffer::iterator&,const TextBuffer::iterator& > SlotType;
@@ -668,22 +839,26 @@ void TextBuffer_signal_apply_tag_callback(GtkTextBuffer* self, GtkTextTag* p0,co
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , Glib::wrap(p1)
 , Glib::wrap(p2)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextBuffer_signal_apply_tag_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_apply_tag_info =
 {
   "apply_tag",
   (GCallback) &TextBuffer_signal_apply_tag_callback,
@@ -691,7 +866,7 @@ const Glib::SignalProxyInfo TextBuffer_signal_apply_tag_info =
 };
 
 
-void TextBuffer_signal_remove_tag_callback(GtkTextBuffer* self, GtkTextTag* p0,const GtkTextIter* p1,const GtkTextIter* p2,void* data)
+static void TextBuffer_signal_remove_tag_callback(GtkTextBuffer* self, GtkTextTag* p0,const GtkTextIter* p1,const GtkTextIter* p2,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<TextBuffer::Tag>&,const TextBuffer::iterator&,const TextBuffer::iterator& > SlotType;
@@ -699,22 +874,26 @@ void TextBuffer_signal_remove_tag_callback(GtkTextBuffer* self, GtkTextTag* p0,c
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , Glib::wrap(p1)
 , Glib::wrap(p2)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextBuffer_signal_remove_tag_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_remove_tag_info =
 {
   "remove_tag",
   (GCallback) &TextBuffer_signal_remove_tag_callback,
@@ -722,7 +901,7 @@ const Glib::SignalProxyInfo TextBuffer_signal_remove_tag_info =
 };
 
 
-const Glib::SignalProxyInfo TextBuffer_signal_begin_user_action_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_begin_user_action_info =
 {
   "begin_user_action",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -730,13 +909,14 @@ const Glib::SignalProxyInfo TextBuffer_signal_begin_user_action_info =
 };
 
 
-const Glib::SignalProxyInfo TextBuffer_signal_end_user_action_info =
+static const Glib::SignalProxyInfo TextBuffer_signal_end_user_action_info =
 {
   "end_user_action",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -783,6 +963,10 @@ void TextBuffer_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->insert_text = &insert_text_callback;
   klass->insert_pixbuf = &insert_pixbuf_callback;
   klass->insert_child_anchor = &insert_child_anchor_callback;
@@ -795,9 +979,13 @@ void TextBuffer_Class::class_init_function(void* g_class, void* class_data)
   klass->remove_tag = &remove_tag_callback;
   klass->begin_user_action = &begin_user_action_callback;
   klass->end_user_action = &end_user_action_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void TextBuffer_Class::insert_text_callback(GtkTextBuffer* self, GtkTextIter* p0, const gchar* p1, gint p2)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -810,18 +998,22 @@ void TextBuffer_Class::insert_text_callback(GtkTextBuffer* self, GtkTextIter* p0
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_insert(Glib::wrap(p0)
 , Glib::ustring(p1, p1 + p2)
 , p2
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -834,7 +1026,6 @@ void TextBuffer_Class::insert_text_callback(GtkTextBuffer* self, GtkTextIter* p0
       (*base->insert_text)(self, p0, p1, p2);
   }
 }
-
 void TextBuffer_Class::insert_pixbuf_callback(GtkTextBuffer* self, GtkTextIter* p0, GdkPixbuf* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -847,17 +1038,21 @@ void TextBuffer_Class::insert_pixbuf_callback(GtkTextBuffer* self, GtkTextIter*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_insert_pixbuf(Glib::wrap(p0)
 , Glib::wrap(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -870,7 +1065,6 @@ void TextBuffer_Class::insert_pixbuf_callback(GtkTextBuffer* self, GtkTextIter*
       (*base->insert_pixbuf)(self, p0, p1);
   }
 }
-
 void TextBuffer_Class::insert_child_anchor_callback(GtkTextBuffer* self, GtkTextIter* p0, GtkTextChildAnchor* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -883,17 +1077,21 @@ void TextBuffer_Class::insert_child_anchor_callback(GtkTextBuffer* self, GtkText
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_insert_child_anchor(Glib::wrap(p0)
 , Glib::wrap(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -906,7 +1104,6 @@ void TextBuffer_Class::insert_child_anchor_callback(GtkTextBuffer* self, GtkText
       (*base->insert_child_anchor)(self, p0, p1);
   }
 }
-
 void TextBuffer_Class::delete_range_callback(GtkTextBuffer* self, GtkTextIter* p0, GtkTextIter* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -919,17 +1116,21 @@ void TextBuffer_Class::delete_range_callback(GtkTextBuffer* self, GtkTextIter* p
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_erase(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -942,7 +1143,6 @@ void TextBuffer_Class::delete_range_callback(GtkTextBuffer* self, GtkTextIter* p
       (*base->delete_range)(self, p0, p1);
   }
 }
-
 void TextBuffer_Class::changed_callback(GtkTextBuffer* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -955,15 +1155,19 @@ void TextBuffer_Class::changed_callback(GtkTextBuffer* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -976,7 +1180,6 @@ void TextBuffer_Class::changed_callback(GtkTextBuffer* self)
       (*base->changed)(self);
   }
 }
-
 void TextBuffer_Class::modified_changed_callback(GtkTextBuffer* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -989,15 +1192,19 @@ void TextBuffer_Class::modified_changed_callback(GtkTextBuffer* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_modified_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1010,7 +1217,6 @@ void TextBuffer_Class::modified_changed_callback(GtkTextBuffer* self)
       (*base->modified_changed)(self);
   }
 }
-
 void TextBuffer_Class::mark_set_callback(GtkTextBuffer* self, const GtkTextIter* p0, GtkTextMark* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1023,17 +1229,21 @@ void TextBuffer_Class::mark_set_callback(GtkTextBuffer* self, const GtkTextIter*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_mark_set(Glib::wrap(p0)
 , Glib::wrap(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1046,7 +1256,6 @@ void TextBuffer_Class::mark_set_callback(GtkTextBuffer* self, const GtkTextIter*
       (*base->mark_set)(self, p0, p1);
   }
 }
-
 void TextBuffer_Class::mark_deleted_callback(GtkTextBuffer* self, GtkTextMark* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1059,16 +1268,20 @@ void TextBuffer_Class::mark_deleted_callback(GtkTextBuffer* self, GtkTextMark* p
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_mark_deleted(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1081,7 +1294,6 @@ void TextBuffer_Class::mark_deleted_callback(GtkTextBuffer* self, GtkTextMark* p
       (*base->mark_deleted)(self, p0);
   }
 }
-
 void TextBuffer_Class::apply_tag_callback(GtkTextBuffer* self, GtkTextTag* p0, const GtkTextIter* p1, const GtkTextIter* p2)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1094,18 +1306,22 @@ void TextBuffer_Class::apply_tag_callback(GtkTextBuffer* self, GtkTextTag* p0, c
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_apply_tag(Glib::wrap(p0, true)
 , Glib::wrap(p1)
 , Glib::wrap(p2)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1118,7 +1334,6 @@ void TextBuffer_Class::apply_tag_callback(GtkTextBuffer* self, GtkTextTag* p0, c
       (*base->apply_tag)(self, p0, p1, p2);
   }
 }
-
 void TextBuffer_Class::remove_tag_callback(GtkTextBuffer* self, GtkTextTag* p0, const GtkTextIter* p1, const GtkTextIter* p2)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1131,18 +1346,22 @@ void TextBuffer_Class::remove_tag_callback(GtkTextBuffer* self, GtkTextTag* p0,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_remove_tag(Glib::wrap(p0, true)
 , Glib::wrap(p1)
 , Glib::wrap(p2)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1155,7 +1374,6 @@ void TextBuffer_Class::remove_tag_callback(GtkTextBuffer* self, GtkTextTag* p0,
       (*base->remove_tag)(self, p0, p1, p2);
   }
 }
-
 void TextBuffer_Class::begin_user_action_callback(GtkTextBuffer* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1168,15 +1386,19 @@ void TextBuffer_Class::begin_user_action_callback(GtkTextBuffer* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_begin_user_action();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1189,7 +1411,6 @@ void TextBuffer_Class::begin_user_action_callback(GtkTextBuffer* self)
       (*base->begin_user_action)(self);
   }
 }
-
 void TextBuffer_Class::end_user_action_callback(GtkTextBuffer* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1202,15 +1423,19 @@ void TextBuffer_Class::end_user_action_callback(GtkTextBuffer* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_end_user_action();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1223,6 +1448,7 @@ void TextBuffer_Class::end_user_action_callback(GtkTextBuffer* self)
       (*base->end_user_action)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* TextBuffer_Class::wrap_new(GObject* object)
@@ -1295,20 +1521,15 @@ Glib::RefPtr<TextBuffer::TagTable> TextBuffer::get_tag_table()
 {
 
   Glib::RefPtr<TextBuffer::TagTable> retvalue = Glib::wrap(gtk_text_buffer_get_tag_table(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TextBuffer::TagTable> TextBuffer::get_tag_table() const
 {
-
-  Glib::RefPtr<const TextBuffer::TagTable> retvalue = Glib::wrap(gtk_text_buffer_get_tag_table(const_cast<GtkTextBuffer*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<TextBuffer*>(this)->get_tag_table();
 }
 
 Glib::ustring TextBuffer::get_text(const iterator& start, const iterator& end, bool include_hidden_chars)
@@ -1316,109 +1537,114 @@ Glib::ustring TextBuffer::get_text(const iterator& start, const iterator& end, b
   return Glib::convert_return_gchar_ptr_to_ustring(gtk_text_buffer_get_text(gobj(), (start).gobj(), (end).gobj(), static_cast<int>(include_hidden_chars)));
 }
 
+Glib::ustring TextBuffer::get_text(const iterator& start, const iterator& end, bool include_hidden_chars) const
+{
+  return Glib::convert_return_gchar_ptr_to_ustring(gtk_text_buffer_get_text(const_cast<GtkTextBuffer*>(gobj()), (start).gobj(), (end).gobj(), static_cast<int>(include_hidden_chars)));
+}
+
 Glib::ustring TextBuffer::get_slice(const iterator& start, const iterator& end, bool include_hidden_chars)
 {
   return Glib::convert_return_gchar_ptr_to_ustring(gtk_text_buffer_get_slice(gobj(), (start).gobj(), (end).gobj(), static_cast<int>(include_hidden_chars)));
 }
 
+Glib::ustring TextBuffer::get_slice(const iterator& start, const iterator& end, bool include_hidden_chars) const
+{
+  return Glib::convert_return_gchar_ptr_to_ustring(gtk_text_buffer_get_slice(const_cast<GtkTextBuffer*>(gobj()), (start).gobj(), (end).gobj(), static_cast<int>(include_hidden_chars)));
+}
+
 Glib::RefPtr<TextBuffer::Mark> TextBuffer::create_mark(const Glib::ustring& mark_name, const iterator& where, bool left_gravity)
 {
 
   Glib::RefPtr<TextBuffer::Mark> retvalue = Glib::wrap(gtk_text_buffer_create_mark(gobj(), mark_name.c_str(), (where).gobj(), static_cast<int>(left_gravity)));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 void TextBuffer::move_mark(const Glib::RefPtr<Mark>& mark, const iterator& where)
 {
-  gtk_text_buffer_move_mark(gobj(), Glib::unwrap(mark), (where).gobj());
+gtk_text_buffer_move_mark(gobj(), Glib::unwrap(mark), (where).gobj()); 
 }
 
 void TextBuffer::delete_mark(const Glib::RefPtr<Mark>& mark)
 {
-  gtk_text_buffer_delete_mark(gobj(), Glib::unwrap(mark));
+gtk_text_buffer_delete_mark(gobj(), Glib::unwrap(mark)); 
 }
 
 Glib::RefPtr<TextBuffer::Mark> TextBuffer::get_mark(const Glib::ustring& name)
 {
 
   Glib::RefPtr<TextBuffer::Mark> retvalue = Glib::wrap(gtk_text_buffer_get_mark(gobj(), name.c_str()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TextBuffer::Mark> TextBuffer::get_mark(const Glib::ustring& name) const
 {
-
-  Glib::RefPtr<const TextBuffer::Mark> retvalue = Glib::wrap(gtk_text_buffer_get_mark(const_cast<GtkTextBuffer*>(gobj()), name.c_str()));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<TextBuffer*>(this)->get_mark(name);
 }
 
 void TextBuffer::move_mark_by_name(const Glib::ustring& name, const iterator& where)
 {
-  gtk_text_buffer_move_mark_by_name(gobj(), name.c_str(), (where).gobj());
+gtk_text_buffer_move_mark_by_name(gobj(), name.c_str(), (where).gobj()); 
 }
 
 void TextBuffer::delete_mark_by_name(const Glib::ustring& name)
 {
-  gtk_text_buffer_delete_mark_by_name(gobj(), name.c_str());
+gtk_text_buffer_delete_mark_by_name(gobj(), name.c_str()); 
 }
 
 Glib::RefPtr<TextBuffer::Mark> TextBuffer::get_insert()
 {
 
   Glib::RefPtr<TextBuffer::Mark> retvalue = Glib::wrap(gtk_text_buffer_get_insert(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<TextBuffer::Mark> TextBuffer::get_selection_bound()
 {
 
   Glib::RefPtr<TextBuffer::Mark> retvalue = Glib::wrap(gtk_text_buffer_get_selection_bound(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 void TextBuffer::place_cursor(const iterator& where)
 {
-  gtk_text_buffer_place_cursor(gobj(), (where).gobj());
+gtk_text_buffer_place_cursor(gobj(), (where).gobj()); 
 }
 
 void TextBuffer::apply_tag(const Glib::RefPtr<Tag>& tag, const iterator& start, const iterator& end)
 {
-  gtk_text_buffer_apply_tag(gobj(), Glib::unwrap(tag), (start).gobj(), (end).gobj());
+gtk_text_buffer_apply_tag(gobj(), Glib::unwrap(tag), (start).gobj(), (end).gobj()); 
 }
 
 void TextBuffer::remove_tag(const Glib::RefPtr<Tag>& tag, const iterator& start, const iterator& end)
 {
-  gtk_text_buffer_remove_tag(gobj(), Glib::unwrap(tag), (start).gobj(), (end).gobj());
+gtk_text_buffer_remove_tag(gobj(), Glib::unwrap(tag), (start).gobj(), (end).gobj()); 
 }
 
 void TextBuffer::apply_tag_by_name(const Glib::ustring& name, const iterator& start, const iterator& end)
 {
-  gtk_text_buffer_apply_tag_by_name(gobj(), name.c_str(), (start).gobj(), (end).gobj());
+gtk_text_buffer_apply_tag_by_name(gobj(), name.c_str(), (start).gobj(), (end).gobj()); 
 }
 
 void TextBuffer::remove_tag_by_name(const Glib::ustring& name, const iterator& start, const iterator& end)
 {
-  gtk_text_buffer_remove_tag_by_name(gobj(), name.c_str(), (start).gobj(), (end).gobj());
+gtk_text_buffer_remove_tag_by_name(gobj(), name.c_str(), (start).gobj(), (end).gobj()); 
 }
 
 void TextBuffer::remove_all_tags(const iterator& start, const iterator& end)
 {
-  gtk_text_buffer_remove_all_tags(gobj(), (start).gobj(), (end).gobj());
+gtk_text_buffer_remove_all_tags(gobj(), (start).gobj(), (end).gobj()); 
 }
 
 bool TextBuffer::get_modified() const
@@ -1428,27 +1654,32 @@ bool TextBuffer::get_modified() const
 
 void TextBuffer::set_modified(bool setting)
 {
-  gtk_text_buffer_set_modified(gobj(), static_cast<int>(setting));
+gtk_text_buffer_set_modified(gobj(), static_cast<int>(setting)); 
+}
+
+bool TextBuffer::get_has_selection() const
+{
+  return gtk_text_buffer_get_has_selection(const_cast<GtkTextBuffer*>(gobj()));
 }
 
 void TextBuffer::add_selection_clipboard(const Glib::RefPtr<Clipboard>& clipboard)
 {
-  gtk_text_buffer_add_selection_clipboard(gobj(), Glib::unwrap(clipboard));
+gtk_text_buffer_add_selection_clipboard(gobj(), Glib::unwrap(clipboard)); 
 }
 
 void TextBuffer::remove_selection_clipboard(const Glib::RefPtr<Clipboard>& clipboard)
 {
-  gtk_text_buffer_remove_selection_clipboard(gobj(), Glib::unwrap(clipboard));
+gtk_text_buffer_remove_selection_clipboard(gobj(), Glib::unwrap(clipboard)); 
 }
 
 void TextBuffer::cut_clipboard(const Glib::RefPtr<Clipboard>& clipboard, bool default_editable)
 {
-  gtk_text_buffer_cut_clipboard(gobj(), Glib::unwrap(clipboard), static_cast<int>(default_editable));
+gtk_text_buffer_cut_clipboard(gobj(), Glib::unwrap(clipboard), static_cast<int>(default_editable)); 
 }
 
 void TextBuffer::copy_clipboard(const Glib::RefPtr<Clipboard>& clipboard)
 {
-  gtk_text_buffer_copy_clipboard(gobj(), Glib::unwrap(clipboard));
+gtk_text_buffer_copy_clipboard(gobj(), Glib::unwrap(clipboard)); 
 }
 
 bool TextBuffer::get_selection_bounds(iterator& start, iterator& end) const
@@ -1463,17 +1694,79 @@ bool TextBuffer::erase_selection(bool interactive, bool default_editable)
 
 void TextBuffer::select_range(const iterator& ins, const iterator& bound)
 {
-  gtk_text_buffer_select_range(gobj(), (ins).gobj(), (bound).gobj());
+gtk_text_buffer_select_range(gobj(), (ins).gobj(), (bound).gobj()); 
 }
 
 void TextBuffer::begin_user_action()
 {
-  gtk_text_buffer_begin_user_action(gobj());
+gtk_text_buffer_begin_user_action(gobj()); 
 }
 
 void TextBuffer::end_user_action()
 {
-  gtk_text_buffer_end_user_action(gobj());
+gtk_text_buffer_end_user_action(gobj()); 
+}
+
+#ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED
+void TextBuffer::set_can_paste_rich_text(bool can_paste_rich_text)
+{
+gtk_text_buffer_set_can_paste_rich_text(gobj(), static_cast<int>(can_paste_rich_text)); 
+}
+
+
+#endif // GTKMM_MAEMO_EXTENSIONS_ENABLED
+#ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED
+bool TextBuffer::get_can_paste_rich_text() const
+{
+  return gtk_text_buffer_get_can_paste_rich_text(const_cast<GtkTextBuffer*>(gobj()));
+}
+
+
+#endif // GTKMM_MAEMO_EXTENSIONS_ENABLED
+#ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED
+void TextBuffer::set_rich_text_format(const Glib::ustring& format)
+{
+gtk_text_buffer_set_rich_text_format(gobj(), format.c_str()); 
+}
+
+
+#endif // GTKMM_MAEMO_EXTENSIONS_ENABLED
+#ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED
+Glib::ustring TextBuffer::get_rich_text_format() const
+{
+  return Glib::convert_const_gchar_ptr_to_ustring(gtk_text_buffer_get_rich_text_format(const_cast<GtkTextBuffer*>(gobj())));
+}
+
+
+#endif // GTKMM_MAEMO_EXTENSIONS_ENABLED
+Glib::ustring TextBuffer::register_serialize_tagset(const Glib::ustring& tagset_name)
+{
+  return Gdk::AtomString::to_cpp_type(gtk_text_buffer_register_serialize_tagset(gobj(), tagset_name.c_str()));
+}
+
+Glib::ustring TextBuffer::register_deserialize_tagset(const Glib::ustring& tagset_name)
+{
+  return Gdk::AtomString::to_cpp_type(gtk_text_buffer_register_deserialize_tagset(gobj(), tagset_name.c_str()));
+}
+
+void TextBuffer::unregister_serialize_format(const Glib::ustring& format)
+{
+gtk_text_buffer_unregister_serialize_format(gobj(), Gdk::AtomString::to_c_type(format)); 
+}
+
+void TextBuffer::unregister_deserialize_format(const Glib::ustring& format)
+{
+gtk_text_buffer_unregister_deserialize_format(gobj(), Gdk::AtomString::to_c_type(format)); 
+}
+
+void TextBuffer::set_can_create_tags(const Glib::ustring& format, bool can_create_tags)
+{
+gtk_text_buffer_deserialize_set_can_create_tags(gobj(), Gdk::AtomString::to_c_type(format), static_cast<int>(can_create_tags)); 
+}
+
+bool TextBuffer::get_can_create_tags(const Glib::ustring& format) const
+{
+  return gtk_text_buffer_deserialize_get_can_create_tags(const_cast<GtkTextBuffer*>(gobj()), Gdk::AtomString::to_c_type(format));
 }
 
 
@@ -1482,62 +1775,96 @@ Glib::SignalProxy3< void,const TextBuffer::iterator&,const Glib::ustring&,int >
   return Glib::SignalProxy3< void,const TextBuffer::iterator&,const Glib::ustring&,int >(this, &TextBuffer_signal_insert_info);
 }
 
+
 Glib::SignalProxy2< void,const TextBuffer::iterator&,const Glib::RefPtr<Gdk::Pixbuf>& > TextBuffer::signal_insert_pixbuf()
 {
   return Glib::SignalProxy2< void,const TextBuffer::iterator&,const Glib::RefPtr<Gdk::Pixbuf>& >(this, &TextBuffer_signal_insert_pixbuf_info);
 }
 
+
 Glib::SignalProxy2< void,const TextBuffer::iterator&,const Glib::RefPtr<ChildAnchor>& > TextBuffer::signal_insert_child_anchor()
 {
   return Glib::SignalProxy2< void,const TextBuffer::iterator&,const Glib::RefPtr<ChildAnchor>& >(this, &TextBuffer_signal_insert_child_anchor_info);
 }
 
+
 Glib::SignalProxy2< void,const TextBuffer::iterator&,const TextBuffer::iterator& > TextBuffer::signal_erase()
 {
   return Glib::SignalProxy2< void,const TextBuffer::iterator&,const TextBuffer::iterator& >(this, &TextBuffer_signal_erase_info);
 }
 
+
 Glib::SignalProxy0< void > TextBuffer::signal_changed()
 {
   return Glib::SignalProxy0< void >(this, &TextBuffer_signal_changed_info);
 }
 
+
 Glib::SignalProxy0< void > TextBuffer::signal_modified_changed()
 {
   return Glib::SignalProxy0< void >(this, &TextBuffer_signal_modified_changed_info);
 }
 
+
 Glib::SignalProxy2< void,const TextBuffer::iterator&,const Glib::RefPtr<TextBuffer::Mark>& > TextBuffer::signal_mark_set()
 {
   return Glib::SignalProxy2< void,const TextBuffer::iterator&,const Glib::RefPtr<TextBuffer::Mark>& >(this, &TextBuffer_signal_mark_set_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<TextBuffer::Mark>& > TextBuffer::signal_mark_deleted()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<TextBuffer::Mark>& >(this, &TextBuffer_signal_mark_deleted_info);
 }
 
+
 Glib::SignalProxy3< void,const Glib::RefPtr<TextBuffer::Tag>&,const TextBuffer::iterator&,const TextBuffer::iterator& > TextBuffer::signal_apply_tag()
 {
   return Glib::SignalProxy3< void,const Glib::RefPtr<TextBuffer::Tag>&,const TextBuffer::iterator&,const TextBuffer::iterator& >(this, &TextBuffer_signal_apply_tag_info);
 }
 
+
 Glib::SignalProxy3< void,const Glib::RefPtr<TextBuffer::Tag>&,const TextBuffer::iterator&,const TextBuffer::iterator& > TextBuffer::signal_remove_tag()
 {
   return Glib::SignalProxy3< void,const Glib::RefPtr<TextBuffer::Tag>&,const TextBuffer::iterator&,const TextBuffer::iterator& >(this, &TextBuffer_signal_remove_tag_info);
 }
 
+
 Glib::SignalProxy0< void > TextBuffer::signal_begin_user_action()
 {
   return Glib::SignalProxy0< void >(this, &TextBuffer_signal_begin_user_action_info);
 }
 
+
 Glib::SignalProxy0< void > TextBuffer::signal_end_user_action()
 {
   return Glib::SignalProxy0< void >(this, &TextBuffer_signal_end_user_action_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<Glib::ustring> TextBuffer::property_text() 
+{
+  return Glib::PropertyProxy<Glib::ustring>(this, "text");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<Glib::ustring> TextBuffer::property_text() const
+{
+  return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "text");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> TextBuffer::property_has_selection() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "has-selection");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::TextBuffer::on_insert(const TextBuffer::iterator& pos, const Glib::ustring& text, int bytes)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1547,7 +1874,6 @@ void Gtk::TextBuffer::on_insert(const TextBuffer::iterator& pos, const Glib::ust
   if(base && base->insert_text)
     (*base->insert_text)(gobj(),const_cast<GtkTextIter*>((pos).gobj()),text.c_str(),bytes);
 }
-
 void Gtk::TextBuffer::on_insert_pixbuf(const TextBuffer::iterator& pos, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1557,7 +1883,6 @@ void Gtk::TextBuffer::on_insert_pixbuf(const TextBuffer::iterator& pos, const Gl
   if(base && base->insert_pixbuf)
     (*base->insert_pixbuf)(gobj(),const_cast<GtkTextIter*>((pos).gobj()),Glib::unwrap(pixbuf));
 }
-
 void Gtk::TextBuffer::on_insert_child_anchor(const TextBuffer::iterator& pos, const Glib::RefPtr<ChildAnchor>& anchor)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1567,17 +1892,15 @@ void Gtk::TextBuffer::on_insert_child_anchor(const TextBuffer::iterator& pos, co
   if(base && base->insert_child_anchor)
     (*base->insert_child_anchor)(gobj(),const_cast<GtkTextIter*>((pos).gobj()),Glib::unwrap(anchor));
 }
-
-void Gtk::TextBuffer::on_erase(const TextBuffer::iterator& range_begin, const TextBuffer::iterator& range_end)
+void Gtk::TextBuffer::on_erase(const TextBuffer::iterator& start, const TextBuffer::iterator& end)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class).
   );
 
   if(base && base->delete_range)
-    (*base->delete_range)(gobj(),const_cast<GtkTextIter*>((range_begin).gobj()),const_cast<GtkTextIter*>((range_end).gobj()));
+    (*base->delete_range)(gobj(),const_cast<GtkTextIter*>((start).gobj()),const_cast<GtkTextIter*>((end).gobj()));
 }
-
 void Gtk::TextBuffer::on_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1587,7 +1910,6 @@ void Gtk::TextBuffer::on_changed()
   if(base && base->changed)
     (*base->changed)(gobj());
 }
-
 void Gtk::TextBuffer::on_modified_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1597,7 +1919,6 @@ void Gtk::TextBuffer::on_modified_changed()
   if(base && base->modified_changed)
     (*base->modified_changed)(gobj());
 }
-
 void Gtk::TextBuffer::on_mark_set(const TextBuffer::iterator& location, const Glib::RefPtr<TextBuffer::Mark>& mark)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1607,7 +1928,6 @@ void Gtk::TextBuffer::on_mark_set(const TextBuffer::iterator& location, const Gl
   if(base && base->mark_set)
     (*base->mark_set)(gobj(),(location).gobj(),Glib::unwrap(mark));
 }
-
 void Gtk::TextBuffer::on_mark_deleted(const Glib::RefPtr<TextBuffer::Mark>& mark)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1617,7 +1937,6 @@ void Gtk::TextBuffer::on_mark_deleted(const Glib::RefPtr<TextBuffer::Mark>& mark
   if(base && base->mark_deleted)
     (*base->mark_deleted)(gobj(),Glib::unwrap(mark));
 }
-
 void Gtk::TextBuffer::on_apply_tag(const Glib::RefPtr<TextBuffer::Tag>& tag, const TextBuffer::iterator& range_begin, const TextBuffer::iterator& range_end)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1627,7 +1946,6 @@ void Gtk::TextBuffer::on_apply_tag(const Glib::RefPtr<TextBuffer::Tag>& tag, con
   if(base && base->apply_tag)
     (*base->apply_tag)(gobj(),Glib::unwrap(tag),(range_begin).gobj(),(range_end).gobj());
 }
-
 void Gtk::TextBuffer::on_remove_tag(const Glib::RefPtr<TextBuffer::Tag>& tag, const TextBuffer::iterator& range_begin, const TextBuffer::iterator& range_end)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1637,7 +1955,6 @@ void Gtk::TextBuffer::on_remove_tag(const Glib::RefPtr<TextBuffer::Tag>& tag, co
   if(base && base->remove_tag)
     (*base->remove_tag)(gobj(),Glib::unwrap(tag),(range_begin).gobj(),(range_end).gobj());
 }
-
 void Gtk::TextBuffer::on_begin_user_action()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1647,7 +1964,6 @@ void Gtk::TextBuffer::on_begin_user_action()
   if(base && base->begin_user_action)
     (*base->begin_user_action)(gobj());
 }
-
 void Gtk::TextBuffer::on_end_user_action()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1657,6 +1973,10 @@ void Gtk::TextBuffer::on_end_user_action()
   if(base && base->end_user_action)
     (*base->end_user_action)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/textbuffer.h b/libs/gtkmm2/gtk/gtkmm/textbuffer.h
index 7a40dd9526..e60387ff4c 100644
--- a/libs/gtkmm2/gtk/gtkmm/textbuffer.h
+++ b/libs/gtkmm2/gtk/gtkmm/textbuffer.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TEXTBUFFER_H
 #define _GTKMM_TEXTBUFFER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -187,6 +188,7 @@ public:
   
 
   #ifndef GTKMM_DISABLE_DEPRECATED
+
   /** @deprecated Use set_text()
    */
   void assign(const Glib::ustring& text);
@@ -194,7 +196,8 @@ public:
   /** @deprecated Use set_text()
    */
   void assign(const char* text_begin, const char* text_end);
-  #endif //GTKMM_DISABLE_DEPRECATED
+  #endif // GTKMM_DISABLE_DEPRECATED
+
 
   //TODO: Make all insert() methods have the same return type:
   
@@ -393,11 +396,31 @@ public:
    */
   std::pair<iterator,bool> erase_interactive(const iterator& range_begin, const iterator& range_end, bool default_editable = true);
   
-  
-  //TODO: Document this:
+
+  /** Performs the appropriate action as if the user hit the delete
+   * key with the cursor at the position specified by @a iter. In the
+   * normal case a single character will be deleted, but when
+   * combining accents are involved, more than one character can
+   * be deleted, and when precomposed character and accent combinations
+   * are involved, less than one character will be deleted.
+   * 
+   * Because the buffer is modified, all outstanding iterators become 
+   * invalid after calling this method; however, this method returns 
+   * a valid iterator that points to the location where text was deleted.
+   *
+   * @param iter A position in the buffer.
+   * @param interactive Whether the deletion is caused by user interaction.
+   * @param default_editable Whether the buffer is editable by default.
+   * @result An iterator to the location where text was deleted, if the buffer was modified.
+   *
+   * @newin2p6
+   */
   iterator backspace(const iterator& iter, bool interactive = true, bool default_editable = true);
   
 
+  /** @deprecated Use get_text(const iterator& start, const iterator& end, bool include_hidden_chars) const
+   */
+  
   /** Returns the text in the range [ @a start , @a end ). Excludes undisplayed
    * text (text marked with tags that set the invisibility attribute) if
    *  @a include_hidden_chars  is <tt>false</tt>. Does not include characters
@@ -412,6 +435,25 @@ public:
    */
   Glib::ustring get_text(const iterator& start, const iterator& end, bool include_hidden_chars = true);
 
+  
+  /** Returns the text in the range [ @a start , @a end ). Excludes undisplayed
+   * text (text marked with tags that set the invisibility attribute) if
+   *  @a include_hidden_chars  is <tt>false</tt>. Does not include characters
+   * representing embedded images, so byte and character indexes into
+   * the returned string do <em>not</em> correspond to byte
+   * and character indexes into the buffer. Contrast with
+   * get_slice().
+   * @param start Start of a range.
+   * @param end End of a range.
+   * @param include_hidden_chars Whether to include invisible text.
+   * @return An allocated UTF-8 string.
+   */
+  Glib::ustring get_text(const iterator& start, const iterator& end, bool include_hidden_chars = true) const;
+
+  /** @deprecated Use get_text(bool include_hidden_chars) const.
+   */
+  Glib::ustring get_text(bool include_hidden_chars = true);
+
   /** Returns all the text in the buffer. Excludes undisplayed
    * text (text marked with tags that set the invisibility attribute) if
    *  @a include_hidden_chars  is <tt>false</tt>. Does not include characters
@@ -423,8 +465,10 @@ public:
    * @param include_hidden_chars Whether to include invisible text.
    * @return An allocated UTF-8 string.
    */
-  Glib::ustring get_text(bool include_hidden_chars = true);
+  Glib::ustring get_text(bool include_hidden_chars = true) const;
 
+  /** @deprecated Use get_slice(const iterator& start, const iterator& end, bool include_hidden_chars) const.
+   */
   
   /** Returns the text in the range [ @a start , @a end ). Excludes undisplayed
    * text (text marked with tags that set the invisibility attribute) if
@@ -443,6 +487,24 @@ public:
    */
   Glib::ustring get_slice(const iterator& start, const iterator& end, bool include_hidden_chars = true);
 
+  
+  /** Returns the text in the range [ @a start , @a end ). Excludes undisplayed
+   * text (text marked with tags that set the invisibility attribute) if
+   *  @a include_hidden_chars  is <tt>false</tt>. The returned string includes a
+   * 0xFFFC character whenever the buffer contains
+   * embedded images, so byte and character indexes into
+   * the returned string <em>do</em> correspond to byte
+   * and character indexes into the buffer. Contrast with
+   * get_text(). Note that 0xFFFC can occur in normal
+   * text as well, so it is not a reliable indicator that a pixbuf or
+   * widget is in the buffer.
+   * @param start Start of a range.
+   * @param end End of a range.
+   * @param include_hidden_chars Whether to include invisible text.
+   * @return An allocated UTF-8 string.
+   */
+  Glib::ustring get_slice(const iterator& start, const iterator& end, bool include_hidden_chars = true) const;
+
   iterator insert_pixbuf(const iterator& pos, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
   
 
@@ -509,6 +571,7 @@ public:
    * @param mark A Gtk::TextMark in @a buffer .
    */
   void delete_mark(const Glib::RefPtr<Mark>& mark);
+
   
   /** Returns the mark named @a name  in buffer @a buffer , or <tt>0</tt> if no such
    * mark exists in the buffer.
@@ -674,6 +737,9 @@ public:
   void set_modified(bool setting = true);
 
   
+  bool get_has_selection() const;
+
+  
   /** Adds @a clipboard  to the list of clipboards in which the selection contents
    * of @a buffer  are available. In most cases, @a clipboard  will be the Gtk::Clipboard
    * of type Gdk::SELECTION_PRIMARY for a view of @a buffer .
@@ -732,7 +798,7 @@ public:
    * to be recalculated. This function moves them as a unit, which can
    * be optimized.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param ins Where to put the "insert" mark.
    * @param bound Where to put the "selection_bound" mark.
    */
@@ -765,55 +831,277 @@ public:
   void end_user_action();
 
 
+  //These are only available on the Maemo platform (patched Gtk+):
+
+  
+  /** Sets whether rich text can be pasted and dropped to the text buffer.
+   * 
+   * Since: maemo 1.0
+   * @param can_paste_rich_text Whether rich text pasting and dropping is enabled.
+   */
+
+#ifdef  GTKMM_MAEMO_EXTENSIONS_ENABLED
+  void set_can_paste_rich_text(bool can_paste_rich_text);
+#endif //  GTKMM_MAEMO_EXTENSIONS_ENABLED
+
+  
+  /** 
+   * @return Whether rich text pasting and dropping is enabled
+   * 
+   * Since: maemo 1.0.
+   */
+
+#ifdef  GTKMM_MAEMO_EXTENSIONS_ENABLED
+  bool get_can_paste_rich_text() const;
+#endif //  GTKMM_MAEMO_EXTENSIONS_ENABLED
+
+
+  /** Sets a new rich text format for the widget.
+   * 
+   * Since: maemo 1.0
+   * @param format Name of a collection of tags that the text view supports.
+   */
+
+#ifdef  GTKMM_MAEMO_EXTENSIONS_ENABLED
+  void set_rich_text_format(const Glib::ustring& format);
+#endif //  GTKMM_MAEMO_EXTENSIONS_ENABLED
+
+
+#ifdef GTKMM_MAEMO_EXTENSIONS_ENABLED
+  /** Accept all formats from clipboard
+   *
+   */
+  void set_rich_text_format_all();
+#endif //GTKMM_MAEMO_EXTENSIONS_ENABLED
+
+  
+  /** 
+   * @return The widget's current rich text format.
+   * 
+   * Since: maemo 1.0.
+   */
+
+#ifdef  GTKMM_MAEMO_EXTENSIONS_ENABLED
+  Glib::ustring get_rich_text_format() const;
+#endif //  GTKMM_MAEMO_EXTENSIONS_ENABLED
+ 
+
+//TODO: I have commented these out for now because I don't understand what the register_buffer and content_buffer are. murrayc.
+ //TODO: Documentation.
+ // typedef sigc::slot<guint8*, const Glib::RefPtr<TextBuffer>& /* content_buffer */, const iterator& /* start */, const iterator& /* end */, gsize& /* length */> SlotSerialize;
+
+
+//TODO: Use ArrayHandle, or just use guint8* to be more efficient?
+  // typedef sigc::slot<bool, const Glib::RefPtr<TextBuffer>& /* content_buffer */, iterator& /* iter */, const guint8*  /* data */, gsize /* length */, bool /* create_tags */> SlotDeserialize;
+
+/*
+  Glib::ustring register_serialize_format(const Glib::ustring& mime_type, const SlotSerialize& slot);
+  _IGNORE(gtk_text_buffer_register_serialize_format)
+*/
+
+  
+  Glib::ustring register_serialize_tagset(const Glib::ustring& tagset_name);
+
+/*
+  Glib::ustring register_deserialize_format(const Glib::ustring& mime_type, const SlotDeserialize& slot);
+  _IGNORE(gtk_text_buffer_register_deserialize_format)
+*/
+  
+  Glib::ustring register_deserialize_tagset(const Glib::ustring& tagset_name);
+
+  
+  void unregister_serialize_format(const Glib::ustring& format);
+  
+  void unregister_deserialize_format(const Glib::ustring& format);
+
+//TODO: Wrap property too, if there is one.
+  
+  void set_can_create_tags(const Glib::ustring& format, bool can_create_tags = true);
+  
+  bool get_can_create_tags(const Glib::ustring& format) const;
+
+
+  Glib::StringArrayHandle get_serialize_formats() const;
+  
+  Glib::StringArrayHandle get_deserialize_formats() const;
+  
+
+/*
+//TODO: I have commented these out for now because I don't understand what the register_buffer and content_buffer are. murrayc.
+
+//TODO: Use something other than gsize?
+#m4 _CONVERSION(`const iterator&', `GtkTextIter*',`($3).gobj()')
+  _WRAP_METHOD(guint8* serialize(const Glib::RefPtr<TextBuffer>& content_buffer,
+                                                       const Glib::ustring& format,
+                                                       const iterator& iterstart,
+                                                       const iterator& iterend,
+                                                       gsize& length), gtk_text_buffer_serialize)
+
+//TODO: Is the bool superfluous?
+//TODO: Use an ArrayHandle?
+  _WRAP_METHOD(bool deserialize(const Glib::RefPtr<TextBuffer>& content_buffer,
+                                                       const Glib::ustring& format,
+                                                       const iterator& iter, const guint8* data,
+                                                       gsize length), gtk_text_buffer_deserialize, errthrow)
+*/
+
+
+/**
+   * @par Prototype:
+   * <tt>void %insert(const TextBuffer::iterator& pos, const Glib::ustring& text, int bytes)</tt>
+   */
+
   Glib::SignalProxy3< void,const TextBuffer::iterator&,const Glib::ustring&,int > signal_insert();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %insert_pixbuf(const TextBuffer::iterator& pos, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)</tt>
+   */
+
   Glib::SignalProxy2< void,const TextBuffer::iterator&,const Glib::RefPtr<Gdk::Pixbuf>& > signal_insert_pixbuf();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %insert_child_anchor(const TextBuffer::iterator& pos, const Glib::RefPtr<ChildAnchor>& anchor)</tt>
+   */
+
   Glib::SignalProxy2< void,const TextBuffer::iterator&,const Glib::RefPtr<ChildAnchor>& > signal_insert_child_anchor();
 
   
+  /** The delete_range signal is emitted to delete a range from 
+   * a TextBuffer. Note that your handler must not invalidate the
+   * @a start and @a end iters (or has to revalidate them), if it runs before the 
+   * default handler. There is no need to keep the iters valid in handlers
+   * which run after the default handler but
+   * those don't have access to the deleted text.
+   *
+   * @param start the start of the range to be deleted.
+   * @param end the end of the range to be deleted.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %erase(const TextBuffer::iterator& start, const TextBuffer::iterator& end)</tt>
+   */
+
   Glib::SignalProxy2< void,const TextBuffer::iterator&,const TextBuffer::iterator& > signal_erase();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %modified_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_modified_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %mark_set(const TextBuffer::iterator& location, const Glib::RefPtr<TextBuffer::Mark>& mark)</tt>
+   */
+
   Glib::SignalProxy2< void,const TextBuffer::iterator&,const Glib::RefPtr<TextBuffer::Mark>& > signal_mark_set();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %mark_deleted(const Glib::RefPtr<TextBuffer::Mark>& mark)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<TextBuffer::Mark>& > signal_mark_deleted();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %apply_tag(const Glib::RefPtr<TextBuffer::Tag>& tag, const TextBuffer::iterator& range_begin, const TextBuffer::iterator& range_end)</tt>
+   */
+
   Glib::SignalProxy3< void,const Glib::RefPtr<TextBuffer::Tag>&,const TextBuffer::iterator&,const TextBuffer::iterator& > signal_apply_tag();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %remove_tag(const Glib::RefPtr<TextBuffer::Tag>& tag, const TextBuffer::iterator& range_begin, const TextBuffer::iterator& range_end)</tt>
+   */
+
   Glib::SignalProxy3< void,const Glib::RefPtr<TextBuffer::Tag>&,const TextBuffer::iterator&,const TextBuffer::iterator& > signal_remove_tag();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %begin_user_action()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_begin_user_action();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %end_user_action()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_end_user_action();
 
 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Current text of the buffer.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<Glib::ustring> property_text() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Current text of the buffer.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_text() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the buffer has some text currently selected.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_has_selection() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_insert(const TextBuffer::iterator& pos, const Glib::ustring& text, int bytes);
   virtual void on_insert_pixbuf(const TextBuffer::iterator& pos, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
   virtual void on_insert_child_anchor(const TextBuffer::iterator& pos, const Glib::RefPtr<ChildAnchor>& anchor);
-  virtual void on_erase(const TextBuffer::iterator& range_begin, const TextBuffer::iterator& range_end);
+  virtual void on_erase(const TextBuffer::iterator& start, const TextBuffer::iterator& end);
   virtual void on_changed();
   virtual void on_modified_changed();
   virtual void on_mark_set(const TextBuffer::iterator& location, const Glib::RefPtr<TextBuffer::Mark>& mark);
@@ -822,6 +1110,7 @@ protected:
   virtual void on_remove_tag(const Glib::RefPtr<TextBuffer::Tag>& tag, const TextBuffer::iterator& range_begin, const TextBuffer::iterator& range_end);
   virtual void on_begin_user_action();
   virtual void on_end_user_action();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/textchildanchor.cc b/libs/gtkmm2/gtk/gtkmm/textchildanchor.cc
index e44a5050c3..517e627448 100644
--- a/libs/gtkmm2/gtk/gtkmm/textchildanchor.cc
+++ b/libs/gtkmm2/gtk/gtkmm/textchildanchor.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/textchildanchor.h>
 #include <gtkmm/private/textchildanchor_p.h>
 
@@ -26,7 +27,6 @@
  */
 
 #include <gtk/gtktextchild.h>
-
 namespace
 {
 } // anonymous namespace
@@ -75,8 +75,19 @@ void TextChildAnchor_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* TextChildAnchor_Class::wrap_new(GObject* object)
 {
@@ -146,6 +157,13 @@ bool TextChildAnchor::get_deleted() const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/textchildanchor.h b/libs/gtkmm2/gtk/gtkmm/textchildanchor.h
index 0ee3f68bd0..0ecc37c1ea 100644
--- a/libs/gtkmm2/gtk/gtkmm/textchildanchor.h
+++ b/libs/gtkmm2/gtk/gtkmm/textchildanchor.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TEXTCHILDANCHOR_H
 #define _GTKMM_TEXTCHILDANCHOR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -43,9 +44,11 @@ namespace Gtk
 namespace Gtk
 {
 
-//TODO: Add a real class description.
-
-/** Typedefed as Gtk::TextBuffer::ChildAnchor.
+/** A TextChildAnchor is a spot in the buffer where child widgets can be "anchored" 
+ * (inserted inline, as if they were characters). The anchor can have multiple widgets anchored, 
+ * to allow for multiple views.
+ *
+ * Typedefed as Gtk::TextBuffer::ChildAnchor.
  * @ingroup TextView
  */
 
@@ -132,11 +135,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/textiter.cc b/libs/gtkmm2/gtk/gtkmm/textiter.cc
index 1881fa5574..5c083ddfba 100644
--- a/libs/gtkmm2/gtk/gtkmm/textiter.cc
+++ b/libs/gtkmm2/gtk/gtkmm/textiter.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/textiter.h>
 #include <gtkmm/private/textiter_p.h>
 
@@ -144,10 +145,10 @@ Glib::RefPtr<TextBuffer> TextIter::get_buffer() const
 {
 
   Glib::RefPtr<TextBuffer> retvalue = Glib::wrap(gtk_text_iter_get_buffer(const_cast<GtkTextIter*>(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 int TextIter::get_offset() const
@@ -209,10 +210,10 @@ Glib::RefPtr<Gdk::Pixbuf> TextIter::get_pixbuf() const
 {
 
   Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_text_iter_get_pixbuf(const_cast<GtkTextIter*>(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::SListHandle< Glib::RefPtr<TextMark> > TextIter::get_marks()
@@ -229,20 +230,20 @@ Glib::RefPtr<TextChildAnchor> TextIter::get_child_anchor()
 {
 
   Glib::RefPtr<TextChildAnchor> retvalue = Glib::wrap(gtk_text_iter_get_child_anchor(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TextChildAnchor> TextIter::get_child_anchor() const
 {
 
   Glib::RefPtr<const TextChildAnchor> retvalue = Glib::wrap(gtk_text_iter_get_child_anchor(const_cast<GtkTextIter*>(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::SListHandle< Glib::RefPtr<TextTag> > TextIter::get_toggled_tags(bool toggled_on)
@@ -425,6 +426,26 @@ bool TextIter::backward_word_starts(int count)
   return gtk_text_iter_backward_word_starts(gobj(), count);
 }
 
+bool TextIter::forward_visible_line()
+{
+  return gtk_text_iter_forward_visible_line(gobj());
+}
+
+bool TextIter::backward_visible_line()
+{
+  return gtk_text_iter_backward_visible_line(gobj());
+}
+
+bool TextIter::forward_visible_line(int count)
+{
+  return gtk_text_iter_forward_visible_lines(gobj(), count);
+}
+
+bool TextIter::backward_visible_lines(int count)
+{
+  return gtk_text_iter_backward_visible_lines(gobj(), count);
+}
+
 bool TextIter::forward_visible_word_end()
 {
   return gtk_text_iter_forward_visible_word_end(gobj());
@@ -507,27 +528,27 @@ bool TextIter::backward_visible_cursor_positions(int count)
 
 void TextIter::set_offset(int char_offset)
 {
-  gtk_text_iter_set_offset(gobj(), char_offset);
+gtk_text_iter_set_offset(gobj(), char_offset); 
 }
 
 void TextIter::set_line(int line_number)
 {
-  gtk_text_iter_set_line(gobj(), line_number);
+gtk_text_iter_set_line(gobj(), line_number); 
 }
 
 void TextIter::set_line_offset(int char_on_line)
 {
-  gtk_text_iter_set_line_offset(gobj(), char_on_line);
+gtk_text_iter_set_line_offset(gobj(), char_on_line); 
 }
 
 void TextIter::set_line_index(int byte_on_line)
 {
-  gtk_text_iter_set_line_index(gobj(), byte_on_line);
+gtk_text_iter_set_line_index(gobj(), byte_on_line); 
 }
 
 void TextIter::forward_to_end()
 {
-  gtk_text_iter_forward_to_end(gobj());
+gtk_text_iter_forward_to_end(gobj()); 
 }
 
 bool TextIter::forward_to_line_end()
@@ -537,12 +558,12 @@ bool TextIter::forward_to_line_end()
 
 void TextIter::set_visible_line_offset(int char_on_line)
 {
-  gtk_text_iter_set_visible_line_offset(gobj(), char_on_line);
+gtk_text_iter_set_visible_line_offset(gobj(), char_on_line); 
 }
 
 void TextIter::set_visible_line_index(int byte_on_line)
 {
-  gtk_text_iter_set_visible_line_index(gobj(), byte_on_line);
+gtk_text_iter_set_visible_line_index(gobj(), byte_on_line); 
 }
 
 bool TextIter::forward_to_tag_toggle(const Glib::RefPtr<TextTag>& tag)
@@ -577,7 +598,7 @@ bool TextIter::in_range(const TextIter& start, const TextIter& end) const
 
 void TextIter::order(TextIter& second)
 {
-  gtk_text_iter_order(gobj(), (second).gobj());
+gtk_text_iter_order(gobj(), (second).gobj()); 
 }
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/textiter.h b/libs/gtkmm2/gtk/gtkmm/textiter.h
index 5a8cf919d0..6b222e898b 100644
--- a/libs/gtkmm2/gtk/gtkmm/textiter.h
+++ b/libs/gtkmm2/gtk/gtkmm/textiter.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TEXTITER_H
 #define _GTKMM_TEXTITER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -694,9 +695,61 @@ public:
    */
   bool backward_word_starts(int count);
 
+  
+  /** Moves @a iter  to the start of the next visible line. Returns <tt>true</tt> if there
+   * was a next line to move to, and <tt>false</tt> if @a iter  was simply moved to
+   * the end of the buffer and is now not dereferenceable, or if @a iter  was
+   * already at the end of the buffer.
+   * @return Whether @a iter  can be dereferenced
+   * 
+   * @newin2p8.
+   */
+  bool forward_visible_line();
+  
+  /** Moves @a iter  to the start of the previous visible line. Returns <tt>true</tt> if
+   *  @a iter  could be moved; i.e. if @a iter  was at character offset 0, this
+   * function returns <tt>false</tt>. Therefore if @a iter  was already on line 0,
+   * but not at the start of the line, @a iter  is snapped to the start of
+   * the line and the function returns <tt>true</tt>. (Note that this implies that
+   * in a loop calling this function, the line number may not change on
+   * every iteration, if your first iteration is on line 0.)
+   * @return Whether @a iter  moved
+   * 
+   * @newin2p8.
+   */
+  bool backward_visible_line();
+  
+  /** Moves @a count  visible lines forward, if possible (if @a count  would move
+   * past the start or end of the buffer, moves to the start or end of
+   * the buffer).  The return value indicates whether the iterator moved
+   * onto a dereferenceable position; if the iterator didn't move, or
+   * moved onto the end iterator, then <tt>false</tt> is returned. If @a count  is 0,
+   * the function does nothing and returns <tt>false</tt>. If @a count  is negative,
+   * moves backward by 0 - @a count  lines.
+   * @param count Number of lines to move forward.
+   * @return Whether @a iter  moved and is dereferenceable
+   * 
+   * @newin2p8.
+   */
+  bool forward_visible_line(int count);
+  
+  /** Moves @a count  visible lines backward, if possible (if @a count  would move
+   * past the start or end of the buffer, moves to the start or end of
+   * the buffer).  The return value indicates whether the iterator moved
+   * onto a dereferenceable position; if the iterator didn't move, or
+   * moved onto the end iterator, then <tt>false</tt> is returned. If @a count  is 0,
+   * the function does nothing and returns <tt>false</tt>. If @a count  is negative,
+   * moves forward by 0 - @a count  lines.
+   * @param count Number of lines to move backward.
+   * @return Whether @a iter  moved and is dereferenceable
+   * 
+   * @newin2p8.
+   */
+  bool backward_visible_lines(int count);
+
   //TODO: Now that there are so many *_visible_ versions of the methods, maybe we should
   //just add a visible=false parameter and therefore halve the number of methods. murrayc
-  
+ 
   
   /** Moves forward to the next visible word end. (If @a iter  is currently on a
    * word end, moves forward to the next one after that.) Word breaks
@@ -705,7 +758,7 @@ public:
    * algorithms).
    * @return <tt>true</tt> if @a iter  moved and is not the end iterator 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool forward_visible_word_end();
   
@@ -716,7 +769,7 @@ public:
    * algorithms).
    * @return <tt>true</tt> if @a iter  moved and is not the end iterator 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool backward_visible_word_start();
   
@@ -724,7 +777,7 @@ public:
    * @param count Number of times to move.
    * @return <tt>true</tt> if @a iter  moved and is not the end iterator 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool forward_visible_word_ends(int count);
   
@@ -732,7 +785,7 @@ public:
    * @param count Number of times to move.
    * @return <tt>true</tt> if @a iter  moved and is not the end iterator 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool backward_visible_word_starts(int count);
 
@@ -810,7 +863,7 @@ public:
    * gtk_text_iter_forward_cursor_position() for details.
    * @return <tt>true</tt> if we moved and the new position is dereferenceable
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool forward_visible_cursor_position();
   
@@ -818,7 +871,7 @@ public:
    * gtk_text_iter_backward_cursor_position() for details.
    * @return <tt>true</tt> if we moved and the new position is dereferenceable
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool backward_visible_cursor_position();
   
@@ -827,7 +880,7 @@ public:
    * @param count Number of positions to move.
    * @return <tt>true</tt> if we moved and the new position is dereferenceable
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool forward_visible_cursor_positions(int count);
   
@@ -836,7 +889,7 @@ public:
    * @param count Number of positions to move.
    * @return <tt>true</tt> if we moved and the new position is dereferenceable
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool backward_visible_cursor_positions(int count);
 
@@ -1041,18 +1094,22 @@ TextIter::PredicateAdapter<Predicate>::PredicateAdapter(const Predicate& predica
 template <class Predicate>
 gboolean TextIter::PredicateAdapter<Predicate>::gtk_callback(gunichar uc, void* user_data)
 {
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     // This will either use Predicate::operator(), or call a function pointer.
     // The explicit conditional expression avoids relying on an implicit
     // conversion of the return type to int, which might be not available.
     return (static_cast<TextIter::PredicateAdapter<Predicate>*>(user_data)->predicate_(uc)) ? 1 : 0;
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
     return 0;
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
 inline
@@ -1206,5 +1263,6 @@ class Value<Gtk::TextIter> : public Glib::Value_Boxed<Gtk::TextIter>
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_TEXTITER_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/textmark.cc b/libs/gtkmm2/gtk/gtkmm/textmark.cc
index 2252f8715d..8aadf70324 100644
--- a/libs/gtkmm2/gtk/gtkmm/textmark.cc
+++ b/libs/gtkmm2/gtk/gtkmm/textmark.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/textmark.h>
 #include <gtkmm/private/textmark_p.h>
 
@@ -92,8 +93,19 @@ void TextMark_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* TextMark_Class::wrap_new(GObject* object)
 {
@@ -138,7 +150,7 @@ GType TextMark::get_base_type()
 
 void TextMark::set_visible(bool setting)
 {
-  gtk_text_mark_set_visible(gobj(), static_cast<int>(setting));
+gtk_text_mark_set_visible(gobj(), static_cast<int>(setting)); 
 }
 
 bool TextMark::get_visible() const
@@ -160,20 +172,15 @@ Glib::RefPtr<TextBuffer> TextMark::get_buffer()
 {
 
   Glib::RefPtr<TextBuffer> retvalue = Glib::wrap(gtk_text_mark_get_buffer(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TextBuffer> TextMark::get_buffer() const
 {
-
-  Glib::RefPtr<const TextBuffer> retvalue = Glib::wrap(gtk_text_mark_get_buffer(const_cast<GtkTextMark*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<TextMark*>(this)->get_buffer();
 }
 
 bool TextMark::get_left_gravity() const
@@ -182,6 +189,13 @@ bool TextMark::get_left_gravity() const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/textmark.h b/libs/gtkmm2/gtk/gtkmm/textmark.h
index 559d6ed71d..5616ca20a2 100644
--- a/libs/gtkmm2/gtk/gtkmm/textmark.h
+++ b/libs/gtkmm2/gtk/gtkmm/textmark.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TEXTMARK_H
 #define _GTKMM_TEXTMARK_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -170,11 +171,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/texttag.cc b/libs/gtkmm2/gtk/gtkmm/texttag.cc
index f1867ef7b4..62ebcef88c 100644
--- a/libs/gtkmm2/gtk/gtkmm/texttag.cc
+++ b/libs/gtkmm2/gtk/gtkmm/texttag.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/texttag.h>
 #include <gtkmm/private/texttag_p.h>
 
@@ -28,11 +29,11 @@
 #include <gtkmm/textbuffer.h>
 #include <gtkmm/textiter.h>
 #include <gtk/gtktexttag.h>
-
 namespace
 {
 
-gboolean TextTag_signal_event_callback(GtkTextTag* self, GObject* p0,GdkEvent* p1,const GtkTextIter* p2,void* data)
+
+static gboolean TextTag_signal_event_callback(GtkTextTag* self, GObject* p0,GdkEvent* p1,const GtkTextIter* p2,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,const Glib::RefPtr<Glib::Object>&,GdkEvent*,const TextIter& > SlotType;
@@ -40,24 +41,28 @@ gboolean TextTag_signal_event_callback(GtkTextTag* self, GObject* p0,GdkEvent* p
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , p1, Glib::wrap(p2)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean TextTag_signal_event_notify_callback(GtkTextTag* self, GObject* p0,GdkEvent* p1,const GtkTextIter* p2, void* data)
+static gboolean TextTag_signal_event_notify_callback(GtkTextTag* self, GObject* p0,GdkEvent* p1,const GtkTextIter* p2, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Glib::Object>&,GdkEvent*,const TextIter& > SlotType;
@@ -65,30 +70,35 @@ gboolean TextTag_signal_event_notify_callback(GtkTextTag* self, GObject* p0,GdkE
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , p1, Glib::wrap(p2)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo TextTag_signal_event_info =
+static const Glib::SignalProxyInfo TextTag_signal_event_info =
 {
   "event",
   (GCallback) &TextTag_signal_event_callback,
   (GCallback) &TextTag_signal_event_notify_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -135,10 +145,18 @@ void TextTag_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->event = &event_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 gboolean TextTag_Class::event_callback(GtkTextTag* self, GObject* p0, GdkEvent* p1, const GtkTextIter* p2)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -151,17 +169,21 @@ gboolean TextTag_Class::event_callback(GtkTextTag* self, GObject* p0, GdkEvent*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_event(Glib::wrap(p0, true)
 , p1, Glib::wrap(p2)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -177,6 +199,7 @@ gboolean TextTag_Class::event_callback(GtkTextTag* self, GObject* p0, GdkEvent*
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* TextTag_Class::wrap_new(GObject* object)
@@ -249,7 +272,7 @@ int TextTag::get_priority() const
 
 void TextTag::set_priority(int priority)
 {
-  gtk_text_tag_set_priority(gobj(), priority);
+gtk_text_tag_set_priority(gobj(), priority); 
 }
 
 bool TextTag::event(const Glib::RefPtr<Glib::Object>& event_object, GdkEvent* event, const TextIter& iter)
@@ -264,612 +287,841 @@ Glib::SignalProxy3< bool,const Glib::RefPtr<Glib::Object>&,GdkEvent*,const TextI
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> TextTag::property_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_WriteOnly<Glib::ustring> TextTag::property_background() 
 {
   return Glib::PropertyProxy_WriteOnly<Glib::ustring>(this, "background");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
-Glib::PropertyProxy_ReadOnly<Glib::ustring> TextTag::property_background() const
-{
-  return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "background");
-}
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_WriteOnly<Glib::ustring> TextTag::property_foreground() 
 {
   return Glib::PropertyProxy_WriteOnly<Glib::ustring>(this, "foreground");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
-Glib::PropertyProxy_ReadOnly<Glib::ustring> TextTag::property_foreground() const
-{
-  return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "foreground");
-}
-
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gdk::Color> TextTag::property_background_gdk() 
 {
   return Glib::PropertyProxy<Gdk::Color>(this, "background-gdk");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gdk::Color> TextTag::property_background_gdk() const
 {
   return Glib::PropertyProxy_ReadOnly<Gdk::Color>(this, "background-gdk");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gdk::Color> TextTag::property_foreground_gdk() 
 {
   return Glib::PropertyProxy<Gdk::Color>(this, "foreground-gdk");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gdk::Color> TextTag::property_foreground_gdk() const
 {
   return Glib::PropertyProxy_ReadOnly<Gdk::Color>(this, "foreground-gdk");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Bitmap> > TextTag::property_background_stipple() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Bitmap> >(this, "background-stipple");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Bitmap> > TextTag::property_background_stipple() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Bitmap> >(this, "background-stipple");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Bitmap> > TextTag::property_foreground_stipple() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Bitmap> >(this, "foreground-stipple");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Bitmap> > TextTag::property_foreground_stipple() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Bitmap> >(this, "foreground-stipple");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> TextTag::property_font() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "font");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> TextTag::property_font() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "font");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::FontDescription> TextTag::property_font_desc() 
 {
   return Glib::PropertyProxy<Pango::FontDescription>(this, "font-desc");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::FontDescription> TextTag::property_font_desc() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::FontDescription>(this, "font-desc");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> TextTag::property_family() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "family");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> TextTag::property_family() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "family");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::Style> TextTag::property_style() 
 {
   return Glib::PropertyProxy<Pango::Style>(this, "style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::Style> TextTag::property_style() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::Style>(this, "style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::Variant> TextTag::property_variant() 
 {
   return Glib::PropertyProxy<Pango::Variant>(this, "variant");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::Variant> TextTag::property_variant() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::Variant>(this, "variant");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextTag::property_weight() 
 {
   return Glib::PropertyProxy<int>(this, "weight");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextTag::property_weight() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "weight");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::Stretch> TextTag::property_stretch() 
 {
   return Glib::PropertyProxy<Pango::Stretch>(this, "stretch");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::Stretch> TextTag::property_stretch() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::Stretch>(this, "stretch");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextTag::property_size() 
 {
   return Glib::PropertyProxy<int>(this, "size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextTag::property_size() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "size");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> TextTag::property_size_points() 
 {
   return Glib::PropertyProxy<double>(this, "size-points");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> TextTag::property_size_points() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "size-points");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<double> TextTag::property_scale() 
 {
   return Glib::PropertyProxy<double>(this, "scale");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<double> TextTag::property_scale() const
 {
   return Glib::PropertyProxy_ReadOnly<double>(this, "scale");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextTag::property_pixels_above_lines() 
 {
   return Glib::PropertyProxy<int>(this, "pixels-above-lines");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextTag::property_pixels_above_lines() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "pixels-above-lines");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextTag::property_pixels_below_lines() 
 {
   return Glib::PropertyProxy<int>(this, "pixels-below-lines");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextTag::property_pixels_below_lines() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "pixels-below-lines");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextTag::property_pixels_inside_wrap() 
 {
   return Glib::PropertyProxy<int>(this, "pixels-inside-wrap");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextTag::property_pixels_inside_wrap() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "pixels-inside-wrap");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_editable() 
 {
   return Glib::PropertyProxy<bool>(this, "editable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_editable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "editable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<WrapMode> TextTag::property_wrap_mode() 
 {
   return Glib::PropertyProxy<WrapMode>(this, "wrap-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<WrapMode> TextTag::property_wrap_mode() const
 {
   return Glib::PropertyProxy_ReadOnly<WrapMode>(this, "wrap-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Justification> TextTag::property_justification() 
 {
   return Glib::PropertyProxy<Justification>(this, "justification");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Justification> TextTag::property_justification() const
 {
   return Glib::PropertyProxy_ReadOnly<Justification>(this, "justification");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<TextDirection> TextTag::property_direction() 
 {
   return Glib::PropertyProxy<TextDirection>(this, "direction");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<TextDirection> TextTag::property_direction() const
 {
   return Glib::PropertyProxy_ReadOnly<TextDirection>(this, "direction");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextTag::property_left_margin() 
 {
   return Glib::PropertyProxy<int>(this, "left-margin");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextTag::property_left_margin() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "left-margin");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextTag::property_indent() 
 {
   return Glib::PropertyProxy<int>(this, "indent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextTag::property_indent() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "indent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_strikethrough() 
 {
   return Glib::PropertyProxy<bool>(this, "strikethrough");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_strikethrough() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "strikethrough");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextTag::property_right_margin() 
 {
   return Glib::PropertyProxy<int>(this, "right-margin");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextTag::property_right_margin() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "right-margin");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::Underline> TextTag::property_underline() 
 {
   return Glib::PropertyProxy<Pango::Underline>(this, "underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::Underline> TextTag::property_underline() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::Underline>(this, "underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextTag::property_rise() 
 {
   return Glib::PropertyProxy<int>(this, "rise");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextTag::property_rise() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "rise");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_background_full_height() 
 {
   return Glib::PropertyProxy<bool>(this, "background-full-height");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_background_full_height() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "background-full-height");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> TextTag::property_language() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "language");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> TextTag::property_language() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "language");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::TabArray> TextTag::property_tabs() 
 {
   return Glib::PropertyProxy<Pango::TabArray>(this, "tabs");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::TabArray> TextTag::property_tabs() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::TabArray>(this, "tabs");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_invisible() 
 {
   return Glib::PropertyProxy<bool>(this, "invisible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_invisible() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "invisible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_background_set() 
 {
   return Glib::PropertyProxy<bool>(this, "background-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_background_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "background-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_foreground_set() 
 {
   return Glib::PropertyProxy<bool>(this, "foreground-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_foreground_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "foreground-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_background_stipple_set() 
 {
   return Glib::PropertyProxy<bool>(this, "background-stipple-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_background_stipple_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "background-stipple-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_foreground_stipple_set() 
 {
   return Glib::PropertyProxy<bool>(this, "foreground-stipple-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_foreground_stipple_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "foreground-stipple-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_family_set() 
 {
   return Glib::PropertyProxy<bool>(this, "family-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_family_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "family-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_style_set() 
 {
   return Glib::PropertyProxy<bool>(this, "style-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_style_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "style-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_variant_set() 
 {
   return Glib::PropertyProxy<bool>(this, "variant-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_variant_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "variant-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_weight_set() 
 {
   return Glib::PropertyProxy<bool>(this, "weight-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_weight_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "weight-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_stretch_set() 
 {
   return Glib::PropertyProxy<bool>(this, "stretch-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_stretch_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "stretch-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_size_set() 
 {
   return Glib::PropertyProxy<bool>(this, "size-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_size_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "size-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_scale_set() 
 {
   return Glib::PropertyProxy<bool>(this, "scale-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_scale_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "scale-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_pixels_above_lines_set() 
 {
   return Glib::PropertyProxy<bool>(this, "pixels-above-lines-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_pixels_above_lines_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "pixels-above-lines-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_pixels_below_lines_set() 
 {
   return Glib::PropertyProxy<bool>(this, "pixels-below-lines-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_pixels_below_lines_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "pixels-below-lines-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_pixels_inside_wrap_set() 
 {
   return Glib::PropertyProxy<bool>(this, "pixels-inside-wrap-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_pixels_inside_wrap_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "pixels-inside-wrap-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_editable_set() 
 {
   return Glib::PropertyProxy<bool>(this, "editable-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_editable_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "editable-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_wrap_mode_set() 
 {
   return Glib::PropertyProxy<bool>(this, "wrap-mode-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_wrap_mode_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "wrap-mode-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_justification_set() 
 {
   return Glib::PropertyProxy<bool>(this, "justification-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_justification_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "justification-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_left_margin_set() 
 {
   return Glib::PropertyProxy<bool>(this, "left-margin-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_left_margin_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "left-margin-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_indent_set() 
 {
   return Glib::PropertyProxy<bool>(this, "indent-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_indent_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "indent-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_strikethrough_set() 
 {
   return Glib::PropertyProxy<bool>(this, "strikethrough-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_strikethrough_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "strikethrough-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_right_margin_set() 
 {
   return Glib::PropertyProxy<bool>(this, "right-margin-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_right_margin_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "right-margin-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_underline_set() 
 {
   return Glib::PropertyProxy<bool>(this, "underline-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_underline_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "underline-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_rise_set() 
 {
   return Glib::PropertyProxy<bool>(this, "rise-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_rise_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "rise-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_background_full_height_set() 
 {
   return Glib::PropertyProxy<bool>(this, "background-full-height-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_background_full_height_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "background-full-height-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_language_set() 
 {
   return Glib::PropertyProxy<bool>(this, "language-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_language_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "language-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_tabs_set() 
 {
   return Glib::PropertyProxy<bool>(this, "tabs-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_tabs_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "tabs-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextTag::property_invisible_set() 
 {
   return Glib::PropertyProxy<bool>(this, "invisible-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextTag::property_invisible_set() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "invisible-set");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 bool Gtk::TextTag::on_event(const Glib::RefPtr<Glib::Object>& event_object, GdkEvent* event, const TextIter& iter)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -882,6 +1134,10 @@ bool Gtk::TextTag::on_event(const Glib::RefPtr<Glib::Object>& event_object, GdkE
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/texttag.h b/libs/gtkmm2/gtk/gtkmm/texttag.h
index c5162c0914..b1620c52fe 100644
--- a/libs/gtkmm2/gtk/gtkmm/texttag.h
+++ b/libs/gtkmm2/gtk/gtkmm/texttag.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TEXTTAG_H
 #define _GTKMM_TEXTTAG_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -153,58 +154,58 @@ public:
   bool event(const Glib::RefPtr<Glib::Object>& event_object, GdkEvent* event, const TextIter& iter);
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %event(const Glib::RefPtr<Glib::Object>& event_object, GdkEvent* event, const TextIter& iter)</tt>
+   */
+
   Glib::SignalProxy3< bool,const Glib::RefPtr<Glib::Object>&,GdkEvent*,const TextIter& > signal_event();
 
 
-  /** Name used to refer to the text tag. NULL for anonymous tags.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Name used to refer to the text tag. NULL for anonymous tags.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
  //construct-only.
-  /** Background color as a string.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Background color as a string.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_WriteOnly<Glib::ustring> property_background() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Background color as a string.
-   *
-   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
-   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
-   * the value of the property changes.
-   */
-  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_background() const;
 
-  /** Foreground color as a string.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Foreground color as a string.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_WriteOnly<Glib::ustring> property_foreground() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Foreground color as a string.
-   *
-   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
-   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
-   * the value of the property changes.
-   */
-  Glib::PropertyProxy_ReadOnly<Glib::ustring> property_foreground() const;
 
-  /** Background color as a (possibly unallocated) GdkColor.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Background color as a (possibly unallocated) GdkColor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gdk::Color> property_background_gdk() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Background color as a (possibly unallocated) GdkColor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -212,15 +213,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gdk::Color> property_background_gdk() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Foreground color as a (possibly unallocated) GdkColor.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Foreground color as a (possibly unallocated) GdkColor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gdk::Color> property_foreground_gdk() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Foreground color as a (possibly unallocated) GdkColor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -228,15 +233,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gdk::Color> property_foreground_gdk() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Bitmap to use as a mask when drawing the text background.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Bitmap to use as a mask when drawing the text background.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Bitmap> > property_background_stipple() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Bitmap to use as a mask when drawing the text background.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -244,15 +253,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Bitmap> > property_background_stipple() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Bitmap to use as a mask when drawing the text foreground.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Bitmap to use as a mask when drawing the text foreground.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Bitmap> > property_foreground_stipple() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Bitmap to use as a mask when drawing the text foreground.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -260,15 +273,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Bitmap> > property_foreground_stipple() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font description as a string
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font description as a string
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_font() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font description as a string
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -276,15 +293,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_font() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font description as a PangoFontDescription struct.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font description as a PangoFontDescription struct.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::FontDescription> property_font_desc() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font description as a PangoFontDescription struct.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -292,15 +313,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::FontDescription> property_font_desc() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Name of the font family
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Name of the font family
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_family() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Name of the font family
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -308,15 +333,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_family() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font style as a PangoStyle
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font style as a PangoStyle
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::Style> property_style() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font style as a PangoStyle
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -324,15 +353,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::Style> property_style() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font variant as a PangoVariant
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font variant as a PangoVariant
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::Variant> property_variant() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font variant as a PangoVariant
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -340,15 +373,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::Variant> property_variant() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font weight as an integer
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font weight as an integer
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_weight() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font weight as an integer
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -356,15 +393,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_weight() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font stretch as a PangoStretch
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font stretch as a PangoStretch
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::Stretch> property_stretch() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font stretch as a PangoStretch
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -372,15 +413,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::Stretch> property_stretch() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font size in Pango units.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font size in Pango units.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_size() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font size in Pango units.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -388,15 +433,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_size() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font size in points.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font size in points.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_size_points() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font size in points.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -404,15 +453,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_size_points() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Font size as a scale factor relative to the default font size. This properly adapts to theme changes etc. so is recommended. Pango predefines some scales such as PANGO_SCALE_X_LARGE.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Font size as a scale factor relative to the default font size. This properly adapts to theme changes etc. so is recommended. Pango predefines some scales such as PANGO_SCALE_X_LARGE.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<double> property_scale() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Font size as a scale factor relative to the default font size. This properly adapts to theme changes etc. so is recommended. Pango predefines some scales such as PANGO_SCALE_X_LARGE.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -420,15 +473,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_scale() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Pixels of blank space above paragraphs.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Pixels of blank space above paragraphs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_pixels_above_lines() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Pixels of blank space above paragraphs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -436,15 +493,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_pixels_above_lines() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Pixels of blank space below paragraphs.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Pixels of blank space below paragraphs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_pixels_below_lines() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Pixels of blank space below paragraphs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -452,15 +513,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_pixels_below_lines() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Pixels of blank space between wrapped lines in a paragraph.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Pixels of blank space between wrapped lines in a paragraph.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_pixels_inside_wrap() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Pixels of blank space between wrapped lines in a paragraph.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -468,15 +533,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_pixels_inside_wrap() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the text can be modified by the user.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the text can be modified by the user.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_editable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the text can be modified by the user.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -484,15 +553,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_editable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether to wrap lines never
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to wrap lines never
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<WrapMode> property_wrap_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether to wrap lines never
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -500,15 +573,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<WrapMode> property_wrap_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Left
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Left
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Justification> property_justification() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Left
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -516,15 +593,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Justification> property_justification() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Text direction
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Text direction
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<TextDirection> property_direction() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Text direction
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -532,15 +613,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<TextDirection> property_direction() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Width of the left margin in pixels.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Width of the left margin in pixels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_left_margin() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Width of the left margin in pixels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -548,15 +633,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_left_margin() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Amount to indent the paragraph
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Amount to indent the paragraph
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_indent() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Amount to indent the paragraph
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -564,15 +653,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_indent() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether to strike through the text.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to strike through the text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_strikethrough() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether to strike through the text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -580,15 +673,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_strikethrough() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Width of the right margin in pixels.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Width of the right margin in pixels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_right_margin() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Width of the right margin in pixels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -596,15 +693,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_right_margin() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Style of underline for this text.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Style of underline for this text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::Underline> property_underline() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Style of underline for this text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -612,31 +713,39 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::Underline> property_underline() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Offset of text above the baseline (below the baseline if rise is negative) in pixels.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Offset of text above the baseline (below the baseline if rise is negative) in Pango units.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_rise() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Offset of text above the baseline (below the baseline if rise is negative) in pixels.
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Offset of text above the baseline (below the baseline if rise is negative) in Pango units.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_rise() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the background color fills the entire line height or only the height of the tagged characters.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the background color fills the entire line height or only the height of the tagged characters.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_background_full_height() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the background color fills the entire line height or only the height of the tagged characters.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -644,15 +753,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_background_full_height() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The language this text is in
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The language this text is in
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_language() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The language this text is in
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -660,15 +773,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_language() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Custom tabs for this text.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Custom tabs for this text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::TabArray> property_tabs() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Custom tabs for this text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -676,31 +793,39 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::TabArray> property_tabs() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this text is hidden. Not implemented in GTK 2.0.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this text is hidden.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_invisible() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** Whether this text is hidden. Not implemented in GTK 2.0.
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this text is hidden.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_invisible() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the background color.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the background color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_background_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the background color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -708,15 +833,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_background_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the foreground color.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the foreground color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_foreground_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the foreground color.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -724,15 +853,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_foreground_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the background stipple.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the background stipple.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_background_stipple_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the background stipple.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -740,15 +873,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_background_stipple_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the foreground stipple.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the foreground stipple.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_foreground_stipple_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the foreground stipple.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -756,15 +893,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_foreground_stipple_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font family.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font family.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_family_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font family.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -772,15 +913,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_family_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font style.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font style.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_style_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font style.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -788,15 +933,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_style_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font variant.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font variant.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_variant_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font variant.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -804,15 +953,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_variant_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font weight.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font weight.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_weight_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font weight.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -820,15 +973,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_weight_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font stretch.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font stretch.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_stretch_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font stretch.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -836,15 +993,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_stretch_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the font size.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the font size.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_size_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the font size.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -852,15 +1013,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_size_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag scales the font size by a factor.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag scales the font size by a factor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_scale_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag scales the font size by a factor.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -868,15 +1033,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_scale_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the number of pixels above lines.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the number of pixels above lines.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_pixels_above_lines_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the number of pixels above lines.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -884,15 +1053,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_pixels_above_lines_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the number of pixels above lines.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the number of pixels above lines.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_pixels_below_lines_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the number of pixels above lines.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -900,15 +1073,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_pixels_below_lines_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the number of pixels between wrapped lines.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the number of pixels between wrapped lines.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_pixels_inside_wrap_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the number of pixels between wrapped lines.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -916,15 +1093,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_pixels_inside_wrap_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects text editability.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects text editability.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_editable_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects text editability.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -932,15 +1113,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_editable_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects line wrap mode.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects line wrap mode.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_wrap_mode_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects line wrap mode.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -948,15 +1133,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_wrap_mode_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects paragraph justification.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects paragraph justification.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_justification_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects paragraph justification.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -964,15 +1153,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_justification_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the left margin.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the left margin.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_left_margin_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the left margin.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -980,15 +1173,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_left_margin_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects indentation.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects indentation.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_indent_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects indentation.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -996,15 +1193,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_indent_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects strikethrough.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects strikethrough.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_strikethrough_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects strikethrough.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1012,15 +1213,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_strikethrough_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the right margin.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the right margin.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_right_margin_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the right margin.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1028,15 +1233,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_right_margin_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects underlining.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects underlining.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_underline_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects underlining.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1044,15 +1253,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_underline_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the rise.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the rise.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_rise_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the rise.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1060,15 +1273,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_rise_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects background height.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects background height.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_background_full_height_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects background height.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1076,15 +1293,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_background_full_height_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects the language the text is rendered as.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects the language the text is rendered as.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_language_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects the language the text is rendered as.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1092,15 +1313,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_language_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects tabs.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects tabs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_tabs_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects tabs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1108,15 +1333,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_tabs_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether this tag affects text visibility.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether this tag affects text visibility.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_invisible_set() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether this tag affects text visibility.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1124,18 +1353,25 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_invisible_set() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual bool on_event(const Glib::RefPtr<Glib::Object>& event_object, GdkEvent* event, const TextIter& iter);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/texttagtable.cc b/libs/gtkmm2/gtk/gtkmm/texttagtable.cc
index c237a5a325..44b55e773a 100644
--- a/libs/gtkmm2/gtk/gtkmm/texttagtable.cc
+++ b/libs/gtkmm2/gtk/gtkmm/texttagtable.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/texttagtable.h>
 #include <gtkmm/private/texttagtable_p.h>
 
@@ -29,48 +30,24 @@
 #include <gtk/gtktexttag.h>
 #include <gtk/gtktexttagtable.h>
 
-namespace Gtk
-{
-
-//This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_ForEach
-{
-public:
-  typedef TextTagTable::SlotForEach SlotType;
-
-  SignalProxy_ForEach(const SlotType& slot);
-  ~SignalProxy_ForEach();
-
-  static void gtk_callback(GtkTextTag* texttag, gpointer data);
-
-protected:
-  SlotType slot_;
-};
 
-SignalProxy_ForEach::SignalProxy_ForEach(const SlotType& slot)
+static void SignalProxy_ForEach_gtk_callback(GtkTextTag* texttag, gpointer data)
 {
-  slot_ = slot;
-}
-
-SignalProxy_ForEach::~SignalProxy_ForEach()
-{
-}
-
-void SignalProxy_ForEach::gtk_callback(GtkTextTag* texttag, gpointer data)
-{
-  SignalProxy_ForEach* pSignalProxy = static_cast<SignalProxy_ForEach*>(data);
-  if(pSignalProxy)
+  Gtk::TextTagTable::SlotForEach* the_slot = static_cast<Gtk::TextTagTable::SlotForEach*>(data);
+  if(the_slot)
   {
     //Use Slot::operator():
-    (pSignalProxy->slot_)(Glib::wrap(texttag, true)); //true = take_copy.
+    (*the_slot)(Glib::wrap(texttag, true)); //true = take_copy.
   }
 }
 
+namespace Gtk
+{
 
 void TextTagTable::foreach(const SlotForEach& slot)
 {
-  SignalProxy_ForEach proxy(slot); //It doesn't need to exist for longer than the function call.
-  gtk_text_tag_table_foreach(gobj(),  &SignalProxy_ForEach::gtk_callback, (gpointer)&proxy);
+  //The slot doesn't need to exist for longer than the function call.
+  gtk_text_tag_table_foreach(gobj(),  &SignalProxy_ForEach_gtk_callback, (gpointer)&slot);
 }
 
 
@@ -80,7 +57,8 @@ void TextTagTable::foreach(const SlotForEach& slot)
 namespace
 {
 
-void TextTagTable_signal_tag_changed_callback(GtkTextTagTable* self, GtkTextTag* p0,gboolean p1,void* data)
+
+static void TextTagTable_signal_tag_changed_callback(GtkTextTagTable* self, GtkTextTag* p0,gboolean p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<TextTag>&,bool > SlotType;
@@ -88,21 +66,25 @@ void TextTagTable_signal_tag_changed_callback(GtkTextTagTable* self, GtkTextTag*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextTagTable_signal_tag_changed_info =
+static const Glib::SignalProxyInfo TextTagTable_signal_tag_changed_info =
 {
   "tag_changed",
   (GCallback) &TextTagTable_signal_tag_changed_callback,
@@ -110,7 +92,7 @@ const Glib::SignalProxyInfo TextTagTable_signal_tag_changed_info =
 };
 
 
-void TextTagTable_signal_tag_added_callback(GtkTextTagTable* self, GtkTextTag* p0,void* data)
+static void TextTagTable_signal_tag_added_callback(GtkTextTagTable* self, GtkTextTag* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<TextTag>& > SlotType;
@@ -118,20 +100,24 @@ void TextTagTable_signal_tag_added_callback(GtkTextTagTable* self, GtkTextTag* p
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextTagTable_signal_tag_added_info =
+static const Glib::SignalProxyInfo TextTagTable_signal_tag_added_info =
 {
   "tag_added",
   (GCallback) &TextTagTable_signal_tag_added_callback,
@@ -139,7 +125,7 @@ const Glib::SignalProxyInfo TextTagTable_signal_tag_added_info =
 };
 
 
-void TextTagTable_signal_tag_removed_callback(GtkTextTagTable* self, GtkTextTag* p0,void* data)
+static void TextTagTable_signal_tag_removed_callback(GtkTextTagTable* self, GtkTextTag* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<TextTag>& > SlotType;
@@ -147,26 +133,31 @@ void TextTagTable_signal_tag_removed_callback(GtkTextTagTable* self, GtkTextTag*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextTagTable_signal_tag_removed_info =
+static const Glib::SignalProxyInfo TextTagTable_signal_tag_removed_info =
 {
   "tag_removed",
   (GCallback) &TextTagTable_signal_tag_removed_callback,
   (GCallback) &TextTagTable_signal_tag_removed_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -213,12 +204,20 @@ void TextTagTable_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->tag_changed = &tag_changed_callback;
   klass->tag_added = &tag_added_callback;
   klass->tag_removed = &tag_removed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void TextTagTable_Class::tag_changed_callback(GtkTextTagTable* self, GtkTextTag* p0, gboolean p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -231,17 +230,21 @@ void TextTagTable_Class::tag_changed_callback(GtkTextTagTable* self, GtkTextTag*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_tag_changed(Glib::wrap(p0, true)
 , p1
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -254,7 +257,6 @@ void TextTagTable_Class::tag_changed_callback(GtkTextTagTable* self, GtkTextTag*
       (*base->tag_changed)(self, p0, p1);
   }
 }
-
 void TextTagTable_Class::tag_added_callback(GtkTextTagTable* self, GtkTextTag* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -267,16 +269,20 @@ void TextTagTable_Class::tag_added_callback(GtkTextTagTable* self, GtkTextTag* p
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_tag_added(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -289,7 +295,6 @@ void TextTagTable_Class::tag_added_callback(GtkTextTagTable* self, GtkTextTag* p
       (*base->tag_added)(self, p0);
   }
 }
-
 void TextTagTable_Class::tag_removed_callback(GtkTextTagTable* self, GtkTextTag* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -302,16 +307,20 @@ void TextTagTable_Class::tag_removed_callback(GtkTextTagTable* self, GtkTextTag*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_tag_removed(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -324,6 +333,7 @@ void TextTagTable_Class::tag_removed_callback(GtkTextTagTable* self, GtkTextTag*
       (*base->tag_removed)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* TextTagTable_Class::wrap_new(GObject* object)
@@ -380,32 +390,27 @@ Glib::RefPtr<TextTagTable> TextTagTable::create()
 }
 void TextTagTable::add(const Glib::RefPtr<TextTag>& tag)
 {
-  gtk_text_tag_table_add(gobj(), Glib::unwrap(tag));
+gtk_text_tag_table_add(gobj(), Glib::unwrap(tag)); 
 }
 
 void TextTagTable::remove(const Glib::RefPtr<TextTag>& tag)
 {
-  gtk_text_tag_table_remove(gobj(), Glib::unwrap(tag));
+gtk_text_tag_table_remove(gobj(), Glib::unwrap(tag)); 
 }
 
 Glib::RefPtr<TextTag> TextTagTable::lookup(const Glib::ustring& name)
 {
 
   Glib::RefPtr<TextTag> retvalue = Glib::wrap(gtk_text_tag_table_lookup(gobj(), name.c_str()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TextTag> TextTagTable::lookup(const Glib::ustring& name) const
 {
-
-  Glib::RefPtr<const TextTag> retvalue = Glib::wrap(gtk_text_tag_table_lookup(const_cast<GtkTextTagTable*>(gobj()), name.c_str()));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<TextTagTable*>(this)->lookup(name);
 }
 
 int TextTagTable::get_size() const
@@ -419,17 +424,20 @@ Glib::SignalProxy2< void,const Glib::RefPtr<TextTag>&,bool > TextTagTable::signa
   return Glib::SignalProxy2< void,const Glib::RefPtr<TextTag>&,bool >(this, &TextTagTable_signal_tag_changed_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<TextTag>& > TextTagTable::signal_tag_added()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<TextTag>& >(this, &TextTagTable_signal_tag_added_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<TextTag>& > TextTagTable::signal_tag_removed()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<TextTag>& >(this, &TextTagTable_signal_tag_removed_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::TextTagTable::on_tag_changed(const Glib::RefPtr<TextTag>& tag, bool size_changed)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -439,7 +447,6 @@ void Gtk::TextTagTable::on_tag_changed(const Glib::RefPtr<TextTag>& tag, bool si
   if(base && base->tag_changed)
     (*base->tag_changed)(gobj(),Glib::unwrap(tag),static_cast<int>(size_changed));
 }
-
 void Gtk::TextTagTable::on_tag_added(const Glib::RefPtr<TextTag>& tag)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -449,7 +456,6 @@ void Gtk::TextTagTable::on_tag_added(const Glib::RefPtr<TextTag>& tag)
   if(base && base->tag_added)
     (*base->tag_added)(gobj(),Glib::unwrap(tag));
 }
-
 void Gtk::TextTagTable::on_tag_removed(const Glib::RefPtr<TextTag>& tag)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -459,6 +465,10 @@ void Gtk::TextTagTable::on_tag_removed(const Glib::RefPtr<TextTag>& tag)
   if(base && base->tag_removed)
     (*base->tag_removed)(gobj(),Glib::unwrap(tag));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/texttagtable.h b/libs/gtkmm2/gtk/gtkmm/texttagtable.h
index 3c8d8215ac..ad88a29b71 100644
--- a/libs/gtkmm2/gtk/gtkmm/texttagtable.h
+++ b/libs/gtkmm2/gtk/gtkmm/texttagtable.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TEXTTAGTABLE_H
 #define _GTKMM_TEXTTAGTABLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -143,12 +144,27 @@ public:
   int get_size() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %tag_changed(const Glib::RefPtr<TextTag>& tag, bool size_changed)</tt>
+   */
+
   Glib::SignalProxy2< void,const Glib::RefPtr<TextTag>&,bool > signal_tag_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %tag_added(const Glib::RefPtr<TextTag>& tag)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<TextTag>& > signal_tag_added();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %tag_removed(const Glib::RefPtr<TextTag>& tag)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<TextTag>& > signal_tag_removed();
 
 
@@ -156,14 +172,20 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_tag_changed(const Glib::RefPtr<TextTag>& tag, bool size_changed);
   virtual void on_tag_added(const Glib::RefPtr<TextTag>& tag);
   virtual void on_tag_removed(const Glib::RefPtr<TextTag>& tag);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/textview.cc b/libs/gtkmm2/gtk/gtkmm/textview.cc
index d4d571371f..53887b9ddc 100644
--- a/libs/gtkmm2/gtk/gtkmm/textview.cc
+++ b/libs/gtkmm2/gtk/gtkmm/textview.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/textview.h>
 #include <gtkmm/private/textview_p.h>
 
@@ -59,22 +60,24 @@ void TextView::scroll_to(const Glib::RefPtr<TextBuffer::Mark>& mark, double with
   gtk_text_view_scroll_to_mark(gobj(), Glib::unwrap(mark), within_margin, TRUE /* use_align */, xalign, yalign);
 }
 
-//deprecated:
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 bool TextView::scroll_to_iter(TextBuffer::iterator& iter, double within_margin)
 {
   return scroll_to(iter, within_margin);
 }
 
-//deprecated:
 void TextView::scroll_to_mark(const Glib::RefPtr<TextBuffer::Mark>& mark, double within_margin)
 {
   scroll_to(mark, within_margin);
 }
-
+  
 void TextView::scroll_mark_onscreen(const Glib::RefPtr<TextBuffer::Mark>& mark)
 {
   scroll_to(mark);
 }
+#endif // GTKMM_DISABLE_DEPRECATED
+
 
 } // namespace Gtk
 
@@ -82,7 +85,8 @@ void TextView::scroll_mark_onscreen(const Glib::RefPtr<TextBuffer::Mark>& mark)
 namespace
 {
 
-void TextView_signal_set_scroll_adjustments_callback(GtkTextView* self, GtkAdjustment* p0,GtkAdjustment* p1,void* data)
+
+static void TextView_signal_set_scroll_adjustments_callback(GtkTextView* self, GtkAdjustment* p0,GtkAdjustment* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Adjustment*,Adjustment* > SlotType;
@@ -90,21 +94,25 @@ void TextView_signal_set_scroll_adjustments_callback(GtkTextView* self, GtkAdjus
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextView_signal_set_scroll_adjustments_info =
+static const Glib::SignalProxyInfo TextView_signal_set_scroll_adjustments_info =
 {
   "set_scroll_adjustments",
   (GCallback) &TextView_signal_set_scroll_adjustments_callback,
@@ -112,7 +120,7 @@ const Glib::SignalProxyInfo TextView_signal_set_scroll_adjustments_info =
 };
 
 
-void TextView_signal_populate_popup_callback(GtkTextView* self, GtkMenu* p0,void* data)
+static void TextView_signal_populate_popup_callback(GtkTextView* self, GtkMenu* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Menu* > SlotType;
@@ -120,20 +128,24 @@ void TextView_signal_populate_popup_callback(GtkTextView* self, GtkMenu* p0,void
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextView_signal_populate_popup_info =
+static const Glib::SignalProxyInfo TextView_signal_populate_popup_info =
 {
   "populate_popup",
   (GCallback) &TextView_signal_populate_popup_callback,
@@ -141,7 +153,7 @@ const Glib::SignalProxyInfo TextView_signal_populate_popup_info =
 };
 
 
-const Glib::SignalProxyInfo TextView_signal_set_anchor_info =
+static const Glib::SignalProxyInfo TextView_signal_set_anchor_info =
 {
   "set_anchor",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -149,7 +161,7 @@ const Glib::SignalProxyInfo TextView_signal_set_anchor_info =
 };
 
 
-void TextView_signal_insert_at_cursor_callback(GtkTextView* self, const gchar* p0,void* data)
+static void TextView_signal_insert_at_cursor_callback(GtkTextView* self, const gchar* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::ustring& > SlotType;
@@ -157,26 +169,31 @@ void TextView_signal_insert_at_cursor_callback(GtkTextView* self, const gchar* p
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::convert_const_gchar_ptr_to_ustring(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TextView_signal_insert_at_cursor_info =
+static const Glib::SignalProxyInfo TextView_signal_insert_at_cursor_info =
 {
   "insert_at_cursor",
   (GCallback) &TextView_signal_insert_at_cursor_callback,
   (GCallback) &TextView_signal_insert_at_cursor_callback
 };
 
+
 } // anonymous namespace
 
 // static
@@ -227,13 +244,21 @@ void TextView_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->set_scroll_adjustments = &set_scroll_adjustments_callback;
   klass->populate_popup = &populate_popup_callback;
   klass->set_anchor = &set_anchor_callback;
   klass->insert_at_cursor = &insert_at_cursor_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void TextView_Class::set_scroll_adjustments_callback(GtkTextView* self, GtkAdjustment* p0, GtkAdjustment* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -246,17 +271,21 @@ void TextView_Class::set_scroll_adjustments_callback(GtkTextView* self, GtkAdjus
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_set_scroll_adjustments(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -269,7 +298,6 @@ void TextView_Class::set_scroll_adjustments_callback(GtkTextView* self, GtkAdjus
       (*base->set_scroll_adjustments)(self, p0, p1);
   }
 }
-
 void TextView_Class::populate_popup_callback(GtkTextView* self, GtkMenu* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -282,16 +310,20 @@ void TextView_Class::populate_popup_callback(GtkTextView* self, GtkMenu* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_populate_popup(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -304,7 +336,6 @@ void TextView_Class::populate_popup_callback(GtkTextView* self, GtkMenu* p0)
       (*base->populate_popup)(self, p0);
   }
 }
-
 void TextView_Class::set_anchor_callback(GtkTextView* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -317,15 +348,19 @@ void TextView_Class::set_anchor_callback(GtkTextView* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_set_anchor();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -338,7 +373,6 @@ void TextView_Class::set_anchor_callback(GtkTextView* self)
       (*base->set_anchor)(self);
   }
 }
-
 void TextView_Class::insert_at_cursor_callback(GtkTextView* self, const gchar* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -351,16 +385,20 @@ void TextView_Class::insert_at_cursor_callback(GtkTextView* self, const gchar* p
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_insert_at_cursor(Glib::convert_const_gchar_ptr_to_ustring(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -373,6 +411,7 @@ void TextView_Class::insert_at_cursor_callback(GtkTextView* self, const gchar* p
       (*base->insert_at_cursor)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* TextView_Class::wrap_new(GObject* o)
@@ -423,27 +462,22 @@ TextView::TextView()
 
 void TextView::set_buffer(const Glib::RefPtr<TextBuffer>& buffer)
 {
-  gtk_text_view_set_buffer(gobj(), Glib::unwrap(buffer));
+gtk_text_view_set_buffer(gobj(), Glib::unwrap(buffer)); 
 }
 
 Glib::RefPtr<TextBuffer> TextView::get_buffer()
 {
 
   Glib::RefPtr<TextBuffer> retvalue = Glib::wrap(gtk_text_view_get_buffer(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TextBuffer> TextView::get_buffer() const
 {
-
-  Glib::RefPtr<const TextBuffer> retvalue = Glib::wrap(gtk_text_view_get_buffer(const_cast<GtkTextView*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<TextView*>(this)->get_buffer();
 }
 
 bool TextView::move_mark_onscreen(const Glib::RefPtr<TextBuffer::Mark>& mark)
@@ -458,12 +492,12 @@ bool TextView::place_cursor_onscreen()
 
 void TextView::get_visible_rect(Gdk::Rectangle& visible_rect) const
 {
-  gtk_text_view_get_visible_rect(const_cast<GtkTextView*>(gobj()), (visible_rect).gobj());
+gtk_text_view_get_visible_rect(const_cast<GtkTextView*>(gobj()), (visible_rect).gobj()); 
 }
 
 void TextView::set_cursor_visible(bool setting)
 {
-  gtk_text_view_set_cursor_visible(gobj(), static_cast<int>(setting));
+gtk_text_view_set_cursor_visible(gobj(), static_cast<int>(setting)); 
 }
 
 bool TextView::get_cursor_visible() const
@@ -473,57 +507,52 @@ bool TextView::get_cursor_visible() const
 
 void TextView::get_iter_location(const TextBuffer::iterator& iter, Gdk::Rectangle& location) const
 {
-  gtk_text_view_get_iter_location(const_cast<GtkTextView*>(gobj()), (iter).gobj(), (location).gobj());
+gtk_text_view_get_iter_location(const_cast<GtkTextView*>(gobj()), (iter).gobj(), (location).gobj()); 
 }
 
 void TextView::get_iter_at_location(TextBuffer::iterator& iter, int x, int y) const
 {
-  gtk_text_view_get_iter_at_location(const_cast<GtkTextView*>(gobj()), (iter).gobj(), x, y);
+gtk_text_view_get_iter_at_location(const_cast<GtkTextView*>(gobj()), (iter).gobj(), x, y); 
 }
 
 void TextView::get_iter_at_position(TextBuffer::iterator& iter, int& trailing, int x, int y) const
 {
-  gtk_text_view_get_iter_at_position(const_cast<GtkTextView*>(gobj()), (iter).gobj(), &trailing, x, y);
+gtk_text_view_get_iter_at_position(const_cast<GtkTextView*>(gobj()), (iter).gobj(), &trailing, x, y); 
 }
 
 void TextView::get_line_yrange(const TextBuffer::iterator& iter, int& y, int& height) const
 {
-  gtk_text_view_get_line_yrange(const_cast<GtkTextView*>(gobj()), (iter).gobj(), &y, &height);
+gtk_text_view_get_line_yrange(const_cast<GtkTextView*>(gobj()), (iter).gobj(), &y, &height); 
 }
 
 void TextView::get_line_at_y(TextBuffer::iterator& target_iter, int y, int& line_top) const
 {
-  gtk_text_view_get_line_at_y(const_cast<GtkTextView*>(gobj()), (target_iter).gobj(), y, &line_top);
+gtk_text_view_get_line_at_y(const_cast<GtkTextView*>(gobj()), (target_iter).gobj(), y, &line_top); 
 }
 
 void TextView::buffer_to_window_coords(TextWindowType win, int buffer_x, int buffer_y, int& window_x, int& window_y) const
 {
-  gtk_text_view_buffer_to_window_coords(const_cast<GtkTextView*>(gobj()), ((GtkTextWindowType)(win)), buffer_x, buffer_y, &window_x, &window_y);
+gtk_text_view_buffer_to_window_coords(const_cast<GtkTextView*>(gobj()), ((GtkTextWindowType)(win)), buffer_x, buffer_y, &window_x, &window_y); 
 }
 
 void TextView::window_to_buffer_coords(TextWindowType win, int window_x, int window_y, int& buffer_x, int& buffer_y) const
 {
-  gtk_text_view_window_to_buffer_coords(const_cast<GtkTextView*>(gobj()), ((GtkTextWindowType)(win)), window_x, window_y, &buffer_x, &buffer_y);
+gtk_text_view_window_to_buffer_coords(const_cast<GtkTextView*>(gobj()), ((GtkTextWindowType)(win)), window_x, window_y, &buffer_x, &buffer_y); 
 }
 
 Glib::RefPtr<Gdk::Window> TextView::get_window(TextWindowType win)
 {
 
   Glib::RefPtr<Gdk::Window> retvalue = Glib::wrap((GdkWindowObject*)(gtk_text_view_get_window(gobj(), ((GtkTextWindowType)(win)))));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Window> TextView::get_window(TextWindowType win) const
 {
-
-  Glib::RefPtr<const Gdk::Window> retvalue = Glib::wrap((GdkWindowObject*)(gtk_text_view_get_window(const_cast<GtkTextView*>(gobj()), ((GtkTextWindowType)(win)))));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<TextView*>(this)->get_window(win);
 }
 
 TextWindowType TextView::get_window_type(const Glib::RefPtr<Gdk::Window>& window)
@@ -533,7 +562,7 @@ TextWindowType TextView::get_window_type(const Glib::RefPtr<Gdk::Window>& window
 
 void TextView::set_border_window_size(TextWindowType type, int size)
 {
-  gtk_text_view_set_border_window_size(gobj(), ((GtkTextWindowType)(type)), size);
+gtk_text_view_set_border_window_size(gobj(), ((GtkTextWindowType)(type)), size); 
 }
 
 int TextView::get_border_window_size(TextWindowType type) const
@@ -573,22 +602,22 @@ bool TextView::move_visually(TextBuffer::iterator& iter, int count)
 
 void TextView::add_child_at_anchor(Widget& child, const Glib::RefPtr<TextBuffer::ChildAnchor>& anchor)
 {
-  gtk_text_view_add_child_at_anchor(gobj(), (child).gobj(), Glib::unwrap(anchor));
+gtk_text_view_add_child_at_anchor(gobj(), (child).gobj(), Glib::unwrap(anchor)); 
 }
 
 void TextView::add_child_in_window(Widget& child, TextWindowType which_window, int xpos, int ypos)
 {
-  gtk_text_view_add_child_in_window(gobj(), (child).gobj(), ((GtkTextWindowType)(which_window)), xpos, ypos);
+gtk_text_view_add_child_in_window(gobj(), (child).gobj(), ((GtkTextWindowType)(which_window)), xpos, ypos); 
 }
 
 void TextView::move_child(Widget& child, int xpos, int ypos)
 {
-  gtk_text_view_move_child(gobj(), (child).gobj(), xpos, ypos);
+gtk_text_view_move_child(gobj(), (child).gobj(), xpos, ypos); 
 }
 
 void TextView::set_wrap_mode(WrapMode wrap_mode)
 {
-  gtk_text_view_set_wrap_mode(gobj(), ((GtkWrapMode)(wrap_mode)));
+gtk_text_view_set_wrap_mode(gobj(), ((GtkWrapMode)(wrap_mode))); 
 }
 
 WrapMode TextView::get_wrap_mode() const
@@ -598,7 +627,7 @@ WrapMode TextView::get_wrap_mode() const
 
 void TextView::set_editable(bool setting)
 {
-  gtk_text_view_set_editable(gobj(), static_cast<int>(setting));
+gtk_text_view_set_editable(gobj(), static_cast<int>(setting)); 
 }
 
 bool TextView::get_editable() const
@@ -608,7 +637,7 @@ bool TextView::get_editable() const
 
 void TextView::set_pixels_above_lines(int pixels_above_lines)
 {
-  gtk_text_view_set_pixels_above_lines(gobj(), pixels_above_lines);
+gtk_text_view_set_pixels_above_lines(gobj(), pixels_above_lines); 
 }
 
 int TextView::get_pixels_above_lines() const
@@ -618,7 +647,7 @@ int TextView::get_pixels_above_lines() const
 
 void TextView::set_pixels_below_lines(int pixels_below_lines)
 {
-  gtk_text_view_set_pixels_below_lines(gobj(), pixels_below_lines);
+gtk_text_view_set_pixels_below_lines(gobj(), pixels_below_lines); 
 }
 
 int TextView::get_pixels_below_lines() const
@@ -628,7 +657,7 @@ int TextView::get_pixels_below_lines() const
 
 void TextView::set_pixels_inside_wrap(int pixels_inside_wrap)
 {
-  gtk_text_view_set_pixels_inside_wrap(gobj(), pixels_inside_wrap);
+gtk_text_view_set_pixels_inside_wrap(gobj(), pixels_inside_wrap); 
 }
 
 int TextView::get_pixels_inside_wrap() const
@@ -638,7 +667,7 @@ int TextView::get_pixels_inside_wrap() const
 
 void TextView::set_justification(Justification justification)
 {
-  gtk_text_view_set_justification(gobj(), ((GtkJustification)(justification)));
+gtk_text_view_set_justification(gobj(), ((GtkJustification)(justification))); 
 }
 
 Justification TextView::get_justification() const
@@ -648,7 +677,7 @@ Justification TextView::get_justification() const
 
 void TextView::set_left_margin(int left_margin)
 {
-  gtk_text_view_set_left_margin(gobj(), left_margin);
+gtk_text_view_set_left_margin(gobj(), left_margin); 
 }
 
 int TextView::get_left_margin() const
@@ -658,7 +687,7 @@ int TextView::get_left_margin() const
 
 void TextView::set_right_margin(int right_margin)
 {
-  gtk_text_view_set_right_margin(gobj(), right_margin);
+gtk_text_view_set_right_margin(gobj(), right_margin); 
 }
 
 int TextView::get_right_margin() const
@@ -668,7 +697,7 @@ int TextView::get_right_margin() const
 
 void TextView::set_indent(int indent)
 {
-  gtk_text_view_set_indent(gobj(), indent);
+gtk_text_view_set_indent(gobj(), indent); 
 }
 
 int TextView::get_indent() const
@@ -678,7 +707,7 @@ int TextView::get_indent() const
 
 void TextView::set_tabs(Pango::TabArray& tabs)
 {
-  gtk_text_view_set_tabs(gobj(), (tabs).gobj());
+gtk_text_view_set_tabs(gobj(), (tabs).gobj()); 
 }
 
 Pango::TabArray TextView::get_tabs() const
@@ -693,7 +722,7 @@ TextAttributes TextView::get_default_attributes() const
 
 void TextView::set_overwrite(bool overwrite)
 {
-  gtk_text_view_set_overwrite(gobj(), static_cast<int>(overwrite));
+gtk_text_view_set_overwrite(gobj(), static_cast<int>(overwrite)); 
 }
 
 bool TextView::get_overwrite() const
@@ -703,7 +732,7 @@ bool TextView::get_overwrite() const
 
 void TextView::set_accepts_tab(bool accepts_tab)
 {
-  gtk_text_view_set_accepts_tab(gobj(), static_cast<int>(accepts_tab));
+gtk_text_view_set_accepts_tab(gobj(), static_cast<int>(accepts_tab)); 
 }
 
 bool TextView::get_accepts_tab() const
@@ -717,163 +746,223 @@ Glib::SignalProxy2< void,Adjustment*,Adjustment* > TextView::signal_set_scroll_a
   return Glib::SignalProxy2< void,Adjustment*,Adjustment* >(this, &TextView_signal_set_scroll_adjustments_info);
 }
 
+
 Glib::SignalProxy1< void,Menu* > TextView::signal_populate_popup()
 {
   return Glib::SignalProxy1< void,Menu* >(this, &TextView_signal_populate_popup_info);
 }
 
+
 Glib::SignalProxy0< void > TextView::signal_set_anchor()
 {
   return Glib::SignalProxy0< void >(this, &TextView_signal_set_anchor_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::ustring& > TextView::signal_insert_at_cursor()
 {
   return Glib::SignalProxy1< void,const Glib::ustring& >(this, &TextView_signal_insert_at_cursor_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextView::property_pixels_above_lines() 
 {
   return Glib::PropertyProxy<int>(this, "pixels-above-lines");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextView::property_pixels_above_lines() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "pixels-above-lines");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextView::property_pixels_below_lines() 
 {
   return Glib::PropertyProxy<int>(this, "pixels-below-lines");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextView::property_pixels_below_lines() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "pixels-below-lines");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextView::property_pixels_inside_wrap() 
 {
   return Glib::PropertyProxy<int>(this, "pixels-inside-wrap");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextView::property_pixels_inside_wrap() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "pixels-inside-wrap");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextView::property_editable() 
 {
   return Glib::PropertyProxy<bool>(this, "editable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextView::property_editable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "editable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<WrapMode> TextView::property_wrap_mode() 
 {
   return Glib::PropertyProxy<WrapMode>(this, "wrap-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<WrapMode> TextView::property_wrap_mode() const
 {
   return Glib::PropertyProxy_ReadOnly<WrapMode>(this, "wrap-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Justification> TextView::property_justification() 
 {
   return Glib::PropertyProxy<Justification>(this, "justification");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Justification> TextView::property_justification() const
 {
   return Glib::PropertyProxy_ReadOnly<Justification>(this, "justification");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextView::property_left_margin() 
 {
   return Glib::PropertyProxy<int>(this, "left-margin");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextView::property_left_margin() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "left-margin");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextView::property_right_margin() 
 {
   return Glib::PropertyProxy<int>(this, "right-margin");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextView::property_right_margin() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "right-margin");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TextView::property_indent() 
 {
   return Glib::PropertyProxy<int>(this, "indent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TextView::property_indent() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "indent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Pango::TabArray> TextView::property_tabs() 
 {
   return Glib::PropertyProxy<Pango::TabArray>(this, "tabs");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Pango::TabArray> TextView::property_tabs() const
 {
   return Glib::PropertyProxy_ReadOnly<Pango::TabArray>(this, "tabs");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextView::property_cursor_visible() 
 {
   return Glib::PropertyProxy<bool>(this, "cursor-visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextView::property_cursor_visible() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "cursor-visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<TextBuffer> > TextView::property_buffer() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<TextBuffer> >(this, "buffer");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TextBuffer> > TextView::property_buffer() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TextBuffer> >(this, "buffer");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextView::property_overwrite() 
 {
   return Glib::PropertyProxy<bool>(this, "overwrite");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextView::property_overwrite() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "overwrite");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TextView::property_accepts_tab() 
 {
   return Glib::PropertyProxy<bool>(this, "accepts-tab");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TextView::property_accepts_tab() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "accepts-tab");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::TextView::on_set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -883,7 +972,6 @@ void Gtk::TextView::on_set_scroll_adjustments(Adjustment* hadjustment, Adjustmen
   if(base && base->set_scroll_adjustments)
     (*base->set_scroll_adjustments)(gobj(),(GtkAdjustment*)Glib::unwrap(hadjustment),(GtkAdjustment*)Glib::unwrap(vadjustment));
 }
-
 void Gtk::TextView::on_populate_popup(Menu* menu)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -893,7 +981,6 @@ void Gtk::TextView::on_populate_popup(Menu* menu)
   if(base && base->populate_popup)
     (*base->populate_popup)(gobj(),(GtkMenu*)Glib::unwrap(menu));
 }
-
 void Gtk::TextView::on_set_anchor()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -903,7 +990,6 @@ void Gtk::TextView::on_set_anchor()
   if(base && base->set_anchor)
     (*base->set_anchor)(gobj());
 }
-
 void Gtk::TextView::on_insert_at_cursor(const Glib::ustring& str)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -913,6 +999,10 @@ void Gtk::TextView::on_insert_at_cursor(const Glib::ustring& str)
   if(base && base->insert_at_cursor)
     (*base->insert_at_cursor)(gobj(),str.c_str());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/textview.h b/libs/gtkmm2/gtk/gtkmm/textview.h
index aee4dc44b7..3053df9248 100644
--- a/libs/gtkmm2/gtk/gtkmm/textview.h
+++ b/libs/gtkmm2/gtk/gtkmm/textview.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TEXTVIEW_H
 #define _GTKMM_TEXTVIEW_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -135,15 +136,21 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment);
   virtual void on_populate_popup(Menu* menu);
   virtual void on_set_anchor();
   virtual void on_insert_at_cursor(const Glib::ustring& str);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -177,19 +184,20 @@ public:
   Glib::RefPtr<const TextBuffer> get_buffer() const;
 
   #ifndef GTKMM_DISABLE_DEPRECATED
+
   /** @deprecated Use scroll_to().
    */                            
   bool scroll_to_iter(TextBuffer::iterator& iter, double within_margin);
 
   /** @deprecated Use scroll_to().
-   */ 
+   */
   void scroll_to_mark(const Glib::RefPtr<TextBuffer::Mark>& mark, double within_margin);
 
   /** @deprecated Use scroll_to()
    */
   void scroll_mark_onscreen(const Glib::RefPtr<TextBuffer::Mark>& mark);
- 
-  #endif //GTKMM_DISABLE_DEPRECATED
+  #endif // GTKMM_DISABLE_DEPRECATED
+
 
   /** Scrolls the TextView so that @a iter is on the screen, by scrolling the minimal distance to get the mark onscreen,
    * possibly not scrolling at all. The effective screen for purposes of this function is reduced by a margin of size
@@ -305,12 +313,16 @@ public:
    * those to buffer coordinates with 
    * window_to_buffer_coords().
    * 
-   * Note that this is diffferent from get_iter_at_location(),
+   * Note that this is different from get_iter_at_location(),
    * which returns cursor locations, i.e. positions <em>between</em>
    * characters.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param iter A Gtk::TextIter.
+   * @param trailing Location to store an integer indicating where
+   * in the grapheme the user clicked. It will either be
+   * zero, or the number of characters in the grapheme. 
+   * 0 represents the trailing edge of the grapheme.
    * @param x X position, in buffer coordinates.
    * @param y Y position, in buffer coordinates.
    */
@@ -653,9 +665,9 @@ public:
   void set_tabs(Pango::TabArray& tabs);
   
   /** Gets the default tabs for @a text_view . Tags in the buffer may
-   * override the defaults. The returned array will be <tt>0</tt> if
+   * override the defaults. The returned array will be empty if
    * "standard" (8-space) tabs are used.
-   * @return Copy of default tab array, or <tt>0</tt> if "standard" tabs are used.
+   * @return Copy of default tab array, or an empty array if "standard" tabs are used.
    */
   Pango::TabArray get_tabs() const;
   
@@ -671,7 +683,7 @@ public:
   
   /** Changes the Gtk::TextView overwrite mode.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param overwrite <tt>true</tt> to turn on overwrite mode, <tt>false</tt> to turn it off.
    */
   void set_overwrite(bool overwrite = true);
@@ -679,7 +691,7 @@ public:
   /** Returns whether the Gtk::TextView is in overwrite mode or not.
    * @return Whether @a text_view  is in overwrite mode or not.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_overwrite() const;
   
@@ -688,7 +700,7 @@ public:
    * is <tt>true</tt> a tab character is inserted. If @a accepts_tab  is <tt>false</tt> the keyboard focus
    * is moved to the next widget in the focus chain.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param accepts_tab <tt>true</tt> if pressing the Tab key should insert a tab character, <tt>false</tt>, if pressing the Tab key should move the keyboard focus.
    */
   void set_accepts_tab(bool accepts_tab = true);
@@ -697,34 +709,57 @@ public:
    * set_accepts_tab().
    * @return <tt>true</tt> if pressing the Tab key inserts a tab character, <tt>false</tt> if pressing the Tab key moves the keyboard focus.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_accepts_tab() const;
     
   
+/**
+   * @par Prototype:
+   * <tt>void %set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment)</tt>
+   */
+
   Glib::SignalProxy2< void,Adjustment*,Adjustment* > signal_set_scroll_adjustments();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %populate_popup(Menu* menu)</tt>
+   */
+
   Glib::SignalProxy1< void,Menu* > signal_populate_popup();
 
 
+/**
+   * @par Prototype:
+   * <tt>void %set_anchor()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_set_anchor();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %insert_at_cursor(const Glib::ustring& str)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::ustring& > signal_insert_at_cursor();
 
   
   //Keybinding signals:
   
   
-  /** Pixels of blank space above paragraphs.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Pixels of blank space above paragraphs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_pixels_above_lines() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Pixels of blank space above paragraphs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -732,15 +767,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_pixels_above_lines() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Pixels of blank space below paragraphs.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Pixels of blank space below paragraphs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_pixels_below_lines() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Pixels of blank space below paragraphs.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -748,15 +787,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_pixels_below_lines() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Pixels of blank space between wrapped lines in a paragraph.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Pixels of blank space between wrapped lines in a paragraph.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_pixels_inside_wrap() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Pixels of blank space between wrapped lines in a paragraph.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -764,15 +807,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_pixels_inside_wrap() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the text can be modified by the user.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the text can be modified by the user.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_editable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the text can be modified by the user.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -780,15 +827,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_editable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether to wrap lines never
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to wrap lines never
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<WrapMode> property_wrap_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether to wrap lines never
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -796,15 +847,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<WrapMode> property_wrap_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Left
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Left
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Justification> property_justification() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Left
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -812,15 +867,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Justification> property_justification() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Width of the left margin in pixels.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Width of the left margin in pixels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_left_margin() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Width of the left margin in pixels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -828,15 +887,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_left_margin() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Width of the right margin in pixels.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Width of the right margin in pixels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_right_margin() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Width of the right margin in pixels.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -844,15 +907,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_right_margin() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Amount to indent the paragraph
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Amount to indent the paragraph
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_indent() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Amount to indent the paragraph
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -860,15 +927,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_indent() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Custom tabs for this text.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Custom tabs for this text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Pango::TabArray> property_tabs() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Custom tabs for this text.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -876,15 +947,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Pango::TabArray> property_tabs() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If the insertion cursor is shown.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If the insertion cursor is shown.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_cursor_visible() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If the insertion cursor is shown.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -892,15 +967,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_cursor_visible() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The buffer which is displayed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The buffer which is displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<TextBuffer> > property_buffer() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The buffer which is displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -908,15 +987,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TextBuffer> > property_buffer() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether entered text overwrites existing contents.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether entered text overwrites existing contents.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_overwrite() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether entered text overwrites existing contents.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -924,15 +1007,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_overwrite() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether Tab will result in a tab character being entered.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether Tab will result in a tab character being entered.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_accepts_tab() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether Tab will result in a tab character being entered.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -940,6 +1027,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_accepts_tab() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -955,6 +1043,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::TextView* wrap(GtkTextView* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_TEXTVIEW_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/toggleaction.cc b/libs/gtkmm2/gtk/gtkmm/toggleaction.cc
index f9892927db..ff78ea03ad 100644
--- a/libs/gtkmm2/gtk/gtkmm/toggleaction.cc
+++ b/libs/gtkmm2/gtk/gtkmm/toggleaction.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/toggleaction.h>
 #include <gtkmm/private/toggleaction_p.h>
 
@@ -54,13 +55,15 @@ Glib::RefPtr<ToggleAction> ToggleAction::create(const Glib::ustring& name, const
 namespace
 {
 
-const Glib::SignalProxyInfo ToggleAction_signal_toggled_info =
+
+static const Glib::SignalProxyInfo ToggleAction_signal_toggled_info =
 {
   "toggled",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -107,10 +110,18 @@ void ToggleAction_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->toggled = &toggled_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void ToggleAction_Class::toggled_callback(GtkToggleAction* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -123,15 +134,19 @@ void ToggleAction_Class::toggled_callback(GtkToggleAction* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_toggled();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -144,6 +159,7 @@ void ToggleAction_Class::toggled_callback(GtkToggleAction* self)
       (*base->toggled)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* ToggleAction_Class::wrap_new(GObject* object)
@@ -200,12 +216,12 @@ Glib::RefPtr<ToggleAction> ToggleAction::create()
 }
 void ToggleAction::toggled()
 {
-  gtk_toggle_action_toggled(gobj());
+gtk_toggle_action_toggled(gobj()); 
 }
 
 void ToggleAction::set_active(bool is_active)
 {
-  gtk_toggle_action_set_active(gobj(), static_cast<int>(is_active));
+gtk_toggle_action_set_active(gobj(), static_cast<int>(is_active)); 
 }
 
 bool ToggleAction::get_active() const
@@ -215,7 +231,7 @@ bool ToggleAction::get_active() const
 
 void ToggleAction::set_draw_as_radio(bool draw_as_radio)
 {
-  gtk_toggle_action_set_draw_as_radio(gobj(), static_cast<int>(draw_as_radio));
+gtk_toggle_action_set_draw_as_radio(gobj(), static_cast<int>(draw_as_radio)); 
 }
 
 bool ToggleAction::get_draw_as_radio() const
@@ -230,17 +246,22 @@ Glib::SignalProxy0< void > ToggleAction::signal_toggled()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ToggleAction::property_draw_as_radio() 
 {
   return Glib::PropertyProxy<bool>(this, "draw-as-radio");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ToggleAction::property_draw_as_radio() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "draw-as-radio");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::ToggleAction::on_toggled()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -250,6 +271,10 @@ void Gtk::ToggleAction::on_toggled()
   if(base && base->toggled)
     (*base->toggled)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/toggleaction.h b/libs/gtkmm2/gtk/gtkmm/toggleaction.h
index b44872026e..ab127fd580 100644
--- a/libs/gtkmm2/gtk/gtkmm/toggleaction.h
+++ b/libs/gtkmm2/gtk/gtkmm/toggleaction.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TOGGLEACTION_H
 #define _GTKMM_TOGGLEACTION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -98,13 +99,13 @@ public:
   
   /** Emits the "toggled" signal on the toggle action.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void toggled();
   
   /** Sets the checked state on the toggle action.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param is_active Whether the action should be checked or not.
    */
   void set_active(bool is_active = true);
@@ -112,13 +113,13 @@ public:
   /** Returns the checked state of the toggle action.
    * @return The checked state of the toggle action
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_active() const;
   
   /** Sets whether the action should have proxies like a radio action.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param draw_as_radio Whether the action should have proxies like a radio 
    * action.
    */
@@ -127,22 +128,30 @@ public:
   /** Returns whether the action should have proxies like a radio action.
    * @return Whether the action should have proxies like a radio action.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_draw_as_radio() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %toggled()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_toggled();
 
 
-  /** Whether the proxies for this action look like radio action proxies.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the proxies for this action look like radio action proxies.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_draw_as_radio() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the proxies for this action look like radio action proxies.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -150,18 +159,25 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_draw_as_radio() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
           
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_toggled();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/togglebutton.cc b/libs/gtkmm2/gtk/gtkmm/togglebutton.cc
index e7600d0406..dd2041018e 100644
--- a/libs/gtkmm2/gtk/gtkmm/togglebutton.cc
+++ b/libs/gtkmm2/gtk/gtkmm/togglebutton.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/togglebutton.h>
 #include <gtkmm/private/togglebutton_p.h>
 
@@ -36,19 +37,27 @@ ToggleButton::ToggleButton(const Glib::ustring& label, bool mnemonic)
   Gtk::Button(Glib::ConstructParams(togglebutton_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), (char*) 0))
 {}
 
+ToggleButton::ToggleButton(const StockID& stock_id)
+:
+  Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
+  Gtk::Button(Glib::ConstructParams(togglebutton_class_.init(), "use_stock",1,"label",stock_id.get_c_str(), (char*) 0))
+{}
+
 } // namespace Gtk
 
 
 namespace
 {
 
-const Glib::SignalProxyInfo ToggleButton_signal_toggled_info =
+
+static const Glib::SignalProxyInfo ToggleButton_signal_toggled_info =
 {
   "toggled",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -93,10 +102,18 @@ void ToggleButton_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->toggled = &toggled_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void ToggleButton_Class::toggled_callback(GtkToggleButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -109,15 +126,19 @@ void ToggleButton_Class::toggled_callback(GtkToggleButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_toggled();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -130,6 +151,7 @@ void ToggleButton_Class::toggled_callback(GtkToggleButton* self)
       (*base->toggled)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* ToggleButton_Class::wrap_new(GObject* o)
@@ -180,7 +202,7 @@ ToggleButton::ToggleButton()
 
 void ToggleButton::set_mode(bool draw_indicator)
 {
-  gtk_toggle_button_set_mode(gobj(), static_cast<int>(draw_indicator));
+gtk_toggle_button_set_mode(gobj(), static_cast<int>(draw_indicator)); 
 }
 
 bool ToggleButton::get_mode() const
@@ -190,7 +212,7 @@ bool ToggleButton::get_mode() const
 
 void ToggleButton::set_active(bool is_active)
 {
-  gtk_toggle_button_set_active(gobj(), static_cast<int>(is_active));
+gtk_toggle_button_set_active(gobj(), static_cast<int>(is_active)); 
 }
 
 bool ToggleButton::get_active() const
@@ -200,7 +222,7 @@ bool ToggleButton::get_active() const
 
 void ToggleButton::set_inconsistent(bool setting)
 {
-  gtk_toggle_button_set_inconsistent(gobj(), static_cast<int>(setting));
+gtk_toggle_button_set_inconsistent(gobj(), static_cast<int>(setting)); 
 }
 
 bool ToggleButton::get_inconsistent() const
@@ -210,7 +232,7 @@ bool ToggleButton::get_inconsistent() const
 
 void ToggleButton::toggled()
 {
-  gtk_toggle_button_toggled(gobj());
+gtk_toggle_button_toggled(gobj()); 
 }
 
 
@@ -220,37 +242,50 @@ Glib::SignalProxy0< void > ToggleButton::signal_toggled()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ToggleButton::property_active() 
 {
   return Glib::PropertyProxy<bool>(this, "active");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ToggleButton::property_active() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "active");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ToggleButton::property_inconsistent() 
 {
   return Glib::PropertyProxy<bool>(this, "inconsistent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ToggleButton::property_inconsistent() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "inconsistent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ToggleButton::property_draw_indicator() 
 {
   return Glib::PropertyProxy<bool>(this, "draw-indicator");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ToggleButton::property_draw_indicator() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "draw-indicator");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::ToggleButton::on_toggled()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -260,6 +295,10 @@ void Gtk::ToggleButton::on_toggled()
   if(base && base->toggled)
     (*base->toggled)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/togglebutton.h b/libs/gtkmm2/gtk/gtkmm/togglebutton.h
index df0da34b34..f4fff2ef09 100644
--- a/libs/gtkmm2/gtk/gtkmm/togglebutton.h
+++ b/libs/gtkmm2/gtk/gtkmm/togglebutton.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TOGGLEBUTTON_H
 #define _GTKMM_TOGGLEBUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -90,12 +91,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_toggled();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -117,13 +124,19 @@ public:
    * to add a widget to this button since it already contains a Gtk::Label
    */
   explicit ToggleButton(const Glib::ustring& label, bool mnemonic = false);
-  
 
+  /** Creates a toggle button containing the image and text from a stock item.
+   * Stock ids have identifiers like Gtk::Stock::OK and Gtk::Stock::APPLY.
+   * @param stock_id The stock item.
+   */
+  explicit ToggleButton(const StockID& stock_id);
+  
+  
   /** Sets whether the button is displayed as a separate indicator and label.
    * You can call this function on a checkbutton or a radiobutton with
    *  @a draw_indicator  = <tt>false</tt> to make the button look like a normal button
    * 
-   * This function only effects instances of classes like Gtk::CheckButton
+   * This function only affects instances of classes like Gtk::CheckButton
    * and Gtk::RadioButton that derive from Gtk::ToggleButton,
    * not instances of Gtk::ToggleButton itself.
    * @param draw_indicator If <tt>true</tt>, draw the button as a separate indicator
@@ -164,18 +177,28 @@ public:
   
   void toggled();
 
+  /** Emitted whenever the toggle tool button changes state.
+   */
   
+/**
+   * @par Prototype:
+   * <tt>void %toggled()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_toggled();
 
 
-  /** If the toggle button should be pressed in or not.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If the toggle button should be pressed in or not.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_active() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If the toggle button should be pressed in or not.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -183,31 +206,39 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_active() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If the toggle button is in an in-between state.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If the toggle button is in an in between state.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_inconsistent() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-/** If the toggle button is in an in-between state.
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** If the toggle button is in an in between state.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_inconsistent() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If the toggle part of the button is displayed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If the toggle part of the button is displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_draw_indicator() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If the toggle part of the button is displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -215,6 +246,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_draw_indicator() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -230,6 +262,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ToggleButton* wrap(GtkToggleButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_TOGGLEBUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/toggletoolbutton.cc b/libs/gtkmm2/gtk/gtkmm/toggletoolbutton.cc
index 3aadab7948..57a80db694 100644
--- a/libs/gtkmm2/gtk/gtkmm/toggletoolbutton.cc
+++ b/libs/gtkmm2/gtk/gtkmm/toggletoolbutton.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/toggletoolbutton.h>
 #include <gtkmm/private/toggletoolbutton_p.h>
 
@@ -50,13 +51,15 @@ ToggleToolButton::ToggleToolButton(Widget& icon_widget, const Glib::ustring& lab
 namespace
 {
 
-const Glib::SignalProxyInfo ToggleToolButton_signal_toggled_info =
+
+static const Glib::SignalProxyInfo ToggleToolButton_signal_toggled_info =
 {
   "toggled",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -101,10 +104,18 @@ void ToggleToolButton_Class::class_init_function(void* g_class, void* class_data
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->toggled = &toggled_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void ToggleToolButton_Class::toggled_callback(GtkToggleToolButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -117,15 +128,19 @@ void ToggleToolButton_Class::toggled_callback(GtkToggleToolButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_toggled();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -138,6 +153,7 @@ void ToggleToolButton_Class::toggled_callback(GtkToggleToolButton* self)
       (*base->toggled)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* ToggleToolButton_Class::wrap_new(GObject* o)
@@ -195,7 +211,7 @@ ToggleToolButton::ToggleToolButton(const Gtk::StockID& stock_id)
 
 void ToggleToolButton::set_active(bool is_active)
 {
-  gtk_toggle_tool_button_set_active(gobj(), static_cast<int>(is_active));
+gtk_toggle_tool_button_set_active(gobj(), static_cast<int>(is_active)); 
 }
 
 bool ToggleToolButton::get_active() const
@@ -210,6 +226,7 @@ Glib::SignalProxy0< void > ToggleToolButton::signal_toggled()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::ToggleToolButton::on_toggled()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -219,6 +236,10 @@ void Gtk::ToggleToolButton::on_toggled()
   if(base && base->toggled)
     (*base->toggled)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/toggletoolbutton.h b/libs/gtkmm2/gtk/gtkmm/toggletoolbutton.h
index 331d65976e..f9f5936a8d 100644
--- a/libs/gtkmm2/gtk/gtkmm/toggletoolbutton.h
+++ b/libs/gtkmm2/gtk/gtkmm/toggletoolbutton.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TOGGLETOOLBUTTON_H
 #define _GTKMM_TOGGLETOOLBUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -89,12 +90,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_toggled();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -135,7 +142,7 @@ public:
    * want the GtkToggleButton to be 'pressed in', and <tt>false</tt> to raise it.
    * This action causes the toggled signal to be emitted.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param is_active Whether @a button  should be active.
    */
   void set_active(bool is_active = true);
@@ -144,11 +151,16 @@ public:
    * Returns <tt>true</tt> if the toggle button is pressed in and <tt>false</tt> if it is raised.
    * @return <tt>true</tt> if the toggle tool button is pressed in, <tt>false</tt> if not
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_active() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %toggled()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_toggled();
 
 
@@ -165,6 +177,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ToggleToolButton* wrap(GtkToggleToolButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_TOGGLETOOLBUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/toolbar.cc b/libs/gtkmm2/gtk/gtkmm/toolbar.cc
index 8e51d70501..8a802bbc3f 100644
--- a/libs/gtkmm2/gtk/gtkmm/toolbar.cc
+++ b/libs/gtkmm2/gtk/gtkmm/toolbar.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/toolbar.h>
 #include <gtkmm/private/toolbar_p.h>
 
@@ -30,7 +31,7 @@
 //but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
 //In future, this GTK_DISABLE_DEPRECATED might be inappropriate because it might cover extra GTK+ API. Just remove it then.
 
-// #define GTK_DISABLE_DEPRECATED
+#define GTK_DISABLE_DEPRECATED
 
 #include <glib.h>
 #include <gtkmm/button.h>
@@ -103,7 +104,8 @@ void Toolbar::unset_drop_highlight_item()
 namespace
 {
 
-void Toolbar_signal_orientation_changed_callback(GtkToolbar* self, GtkOrientation p0,void* data)
+
+static void Toolbar_signal_orientation_changed_callback(GtkToolbar* self, GtkOrientation p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Orientation > SlotType;
@@ -111,20 +113,24 @@ void Toolbar_signal_orientation_changed_callback(GtkToolbar* self, GtkOrientatio
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(((Orientation)(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Toolbar_signal_orientation_changed_info =
+static const Glib::SignalProxyInfo Toolbar_signal_orientation_changed_info =
 {
   "orientation_changed",
   (GCallback) &Toolbar_signal_orientation_changed_callback,
@@ -132,7 +138,7 @@ const Glib::SignalProxyInfo Toolbar_signal_orientation_changed_info =
 };
 
 
-void Toolbar_signal_toolbar_style_changed_callback(GtkToolbar* self, GtkToolbarStyle p0,void* data)
+static void Toolbar_signal_toolbar_style_changed_callback(GtkToolbar* self, GtkToolbarStyle p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,ToolbarStyle > SlotType;
@@ -140,20 +146,24 @@ void Toolbar_signal_toolbar_style_changed_callback(GtkToolbar* self, GtkToolbarS
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(((ToolbarStyle)(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Toolbar_signal_toolbar_style_changed_info =
+static const Glib::SignalProxyInfo Toolbar_signal_toolbar_style_changed_info =
 {
   "style_changed",
   (GCallback) &Toolbar_signal_toolbar_style_changed_callback,
@@ -161,7 +171,7 @@ const Glib::SignalProxyInfo Toolbar_signal_toolbar_style_changed_info =
 };
 
 
-gboolean Toolbar_signal_popup_context_menu_callback(GtkToolbar* self, gint p0,gint p1,gint p2,void* data)
+static gboolean Toolbar_signal_popup_context_menu_callback(GtkToolbar* self, gint p0,gint p1,gint p2,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,int,int,int > SlotType;
@@ -169,25 +179,29 @@ gboolean Toolbar_signal_popup_context_menu_callback(GtkToolbar* self, gint p0,gi
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0
 , p1
 , p2
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Toolbar_signal_popup_context_menu_notify_callback(GtkToolbar* self, gint p0,gint p1,gint p2, void* data)
+static gboolean Toolbar_signal_popup_context_menu_notify_callback(GtkToolbar* self, gint p0,gint p1,gint p2, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,int,int,int > SlotType;
@@ -195,31 +209,36 @@ gboolean Toolbar_signal_popup_context_menu_notify_callback(GtkToolbar* self, gin
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 , p1
 , p2
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Toolbar_signal_popup_context_menu_info =
+static const Glib::SignalProxyInfo Toolbar_signal_popup_context_menu_info =
 {
   "popup_context_menu",
   (GCallback) &Toolbar_signal_popup_context_menu_callback,
   (GCallback) &Toolbar_signal_popup_context_menu_notify_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -264,12 +283,20 @@ void Toolbar_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->orientation_changed = &orientation_changed_callback;
   klass->style_changed = &style_changed_callback;
   klass->popup_context_menu = &popup_context_menu_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Toolbar_Class::orientation_changed_callback(GtkToolbar* self, GtkOrientation p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -282,16 +309,20 @@ void Toolbar_Class::orientation_changed_callback(GtkToolbar* self, GtkOrientatio
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_orientation_changed(((Orientation)(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -304,7 +335,6 @@ void Toolbar_Class::orientation_changed_callback(GtkToolbar* self, GtkOrientatio
       (*base->orientation_changed)(self, p0);
   }
 }
-
 void Toolbar_Class::style_changed_callback(GtkToolbar* self, GtkToolbarStyle p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -317,16 +347,20 @@ void Toolbar_Class::style_changed_callback(GtkToolbar* self, GtkToolbarStyle p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_toolbar_style_changed(((ToolbarStyle)(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -339,7 +373,6 @@ void Toolbar_Class::style_changed_callback(GtkToolbar* self, GtkToolbarStyle p0)
       (*base->style_changed)(self, p0);
   }
 }
-
 gboolean Toolbar_Class::popup_context_menu_callback(GtkToolbar* self, gint p0, gint p1, gint p2)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -352,18 +385,22 @@ gboolean Toolbar_Class::popup_context_menu_callback(GtkToolbar* self, gint p0, g
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_popup_context_menu(p0
 , p1
 , p2
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -379,6 +416,7 @@ gboolean Toolbar_Class::popup_context_menu_callback(GtkToolbar* self, gint p0, g
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Toolbar_Class::wrap_new(GObject* o)
@@ -429,7 +467,7 @@ Toolbar::Toolbar()
 
 void Toolbar::insert(ToolItem& item, int pos)
 {
-  gtk_toolbar_insert(gobj(), (item).gobj(), pos);
+gtk_toolbar_insert(gobj(), (item).gobj(), pos); 
 }
 
 int Toolbar::get_item_index(const ToolItem& item) const
@@ -449,7 +487,7 @@ ToolItem* Toolbar::get_nth_item(int n)
 
 const ToolItem* Toolbar::get_nth_item(int n) const
 {
-  return Glib::wrap(gtk_toolbar_get_nth_item(const_cast<GtkToolbar*>(gobj()), n));
+  return const_cast<Toolbar*>(this)->get_nth_item(n);
 }
 
 bool Toolbar::get_show_arrow() const
@@ -459,12 +497,12 @@ bool Toolbar::get_show_arrow() const
 
 void Toolbar::set_show_arrow(bool show_arrow)
 {
-  gtk_toolbar_set_show_arrow(gobj(), static_cast<int>(show_arrow));
+gtk_toolbar_set_show_arrow(gobj(), static_cast<int>(show_arrow)); 
 }
 
 void Toolbar::set_orientation(Orientation orientation)
 {
-  gtk_toolbar_set_orientation(gobj(), ((GtkOrientation)(orientation)));
+gtk_toolbar_set_orientation(gobj(), ((GtkOrientation)(orientation))); 
 }
 
 Orientation Toolbar::get_orientation() const
@@ -474,7 +512,7 @@ Orientation Toolbar::get_orientation() const
 
 void Toolbar::set_toolbar_style(ToolbarStyle style)
 {
-  gtk_toolbar_set_style(gobj(), ((GtkToolbarStyle)(style)));
+gtk_toolbar_set_style(gobj(), ((GtkToolbarStyle)(style))); 
 }
 
 ToolbarStyle Toolbar::get_toolbar_style() const
@@ -484,7 +522,7 @@ ToolbarStyle Toolbar::get_toolbar_style() const
 
 void Toolbar::set_tooltips(bool enable)
 {
-  gtk_toolbar_set_tooltips(gobj(), static_cast<int>(enable));
+gtk_toolbar_set_tooltips(gobj(), static_cast<int>(enable)); 
 }
 
 bool Toolbar::get_tooltips() const
@@ -494,7 +532,7 @@ bool Toolbar::get_tooltips() const
 
 void Toolbar::unset_toolbar_style()
 {
-  gtk_toolbar_unset_style(gobj());
+gtk_toolbar_unset_style(gobj()); 
 }
 
 IconSize Toolbar::get_icon_size() const
@@ -514,62 +552,77 @@ int Toolbar::get_drop_index(int x, int y) const
 
 void Toolbar::set_drop_highlight_item(ToolItem& tool_item, int index)
 {
-  gtk_toolbar_set_drop_highlight_item(gobj(), (tool_item).gobj(), index);
+gtk_toolbar_set_drop_highlight_item(gobj(), (tool_item).gobj(), index); 
 }
 
-Tooltips* Toolbar::get_tooltips_object() const
+ Tooltips* Toolbar::get_tooltips_object() const
 {
   return Glib::wrap(gobj()->tooltips);
 }
-
+ 
 
 Glib::SignalProxy1< void,Orientation > Toolbar::signal_orientation_changed()
 {
   return Glib::SignalProxy1< void,Orientation >(this, &Toolbar_signal_orientation_changed_info);
 }
 
+
 Glib::SignalProxy1< void,ToolbarStyle > Toolbar::signal_toolbar_style_changed()
 {
   return Glib::SignalProxy1< void,ToolbarStyle >(this, &Toolbar_signal_toolbar_style_changed_info);
 }
 
+
 Glib::SignalProxy3< bool,int,int,int > Toolbar::signal_popup_context_menu()
 {
   return Glib::SignalProxy3< bool,int,int,int >(this, &Toolbar_signal_popup_context_menu_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Orientation> Toolbar::property_orientation() 
 {
   return Glib::PropertyProxy<Orientation>(this, "orientation");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Orientation> Toolbar::property_orientation() const
 {
   return Glib::PropertyProxy_ReadOnly<Orientation>(this, "orientation");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ToolbarStyle> Toolbar::property_toolbar_style() 
 {
   return Glib::PropertyProxy<ToolbarStyle>(this, "toolbar-style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ToolbarStyle> Toolbar::property_toolbar_style() const
 {
   return Glib::PropertyProxy_ReadOnly<ToolbarStyle>(this, "toolbar-style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Toolbar::property_show_arrow() 
 {
   return Glib::PropertyProxy<bool>(this, "show-arrow");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Toolbar::property_show_arrow() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "show-arrow");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Toolbar::on_orientation_changed(Orientation orientation)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -579,7 +632,6 @@ void Gtk::Toolbar::on_orientation_changed(Orientation orientation)
   if(base && base->orientation_changed)
     (*base->orientation_changed)(gobj(),((GtkOrientation)(orientation)));
 }
-
 void Gtk::Toolbar::on_toolbar_style_changed(ToolbarStyle style)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -589,7 +641,6 @@ void Gtk::Toolbar::on_toolbar_style_changed(ToolbarStyle style)
   if(base && base->style_changed)
     (*base->style_changed)(gobj(),((GtkToolbarStyle)(style)));
 }
-
 bool Gtk::Toolbar::on_popup_context_menu(int x, int y, int button_number)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -602,6 +653,10 @@ bool Gtk::Toolbar::on_popup_context_menu(int x, int y, int button_number)
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/toolbar.h b/libs/gtkmm2/gtk/gtkmm/toolbar.h
index 8cf6431014..593c7db298 100644
--- a/libs/gtkmm2/gtk/gtkmm/toolbar.h
+++ b/libs/gtkmm2/gtk/gtkmm/toolbar.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TOOLBAR_H
 #define _GTKMM_TOOLBAR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -92,14 +93,20 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_orientation_changed(Orientation orientation);
   virtual void on_toolbar_style_changed(ToolbarStyle style);
   virtual bool on_popup_context_menu(int x, int y, int button_number);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -112,7 +119,7 @@ public:
    * 0 the item is prepended to the start of the toolbar. If @a pos  is
    * negative, the item is appended to the end of the toolbar.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param item A Gtk::ToolItem.
    * @param pos The position of the new item.
    */
@@ -134,40 +141,42 @@ public:
    * @param item A Gtk::ToolItem that is a child of @a toolbar .
    * @return The position of item on the toolbar.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   int get_item_index(const ToolItem& item) const;
   
   /** Returns the number of items on the toolbar.
    * @return The number of items on the toolbar
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   int get_n_items() const;
   
-  /** Returns the @a n &lt;!-- --&gt;'s item on @a toolbar , or <tt>0</tt> if the
+  /** Returns the @a n &lt;!-- --&gt;'th item on @a toolbar , or <tt>0</tt> if the
    * toolbar does not contain an @a n &lt;!-- --&gt;'th item.
    * @param n A position on the toolbar.
    * @return The @a n &lt;!-- --&gt;'th Gtk::ToolItem on @a toolbar , or <tt>0</tt> if there
-   * isn't an @a n &lt;!-- --&gt;th item.
+   * isn't an @a n &lt;!-- --&gt;'th item.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   ToolItem* get_nth_item(int n);
   
-  /** Returns the @a n &lt;!-- --&gt;'s item on @a toolbar , or <tt>0</tt> if the
+  /** Returns the @a n &lt;!-- --&gt;'th item on @a toolbar , or <tt>0</tt> if the
    * toolbar does not contain an @a n &lt;!-- --&gt;'th item.
    * @param n A position on the toolbar.
    * @return The @a n &lt;!-- --&gt;'th Gtk::ToolItem on @a toolbar , or <tt>0</tt> if there
-   * isn't an @a n &lt;!-- --&gt;th item.
+   * isn't an @a n &lt;!-- --&gt;'th item.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const ToolItem* get_nth_item(int n) const;
   
   /** Returns whether the toolbar has an overflow menu.
-   * See set_show_arrow()
-   * @return Since: 2.4.
+   * See set_show_arrow().
+   * @return <tt>true</tt> if the toolbar has an overflow menu.
+   * 
+   * @newin2p4.
    */
   bool get_show_arrow() const;
   
@@ -176,7 +185,7 @@ public:
    * items that there are not room are available through an
    * overflow menu.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param show_arrow Whether to show an overflow menu.
    */
   void set_show_arrow(bool show_arrow = true);
@@ -225,7 +234,7 @@ public:
    */
   void unset_toolbar_style();
   
-  //Note that gtk_toolbar_set_icon_size() is deprecated, bug gtk_toolbar_get_icon_size() is not.
+  //Note that gtk_toolbar_set_icon_size() is deprecated, but gtk_toolbar_get_icon_size() is not.
   
   /** Retrieves the icon size fo the toolbar. See set_icon_size().
    * @return The current icon size for the icons on the toolbar.
@@ -237,7 +246,7 @@ public:
    * Gtk::Button::set_relief().
    * @return The relief style of buttons on @a toolbar .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   ReliefStyle get_relief_style() const;
   
@@ -251,7 +260,7 @@ public:
    * @param y Y coordinate of a point on the toolbar.
    * @return The position corresponding to the point ( @a x , @a y ) on the toolbar.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   int get_drop_index(int x, int y) const;
   
@@ -265,27 +274,66 @@ public:
    * added to any widget hierarchy or used as highlight item for another
    * toolbar.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param tool_item A Gtk::ToolItem, or <tt>0</tt> to turn of highlighting.
    * @param index A position on @a toolbar .
    */
   void set_drop_highlight_item(ToolItem& tool_item, int index);
   void unset_drop_highlight_item();
 
+  /** Emitted when the orientation of the toolbar changes.
+   *
+   * @param orientation The new Orientation of the toolbar.
+   */
   
+/**
+   * @par Prototype:
+   * <tt>void %orientation_changed(Orientation orientation)</tt>
+   */
+
   Glib::SignalProxy1< void,Orientation > signal_orientation_changed();
 
   
+  /** Emitted when the style of the toolbar changes. 
+   * 
+   * @param @style The new ToolbarStyle of the toolbar.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %toolbar_style_changed(ToolbarStyle style)</tt>
+   */
+
   Glib::SignalProxy1< void,ToolbarStyle > signal_toolbar_style_changed();
 
   
+  /** Emitted when the user right-clicks the toolbar or uses the
+   * keybinding to display a popup menu.
+   *
+   * Application developers should handle this signal if they want
+   * to display a context menu on the toolbar. The context-menu should
+   * appear at the coordinates given by @a x and @a y. The mouse button
+   * number is given by the @a button parameter. If the menu was popped
+   * up using the keybaord, @a button is -1.
+   *
+   * @param x The x coordinate of the point where the menu should appear.
+   * @param y The y coordinate of the point where the menu should appear.
+   * @param button The mouse button the user pressed, or -1
+   * @resultt true if the signal was handled, false if not.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>bool %popup_context_menu(int x, int y, int button_number)</tt>
+   */
+
   Glib::SignalProxy3< bool,int,int,int > signal_popup_context_menu();
 
   
   //This is called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
   
-  Tooltips* get_tooltips_object() const;
-  
+   Tooltips* get_tooltips_object() const;
+   
   //This is probably the same as Container::children().size(), which is deprecated anyway?
   //_MEMBER_GET(num_children, num_children, int, gint)
 
@@ -303,14 +351,17 @@ public:
   //but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
   
     
-  /** The orientation of the toolbar.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The orientation of the toolbar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Orientation> property_orientation() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The orientation of the toolbar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -318,15 +369,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Orientation> property_orientation() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** How to draw the toolbar.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** How to draw the toolbar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ToolbarStyle> property_toolbar_style() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** How to draw the toolbar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -334,15 +389,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ToolbarStyle> property_toolbar_style() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If an arrow should be shown if the toolbar doesn't fit.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If an arrow should be shown if the toolbar doesn't fit.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_show_arrow() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If an arrow should be shown if the toolbar doesn't fit.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -350,6 +409,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_show_arrow() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -365,6 +425,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Toolbar* wrap(GtkToolbar* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_TOOLBAR_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/toolbutton.cc b/libs/gtkmm2/gtk/gtkmm/toolbutton.cc
index 29519767d2..e0ec041c51 100644
--- a/libs/gtkmm2/gtk/gtkmm/toolbutton.cc
+++ b/libs/gtkmm2/gtk/gtkmm/toolbutton.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/toolbutton.h>
 #include <gtkmm/private/toolbutton_p.h>
 
@@ -43,13 +44,15 @@ ToolButton::ToolButton(const Glib::ustring& label)
 namespace
 {
 
-const Glib::SignalProxyInfo ToolButton_signal_clicked_info =
+
+static const Glib::SignalProxyInfo ToolButton_signal_clicked_info =
 {
   "clicked",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -94,10 +97,18 @@ void ToolButton_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->clicked = &clicked_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void ToolButton_Class::clicked_callback(GtkToolButton* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -110,15 +121,19 @@ void ToolButton_Class::clicked_callback(GtkToolButton* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_clicked();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -131,6 +146,7 @@ void ToolButton_Class::clicked_callback(GtkToolButton* self)
       (*base->clicked)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* ToolButton_Class::wrap_new(GObject* o)
@@ -195,7 +211,7 @@ ToolButton::ToolButton(Widget& icon_widget, const Glib::ustring& label)
 
 void ToolButton::set_label(const Glib::ustring& label)
 {
-  gtk_tool_button_set_label(gobj(), label.c_str());
+gtk_tool_button_set_label(gobj(), label.c_str()); 
 }
 
 Glib::ustring ToolButton::get_label() const
@@ -205,7 +221,7 @@ Glib::ustring ToolButton::get_label() const
 
 void ToolButton::set_use_underline(bool use_underline)
 {
-  gtk_tool_button_set_use_underline(gobj(), static_cast<int>(use_underline));
+gtk_tool_button_set_use_underline(gobj(), static_cast<int>(use_underline)); 
 }
 
 bool ToolButton::get_use_underline() const
@@ -215,7 +231,7 @@ bool ToolButton::get_use_underline() const
 
 void ToolButton::set_stock_id(const Gtk::StockID& stock_id)
 {
-  gtk_tool_button_set_stock_id(gobj(), (stock_id).get_c_str());
+gtk_tool_button_set_stock_id(gobj(), (stock_id).get_c_str()); 
 }
 
 Glib::ustring ToolButton::get_stock_id() const
@@ -223,9 +239,19 @@ Glib::ustring ToolButton::get_stock_id() const
   return Glib::convert_const_gchar_ptr_to_ustring(gtk_tool_button_get_stock_id(const_cast<GtkToolButton*>(gobj())));
 }
 
+void ToolButton::set_icon_name(const Glib::ustring& icon_name)
+{
+gtk_tool_button_set_icon_name(gobj(), icon_name.c_str()); 
+}
+
+Glib::ustring ToolButton::get_icon_name() const
+{
+  return Glib::convert_const_gchar_ptr_to_ustring(gtk_tool_button_get_icon_name(const_cast<GtkToolButton*>(gobj())));
+}
+
 void ToolButton::set_icon_widget(Widget& icon_widget)
 {
-  gtk_tool_button_set_icon_widget(gobj(), (icon_widget).gobj());
+gtk_tool_button_set_icon_widget(gobj(), (icon_widget).gobj()); 
 }
 
 Widget* ToolButton::get_icon_widget()
@@ -235,12 +261,12 @@ Widget* ToolButton::get_icon_widget()
 
 const Widget* ToolButton::get_icon_widget() const
 {
-  return Glib::wrap(gtk_tool_button_get_icon_widget(const_cast<GtkToolButton*>(gobj())));
+  return const_cast<ToolButton*>(this)->get_icon_widget();
 }
 
 void ToolButton::set_label_widget(Widget& label_widget)
 {
-  gtk_tool_button_set_label_widget(gobj(), (label_widget).gobj());
+gtk_tool_button_set_label_widget(gobj(), (label_widget).gobj()); 
 }
 
 Widget* ToolButton::get_label_widget()
@@ -250,7 +276,7 @@ Widget* ToolButton::get_label_widget()
 
 const Widget* ToolButton::get_label_widget() const
 {
-  return Glib::wrap(gtk_tool_button_get_label_widget(const_cast<GtkToolButton*>(gobj())));
+  return const_cast<ToolButton*>(this)->get_label_widget();
 }
 
 
@@ -260,57 +286,78 @@ Glib::SignalProxy0< void > ToolButton::signal_clicked()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> ToolButton::property_label() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> ToolButton::property_label() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "label");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ToolButton::property_use_underline() 
 {
   return Glib::PropertyProxy<bool>(this, "use-underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ToolButton::property_use_underline() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "use-underline");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::Widget*> ToolButton::property_label_widget() 
 {
   return Glib::PropertyProxy<Gtk::Widget*>(this, "label-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::Widget*> ToolButton::property_label_widget() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::Widget*>(this, "label-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> ToolButton::property_stock_id() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "stock-id");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> ToolButton::property_stock_id() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "stock-id");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::Widget> ToolButton::property_icon_widget() 
 {
   return Glib::PropertyProxy<Gtk::Widget>(this, "icon-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::Widget> ToolButton::property_icon_widget() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::Widget>(this, "icon-widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::ToolButton::on_clicked()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -320,6 +367,10 @@ void Gtk::ToolButton::on_clicked()
   if(base && base->clicked)
     (*base->clicked)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/toolbutton.h b/libs/gtkmm2/gtk/gtkmm/toolbutton.h
index c4a2622b95..d023ac564f 100644
--- a/libs/gtkmm2/gtk/gtkmm/toolbutton.h
+++ b/libs/gtkmm2/gtk/gtkmm/toolbutton.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TOOLBUTTON_H
 #define _GTKMM_TOOLBUTTON_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -89,12 +90,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_clicked();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -104,7 +111,7 @@ public:
   /** Creates a new ToolButton.
    */
   ToolButton();
-  
+ 
   /** Creates a new ToolButton from a StockID.
    *
    * The ToolButton will be created according to the @a stock_id properties.
@@ -112,7 +119,7 @@ public:
    * @param stock_id The StockID which determines the look of the ToolButton.
    */
   explicit ToolButton(const Gtk::StockID& stock_id);
-  
+
   /** Creates a new ToolButton with a label.
    *
    * The ToolButton will have the label @a label.
@@ -120,7 +127,7 @@ public:
    * @param label The string used to display the label for this ToolButton.
    */
   explicit ToolButton(const Glib::ustring& label);
-  
+
   /** Creates a new ToolButton with an image.
    *
    * The ToolButton will have the label @a label and an image widget @a icon_widget.
@@ -137,7 +144,7 @@ public:
    * is determined by the "stock_id" property. If the "stock_id" property is also
    * <tt>0</tt>, @a button  will not have a label.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param label A string that will be used as label, or <tt>0</tt>.
    */
   void set_label(const Glib::ustring& label);
@@ -147,7 +154,7 @@ public:
    * string is owned by GTK+, and must not be modified or freed.
    * @return The label, or <tt>0</tt>
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_label() const;
   
@@ -160,7 +167,7 @@ public:
    * Labels shown on tool buttons never have mnemonics on them; this property
    * only affects the menu item on the overflow menu.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param use_underline Whether the button label has the form "_Open".
    */
   void set_use_underline(bool use_underline = true);
@@ -170,15 +177,15 @@ public:
    * @return <tt>true</tt> if underscores in the label property are used as
    * mnemonics on menu items on the overflow menu.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_use_underline() const;
   
-  /** Sets the name of the stock item. See new_from_stock().
-   * The stock_id property only has an effect if not
-   * overridden by non-<tt>0</tt> "label" and "icon_widget" properties.
+  /** Sets the name of the stock item. See the ToolButton::ToolButton(const Gtk::StockID& stock_id, IconSize size) constructor.
+   *     The stock_id property only has an effect if not
+   *     overridden by "label" and "icon_widget" properties.
    * 
-   * Since: 2.4
+   *     @a newin2p4 
    * @param stock_id A name of a stock item, or <tt>0</tt>.
    */
   void set_stock_id(const Gtk::StockID& stock_id);
@@ -187,15 +194,35 @@ public:
    * The returned string is owned by GTK+ and must not be freed or modifed.
    * @return The name of the stock item for @a button .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_stock_id() const;
   
+  /** Sets the icon for the tool button from a named themed icon.
+   * See the docs for Gtk::IconTheme for more details.
+   * The "icon_name" property only has an effect if not
+   * overridden by non-<tt>0</tt> "label", "icon_widget" and "stock_id"
+   * properties.
+   * 
+   * @newin2p8
+   * @param icon_name The name of the themed icon.
+   */
+  void set_icon_name(const Glib::ustring& icon_name);
+  
+  /** Returns the name of the themed icon for the tool button,
+   * see set_icon_name().
+   * @return The icon name or <tt>0</tt> if the tool button has
+   * no themed icon
+   * 
+   * @newin2p8.
+   */
+  Glib::ustring get_icon_name() const;
+  
   /** Sets @a icon  as the widget used as icon on @a button . If @a icon_widget  is
    * <tt>0</tt> the icon is determined by the "stock_id" property. If the
    * "stock_id" property is also <tt>0</tt>, @a button  will not have an icon.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param icon_widget The widget used as icon, or <tt>0</tt>.
    */
   void set_icon_widget(Widget& icon_widget);
@@ -204,7 +231,7 @@ public:
    * set_icon_widget().
    * @return The widget used as icon on @a button , or <tt>0</tt>.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Widget* get_icon_widget();
   
@@ -212,7 +239,7 @@ public:
    * set_icon_widget().
    * @return The widget used as icon on @a button , or <tt>0</tt>.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const Widget* get_icon_widget() const;
   
@@ -222,7 +249,7 @@ public:
    * determined by the "stock_id" property is used as label. If
    * "stock_id" is also <tt>0</tt>, @a button  does not have a label.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param label_widget The widget used as label, or <tt>0</tt>.
    */
   void set_label_widget(Widget& label_widget);
@@ -231,7 +258,7 @@ public:
    * set_label_widget().
    * @return The widget used as label on @a button , or <tt>0</tt>.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Widget* get_label_widget();
   
@@ -239,22 +266,34 @@ public:
    * set_label_widget().
    * @return The widget used as label on @a button , or <tt>0</tt>.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const Widget* get_label_widget() const;
 
+ /** This signal is emitted when the tool button is clicked with the mouse
+  * or activated with the keyboard.
+  * @deprecated This is an "action" key-binding signal that you should rarely need to use.
+  */
   
+/**
+   * @par Prototype:
+   * <tt>void %clicked()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_clicked();
 
 
-  /** Text to show in the item.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Text to show in the item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_label() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Text to show in the item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -262,15 +301,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_label() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If set
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_use_underline() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If set
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -278,15 +321,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_use_underline() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Widget to use as the item label.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Widget to use as the item label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gtk::Widget*> property_label_widget() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Widget to use as the item label.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -294,15 +341,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gtk::Widget*> property_label_widget() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The stock icon displayed on the item.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The stock icon displayed on the item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_stock_id() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The stock icon displayed on the item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -310,15 +361,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_stock_id() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Icon widget to display in the item.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Icon widget to display in the item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gtk::Widget> property_icon_widget() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Icon widget to display in the item.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -326,6 +381,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gtk::Widget> property_icon_widget() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
               
 
 };
@@ -341,6 +397,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ToolButton* wrap(GtkToolButton* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_TOOLBUTTON_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/toolitem.cc b/libs/gtkmm2/gtk/gtkmm/toolitem.cc
index bc9e5dbc98..ed0936164c 100644
--- a/libs/gtkmm2/gtk/gtkmm/toolitem.cc
+++ b/libs/gtkmm2/gtk/gtkmm/toolitem.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/toolitem.h>
 #include <gtkmm/private/toolitem_p.h>
 
@@ -37,7 +38,8 @@ namespace Gtk
 namespace
 {
 
-gboolean ToolItem_signal_create_menu_proxy_callback(GtkToolItem* self, void* data)
+
+static gboolean ToolItem_signal_create_menu_proxy_callback(GtkToolItem* self, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool > SlotType;
@@ -45,22 +47,26 @@ gboolean ToolItem_signal_create_menu_proxy_callback(GtkToolItem* self, void* dat
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean ToolItem_signal_create_menu_proxy_notify_callback(GtkToolItem* self,  void* data)
+static gboolean ToolItem_signal_create_menu_proxy_notify_callback(GtkToolItem* self,  void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void > SlotType;
@@ -68,22 +74,26 @@ gboolean ToolItem_signal_create_menu_proxy_notify_callback(GtkToolItem* self,  v
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo ToolItem_signal_create_menu_proxy_info =
+static const Glib::SignalProxyInfo ToolItem_signal_create_menu_proxy_info =
 {
   "create_menu_proxy",
   (GCallback) &ToolItem_signal_create_menu_proxy_callback,
@@ -91,7 +101,7 @@ const Glib::SignalProxyInfo ToolItem_signal_create_menu_proxy_info =
 };
 
 
-const Glib::SignalProxyInfo ToolItem_signal_toolbar_reconfigured_info =
+static const Glib::SignalProxyInfo ToolItem_signal_toolbar_reconfigured_info =
 {
   "toolbar_reconfigured",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -99,7 +109,7 @@ const Glib::SignalProxyInfo ToolItem_signal_toolbar_reconfigured_info =
 };
 
 
-gboolean ToolItem_signal_set_tooltip_callback(GtkToolItem* self, GtkTooltips* p0,const gchar* p1,const gchar* p2,void* data)
+static gboolean ToolItem_signal_set_tooltip_callback(GtkToolItem* self, GtkTooltips* p0,const gchar* p1,const gchar* p2,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,Tooltips*,const Glib::ustring&,const Glib::ustring& > SlotType;
@@ -107,25 +117,29 @@ gboolean ToolItem_signal_set_tooltip_callback(GtkToolItem* self, GtkTooltips* p0
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::convert_const_gchar_ptr_to_ustring(p1)
 , Glib::convert_const_gchar_ptr_to_ustring(p2)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean ToolItem_signal_set_tooltip_notify_callback(GtkToolItem* self, GtkTooltips* p0,const gchar* p1,const gchar* p2, void* data)
+static gboolean ToolItem_signal_set_tooltip_notify_callback(GtkToolItem* self, GtkTooltips* p0,const gchar* p1,const gchar* p2, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Tooltips*,const Glib::ustring&,const Glib::ustring& > SlotType;
@@ -133,31 +147,36 @@ gboolean ToolItem_signal_set_tooltip_notify_callback(GtkToolItem* self, GtkToolt
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::convert_const_gchar_ptr_to_ustring(p1)
 , Glib::convert_const_gchar_ptr_to_ustring(p2)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo ToolItem_signal_set_tooltip_info =
+static const Glib::SignalProxyInfo ToolItem_signal_set_tooltip_info =
 {
   "set_tooltip",
   (GCallback) &ToolItem_signal_set_tooltip_callback,
   (GCallback) &ToolItem_signal_set_tooltip_notify_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -202,11 +221,19 @@ void ToolItem_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->create_menu_proxy = &create_menu_proxy_callback;
   klass->toolbar_reconfigured = &toolbar_reconfigured_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 gboolean ToolItem_Class::create_menu_proxy_callback(GtkToolItem* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -219,15 +246,19 @@ gboolean ToolItem_Class::create_menu_proxy_callback(GtkToolItem* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_create_menu_proxy());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -243,7 +274,6 @@ gboolean ToolItem_Class::create_menu_proxy_callback(GtkToolItem* self)
   typedef gboolean RType;
   return RType();
 }
-
 void ToolItem_Class::toolbar_reconfigured_callback(GtkToolItem* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -256,15 +286,19 @@ void ToolItem_Class::toolbar_reconfigured_callback(GtkToolItem* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_toolbar_reconfigured();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -277,6 +311,7 @@ void ToolItem_Class::toolbar_reconfigured_callback(GtkToolItem* self)
       (*base->toolbar_reconfigured)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* ToolItem_Class::wrap_new(GObject* o)
@@ -327,7 +362,7 @@ ToolItem::ToolItem()
 
 void ToolItem::set_homogeneous(bool homogeneous)
 {
-  gtk_tool_item_set_homogeneous(gobj(), static_cast<int>(homogeneous));
+gtk_tool_item_set_homogeneous(gobj(), static_cast<int>(homogeneous)); 
 }
 
 bool ToolItem::get_homogeneous() const
@@ -337,7 +372,7 @@ bool ToolItem::get_homogeneous() const
 
 void ToolItem::set_expand(bool expand)
 {
-  gtk_tool_item_set_expand(gobj(), static_cast<int>(expand));
+gtk_tool_item_set_expand(gobj(), static_cast<int>(expand)); 
 }
 
 bool ToolItem::get_expand() const
@@ -347,12 +382,12 @@ bool ToolItem::get_expand() const
 
 void ToolItem::set_tooltip(Tooltips& tooltips, const Glib::ustring& tip_text, const Glib::ustring& tip_private)
 {
-  gtk_tool_item_set_tooltip(gobj(), (tooltips).gobj(), tip_text.c_str(), tip_private.c_str());
+gtk_tool_item_set_tooltip(gobj(), (tooltips).gobj(), tip_text.c_str(), tip_private.c_str()); 
 }
 
 void ToolItem::set_use_drag_window(bool use_drag_window)
 {
-  gtk_tool_item_set_use_drag_window(gobj(), static_cast<int>(use_drag_window));
+gtk_tool_item_set_use_drag_window(gobj(), static_cast<int>(use_drag_window)); 
 }
 
 bool ToolItem::get_use_drag_window() const
@@ -362,7 +397,7 @@ bool ToolItem::get_use_drag_window() const
 
 void ToolItem::set_visible_horizontal(bool visible_horizontal)
 {
-  gtk_tool_item_set_visible_horizontal(gobj(), static_cast<int>(visible_horizontal));
+gtk_tool_item_set_visible_horizontal(gobj(), static_cast<int>(visible_horizontal)); 
 }
 
 bool ToolItem::get_visible_horizontal() const
@@ -372,7 +407,7 @@ bool ToolItem::get_visible_horizontal() const
 
 void ToolItem::set_visible_vertical(bool visible_vertical)
 {
-  gtk_tool_item_set_visible_vertical(gobj(), static_cast<int>(visible_vertical));
+gtk_tool_item_set_visible_vertical(gobj(), static_cast<int>(visible_vertical)); 
 }
 
 bool ToolItem::get_visible_vertical() const
@@ -387,7 +422,7 @@ bool ToolItem::get_is_important() const
 
 void ToolItem::set_is_important(bool is_important)
 {
-  gtk_tool_item_set_is_important(gobj(), static_cast<int>(is_important));
+gtk_tool_item_set_is_important(gobj(), static_cast<int>(is_important)); 
 }
 
 IconSize ToolItem::get_icon_size() const
@@ -417,7 +452,7 @@ Widget* ToolItem::retrieve_proxy_menu_item()
 
 const Widget* ToolItem::retrieve_proxy_menu_item() const
 {
-  return Glib::wrap(gtk_tool_item_retrieve_proxy_menu_item(const_cast<GtkToolItem*>(gobj())));
+  return const_cast<ToolItem*>(this)->retrieve_proxy_menu_item();
 }
 
 Widget* ToolItem::get_proxy_menu_item(const Glib::ustring& menu_item_id)
@@ -427,17 +462,17 @@ Widget* ToolItem::get_proxy_menu_item(const Glib::ustring& menu_item_id)
 
 const Widget* ToolItem::get_proxy_menu_item(const Glib::ustring& menu_item_id) const
 {
-  return Glib::wrap(gtk_tool_item_get_proxy_menu_item(const_cast<GtkToolItem*>(gobj()), menu_item_id.c_str()));
+  return const_cast<ToolItem*>(this)->get_proxy_menu_item(menu_item_id);
 }
 
 void ToolItem::set_proxy_menu_item(const Glib::ustring& menu_item_id, Widget& menu_item)
 {
-  gtk_tool_item_set_proxy_menu_item(gobj(), menu_item_id.c_str(), (menu_item).gobj());
+gtk_tool_item_set_proxy_menu_item(gobj(), menu_item_id.c_str(), (menu_item).gobj()); 
 }
 
 void ToolItem::rebuild_menu()
 {
-  gtk_tool_item_rebuild_menu(gobj());
+gtk_tool_item_rebuild_menu(gobj()); 
 }
 
 
@@ -446,48 +481,63 @@ Glib::SignalProxy0< bool > ToolItem::signal_create_menu_proxy()
   return Glib::SignalProxy0< bool >(this, &ToolItem_signal_create_menu_proxy_info);
 }
 
+
 Glib::SignalProxy0< void > ToolItem::signal_toolbar_reconfigured()
 {
   return Glib::SignalProxy0< void >(this, &ToolItem_signal_toolbar_reconfigured_info);
 }
 
+
 Glib::SignalProxy3< bool,Tooltips*,const Glib::ustring&,const Glib::ustring& > ToolItem::signal_set_tooltip()
 {
   return Glib::SignalProxy3< bool,Tooltips*,const Glib::ustring&,const Glib::ustring& >(this, &ToolItem_signal_set_tooltip_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ToolItem::property_visible_horizontal() 
 {
   return Glib::PropertyProxy<bool>(this, "visible-horizontal");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ToolItem::property_visible_horizontal() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "visible-horizontal");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ToolItem::property_visible_vertical() 
 {
   return Glib::PropertyProxy<bool>(this, "visible-vertical");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ToolItem::property_visible_vertical() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "visible-vertical");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> ToolItem::property_is_important() 
 {
   return Glib::PropertyProxy<bool>(this, "is-important");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> ToolItem::property_is_important() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "is-important");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 bool Gtk::ToolItem::on_create_menu_proxy()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -500,7 +550,6 @@ bool Gtk::ToolItem::on_create_menu_proxy()
   typedef bool RType;
   return RType();
 }
-
 void Gtk::ToolItem::on_toolbar_reconfigured()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -510,6 +559,10 @@ void Gtk::ToolItem::on_toolbar_reconfigured()
   if(base && base->toolbar_reconfigured)
     (*base->toolbar_reconfigured)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/toolitem.h b/libs/gtkmm2/gtk/gtkmm/toolitem.h
index 29b4bf2850..043d59eb58 100644
--- a/libs/gtkmm2/gtk/gtkmm/toolitem.h
+++ b/libs/gtkmm2/gtk/gtkmm/toolitem.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TOOLITEM_H
 #define _GTKMM_TOOLITEM_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -89,13 +90,19 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual bool on_create_menu_proxy();
   virtual void on_toolbar_reconfigured();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -108,7 +115,7 @@ public:
    * homogeneous items. The effect is that all homogeneous items will have
    * the same width as the widest of the items.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param homogeneous Whether @a tool_item  is the same size as other homogeneous items.
    */
   void set_homogeneous(bool homogeneous = true);
@@ -118,7 +125,7 @@ public:
    * @return <tt>true</tt> if the item is the same size as other homogeneous
    * item.s
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_homogeneous() const;
 
@@ -128,7 +135,7 @@ public:
    * effect is that the item gets bigger when the toolbar gets bigger
    * and smaller when the toolbar gets smaller.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param expand Whether @a tool_item  is allocated extra space.
    */
   void set_expand(bool expand = true);
@@ -137,7 +144,7 @@ public:
    * See set_expand().
    * @return <tt>true</tt> if @a tool_item  is allocated extra space.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_expand() const;
 
@@ -146,7 +153,7 @@ public:
    * text to be displayed as tooltip on the item and the private text
    * to be used. See Gtk::Tooltips::set_tip().
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param tooltips The Gtk::Tooltips object to be used.
    * @param tip_text Text to be used as tooltip text for @a tool_item .
    * @param tip_private Text to be used as private tooltip text.
@@ -159,7 +166,7 @@ public:
    * When @a toolitem  has a drag window it will intercept all events,
    * even those that would otherwise be sent to a child of @a toolitem .
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param use_drag_window Whether @a toolitem  has a drag window.
    */
   void set_use_drag_window(bool use_drag_window = true);
@@ -168,14 +175,14 @@ public:
    * set_use_drag_window().
    * @return <tt>true</tt> if @a toolitem  uses a drag window.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_use_drag_window() const;
 
   
   /** Sets whether @a toolitem  is visible when the toolbar is docked horizontally.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param visible_horizontal Whether @a toolitem  is visible when in horizontal mode.
    */
   void set_visible_horizontal(bool visible_horizontal = true);
@@ -185,7 +192,7 @@ public:
    * @return <tt>true</tt> if @a toolitem  is visible on toolbars that are
    * docked horizontally.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_visible_horizontal() const;
 
@@ -195,7 +202,7 @@ public:
    * useful on a vertically docked toolbar. If @a visible_vertical  is <tt>false</tt>
    *  @a toolitem  will not appear on toolbars that are docked vertically.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param visible_vertical Whether @a toolitem  is visible when the toolbar
    * is in vertical mode.
    */
@@ -205,7 +212,7 @@ public:
    * See set_visible_vertical().
    * @return Whether @a toolitem  is visible when the toolbar is docked vertically
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_visible_vertical() const;
 
@@ -214,7 +221,7 @@ public:
    * set_is_important()
    * @return <tt>true</tt> if @a tool_item  is considered important.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_is_important() const;
   
@@ -224,7 +231,7 @@ public:
    * only tool buttons with the "is_important" property set have labels, an
    * effect known as "priority text"
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param is_important Whether the tool item should be considered important.
    */
   void set_is_important(bool is_important = true);
@@ -235,7 +242,7 @@ public:
    * they should use.
    * @return A Gtk::IconSize indicating the icon size used for @a tool_item 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   IconSize get_icon_size () const;
   
@@ -245,7 +252,7 @@ public:
    * @return A Gtk::Orientation indicating the orientation
    * used for @a tool_item 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Orientation get_orientation() const;
   
@@ -271,7 +278,7 @@ public:
    * @return A Gtk::ToolbarStyle indicating the toolbar style used
    * for @a tool_item .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   ToolbarStyle get_toolbar_style() const;
   
@@ -282,7 +289,7 @@ public:
    * @return A Gtk::ReliefStyle indicating the relief style used
    * for @a tool_item .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   ReliefStyle get_relief_style() const;
 
@@ -293,7 +300,7 @@ public:
    * @return The Gtk::MenuItem that is going to appear in the
    * overflow menu for @a tool_item .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Widget* retrieve_proxy_menu_item();
   
@@ -303,7 +310,7 @@ public:
    * @return The Gtk::MenuItem that is going to appear in the
    * overflow menu for @a tool_item .
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const Widget* retrieve_proxy_menu_item() const;
   
@@ -318,7 +325,7 @@ public:
    * @return The Gtk::MenuItem passed to
    * set_proxy_menu_item(), if the @a menu_item_id &lt;!-- --&gt;s match.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Widget* get_proxy_menu_item(const Glib::ustring& menu_item_id);
   
@@ -333,7 +340,7 @@ public:
    * @return The Gtk::MenuItem passed to
    * set_proxy_menu_item(), if the @a menu_item_id &lt;!-- --&gt;s match.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const Widget* get_proxy_menu_item(const Glib::ustring& menu_item_id) const;
   
@@ -341,7 +348,7 @@ public:
    *  @a menu_item_id  is used to identify the caller of this function and
    * should also be used with get_proxy_menu_item().
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param menu_item_id A string used to identify @a menu_item .
    * @param menu_item A Gtk::MenuItem to be used in the overflow menu.
    */
@@ -357,32 +364,97 @@ public:
    * changes what it will do in response to the "create_menu_proxy"
    * signal.
    * 
-   * Since: 2.6
+   * @newin2p6
    */
   void rebuild_menu();
   
+  //TODO: This suggests calling set_proxy_menu_item() with NULL. but the function asserts against that.
+  /** This signal is emitted when the toolbar needs information from @tool_item
+   * about whether the item should appear in the toolbar overflow menu. In
+   * response the tool item should either
+   * <itemizedlist>
+   * <listitem> call set_proxy_menu_item() with a NULL
+   * pointer and return true to indicate that the item should not appear
+   * in the overflow menu
+   * </listitem>
+   * <listitem> call set_proxy_menu_item() with a new menu
+   * item and return true, or 
+   * </listitem>
+   * <listitem> return false to indicate that the signal was not
+   * handled by the item. This means that
+   * the item will not appear in the overflow menu unless a later handler
+   * installs a menu item.
+   * </listitem>
+   * </itemizedlist>
+   *
+   * The toolbar may cache the result of this signal. When the tool item changes
+   * how it will respond to this signal it must call rebuild_menu()
+   * to invalidate the cache and ensure that the toolbar rebuilds its overflow
+   * menu.
+   *
+   * @result true if the signal was handled, false if not
+   */
   
+/**
+   * @par Prototype:
+   * <tt>bool %create_menu_proxy()</tt>
+   */
+
   Glib::SignalProxy0< bool > signal_create_menu_proxy();
 
   
+  /** This signal is emitted when some property of the toolbar that the
+   * item is a child of changes. For custom subclasses of ToolItem,
+   * the default handler of this signal use the functions
+   * <itemizedlist>
+   * <listitem>Toolbar::get_orientation()</listitem>
+   * <listitem>Toolbar::get_style()</listitem>
+   * <listitem>Toolbar::get_icon_size()</listitem>
+   * <listitem>Toolbar::get_relief_style()</listitem>
+   * </itemizedlist>
+   * to find out what the toolbar should look like and change
+   * themselves accordingly.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %toolbar_reconfigured()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_toolbar_reconfigured();
 
 
   //We use no_default_handler for this, because we can not add a new vfunc to 2.5 without breaking ABI.
   //TODO: Remove no_default_handler when we do an ABI-break-with-parallel-install.
+  /** This signal is emitted when the toolitem's tooltip changes.
+   * Application developers can use gtk_tool_item_set_tooltip() to
+   * set the item's tooltip.
+   *
+   * @param tooltips the Tooltips
+   * @param tip_text the tooltip text
+   * @param tip_private the tooltip private text
+   * @result true if the signal was handled, false if not.
+   */
   
+/**
+   * @par Prototype:
+   * <tt>bool %set_tooltip(Tooltips* tooltips, const Glib::ustring& tip_text, const Glib::ustring& tip_private)</tt>
+   */
 
   Glib::SignalProxy3< bool,Tooltips*,const Glib::ustring&,const Glib::ustring& > signal_set_tooltip();
 
   
-  /** Whether the toolbar item is visible when the toolbar is in a horizontal orientation.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the toolbar item is visible when the toolbar is in a horizontal orientation.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_visible_horizontal() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the toolbar item is visible when the toolbar is in a horizontal orientation.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -390,15 +462,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_visible_horizontal() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the toolbar item is visible when the toolbar is in a vertical orientation.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the toolbar item is visible when the toolbar is in a vertical orientation.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_visible_vertical() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the toolbar item is visible when the toolbar is in a vertical orientation.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -406,15 +482,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_visible_vertical() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the toolbar item is considered important. When TRUE
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the toolbar item is considered important. When TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_is_important() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the toolbar item is considered important. When TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -422,6 +502,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_is_important() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -437,6 +518,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::ToolItem* wrap(GtkToolItem* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_TOOLITEM_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/tooltips.cc b/libs/gtkmm2/gtk/gtkmm/tooltips.cc
index 80b1946879..ad6a0b78bb 100644
--- a/libs/gtkmm2/gtk/gtkmm/tooltips.cc
+++ b/libs/gtkmm2/gtk/gtkmm/tooltips.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/tooltips.h>
 #include <gtkmm/private/tooltips_p.h>
 
@@ -91,8 +92,19 @@ void Tooltips_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Tooltips_Class::wrap_new(GObject* o)
 {
@@ -142,17 +154,17 @@ Tooltips::Tooltips()
 
 void Tooltips::enable()
 {
-  gtk_tooltips_enable(gobj());
+gtk_tooltips_enable(gobj()); 
 }
 
 void Tooltips::disable()
 {
-  gtk_tooltips_disable(gobj());
+gtk_tooltips_disable(gobj()); 
 }
 
 void Tooltips::set_tip(Widget& widget, const Glib::ustring& tip_text, const Glib::ustring& tip_private)
 {
-  gtk_tooltips_set_tip(gobj(), (widget).gobj(), tip_text.c_str(), tip_private.c_str());
+gtk_tooltips_set_tip(gobj(), (widget).gobj(), tip_text.c_str(), tip_private.c_str()); 
 }
 
 GtkTooltipsData* Tooltips::data_get(Widget& widget)
@@ -160,12 +172,20 @@ GtkTooltipsData* Tooltips::data_get(Widget& widget)
   return gtk_tooltips_data_get((widget).gobj());
 }
 
+
 void Tooltips::force_window()
 {
-  gtk_tooltips_force_window(gobj());
+gtk_tooltips_force_window(gobj()); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/tooltips.h b/libs/gtkmm2/gtk/gtkmm/tooltips.h
index 277dc72466..4e1614d6cc 100644
--- a/libs/gtkmm2/gtk/gtkmm/tooltips.h
+++ b/libs/gtkmm2/gtk/gtkmm/tooltips.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TOOLTIPS_H
 #define _GTKMM_TOOLTIPS_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -95,11 +96,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -140,6 +147,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Tooltips* wrap(GtkTooltips* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_TOOLTIPS_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treedragdest.cc b/libs/gtkmm2/gtk/gtkmm/treedragdest.cc
index d201fbddea..e899e90376 100644
--- a/libs/gtkmm2/gtk/gtkmm/treedragdest.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treedragdest.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treedragdest.h>
 #include <gtkmm/private/treedragdest_p.h>
 
@@ -74,10 +75,16 @@ void TreeDragDest_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->drag_data_received = &drag_data_received_vfunc_callback;
   klass->row_drop_possible = &row_drop_possible_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 gboolean TreeDragDest_Class::drag_data_received_vfunc_callback(GtkTreeDragDest* self, GtkTreePath* dest, GtkSelectionData* selection_data)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -90,17 +97,21 @@ gboolean TreeDragDest_Class::drag_data_received_vfunc_callback(GtkTreeDragDest*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->drag_data_received_vfunc(Gtk::TreePath(dest, true)
 , SelectionData_WithoutOwnership(selection_data)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -117,7 +128,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean TreeDragDest_Class::row_drop_possible_vfunc_callback(GtkTreeDragDest* self, GtkTreePath* dest_path, GtkSelectionData* selection_data)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -130,17 +140,21 @@ gboolean TreeDragDest_Class::row_drop_possible_vfunc_callback(GtkTreeDragDest* s
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->row_drop_possible_vfunc(Gtk::TreePath(dest_path, true)
 , SelectionData_WithoutOwnership(selection_data)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -157,6 +171,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* TreeDragDest_Class::wrap_new(GObject* object)
@@ -210,6 +228,10 @@ bool TreeDragDest::row_drop_possible(const TreeModel::Path& dest_path, const Sel
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 bool Gtk::TreeDragDest::drag_data_received_vfunc(const TreeModel::Path& dest, const SelectionData& selection_data) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -223,7 +245,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::TreeDragDest::row_drop_possible_vfunc(const TreeModel::Path& dest, const SelectionData& selection_data) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -237,6 +258,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/treedragdest.h b/libs/gtkmm2/gtk/gtkmm/treedragdest.h
index afd98c697c..59b4a8376b 100644
--- a/libs/gtkmm2/gtk/gtkmm/treedragdest.h
+++ b/libs/gtkmm2/gtk/gtkmm/treedragdest.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREEDRAGDEST_H
 #define _GTKMM_TREEDRAGDEST_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -125,20 +126,31 @@ public:
   bool row_drop_possible(const TreeModel::Path& dest_path, const SelectionData& selection_data) const;
                              
 protected:
-    virtual bool drag_data_received_vfunc(const TreeModel::Path& dest, const SelectionData& selection_data);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool drag_data_received_vfunc(const TreeModel::Path& dest, const SelectionData& selection_data);
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
-    virtual bool row_drop_possible_vfunc(const TreeModel::Path& dest, const SelectionData& selection_data) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool row_drop_possible_vfunc(const TreeModel::Path& dest, const SelectionData& selection_data) const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -157,5 +169,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_TREEDRAGDEST_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treedragsource.cc b/libs/gtkmm2/gtk/gtkmm/treedragsource.cc
index 57cbdeb64b..28bb5b1a39 100644
--- a/libs/gtkmm2/gtk/gtkmm/treedragsource.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treedragsource.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treedragsource.h>
 #include <gtkmm/private/treedragsource_p.h>
 
@@ -31,6 +32,7 @@
 namespace Gtk
 {
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 //This vfunc wrapper is manually written, so that we can use a temporary instance for the SelectionData& output parameter:
 
 gboolean TreeDragSource_Class::drag_data_get_vfunc_callback(GtkTreeDragSource* self, GtkTreePath* path, GtkSelectionData* selection_data)
@@ -45,16 +47,20 @@ gboolean TreeDragSource_Class::drag_data_get_vfunc_callback(GtkTreeDragSource* s
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       SelectionData_WithoutOwnership temp_instance(selection_data);
       return static_cast<int>(obj->drag_data_get_vfunc(Gtk::TreePath(path, true), temp_instance));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -85,6 +91,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 } //namespace Gtk
 
@@ -135,11 +142,17 @@ void TreeDragSource_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
     klass->drag_data_get = &drag_data_get_vfunc_callback;
     klass->row_draggable = &row_draggable_vfunc_callback;
   klass->drag_data_delete = &drag_data_delete_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 gboolean TreeDragSource_Class::row_draggable_vfunc_callback(GtkTreeDragSource* self, GtkTreePath* path)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -152,16 +165,20 @@ gboolean TreeDragSource_Class::row_draggable_vfunc_callback(GtkTreeDragSource* s
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->row_draggable_vfunc(Gtk::TreePath(path, true)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -178,7 +195,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 gboolean TreeDragSource_Class::drag_data_delete_vfunc_callback(GtkTreeDragSource* self, GtkTreePath* path)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -191,16 +207,20 @@ gboolean TreeDragSource_Class::drag_data_delete_vfunc_callback(GtkTreeDragSource
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->drag_data_delete_vfunc(Gtk::TreePath(path, true)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -217,6 +237,10 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* TreeDragSource_Class::wrap_new(GObject* object)
@@ -275,6 +299,10 @@ bool TreeDragSource::drag_data_delete(const TreeModel::Path& path)
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
 bool Gtk::TreeDragSource::row_draggable_vfunc(const TreeModel::Path& path) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -288,7 +316,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::TreeDragSource::drag_data_delete_vfunc(const TreeModel::Path& path) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -302,6 +329,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/treedragsource.h b/libs/gtkmm2/gtk/gtkmm/treedragsource.h
index 41bdf732ec..9887fcd00c 100644
--- a/libs/gtkmm2/gtk/gtkmm/treedragsource.h
+++ b/libs/gtkmm2/gtk/gtkmm/treedragsource.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREEDRAGSOURCE_H
 #define _GTKMM_TREEDRAGSOURCE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -132,23 +133,36 @@ public:
 protected:
 
 
-    virtual bool row_draggable_vfunc(const TreeModel::Path& path) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool row_draggable_vfunc(const TreeModel::Path& path) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
-  //We hand-code this so that we can use a temporary instance for teh SelectionData& output parameter:
+  //We hand-code this so that we can use a temporary instance for the SelectionData& output parameter:
+  #ifdef GLIBMM_VFUNCS_ENABLED
   virtual bool drag_data_get_vfunc(const TreeModel::Path& path, SelectionData& selection_data) const;
+  #endif //GLIBMM_VFUNCS_ENABLED
    
-    virtual bool drag_data_delete_vfunc(const TreeModel::Path& path);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool drag_data_delete_vfunc(const TreeModel::Path& path);
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -167,5 +181,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_TREEDRAGSOURCE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treeiter.cc b/libs/gtkmm2/gtk/gtkmm/treeiter.cc
index 8c355c353d..4addfcc9b4 100644
--- a/libs/gtkmm2/gtk/gtkmm/treeiter.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treeiter.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treeiter.h>
 #include <gtkmm/private/treeiter_p.h>
 
@@ -29,7 +30,7 @@ namespace
 {
 
 // This is copied from Totem. In future there might be a version in GTK+ itself - see bug #
-void gtkmm_gtk_tree_model_iter_previous(GtkTreeModel* tree_model, GtkTreeIter* iter)
+static void gtkmm_gtk_tree_model_iter_previous(GtkTreeModel* tree_model, GtkTreeIter* iter)
 {
   GtkTreePath *const path = gtk_tree_model_get_path(tree_model, iter);
 
@@ -150,8 +151,6 @@ bool TreeIter::equal(const TreeIter& other) const
   // A GtkTreeIter has the same stamp value as its model.
   g_assert(gobject_.stamp == other.gobject_.stamp || is_end_ || other.is_end_);
 
-  //TODO: Allow custom treemodels to provide a different implementation.
-  
   // If all user_data pointers are equal we can assume the iterators to be
   // equal.  This should be safe since GtkTreeIter lacks destroy notification,
   // thus there is no way to attach more data fields to the iterator.
diff --git a/libs/gtkmm2/gtk/gtkmm/treeiter.h b/libs/gtkmm2/gtk/gtkmm/treeiter.h
index 49a639d4cf..df41741ffa 100644
--- a/libs/gtkmm2/gtk/gtkmm/treeiter.h
+++ b/libs/gtkmm2/gtk/gtkmm/treeiter.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREEITER_H
 #define _GTKMM_TREEITER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -304,7 +305,7 @@ public:
    * you do not know the column type at compile-time.
    * If the @a data output argument is of an inappropriate C++ type then this might fail at runtime.
    * @param column The number of the column whose value you want to change.
-   * @retval data An output argument which will contain the value of this column of this row.
+   * @result data An output argument which will contain the value of this column of this row.
    */
   template <class ColumnType>
   void get_value(int column, ColumnType& data) const;
@@ -513,5 +514,6 @@ class Value<Gtk::TreeIterBase> : public Glib::Value_Boxed<Gtk::TreeIterBase>
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_TREEITER_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treemodel.cc b/libs/gtkmm2/gtk/gtkmm/treemodel.cc
index b6989dff58..9997d5cd91 100644
--- a/libs/gtkmm2/gtk/gtkmm/treemodel.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treemodel.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treemodel.h>
 #include <gtkmm/private/treemodel_p.h>
 
@@ -32,54 +33,66 @@
 namespace
 {
 
-gboolean proxy_foreach_iter_callback(GtkTreeModel* model, GtkTreePath*, GtkTreeIter* iter, void* data)
+static gboolean proxy_foreach_iter_callback(GtkTreeModel* model, GtkTreePath*, GtkTreeIter* iter, void* data)
 {
   typedef Gtk::TreeModel::SlotForeachIter SlotType;
   SlotType& slot = *static_cast<SlotType*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     return slot(Gtk::TreeModel::iterator(model, iter));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   return 1;
 }
 
-gboolean proxy_foreach_path_callback(GtkTreeModel*, GtkTreePath* path, GtkTreeIter*, void* data)
+static gboolean proxy_foreach_path_callback(GtkTreeModel*, GtkTreePath* path, GtkTreeIter*, void* data)
 {
   typedef Gtk::TreeModel::SlotForeachPath SlotType;
   SlotType& slot = *static_cast<SlotType*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     return slot(Gtk::TreeModel::Path(path, true));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   return 1;
 }
 
-gboolean proxy_foreach_path_and_iter_callback(GtkTreeModel* model, GtkTreePath* path,
+static gboolean proxy_foreach_path_and_iter_callback(GtkTreeModel* model, GtkTreePath* path,
                                               GtkTreeIter* iter, void* data)
 {
   typedef Gtk::TreeModel::SlotForeachPathAndIter SlotType;
   SlotType& slot = *static_cast<SlotType*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     return slot(Gtk::TreeModel::Path(path, true), Gtk::TreeModel::iterator(model, iter));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   return 1;
 }
@@ -160,6 +173,8 @@ bool TreeModel::iter_is_valid(const iterator& iter) const
   return (!iter.is_end_ && iter.gobj()->stamp != 0);
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+
 // Custom vfunc callbacks, because the C++ vfuncs have different parameters and return types
 // that can not be generated automatically:
 gboolean TreeModel_Class::iter_next_vfunc_callback(GtkTreeModel* self, GtkTreeIter* iter)
@@ -174,8 +189,10 @@ gboolean TreeModel_Class::iter_next_vfunc_callback(GtkTreeModel* self, GtkTreeIt
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       TreeModel::iterator iter_input = TreeModel::iterator(self, iter);
       TreeModel::iterator iter_next( self, iter ); //Copies iter by value.
@@ -186,11 +203,13 @@ gboolean TreeModel_Class::iter_next_vfunc_callback(GtkTreeModel* self, GtkTreeIt
         *iter = *(iter_next.gobj());
 
       return test;
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -245,8 +264,10 @@ gboolean TreeModel_Class::get_iter_vfunc_callback(GtkTreeModel* self, GtkTreeIte
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       Gtk::TreeModel::iterator iter_out(self, iter); //copies the iter by value.
       gboolean test = obj->get_iter_vfunc(Gtk::TreePath(path, true), iter_out);
@@ -256,11 +277,13 @@ gboolean TreeModel_Class::get_iter_vfunc_callback(GtkTreeModel* self, GtkTreeIte
         *iter = *(iter_out.gobj());
 
       return test;
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -308,8 +331,10 @@ gboolean TreeModel_Class::iter_children_vfunc_callback(GtkTreeModel* self, GtkTr
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       Gtk::TreeModel::iterator iter_out(self, iter); //copies the iter by value.
 
@@ -333,11 +358,13 @@ gboolean TreeModel_Class::iter_children_vfunc_callback(GtkTreeModel* self, GtkTr
         *iter = *(iter_out.gobj());
         
       return test;
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -385,8 +412,10 @@ gboolean TreeModel_Class::iter_parent_vfunc_callback(GtkTreeModel* self, GtkTree
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       Gtk::TreeModel::iterator iter_out(self, iter);
       Gtk::TreeModel::iterator child_cpp(self, child);
@@ -397,11 +426,13 @@ gboolean TreeModel_Class::iter_parent_vfunc_callback(GtkTreeModel* self, GtkTree
         *iter = *(iter_out.gobj());
 
       return test;
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -449,8 +480,10 @@ gboolean TreeModel_Class::iter_nth_child_vfunc_callback(GtkTreeModel* self, GtkT
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       Gtk::TreeModel::iterator iter_out(self, iter);
 
@@ -473,11 +506,13 @@ gboolean TreeModel_Class::iter_nth_child_vfunc_callback(GtkTreeModel* self, GtkT
         *iter = *(iter_out.gobj());
 
       return test;
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -547,8 +582,10 @@ gboolean TreeModel_Class::iter_n_children_vfunc_callback(GtkTreeModel* self, Gtk
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
 
       //Deal with the case that iter is null, as described in the C docs:
@@ -556,11 +593,13 @@ gboolean TreeModel_Class::iter_n_children_vfunc_callback(GtkTreeModel* self, Gtk
         return obj->iter_n_children_vfunc( Gtk::TreeModel::iterator(self, iter) );
       else
         return obj->iter_n_root_children_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -606,6 +645,8 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   return RType();
 }
 
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
 void TreeModel::rows_reordered(const Path& path, const iterator& iter, const Glib::ArrayHandle<int>& new_order)
 {
@@ -613,6 +654,11 @@ void TreeModel::rows_reordered(const Path& path, const iterator& iter, const Gli
   gtk_tree_model_rows_reordered(gobj(), const_cast<GtkTreePath*>((path).gobj()), const_cast<GtkTreeIter*>((iter).gobj()), const_cast<int*>(new_order.data()));
 }
  
+void TreeModel::rows_reordered(const Path& path, const Glib::ArrayHandle<int>& new_order)
+{
+  //The size of the array seems to be based on the known number of children. murrayc.
+  gtk_tree_model_rows_reordered(gobj(), const_cast<GtkTreePath*>((path).gobj()), 0, const_cast<int*>(new_order.data()));
+}
 
 } // namespace Gtk
 
@@ -620,7 +666,8 @@ void TreeModel::rows_reordered(const Path& path, const iterator& iter, const Gli
 namespace
 {
 
-void TreeModel_signal_row_changed_callback(GtkTreeModel* self, GtkTreePath* path,GtkTreeIter* iter,void* data)
+
+static void TreeModel_signal_row_changed_callback(GtkTreeModel* self, GtkTreePath* path,GtkTreeIter* iter,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TreeModel::Path&,const TreeModel::iterator& > SlotType;
@@ -628,21 +675,25 @@ void TreeModel_signal_row_changed_callback(GtkTreeModel* self, GtkTreePath* path
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Gtk::TreePath(path, true)
 , Gtk::TreeModel::iterator(self, iter)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TreeModel_signal_row_changed_info =
+static const Glib::SignalProxyInfo TreeModel_signal_row_changed_info =
 {
   "row_changed",
   (GCallback) &TreeModel_signal_row_changed_callback,
@@ -650,7 +701,7 @@ const Glib::SignalProxyInfo TreeModel_signal_row_changed_info =
 };
 
 
-void TreeModel_signal_row_inserted_callback(GtkTreeModel* self, GtkTreePath* path,GtkTreeIter* iter,void* data)
+static void TreeModel_signal_row_inserted_callback(GtkTreeModel* self, GtkTreePath* path,GtkTreeIter* iter,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TreeModel::Path&,const TreeModel::iterator& > SlotType;
@@ -658,21 +709,25 @@ void TreeModel_signal_row_inserted_callback(GtkTreeModel* self, GtkTreePath* pat
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Gtk::TreePath(path, true)
 , Gtk::TreeModel::iterator(self, iter)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TreeModel_signal_row_inserted_info =
+static const Glib::SignalProxyInfo TreeModel_signal_row_inserted_info =
 {
   "row_inserted",
   (GCallback) &TreeModel_signal_row_inserted_callback,
@@ -680,7 +735,7 @@ const Glib::SignalProxyInfo TreeModel_signal_row_inserted_info =
 };
 
 
-void TreeModel_signal_row_has_child_toggled_callback(GtkTreeModel* self, GtkTreePath* path,GtkTreeIter* iter,void* data)
+static void TreeModel_signal_row_has_child_toggled_callback(GtkTreeModel* self, GtkTreePath* path,GtkTreeIter* iter,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TreeModel::Path&,const TreeModel::iterator& > SlotType;
@@ -688,21 +743,25 @@ void TreeModel_signal_row_has_child_toggled_callback(GtkTreeModel* self, GtkTree
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Gtk::TreePath(path, true)
 , Gtk::TreeModel::iterator(self, iter)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TreeModel_signal_row_has_child_toggled_info =
+static const Glib::SignalProxyInfo TreeModel_signal_row_has_child_toggled_info =
 {
   "row_has_child_toggled",
   (GCallback) &TreeModel_signal_row_has_child_toggled_callback,
@@ -710,7 +769,7 @@ const Glib::SignalProxyInfo TreeModel_signal_row_has_child_toggled_info =
 };
 
 
-void TreeModel_signal_row_deleted_callback(GtkTreeModel* self, GtkTreePath* path,void* data)
+static void TreeModel_signal_row_deleted_callback(GtkTreeModel* self, GtkTreePath* path,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TreeModel::Path& > SlotType;
@@ -718,20 +777,24 @@ void TreeModel_signal_row_deleted_callback(GtkTreeModel* self, GtkTreePath* path
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Gtk::TreePath(path, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TreeModel_signal_row_deleted_info =
+static const Glib::SignalProxyInfo TreeModel_signal_row_deleted_info =
 {
   "row_deleted",
   (GCallback) &TreeModel_signal_row_deleted_callback,
@@ -739,7 +802,7 @@ const Glib::SignalProxyInfo TreeModel_signal_row_deleted_info =
 };
 
 
-void TreeModel_signal_rows_reordered_callback(GtkTreeModel* self, GtkTreePath* path,GtkTreeIter* iter,gint* new_order,void* data)
+static void TreeModel_signal_rows_reordered_callback(GtkTreeModel* self, GtkTreePath* path,GtkTreeIter* iter,gint* new_order,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TreeModel::Path&,const TreeModel::iterator&,int* > SlotType;
@@ -747,28 +810,33 @@ void TreeModel_signal_rows_reordered_callback(GtkTreeModel* self, GtkTreePath* p
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Gtk::TreePath(path, true)
 , Gtk::TreeModel::iterator(self, iter)
 , new_order
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TreeModel_signal_rows_reordered_info =
+static const Glib::SignalProxyInfo TreeModel_signal_rows_reordered_info =
 {
   "rows_reordered",
   (GCallback) &TreeModel_signal_rows_reordered_callback,
   (GCallback) &TreeModel_signal_rows_reordered_callback
 };
 
+
 } // anonymous namespace
 
 // static
@@ -819,6 +887,7 @@ void TreeModel_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->get_flags = &get_flags_vfunc_callback;
   klass->get_n_columns = &get_n_columns_vfunc_callback;
   klass->get_column_type = &get_column_type_vfunc_callback;
@@ -833,13 +902,18 @@ void TreeModel_Class::iface_init_function(void* g_iface, void*)
   klass->unref_node = &unref_node_vfunc_callback;
   klass->get_path = &get_path_vfunc_callback;
   klass->get_value = &get_value_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->row_changed = &row_changed_callback;
   klass->row_inserted = &row_inserted_callback;
   klass->row_has_child_toggled = &row_has_child_toggled_callback;
   klass->row_deleted = &row_deleted_callback;
   klass->rows_reordered = &rows_reordered_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 GtkTreeModelFlags TreeModel_Class::get_flags_vfunc_callback(GtkTreeModel* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -852,15 +926,19 @@ GtkTreeModelFlags TreeModel_Class::get_flags_vfunc_callback(GtkTreeModel* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return ((GtkTreeModelFlags)(obj->get_flags_vfunc()));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -877,7 +955,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef GtkTreeModelFlags RType;
   return RType();
 }
-
 gint TreeModel_Class::get_n_columns_vfunc_callback(GtkTreeModel* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -890,15 +967,19 @@ gint TreeModel_Class::get_n_columns_vfunc_callback(GtkTreeModel* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_n_columns_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -915,7 +996,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gint RType;
   return RType();
 }
-
 GType TreeModel_Class::get_column_type_vfunc_callback(GtkTreeModel* self, gint index)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -928,16 +1008,20 @@ GType TreeModel_Class::get_column_type_vfunc_callback(GtkTreeModel* self, gint i
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return obj->get_column_type_vfunc(index
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -954,7 +1038,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef GType RType;
   return RType();
 }
-
 gboolean TreeModel_Class::iter_has_child_vfunc_callback(GtkTreeModel* self, GtkTreeIter* iter)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -967,16 +1050,20 @@ gboolean TreeModel_Class::iter_has_child_vfunc_callback(GtkTreeModel* self, GtkT
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->iter_has_child_vfunc(Gtk::TreeModel::iterator(self, iter)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -993,7 +1080,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 void TreeModel_Class::ref_node_vfunc_callback(GtkTreeModel* self, GtkTreeIter* iter)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1006,16 +1092,20 @@ void TreeModel_Class::ref_node_vfunc_callback(GtkTreeModel* self, GtkTreeIter* i
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->ref_node_vfunc(Gtk::TreeModel::iterator(self, iter)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1029,7 +1119,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->ref_node)(self, iter);
   }
 }
-
 void TreeModel_Class::unref_node_vfunc_callback(GtkTreeModel* self, GtkTreeIter* iter)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1042,16 +1131,20 @@ void TreeModel_Class::unref_node_vfunc_callback(GtkTreeModel* self, GtkTreeIter*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->unref_node_vfunc(Gtk::TreeModel::iterator(self, iter)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1065,7 +1158,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->unref_node)(self, iter);
   }
 }
-
 GtkTreePath* TreeModel_Class::get_path_vfunc_callback(GtkTreeModel* self, GtkTreeIter* iter)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1078,16 +1170,20 @@ GtkTreePath* TreeModel_Class::get_path_vfunc_callback(GtkTreeModel* self, GtkTre
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return (obj->get_path_vfunc(Gtk::TreeModel::iterator(self, iter)
 )).gobj_copy();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1104,7 +1200,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef GtkTreePath* RType;
   return RType();
 }
-
 void TreeModel_Class::get_value_vfunc_callback(GtkTreeModel* self, GtkTreeIter* iter, gint column, GValue* value)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1117,18 +1212,22 @@ void TreeModel_Class::get_value_vfunc_callback(GtkTreeModel* self, GtkTreeIter*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->get_value_vfunc(Gtk::TreeModel::iterator(self, iter)
 , column
 , *reinterpret_cast<Glib::ValueBase*>(value)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1142,8 +1241,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->get_value)(self, iter, column, value);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void TreeModel_Class::row_changed_callback(GtkTreeModel* self, GtkTreePath* path, GtkTreeIter* iter)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1156,17 +1256,21 @@ void TreeModel_Class::row_changed_callback(GtkTreeModel* self, GtkTreePath* path
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_row_changed(Gtk::TreePath(path, true)
 , Gtk::TreeModel::iterator(self, iter)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1180,7 +1284,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->row_changed)(self, path, iter);
   }
 }
-
 void TreeModel_Class::row_inserted_callback(GtkTreeModel* self, GtkTreePath* path, GtkTreeIter* iter)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1193,17 +1296,21 @@ void TreeModel_Class::row_inserted_callback(GtkTreeModel* self, GtkTreePath* pat
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_row_inserted(Gtk::TreePath(path, true)
 , Gtk::TreeModel::iterator(self, iter)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1217,7 +1324,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->row_inserted)(self, path, iter);
   }
 }
-
 void TreeModel_Class::row_has_child_toggled_callback(GtkTreeModel* self, GtkTreePath* path, GtkTreeIter* iter)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1230,17 +1336,21 @@ void TreeModel_Class::row_has_child_toggled_callback(GtkTreeModel* self, GtkTree
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_row_has_child_toggled(Gtk::TreePath(path, true)
 , Gtk::TreeModel::iterator(self, iter)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1254,7 +1364,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->row_has_child_toggled)(self, path, iter);
   }
 }
-
 void TreeModel_Class::row_deleted_callback(GtkTreeModel* self, GtkTreePath* path)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1267,16 +1376,20 @@ void TreeModel_Class::row_deleted_callback(GtkTreeModel* self, GtkTreePath* path
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_row_deleted(Gtk::TreePath(path, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1290,7 +1403,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->row_deleted)(self, path);
   }
 }
-
 void TreeModel_Class::rows_reordered_callback(GtkTreeModel* self, GtkTreePath* path, GtkTreeIter* iter, gint* new_order)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1303,18 +1415,22 @@ void TreeModel_Class::rows_reordered_callback(GtkTreeModel* self, GtkTreePath* p
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_rows_reordered(Gtk::TreePath(path, true)
 , Gtk::TreeModel::iterator(self, iter)
 , new_order
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1328,6 +1444,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->rows_reordered)(self, path, iter, new_order);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* TreeModel_Class::wrap_new(GObject* object)
@@ -1392,27 +1509,27 @@ TreeModel::Path TreeModel::get_path(const iterator& iter) const
 
 void TreeModel::row_changed(const Path& path, const iterator& iter)
 {
-  gtk_tree_model_row_changed(gobj(), const_cast<GtkTreePath*>((path).gobj()), const_cast<GtkTreeIter*>((iter).gobj()));
+gtk_tree_model_row_changed(gobj(), const_cast<GtkTreePath*>((path).gobj()), const_cast<GtkTreeIter*>((iter).gobj())); 
 }
 
 void TreeModel::row_inserted(const Path& path, const iterator& iter)
 {
-  gtk_tree_model_row_inserted(gobj(), const_cast<GtkTreePath*>((path).gobj()), const_cast<GtkTreeIter*>((iter).gobj()));
+gtk_tree_model_row_inserted(gobj(), const_cast<GtkTreePath*>((path).gobj()), const_cast<GtkTreeIter*>((iter).gobj())); 
 }
 
 void TreeModel::row_has_child_toggled(const Path& path, const iterator& iter)
 {
-  gtk_tree_model_row_has_child_toggled(gobj(), const_cast<GtkTreePath*>((path).gobj()), const_cast<GtkTreeIter*>((iter).gobj()));
+gtk_tree_model_row_has_child_toggled(gobj(), const_cast<GtkTreePath*>((path).gobj()), const_cast<GtkTreeIter*>((iter).gobj())); 
 }
 
 void TreeModel::row_deleted(const Path& path)
 {
-  gtk_tree_model_row_deleted(gobj(), const_cast<GtkTreePath*>((path).gobj()));
+gtk_tree_model_row_deleted(gobj(), const_cast<GtkTreePath*>((path).gobj())); 
 }
 
 void TreeModel::rows_reordered(const Path& path, const iterator& iter, int* new_order)
 {
-  gtk_tree_model_rows_reordered(gobj(), const_cast<GtkTreePath*>((path).gobj()), const_cast<GtkTreeIter*>((iter).gobj()), new_order);
+gtk_tree_model_rows_reordered(gobj(), const_cast<GtkTreePath*>((path).gobj()), const_cast<GtkTreeIter*>((iter).gobj()), new_order); 
 }
 
 Glib::ustring TreeModel::get_string(const iterator& iter) const
@@ -1426,27 +1543,32 @@ Glib::SignalProxy2< void,const TreeModel::Path&,const TreeModel::iterator& > Tre
   return Glib::SignalProxy2< void,const TreeModel::Path&,const TreeModel::iterator& >(this, &TreeModel_signal_row_changed_info);
 }
 
+
 Glib::SignalProxy2< void,const TreeModel::Path&,const TreeModel::iterator& > TreeModel::signal_row_inserted()
 {
   return Glib::SignalProxy2< void,const TreeModel::Path&,const TreeModel::iterator& >(this, &TreeModel_signal_row_inserted_info);
 }
 
+
 Glib::SignalProxy2< void,const TreeModel::Path&,const TreeModel::iterator& > TreeModel::signal_row_has_child_toggled()
 {
   return Glib::SignalProxy2< void,const TreeModel::Path&,const TreeModel::iterator& >(this, &TreeModel_signal_row_has_child_toggled_info);
 }
 
+
 Glib::SignalProxy1< void,const TreeModel::Path& > TreeModel::signal_row_deleted()
 {
   return Glib::SignalProxy1< void,const TreeModel::Path& >(this, &TreeModel_signal_row_deleted_info);
 }
 
+
 Glib::SignalProxy3< void,const TreeModel::Path&,const TreeModel::iterator&,int* > TreeModel::signal_rows_reordered()
 {
   return Glib::SignalProxy3< void,const TreeModel::Path&,const TreeModel::iterator&,int* >(this, &TreeModel_signal_rows_reordered_info);
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::TreeModel::on_row_changed(const TreeModel::Path& path, const TreeModel::iterator& iter)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1457,7 +1579,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->row_changed)
     (*base->row_changed)(gobj(),const_cast<GtkTreePath*>((path).gobj()),const_cast<GtkTreeIter*>((iter).gobj()));
 }
-
 void Gtk::TreeModel::on_row_inserted(const TreeModel::Path& path, const TreeModel::iterator& iter)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1468,7 +1589,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->row_inserted)
     (*base->row_inserted)(gobj(),const_cast<GtkTreePath*>((path).gobj()),const_cast<GtkTreeIter*>((iter).gobj()));
 }
-
 void Gtk::TreeModel::on_row_has_child_toggled(const TreeModel::Path& path, const TreeModel::iterator& iter)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1479,7 +1599,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->row_has_child_toggled)
     (*base->row_has_child_toggled)(gobj(),const_cast<GtkTreePath*>((path).gobj()),const_cast<GtkTreeIter*>((iter).gobj()));
 }
-
 void Gtk::TreeModel::on_row_deleted(const TreeModel::Path& path)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1490,7 +1609,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->row_deleted)
     (*base->row_deleted)(gobj(),const_cast<GtkTreePath*>((path).gobj()));
 }
-
 void Gtk::TreeModel::on_rows_reordered(const TreeModel::Path& path, const TreeModel::iterator& iter, int* new_order)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1501,8 +1619,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->rows_reordered)
     (*base->rows_reordered)(gobj(),const_cast<GtkTreePath*>((path).gobj()),const_cast<GtkTreeIter*>((iter).gobj()),new_order);
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 TreeModelFlags Gtk::TreeModel::get_flags_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1516,7 +1635,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef TreeModelFlags RType;
   return RType();
 }
-
 int Gtk::TreeModel::get_n_columns_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1530,7 +1648,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef int RType;
   return RType();
 }
-
 GType Gtk::TreeModel::get_column_type_vfunc(int index) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1544,7 +1661,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef GType RType;
   return RType();
 }
-
 bool Gtk::TreeModel::iter_has_child_vfunc(const iterator& iter) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1558,7 +1674,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 void Gtk::TreeModel::ref_node_vfunc(const iterator& iter) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1569,7 +1684,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->ref_node)
     (*base->ref_node)(const_cast<GtkTreeModel*>(gobj()),const_cast<GtkTreeIter*>((iter).gobj()));
 }
-
 void Gtk::TreeModel::unref_node_vfunc(const iterator& iter) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1580,7 +1694,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->unref_node)
     (*base->unref_node)(const_cast<GtkTreeModel*>(gobj()),const_cast<GtkTreeIter*>((iter).gobj()));
 }
-
 TreeModel::Path Gtk::TreeModel::get_path_vfunc(const iterator& iter) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1594,7 +1707,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef TreeModel::Path RType;
   return RType();
 }
-
 void Gtk::TreeModel::get_value_vfunc(const iterator& iter, int column, Glib::ValueBase& value) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1605,6 +1717,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->get_value)
     (*base->get_value)(const_cast<GtkTreeModel*>(gobj()),const_cast<GtkTreeIter*>((iter).gobj()),column,(value).gobj());
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/treemodel.h b/libs/gtkmm2/gtk/gtkmm/treemodel.h
index 25e0eb92e3..2ac7940a3f 100644
--- a/libs/gtkmm2/gtk/gtkmm/treemodel.h
+++ b/libs/gtkmm2/gtk/gtkmm/treemodel.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREEMODEL_H
 #define _GTKMM_TREEMODEL_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -342,13 +343,32 @@ public:
    */
   void row_deleted(const Path& path);
 
+ /** Emits the "rows_reordered" signal on the tree model.  This should be called by
+  * custom models when their rows have been reordered. 
+  *
+  * @param path A tree path pointing to the tree node whose children have been reordered.
+  * @param iter A valid iterator pointing to the node whose children have been reordered. See also, rows_reordered(const Path& path, const Glib::ArrayHandle<int>& new_order), if the path has a depth of 0.
+  * @param new_order An array of integers mapping the current position of each child
+  * to its old position before the re-ordering, i.e. @a new_order<literal>[newpos] = oldpos.
+  */
   void rows_reordered(const Path& path, const iterator& iter, const Glib::ArrayHandle<int>& new_order);
+
+ /** Emits the "rows_reordered" signal on the tree model.  This should be called by
+  * custom models when their rows have been reordered. This method overload is for nodes whose 
+  * path has a depth of 0.
+  * @newin2p10
+  *
+  * @param path A tree path pointing to the tree node whose children have been reordered.
+  * @param new_order An array of integers mapping the current position of each child
+  * to its old position before the re-ordering, i.e. @a new_order<literal>[newpos] = oldpos.
+  */
+  void rows_reordered(const Path& path, const Glib::ArrayHandle<int>& new_order);
   
   
   /** Emits the "rows_reordered" signal on @a tree_model .  This should be called by
    * models when their rows have been reordered.
    * @param path A Gtk::TreePath pointing to the tree node whose children have been reordered.
-   * @param iter A valid Gtk::TreeIter pointing to the node whose children have been reordered.
+   * @param iter A valid Gtk::TreeIter pointing to the node whose children have been reordered, or <tt>0</tt> if the depth of @a path  is 0.
    * @param new_order An array of integers mapping the current position of each child
    * to its old position before the re-ordering,
    * i.e. @a new_order <tt>[newpos] = oldpos</tt>.
@@ -359,36 +379,71 @@ public:
   /** Generates a string representation of the iter. This string is a ':'
    * separated list of numbers. For example, "4:10:0:3" would be an
    * acceptable return value for this string.
+   * 
+   *  @a newin2p2 
    * @param iter An Gtk::TreeIter.
    * @return The string.
-   * 
-   * Since: 2.2.
    */
   Glib::ustring get_string(const iterator& iter) const;
 
  
+/**
+   * @par Prototype:
+   * <tt>void %row_changed(const TreeModel::Path& path, const TreeModel::iterator& iter)</tt>
+   */
+
   Glib::SignalProxy2< void,const TreeModel::Path&,const TreeModel::iterator& > signal_row_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %row_inserted(const TreeModel::Path& path, const TreeModel::iterator& iter)</tt>
+   */
+
   Glib::SignalProxy2< void,const TreeModel::Path&,const TreeModel::iterator& > signal_row_inserted();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %row_has_child_toggled(const TreeModel::Path& path, const TreeModel::iterator& iter)</tt>
+   */
+
   Glib::SignalProxy2< void,const TreeModel::Path&,const TreeModel::iterator& > signal_row_has_child_toggled();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %row_deleted(const TreeModel::Path& path)</tt>
+   */
+
   Glib::SignalProxy1< void,const TreeModel::Path& > signal_row_deleted();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %rows_reordered(const TreeModel::Path& path, const TreeModel::iterator& iter, int* new_order)</tt>
+   */
+
   Glib::SignalProxy3< void,const TreeModel::Path&,const TreeModel::iterator&,int* > signal_rows_reordered();
 
 
 protected:
-    virtual TreeModelFlags get_flags_vfunc() const;
-    virtual int get_n_columns_vfunc() const;
-    virtual GType get_column_type_vfunc(int index) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual TreeModelFlags get_flags_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual int get_n_columns_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual GType get_column_type_vfunc(int index) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
   //These are only for deriving new TreeModels, which isn't very common or easy:
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   /** Override and implement this in a derived TreeModel class.
    * Sets @a iter_next to refer to the node following @a iter it at the current level.
    * If there is no next iter, false is returned and iter_next is set to be invalid.
@@ -453,6 +508,7 @@ protected:
    * @result true if the operation was possible.
    */
   virtual bool iter_nth_root_child_vfunc(int n, iterator& iter) const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
   
   /** Override and implement this in a derived TreeModel class.
@@ -461,8 +517,12 @@ protected:
    * @param iter The iterator to test for children.
    * @result true if @a iter has children.
    */
-    virtual bool iter_has_child_vfunc(const iterator& iter) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool iter_has_child_vfunc(const iterator& iter) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   /** Override and implement this in a derived TreeModel class.
    * Returns the number of children that @a iter has.
    * See also iter_n_root_children_vfunc().  
@@ -479,6 +539,7 @@ protected:
    * @result The number of children at the root level.
    */
   virtual int iter_n_root_children_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
   /** Override and implement this in a derived TreeModel class.
    * Lets the tree ref the node.  This is an optional method for models to
@@ -496,7 +557,10 @@ protected:
    *
    * @param iter the iterator.
    */
-    virtual void ref_node_vfunc(const iterator& iter) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void ref_node_vfunc(const iterator& iter) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
   /** Override and implement this in a derived TreeModel class.
    * Lets the tree unref the node.  This is an optional method for models to
@@ -508,7 +572,10 @@ protected:
    *
    * @param iter the iterator.
    */
-    virtual void unref_node_vfunc(const iterator& iter) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void unref_node_vfunc(const iterator& iter) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
   /** Override and implement this in a derived TreeModel class.
    * Returns a Path referenced by @a iter.
@@ -518,7 +585,10 @@ protected:
    */
  
 
-    virtual TreeModel::Path get_path_vfunc(const iterator& iter) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual TreeModel::Path get_path_vfunc(const iterator& iter) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
   /** Override and implement this in a derived TreeModel class.
    * Initializes and sets @a value to that at @a column.
@@ -527,10 +597,13 @@ protected:
    * @param column The column to lookup the value at.
    * @param value An empty Glib:Value to set.
    */
-    virtual void get_value_vfunc(const iterator& iter, int column, Glib::ValueBase& value) const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void get_value_vfunc(const iterator& iter, int column, Glib::ValueBase& value) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
   /** Override and implement this in a derived TreeModel class.
-   * @note This virtual method is <em>deprecated</em>.  If you want to check
+   * @note This virtual method is not recommended.  To check
    * whether an iterator is valid, call TreeStore::iter_is_valid(),
    * ListStore::iter_is_valid() or TreeModelSort::iter_is_valid() directly
    * instead.  Because these methods are intended to be used only for debugging
@@ -565,16 +638,22 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_row_changed(const TreeModel::Path& path, const TreeModel::iterator& iter);
   virtual void on_row_inserted(const TreeModel::Path& path, const TreeModel::iterator& iter);
   virtual void on_row_has_child_toggled(const TreeModel::Path& path, const TreeModel::iterator& iter);
   virtual void on_row_deleted(const TreeModel::Path& path);
   virtual void on_rows_reordered(const TreeModel::Path& path, const TreeModel::iterator& iter, int* new_order);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -593,5 +672,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_TREEMODEL_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treemodelfilter.cc b/libs/gtkmm2/gtk/gtkmm/treemodelfilter.cc
index 08670fb795..e19571acf2 100644
--- a/libs/gtkmm2/gtk/gtkmm/treemodelfilter.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treemodelfilter.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treemodelfilter.h>
 #include <gtkmm/private/treemodelfilter_p.h>
 
@@ -25,110 +26,69 @@
 
 #include <gtk/gtktreemodelfilter.h>
 
-namespace //anonymous
-{
-
-// This Signal Proxy allows the C++ coder to specify
-// a sigc::slot instead of a static function.
-class SignalProxy_Visible
-{
-public:
-  typedef Gtk::TreeModelFilter::SlotVisible SlotType;
-
-  SignalProxy_Visible(const SlotType& slot)
-  : slot_(slot) {}
-
-  ~SignalProxy_Visible();
-
-  static gboolean gtk_callback(GtkTreeModel* model, GtkTreeIter* iter, gpointer data);
-  static void gtk_callback_destroy(void* data);
-
-private:
-  SlotType slot_;
-};
-
-SignalProxy_Visible::~SignalProxy_Visible()
-{}
 
-gboolean SignalProxy_Visible::gtk_callback(GtkTreeModel* model, GtkTreeIter* iter, gpointer data)
+static gboolean SignalProxy_Visible_gtk_callback(GtkTreeModel* model, GtkTreeIter* iter, gpointer data)
 {
-  SignalProxy_Visible *const self = static_cast<SignalProxy_Visible*>(data);
+  Gtk::TreeModelFilter::SlotVisible* the_slot = static_cast<Gtk::TreeModelFilter::SlotVisible*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    return (self->slot_)( Gtk::TreeModel::const_iterator(model, iter) );
+  #endif //GLIBMM_EXCEPTIONS_ENAB
+    return (*the_slot)( Gtk::TreeModel::const_iterator(model, iter) );
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   return FALSE; //An arbitary default, just to avoid the compiler warning.
 }
 
-void SignalProxy_Visible::gtk_callback_destroy(void* data)
+static void SignalProxy_Visible_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_Visible*>(data);
+  delete static_cast<Gtk::TreeModelFilter::SlotVisible*>(data);
 }
 
 
-// This Signal Proxy allows the C++ coder to specify
-// a sigc::slot instead of a static function.
-class SignalProxy_Modify
+static void SignalProxy_Modify_gtk_callback(GtkTreeModel* model, GtkTreeIter* iter, GValue* value, gint column, gpointer data)
 {
-public:
-  typedef Gtk::TreeModelFilter::SlotModify SlotType;
-
-  SignalProxy_Modify(const SlotType& slot)
-  : slot_(slot) {}
-
-  ~SignalProxy_Modify();
-
-  static void gtk_callback(GtkTreeModel* model, GtkTreeIter* iter, GValue* value, gint column, gpointer data);
-  static void gtk_callback_destroy(void* data);
-
-private:
-  SlotType slot_;
-};
-
-SignalProxy_Modify::~SignalProxy_Modify()
-{}
-
-void SignalProxy_Modify::gtk_callback(GtkTreeModel* model, GtkTreeIter* iter, GValue* value, gint column, gpointer data)
-{
-  SignalProxy_Modify *const self = static_cast<SignalProxy_Modify*>(data);
+  Gtk::TreeModelFilter::SlotModify* the_slot = static_cast<Gtk::TreeModelFilter::SlotModify*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     //Initialize the input parameter with the appropriate type for this column.
     //Then the C++ handler can just use operator==() without calling init on the value output arg:
     Glib::ValueBase cppValue;
     GType column_type = gtk_tree_model_get_column_type(model, column);
     cppValue.init(column_type);
     
-    (self->slot_)( Gtk::TreeModel::const_iterator(model, iter), cppValue, column );
+    (*the_slot)( Gtk::TreeModel::const_iterator(model, iter), cppValue, column );
 
     //GTK+ has already done this for us: g_value_init(value, column_type);
 
     //If the C++ handler has inited value with an inappropriate GType, then this will fail,
     //but they should not do that because it makes no sense.
-    g_value_copy(cppValue.gobj() /* source */, value /* destination */);  
+    g_value_copy(cppValue.gobj() /* source */, value /* destination */);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED  
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void SignalProxy_Modify::gtk_callback_destroy(void* data)
+static void SignalProxy_Modify_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_Modify*>(data);
+  delete static_cast<Gtk::TreeModelFilter::SlotModify*>(data);
 }
 
 
-} // anonymous namespace
-
-
 typedef Gtk::TreeModel::Path Path; //So that the generated method implemenations can use this a return type.
 
 namespace Gtk
@@ -150,14 +110,14 @@ TreeModelFilter::TreeModelFilter(const Glib::RefPtr<TreeModel>& child_model, con
 
 void TreeModelFilter::set_visible_func(const SlotVisible& slot)
 {
-  // Create a signal proxy.  A pointer to this will be passed
+  // Create a copy of the slot.  A pointer to this will be passed
   // through the callback's data parameter.  It will be deleted
-  // when SignalProxy_Visible::gtk_callback_destroy() is called.
-  SignalProxy_Visible *const pSignalProxy = new SignalProxy_Visible(slot);
+  // when SignalProxy_Visible_gtk_callback_destroy() is called.
+  SlotVisible* slot_copy = new SlotVisible(slot);
 
   gtk_tree_model_filter_set_visible_func(gobj(),
-      &SignalProxy_Visible::gtk_callback, pSignalProxy,
-      &SignalProxy_Visible::gtk_callback_destroy);
+      &SignalProxy_Visible_gtk_callback, slot_copy,
+      &SignalProxy_Visible_gtk_callback_destroy);
 }
 
 
@@ -187,15 +147,15 @@ TreeModel::iterator TreeModelFilter::convert_iter_to_child_iter(const iterator&
 
 void TreeModelFilter::set_modify_func(const TreeModelColumnRecord& columns, const SlotModify& slot)
 {
-  // Create a signal proxy.  A pointer to this will be passed
+  // Create a copy of the slot.  A pointer to this will be passed
   // through the callback's data parameter.  It will be deleted
-  // when SignalProxy_Modify::gtk_callback_destroy() is called.
-  SignalProxy_Modify *const pSignalProxy = new SignalProxy_Modify(slot);
+  // when SignalProxy_Modify_gtk_callback_destroy() is called.
+  SlotModify* slot_copy = new SlotModify(slot);
 
   gtk_tree_model_filter_set_modify_func(gobj(),
     columns.size(), const_cast<GType*>(columns.types()),
-    &SignalProxy_Modify::gtk_callback, pSignalProxy,
-    &SignalProxy_Modify::gtk_callback_destroy);
+    &SignalProxy_Modify_gtk_callback, slot_copy,
+    &SignalProxy_Modify_gtk_callback_destroy);
 }
 
 void TreeModelFilter::set_value_impl(const iterator& /* row */, int /* column */, const Glib::ValueBase& /* value */)
@@ -256,8 +216,19 @@ void TreeModelFilter_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* TreeModelFilter_Class::wrap_new(GObject* object)
 {
@@ -310,44 +281,47 @@ Glib::RefPtr<TreeModelFilter> TreeModelFilter::create(const Glib::RefPtr<TreeMod
 }
 void TreeModelFilter::set_visible_column(const TreeModelColumnBase& column)
 {
-  gtk_tree_model_filter_set_visible_column(gobj(), (column).index());
+gtk_tree_model_filter_set_visible_column(gobj(), (column).index()); 
 }
 
 void TreeModelFilter::set_visible_column(int column)
 {
-  gtk_tree_model_filter_set_visible_column(gobj(), column);
+gtk_tree_model_filter_set_visible_column(gobj(), column); 
 }
 
 Glib::RefPtr<TreeModel> TreeModelFilter::get_model()
 {
 
   Glib::RefPtr<TreeModel> retvalue = Glib::wrap(gtk_tree_model_filter_get_model(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TreeModel> TreeModelFilter::get_model() const
 {
-
-  Glib::RefPtr<const TreeModel> retvalue = Glib::wrap(gtk_tree_model_filter_get_model(const_cast<GtkTreeModelFilter*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<TreeModelFilter*>(this)->get_model();
 }
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 Path TreeModelFilter::convert_child_path_to_path(const Path& child_path)
 {
   return Gtk::TreePath(gtk_tree_model_filter_convert_child_path_to_path(gobj(), const_cast<GtkTreePath*>((child_path).gobj())), false);
 }
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 Path TreeModelFilter::convert_path_to_child_path(const Path& filter_path)
 {
   return Gtk::TreePath(gtk_tree_model_filter_convert_path_to_child_path(gobj(), const_cast<GtkTreePath*>((filter_path).gobj())), false);
 }
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
 Path TreeModelFilter::convert_child_path_to_path(const Path& child_path) const
 {
   return Gtk::TreePath(gtk_tree_model_filter_convert_child_path_to_path(const_cast<GtkTreeModelFilter*>(gobj()), const_cast<GtkTreePath*>((child_path).gobj())), false);
@@ -360,15 +334,22 @@ Path TreeModelFilter::convert_path_to_child_path(const Path& filter_path) const
 
 void TreeModelFilter::refilter()
 {
-  gtk_tree_model_filter_refilter(gobj());
+gtk_tree_model_filter_refilter(gobj()); 
 }
 
 void TreeModelFilter::clear_cache()
 {
-  gtk_tree_model_filter_clear_cache(gobj());
+gtk_tree_model_filter_clear_cache(gobj()); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treemodelfilter.h b/libs/gtkmm2/gtk/gtkmm/treemodelfilter.h
index 66ddb7dc90..3cd91bf571 100644
--- a/libs/gtkmm2/gtk/gtkmm/treemodelfilter.h
+++ b/libs/gtkmm2/gtk/gtkmm/treemodelfilter.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREEMODELFILTER_H
 #define _GTKMM_TREEMODELFILTER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -158,7 +159,7 @@ public:
    * G::TYPE_BOOLEAN, where <tt>true</tt> means that a row is visible, and <tt>false</tt>
    * if not.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param column A <tt>int</tt> which is the column containing the visible information.
    */
   void set_visible_column(const TreeModelColumnBase& column);
@@ -168,7 +169,7 @@ public:
    * G::TYPE_BOOLEAN, where <tt>true</tt> means that a row is visible, and <tt>false</tt>
    * if not.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param column A <tt>int</tt> which is the column containing the visible information.
    */
   void set_visible_column(int column);
@@ -177,14 +178,14 @@ public:
   /** Returns a pointer to the child model of @a filter .
    * @return A pointer to a Gtk::TreeModel.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<TreeModel> get_model();
   
   /** Returns a pointer to the child model of @a filter .
    * @return A pointer to a Gtk::TreeModel.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<const TreeModel> get_model() const;
 
@@ -204,29 +205,38 @@ public:
 
   //TODO: Remove these deprecated non-const versions when we can break ABI:
   
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /** Converts @a child_path  to a path relative to @a filter . That is, @a child_path 
    * points to a path in the child model. The rerturned path will point to the
    * same row in the filtered model. If @a child_path  isn't a valid path on the
    * child model, then <tt>0</tt> is returned.
+   * @deprecated Use convert_child_path_to_path(const Path& child_path) const
    * @param child_path A Gtk::TreePath to convert.
    * @return A newly allocated Gtk::TreePath, or <tt>0</tt>.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Path convert_child_path_to_path(const Path& child_path);
-  
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /** Converts @a filter_path  to a path on the child model of @a filter . That is,
    *  @a filter_path  points to a location in @a filter . The returned path will
    * point to the same location in the model not being filtered. If @a filter_path 
    * does not point to a location in the child model, <tt>0</tt> is returned.
+   * @deprecated convert_path_to_child_path(const Path& filter_path) const
    * @param filter_path A Gtk::TreePath to convert.
    * @return A newly allocated Gtk::TreePath, or <tt>0</tt>.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Path convert_path_to_child_path(const Path& filter_path);
+#endif // GTKMM_DISABLE_DEPRECATED
+
 
-  
   /** Converts @a child_path  to a path relative to @a filter . That is, @a child_path 
    * points to a path in the child model. The rerturned path will point to the
    * same row in the filtered model. If @a child_path  isn't a valid path on the
@@ -234,7 +244,7 @@ public:
    * @param child_path A Gtk::TreePath to convert.
    * @return A newly allocated Gtk::TreePath, or <tt>0</tt>.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Path convert_child_path_to_path(const Path& child_path) const;
   
@@ -245,7 +255,7 @@ public:
    * @param filter_path A Gtk::TreePath to convert.
    * @return A newly allocated Gtk::TreePath, or <tt>0</tt>.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Path convert_path_to_child_path(const Path& filter_path) const;
 
@@ -253,7 +263,7 @@ public:
   /** Emits ::row_changed for each row in the child model, which causes
    * the filter to re-evaluate whether a row is visible or not.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void refilter();
   
@@ -264,7 +274,7 @@ public:
    * a lot of unreffed access to nodes. As a side effect of this function,
    * all unreffed itters will be invalid.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void clear_cache();
 
@@ -276,11 +286,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/treemodelsort.cc b/libs/gtkmm2/gtk/gtkmm/treemodelsort.cc
index 00964ef5e0..4c0c8e8966 100644
--- a/libs/gtkmm2/gtk/gtkmm/treemodelsort.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treemodelsort.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treemodelsort.h>
 #include <gtkmm/private/treemodelsort_p.h>
 
@@ -124,8 +125,19 @@ void TreeModelSort_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* TreeModelSort_Class::wrap_new(GObject* object)
 {
@@ -183,20 +195,15 @@ Glib::RefPtr<TreeModel> TreeModelSort::get_model()
 {
 
   Glib::RefPtr<TreeModel> retvalue = Glib::wrap(gtk_tree_model_sort_get_model(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TreeModel> TreeModelSort::get_model() const
 {
-
-  Glib::RefPtr<const TreeModel> retvalue = Glib::wrap(gtk_tree_model_sort_get_model(const_cast<GtkTreeModelSort*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<TreeModelSort*>(this)->get_model();
 }
 
 Path TreeModelSort::convert_child_path_to_path(const Path& child_path) const
@@ -211,12 +218,12 @@ Path TreeModelSort::convert_path_to_child_path(const Path& sorted_path) const
 
 void TreeModelSort::reset_default_sort_func()
 {
-  gtk_tree_model_sort_reset_default_sort_func(gobj());
+gtk_tree_model_sort_reset_default_sort_func(gobj()); 
 }
 
 void TreeModelSort::clear_cache()
 {
-  gtk_tree_model_sort_clear_cache(gobj());
+gtk_tree_model_sort_clear_cache(gobj()); 
 }
 
 bool TreeModelSort::iter_is_valid(const iterator& iter) const
@@ -225,6 +232,13 @@ bool TreeModelSort::iter_is_valid(const iterator& iter) const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treemodelsort.h b/libs/gtkmm2/gtk/gtkmm/treemodelsort.h
index fd56c18d29..1b0f861c50 100644
--- a/libs/gtkmm2/gtk/gtkmm/treemodelsort.h
+++ b/libs/gtkmm2/gtk/gtkmm/treemodelsort.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREEMODELSORT_H
 #define _GTKMM_TREEMODELSORT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -44,6 +45,22 @@ namespace Gtk
 {
 
 /** A wrapper which makes an underlying Gtk::TreeModel sortable.
+ *
+ * The TreeModelSort is a model which implements the TreeSortable interface. 
+ * It does not hold any data itself, but rather is created with
+ * a child model and proxies its data.  It has identical column types to
+ * this child model, and the changes in the child are propagated.  The
+ * primary purpose of this model is to provide a way to sort a different
+ * model without modifying it. Note that the sort function used by
+ * TreeModelSort is not guaranteed to be stable. 
+ *
+ * For instance, you might create two TreeView widgets each with a
+ * view of the same data.  If the model is wrapped by a
+ * TreeModelSort then the two TreeViews can each sort their
+ * view of the data without affecting the other.  By contrast, if we
+ * simply put the same model in each widget, then sorting the first would
+ * sort the second.
+ *
  * @ingroup TreeView
  */
 
@@ -113,8 +130,8 @@ public:
   
   /** Converts @a child_path  to a path relative to @a tree_model_sort .  That is,
    *  @a child_path  points to a path in the child model.  The returned path will
-   * point to the same row in the sorted model.  If @a child_path  isn't a valid path
-   * on the child model, then <tt>0</tt> is returned.
+   * point to the same row in the sorted model.  If @a child_path  isn't a valid 
+   * path on the child model, then <tt>0</tt> is returned.
    * @param child_path A Gtk::TreePath to convert.
    * @return A newly allocated Gtk::TreePath, or <tt>0</tt>.
    */
@@ -128,10 +145,11 @@ public:
   iterator convert_child_iter_to_iter(const iterator& child_iter) const;
 
   
-  /** Converts @a sorted_path  to a path on the child model of @a tree_model_sort .  That
-   * is, @a sorted_path  points to a location in @a tree_model_sort .  The returned path
-   * will point to the same location in the model not being sorted.  If @a sorted_path  
-   * does not point to a location in the child model, <tt>0</tt> is returned.
+  /** Converts @a sorted_path  to a path on the child model of @a tree_model_sort .  
+   * That is, @a sorted_path  points to a location in @a tree_model_sort .  The 
+   * returned path will point to the same location in the model not being 
+   * sorted.  If @a sorted_path  does not point to a location in the child model, 
+   * <tt>0</tt> is returned.
    * @param sorted_path A Gtk::TreePath to convert.
    * @return A newly allocated Gtk::TreePath, or <tt>0</tt>.
    */
@@ -162,14 +180,15 @@ public:
   void clear_cache();
 
   
-  /** WARNING: This function is slow. Only use it for debugging and/or testing
-   * purposes.
+  /** &lt;warning&gt;
+   * This function is slow. Only use it for debugging and/or testing purposes.
+   * &lt;/warning&gt;
    * 
    * Checks if the given iter is a valid iter for this Gtk::TreeModelSort.
    * @param iter A Gtk::TreeIter.
    * @return <tt>true</tt> if the iter is valid, <tt>false</tt> if the iter is invalid.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   bool iter_is_valid(const iterator& iter) const;
 
@@ -181,11 +200,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/treepath.cc b/libs/gtkmm2/gtk/gtkmm/treepath.cc
index a84164113a..937c14ce28 100644
--- a/libs/gtkmm2/gtk/gtkmm/treepath.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treepath.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treepath.h>
 #include <gtkmm/private/treepath_p.h>
 
@@ -137,7 +138,8 @@ bool TreePath::set_in_selection_data(SelectionData& selection_data, const Glib::
   return gtk_tree_set_row_drag_data(selection_data.gobj(), const_cast<GtkTreeModel*>(model->gobj()), const_cast<GtkTreePath*>(gobj()));  
 }
 
-//deprecated:
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 Glib::ArrayHandle<int> TreePath::get_indices() const
 {
   // gtk_tree_path_get_indices() returns a pointer to an internal array,
@@ -147,6 +149,8 @@ Glib::ArrayHandle<int> TreePath::get_indices() const
                                 gtk_tree_path_get_depth(gobject_),
                                 Glib::OWNERSHIP_NONE);
 }
+#endif // GTKMM_DISABLE_DEPRECATED
+
   
 } // namespace Gtk
 
@@ -223,17 +227,17 @@ GtkTreePath* TreePath::gobj_copy() const
 
 void TreePath::push_back(int index)
 {
-  gtk_tree_path_append_index(gobj(), index);
+gtk_tree_path_append_index(gobj(), index); 
 }
 
 void TreePath::push_front(int index)
 {
-  gtk_tree_path_prepend_index(gobj(), index);
+gtk_tree_path_prepend_index(gobj(), index); 
 }
 
 void TreePath::next()
 {
-  gtk_tree_path_next(gobj());
+gtk_tree_path_next(gobj()); 
 }
 
 bool TreePath::prev()
@@ -248,7 +252,7 @@ bool TreePath::up()
 
 void TreePath::down()
 {
-  gtk_tree_path_down(gobj());
+gtk_tree_path_down(gobj()); 
 }
 
 bool TreePath::is_ancestor(const TreePath& descendant) const
@@ -298,21 +302,33 @@ bool operator>=(const TreePath& lhs, const TreePath& rhs)
 }
 
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void TreePath::append_index(int index)
 {
-  gtk_tree_path_append_index(gobj(), index);
+gtk_tree_path_append_index(gobj(), index); 
 }
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void TreePath::prepend_index(int index)
 {
-  gtk_tree_path_prepend_index(gobj(), index);
+gtk_tree_path_prepend_index(gobj(), index); 
 }
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 int TreePath::get_depth() const
 {
   return gtk_tree_path_get_depth(const_cast<GtkTreePath*>(gobj()));
 }
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
 
 } // namespace Gtk
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treepath.h b/libs/gtkmm2/gtk/gtkmm/treepath.h
index 8e41e81284..dff5b457d9 100644
--- a/libs/gtkmm2/gtk/gtkmm/treepath.h
+++ b/libs/gtkmm2/gtk/gtkmm/treepath.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREEPATH_H
 #define _GTKMM_TREEPATH_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -205,31 +206,43 @@ public:
 
 
 #ifndef GTKMM_DISABLE_DEPRECATED
-  /// @deprecated replaced by push_back():
-  
+
   /** Appends a new index to a path.  As a result, the depth of the path is
    * increased.
+   * @deprecated replaced by push_back()
    * @param index The index.
    */
   void append_index(int index);
-  /// @deprecated replaced by push_front():
-  
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /** Prepends a new index to a path.  As a result, the depth of the path is
    * increased.
+   * @deprecated replaced by push_front().
    * @param index The index.
    */
   void prepend_index(int index);
-  /// @deprecated replaced by size():
-  
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /** Returns the current depth of @a path .
+   * @deprecated replaced by size().
    * @return The depth of @a path .
    */
   int get_depth() const;
-  
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /// @deprecated replaced by begin(), end(), and operator[]
   Glib::ArrayHandle<int> get_indices() const;
-#endif
-  
+#endif // GTKMM_DISABLE_DEPRECATED
+
   
   /**
    * Obtains a Gtk::TreeModel and Gtk::TreeModel::Path from selection data of target type
@@ -398,5 +411,6 @@ class Value<Gtk::TreePath> : public Glib::Value_Boxed<Gtk::TreePath>
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_TREEPATH_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treerowreference.cc b/libs/gtkmm2/gtk/gtkmm/treerowreference.cc
index 591323f942..3aa677fef9 100644
--- a/libs/gtkmm2/gtk/gtkmm/treerowreference.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treerowreference.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treerowreference.h>
 #include <gtkmm/private/treerowreference_p.h>
 
@@ -117,6 +118,16 @@ TreeModel::Path TreeRowReference::get_path() const
   return Gtk::TreePath(gtk_tree_row_reference_get_path(const_cast<GtkTreeRowReference*>(gobj())), false);
 }
 
+Glib::RefPtr<TreeModel> TreeRowReference::get_model()
+{
+  return Glib::wrap(gtk_tree_row_reference_get_model(gobj()));
+}
+
+Glib::RefPtr<const TreeModel> TreeRowReference::get_model() const
+{
+  return const_cast<TreeRowReference*>(this)->get_model();
+}
+
 bool TreeRowReference::is_valid() const
 {
   return gtk_tree_row_reference_valid(const_cast<GtkTreeRowReference*>(gobj()));
diff --git a/libs/gtkmm2/gtk/gtkmm/treerowreference.h b/libs/gtkmm2/gtk/gtkmm/treerowreference.h
index 034981d478..640addf509 100644
--- a/libs/gtkmm2/gtk/gtkmm/treerowreference.h
+++ b/libs/gtkmm2/gtk/gtkmm/treerowreference.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREEROWREFERENCE_H
 #define _GTKMM_TREEROWREFERENCE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -92,6 +93,23 @@ public:
   TreeModel::Path get_path() const;
 
   
+  /** Returns the model which @a reference  is monitoring in order to appropriately
+   * the path.
+   * @return The model, or <tt>0</tt>.
+   * 
+   * @newin2p8.
+   */
+  Glib::RefPtr<TreeModel> get_model();
+  
+  /** Returns the model which @a reference  is monitoring in order to appropriately
+   * the path.
+   * @return The model, or <tt>0</tt>.
+   * 
+   * @newin2p8.
+   */
+  Glib::RefPtr<const TreeModel> get_model() const;
+
+  
   /** Returns <tt>true</tt> if the %reference is non-<tt>0</tt> and refers to a current valid
    * path.
    * @return <tt>true</tt> if %reference points to a valid path.
@@ -134,5 +152,6 @@ class Value<Gtk::TreeRowReference> : public Glib::Value_Boxed<Gtk::TreeRowRefere
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_TREEROWREFERENCE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treeselection.cc b/libs/gtkmm2/gtk/gtkmm/treeselection.cc
index 6a6ffffdcc..5c7ab95564 100644
--- a/libs/gtkmm2/gtk/gtkmm/treeselection.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treeselection.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treeselection.h>
 #include <gtkmm/private/treeselection_p.h>
 
@@ -27,88 +28,78 @@
 #include <gtk/gtktreeselection.h>
 
 
-namespace
-{
-
-void proxy_foreach_selection_iter_callback(GtkTreeModel* model, GtkTreePath*, GtkTreeIter* iter, void* data)
+static void proxy_foreach_selection_iter_callback(GtkTreeModel* model, GtkTreePath*, GtkTreeIter* iter, void* data)
 {
   typedef Gtk::TreeSelection::SlotForeachIter SlotType;
   SlotType& slot = *static_cast<SlotType*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     slot(Gtk::TreeModel::iterator(model, iter));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void proxy_foreach_selection_path_callback(GtkTreeModel*, GtkTreePath* path, GtkTreeIter*, void* data)
+static void proxy_foreach_selection_path_callback(GtkTreeModel*, GtkTreePath* path, GtkTreeIter*, void* data)
 {
   typedef Gtk::TreeSelection::SlotForeachPath SlotType;
   SlotType& slot = *static_cast<SlotType*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     slot(Gtk::TreeModel::Path(path, true));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void proxy_foreach_selection_path_and_iter_callback(GtkTreeModel* model, GtkTreePath* path,
+static void proxy_foreach_selection_path_and_iter_callback(GtkTreeModel* model, GtkTreePath* path,
                                                     GtkTreeIter* iter, void* data)
 {
   typedef Gtk::TreeSelection::SlotForeachPathAndIter SlotType;
   SlotType& slot = *static_cast<SlotType*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     slot(Gtk::TreeModel::Path(path, true), Gtk::TreeModel::iterator(model, iter));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
 
-// This Signal Proxy allows the C++ coder to specify
-// a sigc::slot instead of a static function.
-class SignalProxy_Select
-{
-public:
-  typedef Gtk::TreeSelection::SlotSelect SlotType;
-
-  SignalProxy_Select(const SlotType& slot) : slot_(slot) {}
-  ~SignalProxy_Select();
-
-  static gboolean gtk_callback(GtkTreeSelection*, GtkTreeModel* model, GtkTreePath* path,
-                               gboolean path_currently_selected, void* data);
-
-  static void gtk_callback_destroy(void* data);
-
-private:
-  SlotType slot_;
-};
-
-SignalProxy_Select::~SignalProxy_Select()
-{}
-
-gboolean SignalProxy_Select::gtk_callback(GtkTreeSelection*, GtkTreeModel* model, GtkTreePath* path,
+static gboolean SignalProxy_Select_gtk_callback(GtkTreeSelection*, GtkTreeModel* model, GtkTreePath* path,
                                           gboolean path_currently_selected, void* data)
 {
-  SignalProxy_Select *const self = static_cast<SignalProxy_Select*>(data);
+  const Gtk::TreeSelection::SlotSelect* the_slot = static_cast<Gtk::TreeSelection::SlotSelect*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    return (self->slot_)(Glib::wrap(model, true),   // take copy
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    return (*the_slot)(Glib::wrap(model, true),   // take copy
                          Gtk::TreePath(path, true), // take copy
                          path_currently_selected);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
@@ -116,29 +107,28 @@ gboolean SignalProxy_Select::gtk_callback(GtkTreeSelection*, GtkTreeModel* model
   }
 
   return 0;
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void SignalProxy_Select::gtk_callback_destroy(void* data)
+static void SignalProxy_Select_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_Select*>(data);
+  delete static_cast<Gtk::TreeSelection::SlotSelect*>(data);
 }
 
-} // anonymous namespace
-
 
 namespace Gtk
 {
 
 void TreeSelection::set_select_function(const SlotSelect& slot)
 {
-  // Create a signal proxy.  A pointer to this will be passed
+  // Create a copy of the slot.  A pointer to this will be passed
   // through the callback's data parameter.  It will be deleted
-  // when SignalProxy_Select::gtk_callback_destroy() is called.
-  SignalProxy_Select *const pSignalProxy = new SignalProxy_Select(slot);
+  // when SignalProxy_Select_gtk_callback_destroy() is called.
+  SlotSelect* slot_copy = new SlotSelect(slot);
 
   gtk_tree_selection_set_select_function(gobj(),
-      &SignalProxy_Select::gtk_callback, pSignalProxy,
-      &SignalProxy_Select::gtk_callback_destroy);
+      &SignalProxy_Select_gtk_callback, slot_copy,
+      &SignalProxy_Select_gtk_callback_destroy);
 }
 
 Glib::RefPtr<TreeModel> TreeSelection::get_model()
@@ -218,13 +208,15 @@ TreeSelection::ListHandle_Path TreeSelection::get_selected_rows(Glib::RefPtr<Tre
 namespace
 {
 
-const Glib::SignalProxyInfo TreeSelection_signal_changed_info =
+
+static const Glib::SignalProxyInfo TreeSelection_signal_changed_info =
 {
   "changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -271,10 +263,18 @@ void TreeSelection_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->changed = &changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void TreeSelection_Class::changed_callback(GtkTreeSelection* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -287,15 +287,19 @@ void TreeSelection_Class::changed_callback(GtkTreeSelection* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -308,6 +312,7 @@ void TreeSelection_Class::changed_callback(GtkTreeSelection* self)
       (*base->changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* TreeSelection_Class::wrap_new(GObject* object)
@@ -353,7 +358,7 @@ GType TreeSelection::get_base_type()
 
 void TreeSelection::set_mode(SelectionMode type)
 {
-  gtk_tree_selection_set_mode(gobj(), ((GtkSelectionMode)(type)));
+gtk_tree_selection_set_mode(gobj(), ((GtkSelectionMode)(type))); 
 }
 
 SelectionMode TreeSelection::get_mode() const
@@ -368,7 +373,7 @@ TreeView* TreeSelection::get_tree_view()
 
 const TreeView* TreeSelection::get_tree_view() const
 {
-  return Glib::wrap(gtk_tree_selection_get_tree_view(const_cast<GtkTreeSelection*>(gobj())));
+  return const_cast<TreeSelection*>(this)->get_tree_view();
 }
 
 int TreeSelection::count_selected_rows() const
@@ -378,37 +383,37 @@ int TreeSelection::count_selected_rows() const
 
 void TreeSelection::select(const TreeModel::Path& path)
 {
-  gtk_tree_selection_select_path(gobj(), const_cast<GtkTreePath*>((path).gobj()));
+gtk_tree_selection_select_path(gobj(), const_cast<GtkTreePath*>((path).gobj())); 
 }
 
 void TreeSelection::select(const TreeModel::iterator& iter)
 {
-  gtk_tree_selection_select_iter(gobj(), const_cast<GtkTreeIter*>((iter).gobj()));
+gtk_tree_selection_select_iter(gobj(), const_cast<GtkTreeIter*>((iter).gobj())); 
 }
 
 void TreeSelection::select(const TreeModel::Row& row)
 {
-  gtk_tree_selection_select_iter(gobj(), const_cast<GtkTreeIter*>((row).gobj()));
+gtk_tree_selection_select_iter(gobj(), const_cast<GtkTreeIter*>((row).gobj())); 
 }
 
 void TreeSelection::select(const TreeModel::Path& start_path, const TreeModel::Path& end_path)
 {
-  gtk_tree_selection_select_range(gobj(), const_cast<GtkTreePath*>((start_path).gobj()), const_cast<GtkTreePath*>((end_path).gobj()));
+gtk_tree_selection_select_range(gobj(), const_cast<GtkTreePath*>((start_path).gobj()), const_cast<GtkTreePath*>((end_path).gobj())); 
 }
 
 void TreeSelection::unselect(const TreeModel::Path& path)
 {
-  gtk_tree_selection_unselect_path(gobj(), const_cast<GtkTreePath*>((path).gobj()));
+gtk_tree_selection_unselect_path(gobj(), const_cast<GtkTreePath*>((path).gobj())); 
 }
 
 void TreeSelection::unselect(const TreeModel::Path& start_path, const TreeModel::Path& end_path)
 {
-  gtk_tree_selection_unselect_range(gobj(), const_cast<GtkTreePath*>((start_path).gobj()), const_cast<GtkTreePath*>((end_path).gobj()));
+gtk_tree_selection_unselect_range(gobj(), const_cast<GtkTreePath*>((start_path).gobj()), const_cast<GtkTreePath*>((end_path).gobj())); 
 }
 
 void TreeSelection::unselect(const TreeModel::iterator& iter)
 {
-  gtk_tree_selection_unselect_iter(gobj(), const_cast<GtkTreeIter*>((iter).gobj()));
+gtk_tree_selection_unselect_iter(gobj(), const_cast<GtkTreeIter*>((iter).gobj())); 
 }
 
 bool TreeSelection::is_selected(const TreeModel::Path& path) const
@@ -423,12 +428,12 @@ bool TreeSelection::is_selected(const TreeModel::iterator& iter) const
 
 void TreeSelection::select_all()
 {
-  gtk_tree_selection_select_all(gobj());
+gtk_tree_selection_select_all(gobj()); 
 }
 
 void TreeSelection::unselect_all()
 {
-  gtk_tree_selection_unselect_all(gobj());
+gtk_tree_selection_unselect_all(gobj()); 
 }
 
 
@@ -438,6 +443,7 @@ Glib::SignalProxy0< void > TreeSelection::signal_changed()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::TreeSelection::on_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -447,6 +453,10 @@ void Gtk::TreeSelection::on_changed()
   if(base && base->changed)
     (*base->changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/treeselection.h b/libs/gtkmm2/gtk/gtkmm/treeselection.h
index da3cac7285..e0bf0ce9f3 100644
--- a/libs/gtkmm2/gtk/gtkmm/treeselection.h
+++ b/libs/gtkmm2/gtk/gtkmm/treeselection.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREESELECTION_H
 #define _GTKMM_TREESELECTION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -211,7 +212,7 @@ public:
   /** Returns the number of rows that have been selected in @a tree .
    * @return The number of rows selected.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   int count_selected_rows() const;
 
@@ -299,7 +300,7 @@ public:
   /** Unselects a range of nodes, determined by @a start_path  and @a end_path 
    * inclusive.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param start_path The initial node of the range.
    * @param end_path The initial node of the range.
    */
@@ -335,6 +336,11 @@ public:
   void unselect_all();
   
   
+/**
+   * @par Prototype:
+   * <tt>void %changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_changed();
 
 
@@ -342,12 +348,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/treesortable.cc b/libs/gtkmm2/gtk/gtkmm/treesortable.cc
index 3318bd4d0c..7150a99858 100644
--- a/libs/gtkmm2/gtk/gtkmm/treesortable.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treesortable.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treesortable.h>
 #include <gtkmm/private/treesortable_p.h>
 
@@ -23,41 +24,17 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-namespace
-{
-
-// This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_Compare
-{
-public:
-  typedef Gtk::TreeSortable::SlotCompare SlotType;
-
-  explicit SignalProxy_Compare(const SlotType& slot);
-  ~SignalProxy_Compare();
-
-  static int  gtk_callback(GtkTreeModel* model, GtkTreeIter* lhs, GtkTreeIter* rhs, void* data);
-  static void gtk_callback_destroy(void* data);
-
-private:
-  SlotType slot_;
-};
-
-SignalProxy_Compare::SignalProxy_Compare(const SlotType& slot)
-:
-  slot_ (slot)
-{}
-
-SignalProxy_Compare::~SignalProxy_Compare()
-{}
-
-int SignalProxy_Compare::gtk_callback(GtkTreeModel* model, GtkTreeIter* lhs, GtkTreeIter* rhs, void* data)
+static int SignalProxy_Compare_gtk_callback(GtkTreeModel* model, GtkTreeIter* lhs, GtkTreeIter* rhs, void* data)
 {
-  SignalProxy_Compare *const self = static_cast<SignalProxy_Compare*>(data);
+  Gtk::TreeSortable::SlotCompare* the_slot = static_cast<Gtk::TreeSortable::SlotCompare*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     // use Slot::operator()
-    return (self->slot_)(Gtk::TreeIter(model, lhs), Gtk::TreeIter(model, rhs));
+    return (*the_slot)(Gtk::TreeIter(model, lhs), Gtk::TreeIter(model, rhs));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
@@ -65,27 +42,25 @@ int SignalProxy_Compare::gtk_callback(GtkTreeModel* model, GtkTreeIter* lhs, Gtk
   }
 
   return 0;
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void SignalProxy_Compare::gtk_callback_destroy(void* data)
+static void SignalProxy_Compare_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_Compare*>(data);
+  delete static_cast<Gtk::TreeSortable::SlotCompare*>(data);
 }
 
-} // anonymous namespace
-
-
 namespace Gtk
 {
 
 void TreeSortable::set_sort_func(int sort_column_id, const SlotCompare& slot)
 {
-  SignalProxy_Compare *const pSignalProxy = new SignalProxy_Compare(slot);
+  SlotCompare* slot_copy = new SlotCompare(slot);
 
   gtk_tree_sortable_set_sort_func(
       gobj(), sort_column_id,
-      &SignalProxy_Compare::gtk_callback, pSignalProxy,
-      &SignalProxy_Compare::gtk_callback_destroy);
+      &SignalProxy_Compare_gtk_callback, slot_copy,
+      &SignalProxy_Compare_gtk_callback_destroy);
 }
 
 void TreeSortable::set_sort_func(const Gtk::TreeModelColumnBase& sort_column, const SlotCompare& slot)
@@ -95,12 +70,12 @@ void TreeSortable::set_sort_func(const Gtk::TreeModelColumnBase& sort_column, co
 
 void TreeSortable::set_default_sort_func(const SlotCompare& slot)
 {
-  SignalProxy_Compare *const pSignalProxy = new SignalProxy_Compare(slot);
+  SlotCompare* slot_copy = new SlotCompare(slot);
 
   gtk_tree_sortable_set_default_sort_func(
       gobj(),
-      &SignalProxy_Compare::gtk_callback, pSignalProxy,
-      &SignalProxy_Compare::gtk_callback_destroy);
+      &SignalProxy_Compare_gtk_callback, slot_copy,
+      &SignalProxy_Compare_gtk_callback_destroy);
 }
 
 void TreeSortable::unset_default_sort_func()
@@ -109,17 +84,19 @@ void TreeSortable::unset_default_sort_func()
       gobj(), 0, 0, 0); /* See GTK+ docs about the 0s. */
 }
 
-//deprecated:
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void TreeSortable::set_sort_column_id(const TreeModelColumnBase& sort_column, SortType order)
 {
   set_sort_column(sort_column, order);
 }
 
-//deprecated:
 void TreeSortable::set_sort_column_id(int sort_column_id, SortType order)
 {
   set_sort_column(sort_column_id, order);
 }  
+#endif // GTKMM_DISABLE_DEPRECATED
+
 
 } // namespace Gtk
 
@@ -127,13 +104,15 @@ void TreeSortable::set_sort_column_id(int sort_column_id, SortType order)
 namespace
 {
 
-const Glib::SignalProxyInfo TreeSortable_signal_sort_column_changed_info =
+
+static const Glib::SignalProxyInfo TreeSortable_signal_sort_column_changed_info =
 {
   "sort_column_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -178,15 +157,21 @@ void TreeSortable_Class::iface_init_function(void* g_iface, void*)
   //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc
   g_assert(klass != 0); 
 
+#ifdef GLIBMM_VFUNCS_ENABLED
   klass->get_sort_column_id = &get_sort_column_id_vfunc_callback;
   klass->set_sort_column_id = &set_sort_column_id_vfunc_callback;
   klass->set_sort_func = &set_sort_func_vfunc_callback;
   klass->set_default_sort_func = &set_default_sort_func_vfunc_callback;
   klass->has_default_sort_func = &has_default_sort_func_vfunc_callback;
   klass->sort_column_changed = &sort_column_changed_vfunc_callback;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->sort_column_changed = &sort_column_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 gboolean TreeSortable_Class::get_sort_column_id_vfunc_callback(GtkTreeSortable* self, int* sort_column_id, GtkSortType* order)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -199,16 +184,20 @@ gboolean TreeSortable_Class::get_sort_column_id_vfunc_callback(GtkTreeSortable*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->get_sort_column_id_vfunc(sort_column_id, ((SortType*) (order))
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -225,7 +214,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 void TreeSortable_Class::set_sort_column_id_vfunc_callback(GtkTreeSortable* self, int sort_column_id, GtkSortType order)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -238,16 +226,20 @@ void TreeSortable_Class::set_sort_column_id_vfunc_callback(GtkTreeSortable* self
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_sort_column_id_vfunc(sort_column_id, ((SortType)(order))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -261,7 +253,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_sort_column_id)(self, sort_column_id, order);
   }
 }
-
 void TreeSortable_Class::set_sort_func_vfunc_callback(GtkTreeSortable* self, int sort_column_id, GtkTreeIterCompareFunc func, gpointer data, GtkDestroyNotify destroy)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -274,16 +265,20 @@ void TreeSortable_Class::set_sort_func_vfunc_callback(GtkTreeSortable* self, int
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_sort_func_vfunc(sort_column_id, func, data
 , destroy);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -297,7 +292,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_sort_func)(self, sort_column_id, func, data, destroy);
   }
 }
-
 void TreeSortable_Class::set_default_sort_func_vfunc_callback(GtkTreeSortable* self, GtkTreeIterCompareFunc func, gpointer data, GtkDestroyNotify destroy)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -310,16 +304,20 @@ void TreeSortable_Class::set_default_sort_func_vfunc_callback(GtkTreeSortable* s
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->set_default_sort_func_vfunc(func, data
 , destroy);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -333,7 +331,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->set_default_sort_func)(self, func, data, destroy);
   }
 }
-
 gboolean TreeSortable_Class::has_default_sort_func_vfunc_callback(GtkTreeSortable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -346,15 +343,19 @@ gboolean TreeSortable_Class::has_default_sort_func_vfunc_callback(GtkTreeSortabl
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->has_default_sort_func_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -371,7 +372,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
   typedef gboolean RType;
   return RType();
 }
-
 void TreeSortable_Class::sort_column_changed_vfunc_callback(GtkTreeSortable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -384,15 +384,19 @@ void TreeSortable_Class::sort_column_changed_vfunc_callback(GtkTreeSortable* sel
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->sort_column_changed_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -406,8 +410,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->sort_column_changed)(self);
   }
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void TreeSortable_Class::sort_column_changed_callback(GtkTreeSortable* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -420,15 +425,19 @@ void TreeSortable_Class::sort_column_changed_callback(GtkTreeSortable* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_sort_column_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -442,6 +451,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
       (*base->sort_column_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* TreeSortable_Class::wrap_new(GObject* object)
@@ -491,12 +501,12 @@ bool TreeSortable::get_sort_column_id(int& sort_column_id, SortType& order) cons
 
 void TreeSortable::set_sort_column(const TreeModelColumnBase& sort_column_id, SortType order)
 {
-  gtk_tree_sortable_set_sort_column_id(gobj(), (sort_column_id).index(), ((GtkSortType)(order)));
+gtk_tree_sortable_set_sort_column_id(gobj(), (sort_column_id).index(), ((GtkSortType)(order))); 
 }
 
 void TreeSortable::set_sort_column(int sort_column_id, SortType order)
 {
-  gtk_tree_sortable_set_sort_column_id(gobj(), sort_column_id, ((GtkSortType)(order)));
+gtk_tree_sortable_set_sort_column_id(gobj(), sort_column_id, ((GtkSortType)(order))); 
 }
 
 bool TreeSortable::has_default_sort_func() const
@@ -506,7 +516,7 @@ bool TreeSortable::has_default_sort_func() const
 
 void TreeSortable::sort_column_changed()
 {
-  gtk_tree_sortable_sort_column_changed(gobj());
+gtk_tree_sortable_sort_column_changed(gobj()); 
 }
 
 
@@ -516,6 +526,7 @@ Glib::SignalProxy0< void > TreeSortable::signal_sort_column_changed()
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::TreeSortable::on_sort_column_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -526,8 +537,9 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->sort_column_changed)
     (*base->sort_column_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 bool Gtk::TreeSortable::get_sort_column_id_vfunc(int* sort_column_id, SortType* order) const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -541,7 +553,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 void Gtk::TreeSortable::set_sort_column_id_vfunc(int sort_column_id, SortType order) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -552,7 +563,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_sort_column_id)
     (*base->set_sort_column_id)(gobj(),sort_column_id,((GtkSortType)(order)));
 }
-
 void Gtk::TreeSortable::set_sort_func_vfunc(int sort_column_id, GtkTreeIterCompareFunc func, void* data, GtkDestroyNotify destroy) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -563,7 +573,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_sort_func)
     (*base->set_sort_func)(gobj(),sort_column_id,func,data,destroy);
 }
-
 void Gtk::TreeSortable::set_default_sort_func_vfunc(GtkTreeIterCompareFunc func, void* data, GtkDestroyNotify destroy) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -574,7 +583,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->set_default_sort_func)
     (*base->set_default_sort_func)(gobj(),func,data,destroy);
 }
-
 bool Gtk::TreeSortable::has_default_sort_func_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -588,7 +596,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   typedef bool RType;
   return RType();
 }
-
 void Gtk::TreeSortable::sort_column_changed_vfunc() const
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -599,6 +606,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
   if(base && base->sort_column_changed)
     (*base->sort_column_changed)(const_cast<GtkTreeSortable*>(gobj()));
 }
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/treesortable.h b/libs/gtkmm2/gtk/gtkmm/treesortable.h
index 6b295a1f41..514d4181b7 100644
--- a/libs/gtkmm2/gtk/gtkmm/treesortable.h
+++ b/libs/gtkmm2/gtk/gtkmm/treesortable.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREESORTABLE_H
 #define _GTKMM_TREESORTABLE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -135,6 +136,7 @@ public:
   void set_sort_column(int sort_column_id, SortType order);
 
   #ifndef GTKMM_DISABLE_DEPRECATED
+
   /** @deprecated Use set_sort_column() instead.
    */
   void set_sort_column_id(const TreeModelColumnBase& sort_column_id, SortType order);
@@ -142,9 +144,10 @@ public:
   /** @deprecated Use set_sort_column() instead.
    */
   void set_sort_column_id(int sort_column_id, SortType order);
-  #endif //GTKMM_DISABLE_DEPRECATED
+  #endif // GTKMM_DISABLE_DEPRECATED
+
 
-  /** This callback should return -1 if b compares before a, 0 if they compare equal, 1 if a compares after b. 
+  /** This callback should return -1 if a compares before b, 0 if they compare equal, 1 if a compares after b. 
    * For instance, int on_sort_compare(const Gtk::TreeModel::iterator& a, const Gtk::TreeModel::iterator& b);
    */
   typedef sigc::slot<int, const Gtk::TreeModel::iterator&, const Gtk::TreeModel::iterator&> SlotCompare;
@@ -193,29 +196,56 @@ public:
    */
   void sort_column_changed();
   
+/**
+   * @par Prototype:
+   * <tt>void %sort_column_changed()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_sort_column_changed();
 
 
 protected:
-    virtual bool get_sort_column_id_vfunc(int* sort_column_id, SortType* order) const;
-    virtual void set_sort_column_id_vfunc(int sort_column_id, SortType order);
-    virtual void set_sort_func_vfunc(int sort_column_id, GtkTreeIterCompareFunc func, void* data, GtkDestroyNotify destroy);
-    virtual void set_default_sort_func_vfunc(GtkTreeIterCompareFunc func, void* data, GtkDestroyNotify destroy);
-    virtual bool has_default_sort_func_vfunc() const;
-    virtual void sort_column_changed_vfunc() const;
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool get_sort_column_id_vfunc(int* sort_column_id, SortType* order) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_sort_column_id_vfunc(int sort_column_id, SortType order);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_sort_func_vfunc(int sort_column_id, GtkTreeIterCompareFunc func, void* data, GtkDestroyNotify destroy);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void set_default_sort_func_vfunc(GtkTreeIterCompareFunc func, void* data, GtkDestroyNotify destroy);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual bool has_default_sort_func_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void sort_column_changed_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_sort_column_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
@@ -234,5 +264,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _GTKMM_TREESORTABLE_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treestore.cc b/libs/gtkmm2/gtk/gtkmm/treestore.cc
index cddd5961eb..e38fdeb739 100644
--- a/libs/gtkmm2/gtk/gtkmm/treestore.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treestore.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treestore.h>
 #include <gtkmm/private/treestore_p.h>
 
@@ -197,8 +198,19 @@ void TreeStore_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* TreeStore_Class::wrap_new(GObject* object)
 {
@@ -254,12 +266,12 @@ Glib::RefPtr<TreeStore> TreeStore::create(const TreeModelColumnRecord& columns)
 }
 void TreeStore::iter_swap(const iterator& a, const iterator& b)
 {
-  gtk_tree_store_swap(gobj(), const_cast<GtkTreeIter*>((a).gobj()), const_cast<GtkTreeIter*>((b).gobj()));
+gtk_tree_store_swap(gobj(), const_cast<GtkTreeIter*>((a).gobj()), const_cast<GtkTreeIter*>((b).gobj())); 
 }
 
 void TreeStore::clear()
 {
-  gtk_tree_store_clear(gobj());
+gtk_tree_store_clear(gobj()); 
 }
 
 bool TreeStore::is_ancestor(const iterator& iter, const iterator& descendant) const
@@ -278,6 +290,13 @@ bool TreeStore::iter_is_valid(const iterator& iter) const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gtk
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treestore.h b/libs/gtkmm2/gtk/gtkmm/treestore.h
index e5d01a4443..d947c7a2ca 100644
--- a/libs/gtkmm2/gtk/gtkmm/treestore.h
+++ b/libs/gtkmm2/gtk/gtkmm/treestore.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREESTORE_H
 #define _GTKMM_TREESTORE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -190,7 +191,7 @@ public:
   /** Swaps @a a  and @a b  in the same level of @a tree_store . Note that this function
    * only works with unsorted stores.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param a A Gtk::TreeIter.
    * @param b Another Gtk::TreeIter.
    */
@@ -237,7 +238,7 @@ public:
    * @param iter A Gtk::TreeIter.
    * @return <tt>true</tt> if the iter is valid, <tt>false</tt> if the iter is invalid.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   bool iter_is_valid(const iterator& iter) const;
 
@@ -249,11 +250,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/treeview.cc b/libs/gtkmm2/gtk/gtkmm/treeview.cc
index 4337e88c50..e43f7a2df9 100644
--- a/libs/gtkmm2/gtk/gtkmm/treeview.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treeview.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treeview.h>
 #include <gtkmm/private/treeview_p.h>
 
@@ -24,98 +25,51 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktreeview.h>
 #include <gtkmm/treeviewcolumn.h>
 #include <gtkmm/treeview_private.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treemodelfilter.h>
+#include <gtkmm/entry.h>
+#include <gtk/gtktreeview.h>
 
 namespace
 {
 
 //This target name is used in the GTK+ implementation:
-const char treeview_target_row[]   = "GTK_TREE_MODEL_ROW";
+static const char treeview_target_row[]   = "GTK_TREE_MODEL_ROW";
 
 } // anonymous namespace
 
-namespace
-{
-
-//SignalProxy_Mapping:
 
-//This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_Mapping
+static void SignalProxy_Mapping_gtk_callback(GtkTreeView* tree_view, GtkTreePath* path, void* data)
 {
-public:
-  typedef Gtk::TreeView::SlotMapping SlotType;
-
-  SignalProxy_Mapping(const SlotType& slot);
-  ~SignalProxy_Mapping();
-
-  static void gtk_callback(GtkTreeView* tree_view, GtkTreePath* path, void* data);
-
-protected:
-  SlotType slot_;
-};
-
-SignalProxy_Mapping::SignalProxy_Mapping(const SlotType& slot)
-:
-  slot_ (slot)
-{}
-
-SignalProxy_Mapping::~SignalProxy_Mapping()
-{}
-
-void SignalProxy_Mapping::gtk_callback(GtkTreeView* tree_view, GtkTreePath* path, void* data)
-{
-  SignalProxy_Mapping *const self = static_cast<SignalProxy_Mapping*>(data);
+  Gtk::TreeView::SlotMapping* the_slot = static_cast<Gtk::TreeView::SlotMapping*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    (self->slot_)(Glib::wrap(tree_view), Gtk::TreePath(path, true));
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    (*the_slot)(Glib::wrap(tree_view), Gtk::TreePath(path, true));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-
-//SignalProxy_SearchEqual:
-
-//This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_SearchEqual
-{
-public:
-  typedef Gtk::TreeView::SlotSearchEqual SlotType;
-
-  SignalProxy_SearchEqual(const SlotType& slot);
-  ~SignalProxy_SearchEqual();
-
-  static gboolean gtk_callback(GtkTreeModel* model, int column, const char* key,
-                               GtkTreeIter* iter, void* data);
-  static void gtk_callback_destroy(void* data);
-
-protected:
-  SlotType slot_;
-};
-
-SignalProxy_SearchEqual::SignalProxy_SearchEqual(const SlotType& slot)
-:
-  slot_ (slot)
-{}
-
-SignalProxy_SearchEqual::~SignalProxy_SearchEqual()
-{}
-
-gboolean SignalProxy_SearchEqual::gtk_callback(GtkTreeModel* model, int column, const char* key,
+static gboolean SignalProxy_SearchEqual_gtk_callback(GtkTreeModel* model, int column, const char* key,
                                                GtkTreeIter* iter, void* data)
 {
-  SignalProxy_SearchEqual *const self = static_cast<SignalProxy_SearchEqual*>(data);
+  Gtk::TreeView::SlotSearchEqual* the_slot = static_cast<Gtk::TreeView::SlotSearchEqual*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    return (self->slot_)(Glib::wrap(model, true), column, key, Gtk::TreeIter(model, iter));
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    return (*the_slot)(Glib::wrap(model, true), column, key, Gtk::TreeIter(model, iter));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
@@ -123,68 +77,65 @@ gboolean SignalProxy_SearchEqual::gtk_callback(GtkTreeModel* model, int column,
   }
 
   return 0; // arbitrary value
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
-void SignalProxy_SearchEqual::gtk_callback_destroy(void* data)
+static void SignalProxy_SearchEqual_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_SearchEqual*>(data);
+  delete static_cast<Gtk::TreeView::SlotSearchEqual*>(data);
 }
 
-
-//SignalProxy_ColumnDrop:
-
-//This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_ColumnDrop
-{
-public:
-  typedef Gtk::TreeView::SlotColumnDrop SlotType;
-
-  SignalProxy_ColumnDrop(const SlotType& slot);
-  ~SignalProxy_ColumnDrop();
-
-  static gboolean gtk_callback(GtkTreeView* tree_view, GtkTreeViewColumn* column,
-                               GtkTreeViewColumn* prev_column, GtkTreeViewColumn* next_column,
-                               void* data);
-  static void gtk_callback_destroy(void* data);
-
-protected:
-  SlotType slot_;
-};
-
-SignalProxy_ColumnDrop::SignalProxy_ColumnDrop(const SlotType& slot)
-:
-  slot_ (slot)
-{}
-
-SignalProxy_ColumnDrop::~SignalProxy_ColumnDrop()
-{}
-
-gboolean SignalProxy_ColumnDrop::gtk_callback(GtkTreeView* tree_view, GtkTreeViewColumn* column,
+static gboolean SignalProxy_ColumnDrop_gtk_callback(GtkTreeView* tree_view, GtkTreeViewColumn* column,
                                               GtkTreeViewColumn* prev_column,
                                               GtkTreeViewColumn* next_column, void* data)
 {
-  SignalProxy_ColumnDrop *const self = static_cast<SignalProxy_ColumnDrop*>(data);
+  Gtk::TreeView::SlotColumnDrop* the_slot = static_cast<Gtk::TreeView::SlotColumnDrop*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    return (self->slot_)(Glib::wrap(tree_view), Glib::wrap(column),
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    return (*the_slot)(Glib::wrap(tree_view), Glib::wrap(column),
                          Glib::wrap(prev_column), Glib::wrap(next_column));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 
   return 0; // arbitrary value
 }
 
-void SignalProxy_ColumnDrop::gtk_callback_destroy(void* data)
+static void SignalProxy_ColumnDrop_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_ColumnDrop*>(data);
+  delete static_cast<Gtk::TreeView::SlotColumnDrop*>(data);
 }
 
-} // anonymous namespace
 
+static void SignalProxy_SearchPosition_gtk_callback(GtkTreeView* /* tree_view */, GtkWidget* search_dialog, gpointer user_data)
+{
+  Gtk::TreeView::SlotSearchPosition* the_slot = static_cast<Gtk::TreeView::SlotSearchPosition*>(user_data);
+
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  try
+  {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    (*the_slot)(Glib::wrap(search_dialog));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  }
+  catch(...)
+  {
+    Glib::exception_handlers_invoke();
+  }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+}
+
+static void SignalProxy_SearchPosition_gtk_callback_destroy(void* data)
+{
+  delete static_cast<Gtk::TreeView::SlotSearchPosition*>(data);
+}
 
 namespace Gtk
 {
@@ -201,15 +152,14 @@ void TreeView::unset_vadjustment()
 
 int TreeView::insert_column_with_data_func(int position, const Glib::ustring& title, CellRenderer& cell, const SlotCellData& slot)
 {
-  //Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
-  //It will be deleted when TreeView_Private::SignalProxy_CellData::gtk_callback_destroy() is called.
-  TreeView_Private::SignalProxy_CellData *const pSignalProxy =
-      new TreeView_Private::SignalProxy_CellData(slot);
+  //Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
+  //It will be deleted when TreeView_Private::SignalProxy_CellData_gtk_callback_destroy() is called.
+  SlotCellData* slot_copy = new SlotCellData(slot);
 
   return gtk_tree_view_insert_column_with_data_func(
       gobj(), position, title.c_str(), cell.gobj(),
-      &TreeView_Private::SignalProxy_CellData::gtk_callback, pSignalProxy,
-      &TreeView_Private::SignalProxy_CellData::gtk_callback_destroy);
+      &TreeView_Private::SignalProxy_CellData_gtk_callback, slot_copy,
+      &TreeView_Private::SignalProxy_CellData_gtk_callback_destroy);
 }
 
 void TreeView::set_cursor(const TreeModel::Path& path)
@@ -257,6 +207,8 @@ void TreeView::enable_model_drag_dest(Gdk::DragAction actions)
   enable_model_drag_dest(listTargets, actions);
 }
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 bool TreeView::get_path_at_pos(int x, int y, TreeModel::Path& path, TreeViewColumn*& column, int& cell_x, int& cell_y)
 {
   GtkTreePath* pTreePath = 0;
@@ -267,6 +219,19 @@ bool TreeView::get_path_at_pos(int x, int y, TreeModel::Path& path, TreeViewColu
   column = Glib::wrap(pTreeViewColumn);
   return result;
 }
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
+bool TreeView::get_path_at_pos(int x, int y, TreeModel::Path& path, TreeViewColumn*& column, int& cell_x, int& cell_y) const
+{
+  GtkTreePath* pTreePath = 0;
+  GtkTreeViewColumn* pTreeViewColumn = 0;
+  bool result = gtk_tree_view_get_path_at_pos(const_cast<GtkTreeView*>(gobj()), x, y, &pTreePath, &pTreeViewColumn, &cell_x, &cell_y);
+
+  path = TreeModel::Path(pTreePath, false /* don't take a copy, because the gtk_tree_view_get_path_at_pos() docs say that we must free the path */ );
+  column = Glib::wrap(pTreeViewColumn);
+  return result;
+}
 
 int TreeView::insert_column(const Glib::ustring& title, CellRenderer& cell, int position)
 {
@@ -298,32 +263,29 @@ bool TreeView::get_dest_row_at_pos(int drag_x, int drag_y, TreeModel::Path& path
 
 void TreeView::map_expanded_rows(const SlotMapping& slot)
 {
-  //Create a signal proxy.
-  SignalProxy_Mapping signalProxy (slot); //It only needs to live as long as this method call.
-
-  gtk_tree_view_map_expanded_rows(gobj(), &SignalProxy_Mapping::gtk_callback, &signalProxy);
+  gtk_tree_view_map_expanded_rows(gobj(), &SignalProxy_Mapping_gtk_callback, const_cast<SlotMapping*>(&slot));
 }
 
 void TreeView::set_search_equal_func(const SlotSearchEqual& slot)
 {
-  //Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
-  //It will be deleted when SignalProxy_SearchEqual::gtk_callback_destroy() is called.
-  SignalProxy_SearchEqual *const pSignalProxy = new SignalProxy_SearchEqual(slot);
+  //Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
+  //It will be deleted when SignalProxy_SearchEqual_gtk_callback_destroy() is called.
+  SlotSearchEqual* slot_copy = new SlotSearchEqual(slot);
 
   gtk_tree_view_set_search_equal_func(gobj(),
-      &SignalProxy_SearchEqual::gtk_callback, pSignalProxy,
-      &SignalProxy_SearchEqual::gtk_callback_destroy);
+      &SignalProxy_SearchEqual_gtk_callback, slot_copy,
+      &SignalProxy_SearchEqual_gtk_callback_destroy);
 }
 
 void TreeView::set_column_drag_function(const SlotColumnDrop& slot)
 {
-  //Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
-  //It will be deleted when SignalProxy_ColumnDrop::gtk_callback_destroy() is called.
-  SignalProxy_ColumnDrop *const pSignalProxy = new SignalProxy_ColumnDrop(slot);
+  //Create a copt of the slot. A pointer to this will be passed through the callback's data parameter.
+  //It will be deleted when SignalProxy_ColumnDrop_gtk_callback_destroy() is called.
+   SlotColumnDrop* slot_copy = new SlotColumnDrop(slot);
 
   gtk_tree_view_set_column_drag_function(gobj(),
-      &SignalProxy_ColumnDrop::gtk_callback, pSignalProxy,
-      &SignalProxy_ColumnDrop::gtk_callback_destroy);
+      &SignalProxy_ColumnDrop_gtk_callback, slot_copy,
+      &SignalProxy_ColumnDrop_gtk_callback_destroy);
 
 }
 
@@ -421,16 +383,22 @@ Glib::RefPtr<Gtk::TreeModel> TreeView::_get_base_model()
 void TreeView::_auto_store_on_cellrenderer_toggle_edited(const Glib::ustring& path_string,
                                                          int model_column)
 {
+  _auto_store_on_cellrenderer_toggle_edited_with_model(path_string, model_column, _get_base_model());
+}
+
+void TreeView::_auto_store_on_cellrenderer_toggle_edited_with_model(const Glib::ustring& path_string,
+                                                         int model_column, const Glib::RefPtr<Gtk::TreeModel>& model)
+{
   Gtk::TreePath path (path_string);
 
   //Get the row from the path:
-  Glib::RefPtr<TreeModel> refModel = _get_base_model();
-
-  Gtk::TreeModel::iterator iter = refModel->get_iter(path);
-  if(iter)
+  if(model)
   {
+    Gtk::TreeModel::iterator iter = model->get_iter(path);
+    if(iter)
+    {
       Gtk::TreeRow row = *iter;
-      
+
       //Get the new value:
       //This seems to get the old value, not the new one,
       //so we will just NOT the model value ourselves.
@@ -438,9 +406,10 @@ void TreeView::_auto_store_on_cellrenderer_toggle_edited(const Glib::ustring& pa
       bool bActive = false;
       row.get_value(model_column, bActive);
       bActive = !bActive;
-      
-      //Store the user's new text in the model: 
+
+      //Store the user's new text in the model:
       row.set_value(model_column, bActive);
+    }
   }
 }
 
@@ -451,13 +420,40 @@ void TreeView::move_column_to_start(TreeViewColumn& column)
 
 void TreeView::set_row_separator_func(const SlotRowSeparator& slot)
 {
-  //Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
-  //It will be deleted when SignalProxy_RowSeparator::gtk_callback_destroy() is called.
-  TreeView_Private::SignalProxy_RowSeparator *const pSignalProxy = new TreeView_Private::SignalProxy_RowSeparator(slot);
+  //Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
+  //It will be deleted when SignalProxy_RowSeparator_gtk_callback_destroy() is called.
+  SlotRowSeparator* slot_copy = new SlotRowSeparator(slot);
 
   gtk_tree_view_set_row_separator_func(gobj(),
-      &TreeView_Private::SignalProxy_RowSeparator::gtk_callback, pSignalProxy,
-      &TreeView_Private::SignalProxy_RowSeparator::gtk_callback_destroy);
+      &TreeView_Private::SignalProxy_RowSeparator_gtk_callback, slot_copy,
+      &TreeView_Private::SignalProxy_RowSeparator_gtk_callback_destroy);
+}
+
+void TreeView::set_search_position_func(const SlotSearchPosition& slot)
+{
+  //Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
+  //It will be deleted when SignalProxy_SearchPosition_gtk_callback_destroy() is called.
+  SlotSearchPosition* slot_copy = new SlotSearchPosition(slot);
+
+  gtk_tree_view_set_search_position_func(gobj(),
+      &SignalProxy_SearchPosition_gtk_callback, slot_copy,
+      &SignalProxy_SearchPosition_gtk_callback_destroy);
+}
+
+bool TreeView::get_visible_range(TreeModel::Path& start_path, TreeModel::Path& end_path) const
+{
+  GtkTreePath* pTreePathStart = 0;
+  GtkTreePath* pTreePathEnd = 0;
+  bool result = gtk_tree_view_get_visible_range(const_cast<GtkTreeView*>(gobj()), &pTreePathStart, &pTreePathEnd);
+
+  start_path = TreeModel::Path(pTreePathStart, false /* don't take a copy, because the gtk_tree_view_get_visible_range() docs say that we must free the path */ );
+  end_path = TreeModel::Path(pTreePathEnd, false /* don't take a copy, because the gtk_tree_view_get_visible_range() docs say that we must free the path */ );
+  return result;
+}
+
+void TreeView::unset_model()
+{
+  gtk_tree_view_set_model(gobj(), 0);
 }
 
 } // namespace Gtk
@@ -466,7 +462,8 @@ void TreeView::set_row_separator_func(const SlotRowSeparator& slot)
 namespace
 {
 
-void TreeView_signal_set_scroll_adjustments_callback(GtkTreeView* self, GtkAdjustment* p0,GtkAdjustment* p1,void* data)
+
+static void TreeView_signal_set_scroll_adjustments_callback(GtkTreeView* self, GtkAdjustment* p0,GtkAdjustment* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Adjustment*,Adjustment* > SlotType;
@@ -474,21 +471,25 @@ void TreeView_signal_set_scroll_adjustments_callback(GtkTreeView* self, GtkAdjus
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TreeView_signal_set_scroll_adjustments_info =
+static const Glib::SignalProxyInfo TreeView_signal_set_scroll_adjustments_info =
 {
   "set-scroll-adjustments",
   (GCallback) &TreeView_signal_set_scroll_adjustments_callback,
@@ -496,7 +497,7 @@ const Glib::SignalProxyInfo TreeView_signal_set_scroll_adjustments_info =
 };
 
 
-void TreeView_signal_row_activated_callback(GtkTreeView* self, GtkTreePath* p0,GtkTreeViewColumn* p1,void* data)
+static void TreeView_signal_row_activated_callback(GtkTreeView* self, GtkTreePath* p0,GtkTreeViewColumn* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TreeModel::Path&,TreeViewColumn* > SlotType;
@@ -504,21 +505,25 @@ void TreeView_signal_row_activated_callback(GtkTreeView* self, GtkTreePath* p0,G
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Gtk::TreePath(p0, true)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TreeView_signal_row_activated_info =
+static const Glib::SignalProxyInfo TreeView_signal_row_activated_info =
 {
   "row-activated",
   (GCallback) &TreeView_signal_row_activated_callback,
@@ -526,7 +531,7 @@ const Glib::SignalProxyInfo TreeView_signal_row_activated_info =
 };
 
 
-gboolean TreeView_signal_test_expand_row_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1,void* data)
+static gboolean TreeView_signal_test_expand_row_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,const TreeModel::iterator&,const TreeModel::Path& > SlotType;
@@ -534,24 +539,28 @@ gboolean TreeView_signal_test_expand_row_callback(GtkTreeView* self, GtkTreeIter
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(TreeModel::iterator(gtk_tree_view_get_model(self), p0)
 , Gtk::TreePath(p1, true)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean TreeView_signal_test_expand_row_notify_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1, void* data)
+static gboolean TreeView_signal_test_expand_row_notify_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TreeModel::iterator&,const TreeModel::Path& > SlotType;
@@ -559,24 +568,28 @@ gboolean TreeView_signal_test_expand_row_notify_callback(GtkTreeView* self, GtkT
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(TreeModel::iterator(gtk_tree_view_get_model(self), p0)
 , Gtk::TreePath(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo TreeView_signal_test_expand_row_info =
+static const Glib::SignalProxyInfo TreeView_signal_test_expand_row_info =
 {
   "test-expand-row",
   (GCallback) &TreeView_signal_test_expand_row_callback,
@@ -584,7 +597,7 @@ const Glib::SignalProxyInfo TreeView_signal_test_expand_row_info =
 };
 
 
-gboolean TreeView_signal_test_collapse_row_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1,void* data)
+static gboolean TreeView_signal_test_collapse_row_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,const TreeModel::iterator&,const TreeModel::Path& > SlotType;
@@ -592,24 +605,28 @@ gboolean TreeView_signal_test_collapse_row_callback(GtkTreeView* self, GtkTreeIt
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(TreeModel::iterator(gtk_tree_view_get_model(self), p0)
 , Gtk::TreePath(p1, true)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean TreeView_signal_test_collapse_row_notify_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1, void* data)
+static gboolean TreeView_signal_test_collapse_row_notify_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TreeModel::iterator&,const TreeModel::Path& > SlotType;
@@ -617,24 +634,28 @@ gboolean TreeView_signal_test_collapse_row_notify_callback(GtkTreeView* self, Gt
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(TreeModel::iterator(gtk_tree_view_get_model(self), p0)
 , Gtk::TreePath(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo TreeView_signal_test_collapse_row_info =
+static const Glib::SignalProxyInfo TreeView_signal_test_collapse_row_info =
 {
   "test-collapse-row",
   (GCallback) &TreeView_signal_test_collapse_row_callback,
@@ -642,7 +663,7 @@ const Glib::SignalProxyInfo TreeView_signal_test_collapse_row_info =
 };
 
 
-void TreeView_signal_row_expanded_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1,void* data)
+static void TreeView_signal_row_expanded_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TreeModel::iterator&,const TreeModel::Path& > SlotType;
@@ -650,21 +671,25 @@ void TreeView_signal_row_expanded_callback(GtkTreeView* self, GtkTreeIter* p0,Gt
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(TreeModel::iterator(gtk_tree_view_get_model(self), p0)
 , Gtk::TreePath(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TreeView_signal_row_expanded_info =
+static const Glib::SignalProxyInfo TreeView_signal_row_expanded_info =
 {
   "row-expanded",
   (GCallback) &TreeView_signal_row_expanded_callback,
@@ -672,7 +697,7 @@ const Glib::SignalProxyInfo TreeView_signal_row_expanded_info =
 };
 
 
-void TreeView_signal_row_collapsed_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1,void* data)
+static void TreeView_signal_row_collapsed_callback(GtkTreeView* self, GtkTreeIter* p0,GtkTreePath* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const TreeModel::iterator&,const TreeModel::Path& > SlotType;
@@ -680,21 +705,25 @@ void TreeView_signal_row_collapsed_callback(GtkTreeView* self, GtkTreeIter* p0,G
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(TreeModel::iterator(gtk_tree_view_get_model(self), p0)
 , Gtk::TreePath(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo TreeView_signal_row_collapsed_info =
+static const Glib::SignalProxyInfo TreeView_signal_row_collapsed_info =
 {
   "row-collapsed",
   (GCallback) &TreeView_signal_row_collapsed_callback,
@@ -702,7 +731,7 @@ const Glib::SignalProxyInfo TreeView_signal_row_collapsed_info =
 };
 
 
-const Glib::SignalProxyInfo TreeView_signal_cursor_changed_info =
+static const Glib::SignalProxyInfo TreeView_signal_cursor_changed_info =
 {
   "cursor-changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -710,13 +739,14 @@ const Glib::SignalProxyInfo TreeView_signal_cursor_changed_info =
 };
 
 
-const Glib::SignalProxyInfo TreeView_signal_columns_changed_info =
+static const Glib::SignalProxyInfo TreeView_signal_columns_changed_info =
 {
   "columns-changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 // static
@@ -725,6 +755,12 @@ GType Glib::Value<Gtk::TreeViewDropPosition>::value_type()
   return gtk_tree_view_drop_position_get_type();
 }
 
+// static
+GType Glib::Value<Gtk::TreeViewGridLines>::value_type()
+{
+  return gtk_tree_view_grid_lines_get_type();
+}
+
 
 namespace Glib
 {
@@ -767,6 +803,10 @@ void TreeView_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->set_scroll_adjustments = &set_scroll_adjustments_callback;
   klass->row_activated = &row_activated_callback;
   klass->test_expand_row = &test_expand_row_callback;
@@ -775,9 +815,13 @@ void TreeView_Class::class_init_function(void* g_class, void* class_data)
   klass->row_collapsed = &row_collapsed_callback;
   klass->cursor_changed = &cursor_changed_callback;
   klass->columns_changed = &columns_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void TreeView_Class::set_scroll_adjustments_callback(GtkTreeView* self, GtkAdjustment* p0, GtkAdjustment* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -790,17 +834,21 @@ void TreeView_Class::set_scroll_adjustments_callback(GtkTreeView* self, GtkAdjus
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_set_scroll_adjustments(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -813,7 +861,6 @@ void TreeView_Class::set_scroll_adjustments_callback(GtkTreeView* self, GtkAdjus
       (*base->set_scroll_adjustments)(self, p0, p1);
   }
 }
-
 void TreeView_Class::row_activated_callback(GtkTreeView* self, GtkTreePath* p0, GtkTreeViewColumn* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -826,17 +873,21 @@ void TreeView_Class::row_activated_callback(GtkTreeView* self, GtkTreePath* p0,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_row_activated(Gtk::TreePath(p0, true)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -849,7 +900,6 @@ void TreeView_Class::row_activated_callback(GtkTreeView* self, GtkTreePath* p0,
       (*base->row_activated)(self, p0, p1);
   }
 }
-
 gboolean TreeView_Class::test_expand_row_callback(GtkTreeView* self, GtkTreeIter* p0, GtkTreePath* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -862,17 +912,21 @@ gboolean TreeView_Class::test_expand_row_callback(GtkTreeView* self, GtkTreeIter
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_test_expand_row(TreeModel::iterator(gtk_tree_view_get_model(self), p0)
 , Gtk::TreePath(p1, true)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -888,7 +942,6 @@ gboolean TreeView_Class::test_expand_row_callback(GtkTreeView* self, GtkTreeIter
   typedef gboolean RType;
   return RType();
 }
-
 gboolean TreeView_Class::test_collapse_row_callback(GtkTreeView* self, GtkTreeIter* p0, GtkTreePath* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -901,17 +954,21 @@ gboolean TreeView_Class::test_collapse_row_callback(GtkTreeView* self, GtkTreeIt
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_test_collapse_row(TreeModel::iterator(gtk_tree_view_get_model(self), p0)
 , Gtk::TreePath(p1, true)
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -927,7 +984,6 @@ gboolean TreeView_Class::test_collapse_row_callback(GtkTreeView* self, GtkTreeIt
   typedef gboolean RType;
   return RType();
 }
-
 void TreeView_Class::row_expanded_callback(GtkTreeView* self, GtkTreeIter* p0, GtkTreePath* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -940,17 +996,21 @@ void TreeView_Class::row_expanded_callback(GtkTreeView* self, GtkTreeIter* p0, G
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_row_expanded(TreeModel::iterator(gtk_tree_view_get_model(self), p0)
 , Gtk::TreePath(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -963,7 +1023,6 @@ void TreeView_Class::row_expanded_callback(GtkTreeView* self, GtkTreeIter* p0, G
       (*base->row_expanded)(self, p0, p1);
   }
 }
-
 void TreeView_Class::row_collapsed_callback(GtkTreeView* self, GtkTreeIter* p0, GtkTreePath* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -976,17 +1035,21 @@ void TreeView_Class::row_collapsed_callback(GtkTreeView* self, GtkTreeIter* p0,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_row_collapsed(TreeModel::iterator(gtk_tree_view_get_model(self), p0)
 , Gtk::TreePath(p1, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -999,7 +1062,6 @@ void TreeView_Class::row_collapsed_callback(GtkTreeView* self, GtkTreeIter* p0,
       (*base->row_collapsed)(self, p0, p1);
   }
 }
-
 void TreeView_Class::cursor_changed_callback(GtkTreeView* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1012,15 +1074,19 @@ void TreeView_Class::cursor_changed_callback(GtkTreeView* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_cursor_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1033,7 +1099,6 @@ void TreeView_Class::cursor_changed_callback(GtkTreeView* self)
       (*base->cursor_changed)(self);
   }
 }
-
 void TreeView_Class::columns_changed_callback(GtkTreeView* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -1046,15 +1111,19 @@ void TreeView_Class::columns_changed_callback(GtkTreeView* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_columns_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -1067,6 +1136,7 @@ void TreeView_Class::columns_changed_callback(GtkTreeView* self)
       (*base->columns_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* TreeView_Class::wrap_new(GObject* o)
@@ -1126,45 +1196,40 @@ Glib::RefPtr<TreeModel> TreeView::get_model()
 {
 
   Glib::RefPtr<TreeModel> retvalue = Glib::wrap(gtk_tree_view_get_model(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TreeModel> TreeView::get_model() const
 {
 
   Glib::RefPtr<const TreeModel> retvalue = Glib::wrap(gtk_tree_view_get_model(const_cast<GtkTreeView*>(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 void TreeView::set_model(const Glib::RefPtr<TreeModel>& model)
 {
-  gtk_tree_view_set_model(gobj(), Glib::unwrap(model));
+gtk_tree_view_set_model(gobj(), Glib::unwrap(model)); 
 }
 
 Glib::RefPtr<TreeSelection> TreeView::get_selection()
 {
 
   Glib::RefPtr<TreeSelection> retvalue = Glib::wrap(gtk_tree_view_get_selection(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TreeSelection> TreeView::get_selection() const
 {
-
-  Glib::RefPtr<const TreeSelection> retvalue = Glib::wrap(gtk_tree_view_get_selection(const_cast<GtkTreeView*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<TreeView*>(this)->get_selection();
 }
 
 Adjustment* TreeView::get_hadjustment()
@@ -1174,12 +1239,12 @@ Adjustment* TreeView::get_hadjustment()
 
 const Adjustment* TreeView::get_hadjustment() const
 {
-  return Glib::wrap(gtk_tree_view_get_hadjustment(const_cast<GtkTreeView*>(gobj())));
+  return const_cast<TreeView*>(this)->get_hadjustment();
 }
 
 void TreeView::set_hadjustment(Adjustment& adjustment)
 {
-  gtk_tree_view_set_hadjustment(gobj(), (adjustment).gobj());
+gtk_tree_view_set_hadjustment(gobj(), (adjustment).gobj()); 
 }
 
 Adjustment* TreeView::get_vadjustment()
@@ -1189,12 +1254,12 @@ Adjustment* TreeView::get_vadjustment()
 
 const Adjustment* TreeView::get_vadjustment() const
 {
-  return Glib::wrap(gtk_tree_view_get_vadjustment(const_cast<GtkTreeView*>(gobj())));
+  return const_cast<TreeView*>(this)->get_vadjustment();
 }
 
 void TreeView::set_vadjustment(Adjustment& adjustment)
 {
-  gtk_tree_view_set_vadjustment(gobj(), (adjustment).gobj());
+gtk_tree_view_set_vadjustment(gobj(), (adjustment).gobj()); 
 }
 
 bool TreeView::get_headers_visible() const
@@ -1204,22 +1269,27 @@ bool TreeView::get_headers_visible() const
 
 void TreeView::set_headers_visible(bool headers_visible)
 {
-  gtk_tree_view_set_headers_visible(gobj(), static_cast<int>(headers_visible));
+gtk_tree_view_set_headers_visible(gobj(), static_cast<int>(headers_visible)); 
 }
 
 void TreeView::columns_autosize()
 {
-  gtk_tree_view_columns_autosize(gobj());
+gtk_tree_view_columns_autosize(gobj()); 
+}
+
+bool TreeView::get_headers_clickable() const
+{
+  return gtk_tree_view_get_headers_clickable(const_cast<GtkTreeView*>(gobj()));
 }
 
 void TreeView::set_headers_clickable(bool setting)
 {
-  gtk_tree_view_set_headers_clickable(gobj(), static_cast<int>(setting));
+gtk_tree_view_set_headers_clickable(gobj(), static_cast<int>(setting)); 
 }
 
 void TreeView::set_rules_hint(bool setting)
 {
-  gtk_tree_view_set_rules_hint(gobj(), static_cast<int>(setting));
+gtk_tree_view_set_rules_hint(gobj(), static_cast<int>(setting)); 
 }
 
 bool TreeView::get_rules_hint() const
@@ -1249,7 +1319,7 @@ TreeViewColumn* TreeView::get_column(int n)
 
 const TreeViewColumn* TreeView::get_column(int n) const
 {
-  return Glib::wrap(gtk_tree_view_get_column(const_cast<GtkTreeView*>(gobj()), n));
+  return const_cast<TreeView*>(this)->get_column(n);
 }
 
 Glib::ListHandle<TreeViewColumn*> TreeView::get_columns()
@@ -1264,12 +1334,12 @@ Glib::ListHandle<const TreeViewColumn*> TreeView::get_columns() const
 
 void TreeView::move_column_after(TreeViewColumn& column, TreeViewColumn& base_column)
 {
-  gtk_tree_view_move_column_after(gobj(), (column).gobj(), (base_column).gobj());
+gtk_tree_view_move_column_after(gobj(), (column).gobj(), (base_column).gobj()); 
 }
 
 void TreeView::set_expander_column(TreeViewColumn& column)
 {
-  gtk_tree_view_set_expander_column(gobj(), (column).gobj());
+gtk_tree_view_set_expander_column(gobj(), (column).gobj()); 
 }
 
 TreeViewColumn* TreeView::get_expander_column()
@@ -1279,32 +1349,32 @@ TreeViewColumn* TreeView::get_expander_column()
 
 const TreeViewColumn* TreeView::get_expander_column() const
 {
-  return Glib::wrap(gtk_tree_view_get_expander_column(const_cast<GtkTreeView*>(gobj())));
+  return const_cast<TreeView*>(this)->get_expander_column();
 }
 
 void TreeView::scroll_to_point(int tree_x, int tree_y)
 {
-  gtk_tree_view_scroll_to_point(gobj(), tree_x, tree_y);
+gtk_tree_view_scroll_to_point(gobj(), tree_x, tree_y); 
 }
 
 void TreeView::row_activated(const TreeModel::Path& path, TreeViewColumn& column)
 {
-  gtk_tree_view_row_activated(gobj(), const_cast<GtkTreePath*>((path).gobj()), (column).gobj());
+gtk_tree_view_row_activated(gobj(), const_cast<GtkTreePath*>((path).gobj()), (column).gobj()); 
 }
 
 void TreeView::expand_all()
 {
-  gtk_tree_view_expand_all(gobj());
+gtk_tree_view_expand_all(gobj()); 
 }
 
 void TreeView::collapse_all()
 {
-  gtk_tree_view_collapse_all(gobj());
+gtk_tree_view_collapse_all(gobj()); 
 }
 
 void TreeView::expand_to_path(const TreeModel::Path& path)
 {
-  gtk_tree_view_expand_to_path(gobj(), const_cast<GtkTreePath*>((path).gobj()));
+gtk_tree_view_expand_to_path(gobj(), const_cast<GtkTreePath*>((path).gobj())); 
 }
 
 bool TreeView::expand_row(const TreeModel::Path& path, bool open_all)
@@ -1324,7 +1394,7 @@ bool TreeView::row_expanded(const TreeModel::Path& path)
 
 void TreeView::set_reorderable(bool reorderable)
 {
-  gtk_tree_view_set_reorderable(gobj(), static_cast<int>(reorderable));
+gtk_tree_view_set_reorderable(gobj(), static_cast<int>(reorderable)); 
 }
 
 bool TreeView::get_reorderable() const
@@ -1334,72 +1404,112 @@ bool TreeView::get_reorderable() const
 
 void TreeView::set_cursor(const TreeModel::Path& path, TreeViewColumn& focus_column, bool start_editing)
 {
-  gtk_tree_view_set_cursor(gobj(), const_cast<GtkTreePath*>((path).gobj()), (focus_column).gobj(), static_cast<int>(start_editing));
+gtk_tree_view_set_cursor(gobj(), const_cast<GtkTreePath*>((path).gobj()), (focus_column).gobj(), static_cast<int>(start_editing)); 
 }
 
 void TreeView::set_cursor(const TreeModel::Path& path, TreeViewColumn& focus_column, CellRenderer& focus_cell, bool start_editing)
 {
-  gtk_tree_view_set_cursor_on_cell(gobj(), const_cast<GtkTreePath*>((path).gobj()), (focus_column).gobj(), (focus_cell).gobj(), static_cast<int>(start_editing));
+gtk_tree_view_set_cursor_on_cell(gobj(), const_cast<GtkTreePath*>((path).gobj()), (focus_column).gobj(), (focus_cell).gobj(), static_cast<int>(start_editing)); 
 }
 
 Glib::RefPtr<Gdk::Window> TreeView::get_bin_window()
 {
 
   Glib::RefPtr<Gdk::Window> retvalue = Glib::wrap((GdkWindowObject*)(gtk_tree_view_get_bin_window(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Window> TreeView::get_bin_window() const
 {
+  return const_cast<TreeView*>(this)->get_bin_window();
+}
 
-  Glib::RefPtr<const Gdk::Window> retvalue = Glib::wrap((GdkWindowObject*)(gtk_tree_view_get_bin_window(const_cast<GtkTreeView*>(gobj()))));
+#ifndef GTKMM_DISABLE_DEPRECATED
 
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+void TreeView::get_cell_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect)
+{
+gtk_tree_view_get_cell_area(gobj(), const_cast<GtkTreePath*>((path).gobj()), (column).gobj(), (rect).gobj()); 
 }
 
-void TreeView::get_cell_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect)
+#endif // GTKMM_DISABLE_DEPRECATED
+
+void TreeView::get_cell_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect) const
 {
-  gtk_tree_view_get_cell_area(gobj(), const_cast<GtkTreePath*>((path).gobj()), (column).gobj(), (rect).gobj());
+gtk_tree_view_get_cell_area(const_cast<GtkTreeView*>(gobj()), const_cast<GtkTreePath*>((path).gobj()), (column).gobj(), (rect).gobj()); 
 }
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void TreeView::get_background_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect)
 {
-  gtk_tree_view_get_background_area(gobj(), const_cast<GtkTreePath*>((path).gobj()), (column).gobj(), (rect).gobj());
+gtk_tree_view_get_background_area(gobj(), const_cast<GtkTreePath*>((path).gobj()), (column).gobj(), (rect).gobj()); 
 }
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
+void TreeView::get_background_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect) const
+{
+gtk_tree_view_get_background_area(const_cast<GtkTreeView*>(gobj()), const_cast<GtkTreePath*>((path).gobj()), (column).gobj(), (rect).gobj()); 
+}
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void TreeView::get_visible_rect(Gdk::Rectangle& visible_rect)
 {
-  gtk_tree_view_get_visible_rect(gobj(), (visible_rect).gobj());
+gtk_tree_view_get_visible_rect(gobj(), (visible_rect).gobj()); 
 }
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
+void TreeView::get_visible_rect(Gdk::Rectangle& visible_rect) const
+{
+gtk_tree_view_get_visible_rect(const_cast<GtkTreeView*>(gobj()), (visible_rect).gobj()); 
+}
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void TreeView::widget_to_tree_coords(int wx, int wy, int& tx, int& ty)
 {
-  gtk_tree_view_widget_to_tree_coords(gobj(), wx, wy, &tx, &ty);
+gtk_tree_view_widget_to_tree_coords(gobj(), wx, wy, &tx, &ty); 
 }
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
+void TreeView::widget_to_tree_coords(int wx, int wy, int& tx, int& ty) const
+{
+gtk_tree_view_widget_to_tree_coords(const_cast<GtkTreeView*>(gobj()), wx, wy, &tx, &ty); 
+}
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void TreeView::tree_to_widget_coords(int tx, int ty, int& wx, int& wy)
 {
-  gtk_tree_view_tree_to_widget_coords(gobj(), tx, ty, &wx, &wy);
+gtk_tree_view_tree_to_widget_coords(gobj(), tx, ty, &wx, &wy); 
+}
+
+#endif // GTKMM_DISABLE_DEPRECATED
+
+void TreeView::tree_to_widget_coords(int tx, int ty, int& wx, int& wy) const
+{
+gtk_tree_view_tree_to_widget_coords(const_cast<GtkTreeView*>(gobj()), tx, ty, &wx, &wy); 
 }
 
 void TreeView::unset_rows_drag_source()
 {
-  gtk_tree_view_unset_rows_drag_source(gobj());
+gtk_tree_view_unset_rows_drag_source(gobj()); 
 }
 
 void TreeView::unset_rows_drag_dest()
 {
-  gtk_tree_view_unset_rows_drag_dest(gobj());
+gtk_tree_view_unset_rows_drag_dest(gobj()); 
 }
 
 void TreeView::set_drag_dest_row(const TreeModel::Path& path, TreeViewDropPosition pos)
 {
-  gtk_tree_view_set_drag_dest_row(gobj(), const_cast<GtkTreePath*>((path).gobj()), ((GtkTreeViewDropPosition)(pos)));
+gtk_tree_view_set_drag_dest_row(gobj(), const_cast<GtkTreePath*>((path).gobj()), ((GtkTreeViewDropPosition)(pos))); 
 }
 
 Glib::RefPtr<Gdk::Pixmap> TreeView::create_row_drag_icon(const TreeModel::Path& path)
@@ -1409,7 +1519,7 @@ Glib::RefPtr<Gdk::Pixmap> TreeView::create_row_drag_icon(const TreeModel::Path&
 
 void TreeView::set_enable_search(bool enable_search)
 {
-  gtk_tree_view_set_enable_search(gobj(), static_cast<int>(enable_search));
+gtk_tree_view_set_enable_search(gobj(), static_cast<int>(enable_search)); 
 }
 
 bool TreeView::get_enable_search() const
@@ -1424,17 +1534,32 @@ int TreeView::get_search_column() const
 
 void TreeView::set_search_column(const TreeModelColumnBase& column)
 {
-  gtk_tree_view_set_search_column(gobj(), (column).index());
+gtk_tree_view_set_search_column(gobj(), (column).index()); 
 }
 
 void TreeView::set_search_column(int column)
 {
-  gtk_tree_view_set_search_column(gobj(), column);
+gtk_tree_view_set_search_column(gobj(), column); 
+}
+
+Entry* TreeView::get_search_entry()
+{
+  return Glib::wrap(gtk_tree_view_get_search_entry(gobj()));
+}
+
+const Entry* TreeView::get_search_entry() const
+{
+  return const_cast<TreeView*>(this)->get_search_entry();
+}
+
+void TreeView::set_search_entry(Entry& entry)
+{
+gtk_tree_view_set_search_entry(gobj(), (entry).gobj()); 
 }
 
 void TreeView::set_fixed_height_mode(bool enable)
 {
-  gtk_tree_view_set_fixed_height_mode(gobj(), static_cast<int>(enable));
+gtk_tree_view_set_fixed_height_mode(gobj(), static_cast<int>(enable)); 
 }
 
 bool TreeView::get_fixed_height_mode() const
@@ -1444,7 +1569,7 @@ bool TreeView::get_fixed_height_mode() const
 
 void TreeView::set_hover_selection(bool hover)
 {
-  gtk_tree_view_set_hover_selection(gobj(), static_cast<int>(hover));
+gtk_tree_view_set_hover_selection(gobj(), static_cast<int>(hover)); 
 }
 
 bool TreeView::get_hover_selection() const
@@ -1454,7 +1579,7 @@ bool TreeView::get_hover_selection() const
 
 void TreeView::set_hover_expand(bool expand)
 {
-  gtk_tree_view_set_hover_expand(gobj(), static_cast<int>(expand));
+gtk_tree_view_set_hover_expand(gobj(), static_cast<int>(expand)); 
 }
 
 bool TreeView::get_hover_expand() const
@@ -1462,179 +1587,339 @@ bool TreeView::get_hover_expand() const
   return gtk_tree_view_get_hover_expand(const_cast<GtkTreeView*>(gobj()));
 }
 
+void TreeView::set_rubber_banding(bool enable)
+{
+gtk_tree_view_set_rubber_banding(gobj(), static_cast<int>(enable)); 
+}
+
+bool TreeView::get_rubber_banding() const
+{
+  return gtk_tree_view_get_rubber_banding(const_cast<GtkTreeView*>(gobj()));
+}
+
+void TreeView::set_grid_lines(TreeViewGridLines grid_lines)
+{
+gtk_tree_view_set_grid_lines(gobj(), ((GtkTreeViewGridLines)(grid_lines))); 
+}
+
+TreeViewGridLines TreeView::get_grid_lines() const
+{
+  return ((TreeViewGridLines)(gtk_tree_view_get_grid_lines(const_cast<GtkTreeView*>(gobj()))));
+}
+
+void TreeView::set_enable_tree_lines(bool enable)
+{
+gtk_tree_view_set_enable_tree_lines(gobj(), static_cast<int>(enable)); 
+}
+
+bool TreeView::get_enable_tree_lines() const
+{
+  return gtk_tree_view_get_enable_tree_lines(const_cast<GtkTreeView*>(gobj()));
+}
+
 
 Glib::SignalProxy2< void,Adjustment*,Adjustment* > TreeView::signal_set_scroll_adjustments()
 {
   return Glib::SignalProxy2< void,Adjustment*,Adjustment* >(this, &TreeView_signal_set_scroll_adjustments_info);
 }
 
+
 Glib::SignalProxy2< void,const TreeModel::Path&,TreeViewColumn* > TreeView::signal_row_activated()
 {
   return Glib::SignalProxy2< void,const TreeModel::Path&,TreeViewColumn* >(this, &TreeView_signal_row_activated_info);
 }
 
+
 Glib::SignalProxy2< bool,const TreeModel::iterator&,const TreeModel::Path& > TreeView::signal_test_expand_row()
 {
   return Glib::SignalProxy2< bool,const TreeModel::iterator&,const TreeModel::Path& >(this, &TreeView_signal_test_expand_row_info);
 }
 
+
 Glib::SignalProxy2< bool,const TreeModel::iterator&,const TreeModel::Path& > TreeView::signal_test_collapse_row()
 {
   return Glib::SignalProxy2< bool,const TreeModel::iterator&,const TreeModel::Path& >(this, &TreeView_signal_test_collapse_row_info);
 }
 
+
 Glib::SignalProxy2< void,const TreeModel::iterator&,const TreeModel::Path& > TreeView::signal_row_expanded()
 {
   return Glib::SignalProxy2< void,const TreeModel::iterator&,const TreeModel::Path& >(this, &TreeView_signal_row_expanded_info);
 }
 
+
 Glib::SignalProxy2< void,const TreeModel::iterator&,const TreeModel::Path& > TreeView::signal_row_collapsed()
 {
   return Glib::SignalProxy2< void,const TreeModel::iterator&,const TreeModel::Path& >(this, &TreeView_signal_row_collapsed_info);
 }
 
+
 Glib::SignalProxy0< void > TreeView::signal_cursor_changed()
 {
   return Glib::SignalProxy0< void >(this, &TreeView_signal_cursor_changed_info);
 }
 
+
 Glib::SignalProxy0< void > TreeView::signal_columns_changed()
 {
   return Glib::SignalProxy0< void >(this, &TreeView_signal_columns_changed_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<TreeModel> > TreeView::property_model() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<TreeModel> >(this, "model");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TreeModel> > TreeView::property_model() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TreeModel> >(this, "model");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Adjustment*> TreeView::property_hadjustment() 
 {
   return Glib::PropertyProxy<Adjustment*>(this, "hadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Adjustment*> TreeView::property_hadjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Adjustment*>(this, "hadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Adjustment*> TreeView::property_vadjustment() 
 {
   return Glib::PropertyProxy<Adjustment*>(this, "vadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Adjustment*> TreeView::property_vadjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Adjustment*>(this, "vadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeView::property_headers_visible() 
 {
   return Glib::PropertyProxy<bool>(this, "headers-visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeView::property_headers_visible() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "headers-visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeView::property_headers_clickable() 
 {
   return Glib::PropertyProxy<bool>(this, "headers-clickable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeView::property_headers_clickable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "headers-clickable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<TreeViewColumn*> TreeView::property_expander_column() 
 {
   return Glib::PropertyProxy<TreeViewColumn*>(this, "expander-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<TreeViewColumn*> TreeView::property_expander_column() const
 {
   return Glib::PropertyProxy_ReadOnly<TreeViewColumn*>(this, "expander-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeView::property_reorderable() 
 {
   return Glib::PropertyProxy<bool>(this, "reorderable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeView::property_reorderable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "reorderable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeView::property_rules_hint() 
 {
   return Glib::PropertyProxy<bool>(this, "rules-hint");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeView::property_rules_hint() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "rules-hint");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeView::property_enable_search() 
 {
   return Glib::PropertyProxy<bool>(this, "enable-search");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeView::property_enable_search() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "enable-search");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TreeView::property_search_column() 
 {
   return Glib::PropertyProxy<int>(this, "search-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TreeView::property_search_column() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "search-column");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeView::property_fixed_height_mode() 
 {
   return Glib::PropertyProxy<bool>(this, "fixed-height-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeView::property_fixed_height_mode() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "fixed-height-mode");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeView::property_hover_selection() 
 {
   return Glib::PropertyProxy<bool>(this, "hover-selection");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeView::property_hover_selection() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "hover-selection");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeView::property_hover_expand() 
 {
   return Glib::PropertyProxy<bool>(this, "hover-expand");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeView::property_hover_expand() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "hover-expand");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> TreeView::property_show_expanders() 
+{
+  return Glib::PropertyProxy<bool>(this, "show-expanders");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> TreeView::property_show_expanders() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "show-expanders");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> TreeView::property_level_indentation() 
+{
+  return Glib::PropertyProxy<bool>(this, "level-indentation");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> TreeView::property_level_indentation() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "level-indentation");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> TreeView::property_rubber_banding() 
+{
+  return Glib::PropertyProxy<bool>(this, "rubber-banding");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> TreeView::property_rubber_banding() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "rubber-banding");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> TreeView::property_enable_grid_lines() 
+{
+  return Glib::PropertyProxy<bool>(this, "enable-grid-lines");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> TreeView::property_enable_grid_lines() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "enable-grid-lines");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> TreeView::property_enable_tree_lines() 
+{
+  return Glib::PropertyProxy<bool>(this, "enable-tree-lines");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> TreeView::property_enable_tree_lines() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "enable-tree-lines");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::TreeView::on_set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1644,7 +1929,6 @@ void Gtk::TreeView::on_set_scroll_adjustments(Adjustment* hadjustment, Adjustmen
   if(base && base->set_scroll_adjustments)
     (*base->set_scroll_adjustments)(gobj(),(GtkAdjustment*)Glib::unwrap(hadjustment),(GtkAdjustment*)Glib::unwrap(vadjustment));
 }
-
 void Gtk::TreeView::on_row_activated(const TreeModel::Path& path, TreeViewColumn* column)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1654,7 +1938,6 @@ void Gtk::TreeView::on_row_activated(const TreeModel::Path& path, TreeViewColumn
   if(base && base->row_activated)
     (*base->row_activated)(gobj(),const_cast<GtkTreePath*>((path).gobj()),(GtkTreeViewColumn*)Glib::unwrap(column));
 }
-
 bool Gtk::TreeView::on_test_expand_row(const TreeModel::iterator& iter, const TreeModel::Path& path)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1667,7 +1950,6 @@ bool Gtk::TreeView::on_test_expand_row(const TreeModel::iterator& iter, const Tr
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::TreeView::on_test_collapse_row(const TreeModel::iterator& iter, const TreeModel::Path& path)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1680,7 +1962,6 @@ bool Gtk::TreeView::on_test_collapse_row(const TreeModel::iterator& iter, const
   typedef bool RType;
   return RType();
 }
-
 void Gtk::TreeView::on_row_expanded(const TreeModel::iterator& iter, const TreeModel::Path& path)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1690,7 +1971,6 @@ void Gtk::TreeView::on_row_expanded(const TreeModel::iterator& iter, const TreeM
   if(base && base->row_expanded)
     (*base->row_expanded)(gobj(),const_cast<GtkTreeIter*>((iter).gobj()),const_cast<GtkTreePath*>((path).gobj()));
 }
-
 void Gtk::TreeView::on_row_collapsed(const TreeModel::iterator& iter, const TreeModel::Path& path)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1700,7 +1980,6 @@ void Gtk::TreeView::on_row_collapsed(const TreeModel::iterator& iter, const Tree
   if(base && base->row_collapsed)
     (*base->row_collapsed)(gobj(),const_cast<GtkTreeIter*>((iter).gobj()),const_cast<GtkTreePath*>((path).gobj()));
 }
-
 void Gtk::TreeView::on_cursor_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1710,7 +1989,6 @@ void Gtk::TreeView::on_cursor_changed()
   if(base && base->cursor_changed)
     (*base->cursor_changed)(gobj());
 }
-
 void Gtk::TreeView::on_columns_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1720,6 +1998,10 @@ void Gtk::TreeView::on_columns_changed()
   if(base && base->columns_changed)
     (*base->columns_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/treeview.h b/libs/gtkmm2/gtk/gtkmm/treeview.h
index 41a2bb9b9e..0be6852163 100644
--- a/libs/gtkmm2/gtk/gtkmm/treeview.h
+++ b/libs/gtkmm2/gtk/gtkmm/treeview.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREEVIEW_H
 #define _GTKMM_TREEVIEW_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -33,6 +34,7 @@
 #include <gtkmm/treemodelcolumn.h>
 #include <gtkmm/cellrenderer.h>
 #include <gtkmm/targetentry.h>
+#include <gtkmm/entry.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -81,6 +83,38 @@ public:
 namespace Gtk
 {
 
+/**
+ * @ingroup gtkmmEnums
+ */
+enum TreeViewGridLines
+{
+  TREE_VIEW_GRID_LINES_NONE,
+  TREE_VIEW_GRID_LINES_HORIZONTAL,
+  TREE_VIEW_GRID_LINES_VERTICAL,
+  TREE_VIEW_GRID_LINES_BOTH
+};
+
+} // namespace Gtk
+
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+namespace Glib
+{
+
+template <>
+class Value<Gtk::TreeViewGridLines> : public Glib::Value_Enum<Gtk::TreeViewGridLines>
+{
+public:
+  static GType value_type() G_GNUC_CONST;
+};
+
+} // namespace Glib
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
+
+namespace Gtk
+{
+
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
@@ -101,11 +135,11 @@ namespace TreeView_Private
   void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::CellRenderer* pCellRenderer, const Gtk::TreeModelColumn<ColumnType>& model_column);
 
   template<class ColumnType> inline
-  void _auto_store_on_cellrenderer_text_edited_string(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView*);
+  void _auto_store_on_cellrenderer_text_edited_string(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
 
   template <class ColumnType> inline
-  void _auto_store_on_cellrenderer_text_edited_numerical(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView*); 
-  
+  void _auto_store_on_cellrenderer_text_edited_numerical(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model); 
+
   template <class ColumnType> inline
   void _auto_cell_data_func(Gtk::CellRenderer* cell, const Gtk::TreeModel::iterator& iter, int model_column, const Glib::ustring& format);
 }
@@ -176,11 +210,16 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment);
   virtual void on_row_activated(const TreeModel::Path& path, TreeViewColumn* column);
   virtual bool on_test_expand_row(const TreeModel::iterator& iter, const TreeModel::Path& path);
@@ -189,6 +228,7 @@ protected:
   virtual void on_row_collapsed(const TreeModel::iterator& iter, const TreeModel::Path& path);
   virtual void on_cursor_changed();
   virtual void on_columns_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -212,13 +252,13 @@ public:
   explicit TreeView(const Glib::RefPtr<TreeModel>& model);
 
   
-  /** Returns the model the the Gtk::TreeView is based on.  Returns <tt>0</tt> if the
+  /** Returns the model the Gtk::TreeView is based on.  Returns <tt>0</tt> if the
    * model is unset.
    * @return A Gtk::TreeModel, or <tt>0</tt> if none is currently being used.
    */
   Glib::RefPtr<TreeModel> get_model();
   
-  /** Returns the model the the Gtk::TreeView is based on.  Returns <tt>0</tt> if the
+  /** Returns the model the Gtk::TreeView is based on.  Returns <tt>0</tt> if the
    * model is unset.
    * @return A Gtk::TreeModel, or <tt>0</tt> if none is currently being used.
    */
@@ -231,6 +271,11 @@ public:
    */
   void set_model(const Glib::RefPtr<TreeModel>& model);
   
+  /** Remove the model from the TreeView.
+   */
+  void unset_model();
+  
+  
   /** Gets the Gtk::TreeSelection associated with @a tree_view .
    * @return A Gtk::TreeSelection object.
    */
@@ -292,7 +337,7 @@ public:
    */
   bool get_headers_visible() const;
   
-  /** Sets the the visibility state of the headers.
+  /** Sets the visibility state of the headers.
    * @param headers_visible <tt>true</tt> if the headers are visible.
    */
   void set_headers_visible(bool headers_visible);
@@ -302,6 +347,8 @@ public:
    */
   void columns_autosize();
   
+  bool get_headers_clickable() const;
+  
   /** Allow the column title buttons to be clicked.
    * @param setting <tt>true</tt> if the columns are clickable.
    */
@@ -702,7 +749,7 @@ public:
   /** Expands the row at @a path . This will also expand all parent rows of
    *  @a path  as necessary.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param path Path to a row.
    */
   void expand_to_path(const TreeModel::Path& path);
@@ -785,7 +832,7 @@ public:
    * widget.  Please note that editing can only happen when the widget is
    * realized.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param path A Gtk::TreePath.
    * @param focus_column A Gtk::TreeViewColumn, or <tt>0</tt>.
    * @param focus_cell A Gtk::CellRenderer, or <tt>0</tt>.
@@ -826,9 +873,17 @@ public:
    */
   Glib::RefPtr<const Gdk::Window> get_bin_window() const;
 
+  #ifndef GTKMM_DISABLE_DEPRECATED
+
+  /** @deprecated Use the const version.
+   */
+  bool get_path_at_pos(int x, int y, TreeModel::Path& path, TreeViewColumn*& column, int& cell_x, int& cell_y);
+  #endif // GTKMM_DISABLE_DEPRECATED
+
+
   /** Finds the path at the point (x, y), relative to widget
    * coordinates. It is primarily for things like popup menus.
-   *  
+   *
    * @param x The x position to be identified
    * @param y The y position to be identified
    * @param path A reference to a TreeModel::Path to be filled in
@@ -839,8 +894,11 @@ public:
    *   can be placed
    * @return true if a row exists at that coordinate.
    */
-  bool get_path_at_pos(int x, int y, TreeModel::Path& path, TreeViewColumn*& column, int& cell_x, int& cell_y);
+  bool get_path_at_pos(int x, int y, TreeModel::Path& path, TreeViewColumn*& column, int& cell_x, int& cell_y) const;
+
   
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /** Fills the bounding rectangle in tree window coordinates for the cell at the
    * row specified by @a path  and the column specified by @a column .  If @a path  points to a path not currently displayed, the @a y  and @a height  fields
    * of the rectangle will be filled with 0.  The sum of all cell rects does not cover the
@@ -848,55 +906,138 @@ public:
    * returned rectangle is equivalent to the @a cell_area  passed to
    * Gtk::CellRenderer::render().  This function is only valid if #tree_view is
    * realized.
+   * @deprecated Use the const version
    * @param path A Gtk::TreePath for the row.
    * @param column A Gtk::TreeViewColumn for the column.
    * @param rect Rectangle to fill with cell rect.
    */
-  void get_cell_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle&  rect);
+  void get_cell_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect);
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
 //We ignore the fact that one of the arguments can be 0 - it does not seem useful.
 
   
   /** Fills the bounding rectangle in tree window coordinates for the cell at the
+   * row specified by @a path  and the column specified by @a column .  If @a path  points to a path not currently displayed, the @a y  and @a height  fields
+   * of the rectangle will be filled with 0.  The sum of all cell rects does not cover the
+   * entire tree; there are extra pixels in between rows, for example. The
+   * returned rectangle is equivalent to the @a cell_area  passed to
+   * Gtk::CellRenderer::render().  This function is only valid if #tree_view is
+   * realized.
+   * @param path A Gtk::TreePath for the row.
+   * @param column A Gtk::TreeViewColumn for the column.
+   * @param rect Rectangle to fill with cell rect.
+   */
+  void get_cell_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect) const;
+
+   
+#ifndef GTKMM_DISABLE_DEPRECATED
+
+  /** Fills the bounding rectangle in tree window coordinates for the cell at the
    * row specified by @a path  and the column specified by @a column .  The returned rectangle is equivalent to the
    *  @a background_area  passed to Gtk::CellRenderer::render().  These background
    * areas tile to cover the entire tree window (except for the area used for
    * header buttons). Contrast with the @a cell_area , returned by
    * get_cell_area(), which returns only the cell itself, excluding
    * surrounding borders and the tree expander area.
+   * @deprecated Use the const version.
    * @param path A Gtk::TreePath for the row.
    * @param column A Gtk::TreeViewColumn for the column.
    * @param rect Rectangle to fill with cell background rect.
    */
   void get_background_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect);
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
+  /** Fills the bounding rectangle in tree window coordinates for the cell at the
+   * row specified by @a path  and the column specified by @a column .  The returned rectangle is equivalent to the
+   *  @a background_area  passed to Gtk::CellRenderer::render().  These background
+   * areas tile to cover the entire tree window (except for the area used for
+   * header buttons). Contrast with the @a cell_area , returned by
+   * get_cell_area(), which returns only the cell itself, excluding
+   * surrounding borders and the tree expander area.
+   * @param path A Gtk::TreePath for the row.
+   * @param column A Gtk::TreeViewColumn for the column.
+   * @param rect Rectangle to fill with cell background rect.
+   */
+  void get_background_area(const TreeModel::Path& path, TreeViewColumn& column, Gdk::Rectangle& rect) const;
   //We ignore the fact that one of the arguments can be 0 - it does not seem useful.
 
   
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /** Fills @a visible_rect  with the currently-visible region of the
    * buffer, in tree coordinates. Convert to widget coordinates with
    * tree_to_widget_coords(). Tree coordinates start at
    * 0,0 for row 0 of the tree, and cover the entire scrollable area of
    * the tree.
+   * @deprecated Use the const version.
    * @param visible_rect Rectangle to fill.
    */
   void get_visible_rect(Gdk::Rectangle&  visible_rect);
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
+  /** Fills @a visible_rect  with the currently-visible region of the
+   * buffer, in tree coordinates. Convert to widget coordinates with
+   * tree_to_widget_coords(). Tree coordinates start at
+   * 0,0 for row 0 of the tree, and cover the entire scrollable area of
+   * the tree.
+   * @param visible_rect Rectangle to fill.
+   */
+  void get_visible_rect(Gdk::Rectangle&  visible_rect) const;
+
   
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /** Converts widget coordinates to coordinates for the
    * tree window (the full scrollable area of the tree).
+   * @deprecated Use the const version
    * @param wx Widget X coordinate.
    * @param wy Widget Y coordinate.
    * @param tx Return location for tree X coordinate.
    * @param ty Return location for tree Y coordinate.
    */
   void widget_to_tree_coords(int wx, int wy, int& tx, int& ty);
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
+  /** Converts widget coordinates to coordinates for the
+   * tree window (the full scrollable area of the tree).
+   * @param wx Widget X coordinate.
+   * @param wy Widget Y coordinate.
+   * @param tx Return location for tree X coordinate.
+   * @param ty Return location for tree Y coordinate.
+   */
+  void widget_to_tree_coords(int wx, int wy, int& tx, int& ty) const;
+
   
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /** Converts tree coordinates (coordinates in full scrollable area of the tree)
    * to widget coordinates.
+   * @deprecated Use the const version.
    * @param tx Tree X coordinate.
    * @param ty Tree Y coordinate.
    * @param wx Return location for widget X coordinate.
    * @param wy Return location for widget Y coordinate.
    */
   void tree_to_widget_coords(int tx, int ty, int& wx, int& wy);
+#endif // GTKMM_DISABLE_DEPRECATED
+
+
+  /** Converts tree coordinates (coordinates in full scrollable area of the tree)
+   * to widget coordinates.
+   * @param tx Tree X coordinate.
+   * @param ty Tree Y coordinate.
+   * @param wx Return location for widget X coordinate.
+   * @param wy Return location for widget Y coordinate.
+   */
+  void tree_to_widget_coords(int tx, int ty, int& wx, int& wy) const;
+
+   bool get_visible_range(TreeModel::Path& start_path, TreeModel::Path& end_path) const;
+  
 
 /* Drag-and-Drop support */
   
@@ -923,7 +1064,7 @@ public:
                                 Gdk::DragAction actions = Gdk::ACTION_COPY | Gdk::ACTION_MOVE);                                                                                              
 
   
-  /** Turns the TreeViewinto a drop destination for automatic DND.
+  /** Turns the TreeView into a drop destination for automatic DND.
    *
    * @param targets The table of targets that the drag will support.
    * @param actions The bitmask of possible actions for a drag from this widget.
@@ -983,8 +1124,8 @@ public:
   bool get_dest_row_at_pos(int drag_x, int drag_y, TreeModel::Path& path, TreeViewDropPosition& pos) const;
 
   
-  /** Creates a Gdk::Pixmap representation of the row at @a path .  This image is used
-   * for a drag icon.
+  /** Creates a Gdk::Pixmap representation of the row at @a path .  
+   * This image is used for a drag icon.
    * @param path A Gtk::TreePath in @a tree_view .
    * @return A newly-allocated pixmap of the drag icon.
    */
@@ -993,12 +1134,16 @@ public:
 /* Interactive search */
   
   /** If @a enable_search  is set, then the user can type in text to search through
-   * the tree interactively.
+   * the tree interactively (this is sometimes called "typeahead find").
+   * 
+   * Note that even if this is <tt>false</tt>, the user can still initiate a search 
+   * using the "start-interactive-search" key binding.
    * @param enable_search <tt>true</tt>, if the user can search interactively.
    */
   void set_enable_search(bool enable_search = true);
   
-  /** Returns whether or not the tree allows interactive searching.
+  /** Returns whether or not the tree allows to start interactive searching 
+   * by typing in text.
    * @return Whether or not to let the user search interactively.
    */
   bool get_enable_search() const;
@@ -1009,16 +1154,26 @@ public:
   int get_search_column() const;
   
   /** Sets @a column  as the column where the interactive search code should
-   * search in.  Additionally, turns on interactive searching. Note that
-   *  @a column  refers to a column of the model.
-   * @param column The column of the model to search in.
+   * search in. 
+   * 
+   * If the sort column is set, users can use the "start-interactive-search"
+   * key binding to bring up search popup. The enable-search property controls
+   * whether simply typing text will also start an interactive search.
+   * 
+   * Note that @a column  refers to a column of the model.
+   * @param column The column of the model to search in, or -1 to disable searching.
    */
   void set_search_column(const TreeModelColumnBase& column);
   
   /** Sets @a column  as the column where the interactive search code should
-   * search in.  Additionally, turns on interactive searching. Note that
-   *  @a column  refers to a column of the model.
-   * @param column The column of the model to search in.
+   * search in. 
+   * 
+   * If the sort column is set, users can use the "start-interactive-search"
+   * key binding to bring up search popup. The enable-search property controls
+   * whether simply typing text will also start an interactive search.
+   * 
+   * Note that @a column  refers to a column of the model.
+   * @param column The column of the model to search in, or -1 to disable searching.
    */
   void set_search_column(int column);
 
@@ -1034,13 +1189,24 @@ public:
   void set_search_equal_func(const SlotSearchEqual& slot);
   
 
+  Entry* get_search_entry();
+  
+  const Entry* get_search_entry() const;
+  
+  void set_search_entry(Entry& entry);
+
+  ///void on_search_position(Gtk::Widget* search_dialog)
+  typedef sigc::slot<void, Gtk::Widget* /* search_dialog */> SlotSearchPosition;
+  void set_search_position_func(const SlotSearchPosition& slot);
+  
+
   /** Enables or disables the fixed height mode of @a tree_view . 
    * Fixed height mode speeds up Gtk::TreeView by assuming that all 
    * rows have the same height. 
    * Only enable this option if all rows are the same height and all
    * columns are of type Gtk::TREE_VIEW_COLUMN_FIXED.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param enable <tt>true</tt> to enable fixed height mode.
    */
   void set_fixed_height_mode(bool enable = true);
@@ -1048,7 +1214,7 @@ public:
   /** Returns whether fixed height mode is turned on for @a tree_view .
    * @return <tt>true</tt> if @a tree_view  is in fixed height mode
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool get_fixed_height_mode() const;
   
@@ -1057,7 +1223,7 @@ public:
    * Currently, this works only for the selection modes 
    * Gtk::SELECTION_SINGLE and Gtk::SELECTION_BROWSE.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param hover <tt>true</tt> to enable hover selection mode.
    */
   void set_hover_selection(bool hover = true);
@@ -1065,7 +1231,7 @@ public:
   /** Returns whether hover selection mode is turned on for @a tree_view .
    * @return <tt>true</tt> if @a tree_view  is in hover selection mode
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool get_hover_selection() const;
   
@@ -1073,7 +1239,7 @@ public:
    * Hover expansion makes rows expand or collaps if the pointer 
    * moves over them.
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param expand <tt>true</tt> to enable hover selection mode.
    */
   void set_hover_expand(bool expand = true);
@@ -1081,9 +1247,13 @@ public:
   /** Returns whether hover expansion mode is turned on for @a tree_view .
    * @return <tt>true</tt> if @a tree_view  is in hover expansion mode
    * 
-   * Since: 2.6.
+   * @newin2p6.
    */
   bool get_hover_expand() const;
+  
+  void set_rubber_banding(bool enable = true);
+  
+  bool get_rubber_banding() const;
 
   /** For instance,
    * void on_row_separator(const Gtk::TreeModel& model, const Gtk::TreeModel::iterator& iter);
@@ -1093,41 +1263,94 @@ public:
   void set_row_separator_func(const SlotRowSeparator& slot);
   
 
+  void set_grid_lines(TreeViewGridLines grid_lines);
+  
+  TreeViewGridLines get_grid_lines() const;
+
+  
+  void set_enable_tree_lines(bool enable = true);
+  
+  bool get_enable_tree_lines() const;
+
+
+/**
+   * @par Prototype:
+   * <tt>void %set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment)</tt>
+   */
+
   Glib::SignalProxy2< void,Adjustment*,Adjustment* > signal_set_scroll_adjustments();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %row_activated(const TreeModel::Path& path, TreeViewColumn* column)</tt>
+   */
+
   Glib::SignalProxy2< void,const TreeModel::Path&,TreeViewColumn* > signal_row_activated();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %test_expand_row(const TreeModel::iterator& iter, const TreeModel::Path& path)</tt>
+   */
+
   Glib::SignalProxy2< bool,const TreeModel::iterator&,const TreeModel::Path& > signal_test_expand_row();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %test_collapse_row(const TreeModel::iterator& iter, const TreeModel::Path& path)</tt>
+   */
+
   Glib::SignalProxy2< bool,const TreeModel::iterator&,const TreeModel::Path& > signal_test_collapse_row();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %row_expanded(const TreeModel::iterator& iter, const TreeModel::Path& path)</tt>
+   */
+
   Glib::SignalProxy2< void,const TreeModel::iterator&,const TreeModel::Path& > signal_row_expanded();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %row_collapsed(const TreeModel::iterator& iter, const TreeModel::Path& path)</tt>
+   */
+
   Glib::SignalProxy2< void,const TreeModel::iterator&,const TreeModel::Path& > signal_row_collapsed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %cursor_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_cursor_changed();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %columns_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_columns_changed();
 
 
   //Don't wrap these. They are keybinding signals, and their API broke for GTK+ 2.2.
   
   
-  /** The model for the tree view.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The model for the tree view.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<TreeModel> > property_model() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The model for the tree view.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1135,15 +1358,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<TreeModel> > property_model() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Horizontal Adjustment for the widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Horizontal Adjustment for the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Adjustment*> property_hadjustment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Horizontal Adjustment for the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1151,15 +1378,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Adjustment*> property_hadjustment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Vertical Adjustment for the widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Vertical Adjustment for the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Adjustment*> property_vadjustment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Vertical Adjustment for the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1167,15 +1398,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Adjustment*> property_vadjustment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Show the column header buttons.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Show the column header buttons.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_headers_visible() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Show the column header buttons.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1183,15 +1418,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_headers_visible() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Column headers respond to click events.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Column headers respond to click events.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_headers_clickable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Column headers respond to click events.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1199,15 +1438,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_headers_clickable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Set the column for the expander column.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Set the column for the expander column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<TreeViewColumn*> property_expander_column() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Set the column for the expander column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1215,15 +1458,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<TreeViewColumn*> property_expander_column() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** View is reorderable.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** View is reorderable.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_reorderable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** View is reorderable.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1231,15 +1478,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_reorderable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Set a hint to the theme engine to draw rows in alternating colors.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Set a hint to the theme engine to draw rows in alternating colors.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_rules_hint() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Set a hint to the theme engine to draw rows in alternating colors.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1247,15 +1498,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_rules_hint() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** View allows user to search through columns interactively.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** View allows user to search through columns interactively.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_enable_search() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** View allows user to search through columns interactively.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1263,15 +1518,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_enable_search() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Model column to search through when searching through code.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Model column to search through when searching through code.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_search_column() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Model column to search through when searching through code.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1279,15 +1538,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_search_column() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Speeds up GtkTreeView by assuming that all rows have the same height.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Speeds up GtkTreeView by assuming that all rows have the same height.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_fixed_height_mode() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Speeds up GtkTreeView by assuming that all rows have the same height.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1295,15 +1558,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_fixed_height_mode() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the selection should follow the pointer.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the selection should follow the pointer.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_hover_selection() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the selection should follow the pointer.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1311,15 +1578,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_hover_selection() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether rows should be expanded/collapsed when the pointer moves over them.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether rows should be expanded/collapsed when the pointer moves over them.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_hover_expand() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether rows should be expanded/collapsed when the pointer moves over them.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -1327,20 +1598,126 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_hover_expand() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** View has expanders.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_show_expanders() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** View has expanders.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_show_expanders() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Extra indentation for each level.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_level_indentation() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Extra indentation for each level.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_level_indentation() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to enable selection of multiple items by dragging the mouse pointer.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_rubber_banding() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to enable selection of multiple items by dragging the mouse pointer.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_rubber_banding() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether grid lines should be drawn in the tree view.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_enable_grid_lines() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether grid lines should be drawn in the tree view.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_enable_grid_lines() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether tree lines should be drawn in the tree view.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_enable_tree_lines() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether tree lines should be drawn in the tree view.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_enable_tree_lines() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
   /// Get the treeview's model, but actually get the child model if it's a TreeModelFilter.
   Glib::RefPtr<Gtk::TreeModel> _get_base_model();
-  
+ 
 protected:
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
   template<class ColumnType> friend
-  void _auto_store_on_cellrenderer_text_edited_string(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView*);
+  void _auto_store_on_cellrenderer_text_edited_string(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
 
   template <class ColumnType> friend
-  void _auto_store_on_cellrenderer_text_edited_numerical(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView*);
-  
+  void _auto_store_on_cellrenderer_text_edited_numerical(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
+
+  void _auto_store_on_cellrenderer_toggle_edited_with_model(const Glib::ustring& path_string, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
+
+  // This is no longer used, but we must keep it to prevent linker errors with already-compiled applications,
+  // For instance, applications that were compiled with the older versions of the templates that did use this method.
+  // TODO: Remove this when we can break API.
   void _auto_store_on_cellrenderer_toggle_edited(const Glib::ustring& path_string, int model_column);
 
   template<class ColumnType> friend
@@ -1416,7 +1793,7 @@ int TreeView::append_column_numeric_editable(const Glib::ustring& title, const T
 template <class ColumnType> inline
 int TreeView::append_column_editable(const Glib::ustring& title, const TreeModelColumn<ColumnType>& model_column)
 {
-  g_assert(model_column.type() != 0);
+  //Don't use this in a header, because it gives warnings when disabled: g_assert(model_column.type() != 0);
 
   // compilation will fail if there is no appropriate TreeViewColumn
   // constructor for this model column type.
@@ -1465,17 +1842,33 @@ namespace TreeView_Private
 
 //bool specialization:
 template<> inline
-void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::CellRenderer* pCellRenderer,  const Gtk::TreeModelColumn<bool>& model_column)
+void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::CellRenderer* pCellRenderer, const Gtk::TreeModelColumn<bool>& model_column)
 {
   Gtk::CellRendererToggle* pCellToggle = dynamic_cast<Gtk::CellRendererToggle*>(pCellRenderer);
   if(pCellToggle)
   {
     //Set the appropriate property,
+    #ifdef GLIBMM_PROPERTIES_ENABLED
     pCellToggle->property_activatable() = true;
-  
-    //Connect to the appropriate signal, sending the model_column too,
+    #else
+    pCellToggle->set_property("activatable", true);
+    #endif
+
+    //Connect to the appropriate signal, sending the model_column too
+
+    sigc::slot<void, const Glib::ustring&, int> slot_temp = 
+      sigc::bind<-1>(
+        sigc::mem_fun(*this_p, &Gtk::TreeView::_auto_store_on_cellrenderer_toggle_edited_with_model), 
+        this_p->_get_base_model()
+      );
+
     pCellToggle->signal_toggled().connect(
-      sigc::bind<-1>( sigc::mem_fun(*this_p, &Gtk::TreeView::_auto_store_on_cellrenderer_toggle_edited), model_column.index()) );
+      sigc::bind<-1>( 
+        slot_temp,
+        model_column.index()
+      )
+    );
+
     //We use bind<1> instead of bind because some compilers need the extra hint.
   }
 }
@@ -1488,17 +1881,23 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
   if(pCellText)
   {
     //Set the appropriate property,
+    #ifdef GLIBMM_PROPERTIES_ENABLED
     pCellText->property_editable() = true;
+    #else
+    pCellText->set_property("editable", true);
+    #endif
 
     //Some compilers don't like us to give the pointer to a template function directly to sigc::ptr_fun():
-    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView* this_p);
+    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
     type_fptr fptr = _auto_store_on_cellrenderer_text_edited_numerical<int>;
 
     //Connect to the appropriate signal, sending the model_column too,
     //We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
     pCellText->signal_edited().connect(
       sigc::bind<-1>(
-        sigc::bind<-1>( sigc::ptr_fun(fptr), this_p),
+        sigc::bind<-1>( 
+          sigc::ptr_fun(fptr),
+          this_p->_get_base_model() ),
         model_column.index()
       )
     );
@@ -1514,17 +1913,23 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
   if(pCellText)
   {
     //Set the appropriate property,
+    #ifdef GLIBMM_PROPERTIES_ENABLED
     pCellText->property_editable() = true;
+    #else
+    pCellText->set_property("editable", true);
+    #endif
 
     //Some compilers don't like us to give the pointer to a template function directly to sigc::ptr_fun():
-    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView* this_p);
+    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
     type_fptr fptr = _auto_store_on_cellrenderer_text_edited_numerical<unsigned int>;
 
     //Connect to the appropriate signal, sending the model_column too,
     //We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
     pCellText->signal_edited().connect(
       sigc::bind<-1>(
-        sigc::bind<-1>( sigc::ptr_fun(fptr), this_p),
+        sigc::bind<-1>( 
+          sigc::ptr_fun(fptr),
+          this_p->_get_base_model() ),
         model_column.index()
       )
     );
@@ -1540,17 +1945,23 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
   if(pCellText)
   {
     //Set the appropriate property,
+    #ifdef GLIBMM_PROPERTIES_ENABLED
     pCellText->property_editable() = true;
-     
+    #else
+    pCellText->set_property("editable", true);
+    #endif
+
     //Some compilers don't like us to give the pointer to a template function directly to sigc::ptr_fun():
-    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView* this_p);
+    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
     type_fptr fptr = _auto_store_on_cellrenderer_text_edited_numerical<long>;
 
     //Connect to the appropriate signal, sending the model_column too,
     //We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
     pCellText->signal_edited().connect(
       sigc::bind<-1>(
-        sigc::bind<-1>( sigc::ptr_fun(fptr), this_p),
+        sigc::bind<-1>( 
+          sigc::ptr_fun(fptr),
+          this_p->_get_base_model() ),
         model_column.index()
       )
     );
@@ -1566,21 +1977,27 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
   if(pCellText)
   {
     //Set the appropriate property,
+    #ifdef GLIBMM_PROPERTIES_ENABLED
     pCellText->property_editable() = true;
-  
+    #else
+    pCellText->set_property("editable", true);
+    #endif
+
     //Some compilers don't like us to give the pointer to a template function directly to sigc::ptr_fun():
-    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView* this_p);
+    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
     type_fptr fptr = _auto_store_on_cellrenderer_text_edited_numerical<unsigned long>;
 
     //Connect to the appropriate signal, sending the model_column too,
     //We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
     pCellText->signal_edited().connect(
       sigc::bind<-1>(
-        sigc::bind<-1>( sigc::ptr_fun(fptr), this_p),
+        sigc::bind<-1>( 
+          sigc::ptr_fun(fptr),
+          this_p->_get_base_model() ),
         model_column.index()
       )
     );
-    
+ 
   }
 }
 
@@ -1592,17 +2009,23 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
   if(pCellText)
   {
     //Set the appropriate property,
+    #ifdef GLIBMM_PROPERTIES_ENABLED
     pCellText->property_editable() = true;
+    #else
+    pCellText->set_property("editable", true);
+    #endif
 
     //Some compilers don't like us to give the pointer to a template function directly to sigc::ptr_fun():
-    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView* this_p);
+    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
     type_fptr fptr = _auto_store_on_cellrenderer_text_edited_numerical<float>;
 
     //Connect to the appropriate signal, sending the model_column too,
     //We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
     pCellText->signal_edited().connect(
       sigc::bind<-1>(
-        sigc::bind<-1>( sigc::ptr_fun(fptr), this_p),
+        sigc::bind<-1>( 
+          sigc::ptr_fun(fptr),
+          this_p->_get_base_model() ),
         model_column.index()
       )
     );
@@ -1617,17 +2040,23 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
   if(pCellText)
   {
     //Set the appropriate property,
+    #ifdef GLIBMM_PROPERTIES_ENABLED
     pCellText->property_editable() = true;
+    #else
+    pCellText->set_property("editable", true);
+    #endif
 
     //Some compilers don't like us to give the pointer to a template function directly to sigc::ptr_fun():
-    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView* this_p);
+    typedef void (*type_fptr)(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model);
     type_fptr fptr = _auto_store_on_cellrenderer_text_edited_numerical<double>;
 
     //Connect to the appropriate signal, sending the model_column too,
     //We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
     pCellText->signal_edited().connect(
       sigc::bind<-1>(
-        sigc::bind<-1>( sigc::ptr_fun(fptr), this_p),
+        sigc::bind<-1>( 
+          sigc::ptr_fun(fptr),
+          this_p->_get_base_model() ),
         model_column.index()
       )
     );
@@ -1647,9 +2076,9 @@ namespace TreeView_Private
 #ifdef GTKMM_HAVE_SIGC_BIND
 
 template <class ColumnType> inline
-void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::CellRenderer* pCellRenderer,  const Gtk::TreeModelColumn<ColumnType>& model_column)
+void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::CellRenderer* pCellRenderer, const Gtk::TreeModelColumn<ColumnType>& model_column)
 {
-  g_assert(model_column.type() != 0);
+  //Don't use this in a header, because it gives warnings when disabled: g_assert(model_column.type() != 0);
 
   //The different CellRenderers have different "edited" signals,
   //and numerical values need to convert the text value to a number,
@@ -1661,18 +2090,22 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
   //and connect to the appropriate signal, sending the model_column too,
   if(pCellText)
   {
+    #ifdef GLIBMM_PROPERTIES_ENABLED
     pCellText->property_editable() = true;
-   
+    #else
+    pCellText->set_property("editable", true);
+    #endif
+
     //Some compilers (IRIX MipsPro) don't like us to give the pointer to a template function directly to sigc::ptr_fun():
-    typedef void (*type_func)(const Glib::ustring&, const Glib::ustring&, int, Gtk::TreeView*);
+    typedef void (*type_func)(const Glib::ustring&, const Glib::ustring&, int, const Glib::RefPtr<Gtk::TreeModel>&);
     type_func func = &(_auto_store_on_cellrenderer_text_edited_string<ColumnType>);
-    sigc::slot<void, const Glib::ustring&, const Glib::ustring&, int, Gtk::TreeView*> theslot  =
+    sigc::slot<void, const Glib::ustring&, const Glib::ustring&, int, const Glib::RefPtr<Gtk::TreeModel>&> theslot  =
       sigc::ptr_fun(func);
 
     //We use bind<-1> twice here, instead of using bind() once, because some compilers need the extra hint.
     pCellText->signal_edited().connect(
       sigc::bind<-1>(
-        sigc::bind<-1>( theslot, this_p),
+        sigc::bind<-1>( theslot, this_p->_get_base_model()),
         model_column.index()
       )
     );
@@ -1684,44 +2117,48 @@ void _connect_auto_store_editable_signal_handler(Gtk::TreeView* this_p, Gtk::Cel
 #endif //GTKMM_HAVE_SIGC_BIND
 
 template <class ColumnType> inline
-void _auto_store_on_cellrenderer_text_edited_string(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView* this_p)
+void _auto_store_on_cellrenderer_text_edited_string(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model)
 {
   Gtk::TreePath path(path_string);
 
   //Get the row from the path:
-  Glib::RefPtr<TreeModel> refModel = this_p->_get_base_model();
-  Gtk::TreeModel::iterator iter = refModel->get_iter(path);
-  if(iter)
+  if(model)
   {
-      //Store the user's new text in the model:
-      Gtk::TreeRow row = *iter;
-      row.set_value(model_column, (ColumnType)new_text);
+    Gtk::TreeModel::iterator iter = model->get_iter(path);
+    if(iter)
+    {
+        //Store the user's new text in the model:
+        Gtk::TreeRow row = *iter;
+        row.set_value(model_column, (ColumnType)new_text);
+    }
   }
 }
 
 template <class ColumnType> inline
-void _auto_store_on_cellrenderer_text_edited_numerical(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, Gtk::TreeView* this_p)
+void _auto_store_on_cellrenderer_text_edited_numerical(const Glib::ustring& path_string, const Glib::ustring& new_text, int model_column, const Glib::RefPtr<Gtk::TreeModel>& model)
 {
   //This is used on numerical model columns:
 
   Gtk::TreePath path(path_string);
 
   //Get the row from the path:
-  Glib::RefPtr<TreeModel> refModel = this_p->_get_base_model();
-  Gtk::TreeModel::iterator iter = refModel->get_iter(path);
-  if(iter)
-  { 
-    //std::istringstream astream(new_text); //Put it in a stream.
-    //ColumnType new_value = ColumnType();
-    //new_value << astream; //Get it out of the stream as the numerical type.
-    
-    //Convert the text to a number, using the same logic used by GtkCellRendererText when it stores numbers.
-    char* pchEnd = 0;
-    ColumnType new_value = static_cast<ColumnType>( strtod(new_text.c_str(), &pchEnd) );
+  if(model)
+  {
+    Gtk::TreeModel::iterator iter = model->get_iter(path);
+    if(iter)
+    {
+      //std::istringstream astream(new_text); //Put it in a stream.
+      //ColumnType new_value = ColumnType();
+      //new_value << astream; //Get it out of the stream as the numerical type.
 
-    //Store the user's new text in the model:
-    Gtk::TreeRow row = *iter;
-    row.set_value(model_column, (ColumnType)new_value);
+      //Convert the text to a number, using the same logic used by GtkCellRendererText when it stores numbers.
+      char* pchEnd = 0;
+      ColumnType new_value = static_cast<ColumnType>( strtod(new_text.c_str(), &pchEnd) );
+
+      //Store the user's new text in the model:
+      Gtk::TreeRow row = *iter;
+      row.set_value(model_column, (ColumnType)new_value);
+    }
   }
 }
 
@@ -1741,14 +2178,18 @@ void _auto_cell_data_func(Gtk::CellRenderer* cell, const Gtk::TreeModel::iterato
       Gtk::TreeModel::Row row = *iter;
       ColumnType value = ColumnType();
       row.get_value(model_column, value);
-      
+
       //Convert it to a string representation:
       char buff[20];
       int used = g_snprintf(buff, sizeof(buff), format.c_str(), value); //value must be a numeric type.
       if(used > 0)
       {
         //Show the text representation in the view:
+        #ifdef GLIBMM_PROPERTIES_ENABLED
         pTextRenderer->property_text() = buff;
+        #else
+        pTextRenderer->set_property("text", (void*)buff);
+        #endif
       }
     }
   }
@@ -1769,6 +2210,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::TreeView* wrap(GtkTreeView* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_TREEVIEW_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treeview_private.cc b/libs/gtkmm2/gtk/gtkmm/treeview_private.cc
index a18fce35f8..0367008ddc 100644
--- a/libs/gtkmm2/gtk/gtkmm/treeview_private.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treeview_private.cc
@@ -27,52 +27,42 @@ namespace Gtk
 namespace TreeView_Private
 {
 
-SignalProxy_CellData::SignalProxy_CellData(const SlotType& slot)
-:
-  slot_ (slot)
-{}
-
-SignalProxy_CellData::~SignalProxy_CellData()
-{}
-
-void SignalProxy_CellData::gtk_callback(GtkTreeViewColumn*, GtkCellRenderer* cell,
+void SignalProxy_CellData_gtk_callback(GtkTreeViewColumn*, GtkCellRenderer* cell,
                                         GtkTreeModel* model, GtkTreeIter* iter, void* data)
 {
-  SignalProxy_CellData *const self = static_cast<SignalProxy_CellData*>(data);
+  TreeViewColumn::SlotCellData* the_slot = static_cast<TreeViewColumn::SlotCellData*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLE
     // use Slot::operator()
-    (self->slot_)(Glib::wrap(cell, false), TreeIter(model, iter));
+    (*the_slot)(Glib::wrap(cell, false), TreeIter(model, iter));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
     Glib::exception_handlers_invoke();
   }
+  #endif //GLIBMM_EXCEPTIONS_ENABLE
 }
 
-void SignalProxy_CellData::gtk_callback_destroy(void* data)
+void SignalProxy_CellData_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_CellData*>(data);
+  delete static_cast<TreeViewColumn::SlotCellData*>(data);
 }
 
 
-
-SignalProxy_RowSeparator::SignalProxy_RowSeparator(const SlotType& slot)
-:
-  slot_ (slot)
-{}
-
-SignalProxy_RowSeparator::~SignalProxy_RowSeparator()
-{}
-
-gboolean SignalProxy_RowSeparator::gtk_callback(GtkTreeModel* model, GtkTreeIter* iter, void* data)
+gboolean SignalProxy_RowSeparator_gtk_callback(GtkTreeModel* model, GtkTreeIter* iter, void* data)
 {
-  SignalProxy_RowSeparator *const self = static_cast<SignalProxy_RowSeparator*>(data);
+  TreeView::SlotRowSeparator* the_slot = static_cast<TreeView::SlotRowSeparator*>(data);
 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
-    return (self->slot_)(Glib::wrap(model, true), Gtk::TreeIter(model, iter));
+  #endif //GLIBMM_EXCEPTIONS_ENABLE
+    return (*the_slot)(Glib::wrap(model, true), Gtk::TreeIter(model, iter));
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
@@ -80,11 +70,12 @@ gboolean SignalProxy_RowSeparator::gtk_callback(GtkTreeModel* model, GtkTreeIter
   }
 
   return 0; // arbitrary value
+  #endif //GLIBMM_EXCEPTIONS_ENABLE
 }
 
-void SignalProxy_RowSeparator::gtk_callback_destroy(void* data)
+void SignalProxy_RowSeparator_gtk_callback_destroy(void* data)
 {
-  delete static_cast<SignalProxy_RowSeparator*>(data);
+  delete static_cast<TreeView::SlotRowSeparator*>(data);
 }
 
 
diff --git a/libs/gtkmm2/gtk/gtkmm/treeview_private.h b/libs/gtkmm2/gtk/gtkmm/treeview_private.h
index 418abe3a69..42656b5ba8 100644
--- a/libs/gtkmm2/gtk/gtkmm/treeview_private.h
+++ b/libs/gtkmm2/gtk/gtkmm/treeview_private.h
@@ -32,40 +32,12 @@ namespace Gtk
 namespace TreeView_Private
 {
 
-//This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_CellData
-{
-public:
-  typedef TreeViewColumn::SlotCellData SlotType;
-
-  SignalProxy_CellData(const SlotType& slot);
-  ~SignalProxy_CellData();
-
-  static void gtk_callback(GtkTreeViewColumn*, GtkCellRenderer* cell,
+void SignalProxy_CellData_gtk_callback(GtkTreeViewColumn*, GtkCellRenderer* cell,
                            GtkTreeModel* model, GtkTreeIter* iter, void* data);
-  static void gtk_callback_destroy(void* data);
-
-protected:
-  SlotType slot_;
-};
-
-//SignalProxy_RowSeparator:
-
-//This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
-class SignalProxy_RowSeparator
-{
-public:
-  typedef TreeView::SlotRowSeparator SlotType;
-
-  SignalProxy_RowSeparator(const SlotType& slot);
-  ~SignalProxy_RowSeparator();
-
-  static gboolean gtk_callback(GtkTreeModel* model, GtkTreeIter* iter, void* data);
-  static void gtk_callback_destroy(void* data);
+void SignalProxy_CellData_gtk_callback_destroy(void* data);
 
-protected:
-  SlotType slot_;
-};
+gboolean SignalProxy_RowSeparator_gtk_callback(GtkTreeModel* model, GtkTreeIter* iter, void* data);
+void SignalProxy_RowSeparator_gtk_callback_destroy(void* data);
 
 
 } /* namespace TreeView_Private */
diff --git a/libs/gtkmm2/gtk/gtkmm/treeviewcolumn.cc b/libs/gtkmm2/gtk/gtkmm/treeviewcolumn.cc
index 9a726fd39b..97d84d629d 100644
--- a/libs/gtkmm2/gtk/gtkmm/treeviewcolumn.cc
+++ b/libs/gtkmm2/gtk/gtkmm/treeviewcolumn.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/treeviewcolumn.h>
 #include <gtkmm/private/treeviewcolumn_p.h>
 
@@ -53,29 +54,42 @@ TreeViewColumn::TreeViewColumn(const Glib::ustring& title, Gtk::CellRenderer& ce
   pack_start(cell, true);
 }
 
+void TreeViewColumn::add_attribute(Gtk::CellRenderer& cell, const Glib::ustring& property_name,
+                                   const TreeModelColumnBase& column)
+{
+  gtk_tree_view_column_add_attribute(gobj(),
+      (GtkCellRenderer*) cell.gobj(), property_name.c_str(), column.index());
+}
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
 void TreeViewColumn::add_attribute(const Glib::PropertyProxy_Base& property,
                                    const TreeModelColumnBase& column)
 {
   gtk_tree_view_column_add_attribute(gobj(),
       (GtkCellRenderer*) property.get_object()->gobj(), property.get_name(), column.index());
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 void TreeViewColumn::set_renderer(Gtk::CellRenderer& renderer, const TreeModelColumnBase& column)
 {
+#ifdef GLIBMM_PROPERTIES_ENABLED
   add_attribute(renderer._property_renderable(), column);
+#else
+  add_attribute(renderer, renderer._property_renderable(), column);
+#endif
 }
 
 
 void TreeViewColumn::set_cell_data_func(CellRenderer& cell_renderer, const SlotCellData& slot)
 {
-  //Create a signal proxy. A pointer to this will be passed through the callback's data parameter.
-  //It will be deleted when TreeView_Private::SignalProxy_CellData::gtk_callback_destroy() is called.
-  TreeView_Private::SignalProxy_CellData* pSignalProxy = new TreeView_Private::SignalProxy_CellData(slot);
+  //Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
+  //It will be deleted when TreeView_Private::SignalProxy_CellData_gtk_callback_destroy() is called.
+  SlotCellData* slot_copy = new SlotCellData(slot);
 
   gtk_tree_view_column_set_cell_data_func(
       gobj(), cell_renderer.gobj(),
-      &TreeView_Private::SignalProxy_CellData::gtk_callback, pSignalProxy,
-      &TreeView_Private::SignalProxy_CellData::gtk_callback_destroy);
+      &TreeView_Private::SignalProxy_CellData_gtk_callback, slot_copy,
+      &TreeView_Private::SignalProxy_CellData_gtk_callback_destroy);
 }
 
 void TreeViewColumn::unset_cell_data_func(CellRenderer& cell_renderer)
@@ -99,17 +113,19 @@ const CellRenderer* TreeViewColumn::get_first_cell_renderer() const
   return const_cast<TreeViewColumn*>(this)->get_first_cell_renderer();
 }
 
-//deprecated:
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void TreeViewColumn::set_sort_column_id(const TreeModelColumnBase& sort_column)
 {
   set_sort_column(sort_column);
 }
 
-//deprecated:
 void TreeViewColumn::set_sort_column_id(int sort_column_id)
 {
   set_sort_column(sort_column_id);
-}  
+}
+#endif // GTKMM_DISABLE_DEPRECATED
+  
 
 } // namespace Gtk
 
@@ -117,13 +133,15 @@ void TreeViewColumn::set_sort_column_id(int sort_column_id)
 namespace
 {
 
-const Glib::SignalProxyInfo TreeViewColumn_signal_clicked_info =
+
+static const Glib::SignalProxyInfo TreeViewColumn_signal_clicked_info =
 {
   "clicked",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
 };
 
+
 } // anonymous namespace
 
 // static
@@ -174,10 +192,18 @@ void TreeViewColumn_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->clicked = &clicked_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void TreeViewColumn_Class::clicked_callback(GtkTreeViewColumn* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -190,15 +216,19 @@ void TreeViewColumn_Class::clicked_callback(GtkTreeViewColumn* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_clicked();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -211,6 +241,7 @@ void TreeViewColumn_Class::clicked_callback(GtkTreeViewColumn* self)
       (*base->clicked)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* TreeViewColumn_Class::wrap_new(GObject* o)
@@ -261,17 +292,17 @@ TreeViewColumn::TreeViewColumn()
 
 void TreeViewColumn::pack_start(CellRenderer& cell, bool expand)
 {
-  gtk_tree_view_column_pack_start(gobj(), (cell).gobj(), static_cast<int>(expand));
+gtk_tree_view_column_pack_start(gobj(), (cell).gobj(), static_cast<int>(expand)); 
 }
 
 void TreeViewColumn::pack_end(CellRenderer& cell, bool expand)
 {
-  gtk_tree_view_column_pack_end(gobj(), (cell).gobj(), static_cast<int>(expand));
+gtk_tree_view_column_pack_end(gobj(), (cell).gobj(), static_cast<int>(expand)); 
 }
 
 void TreeViewColumn::clear()
 {
-  gtk_tree_view_column_clear(gobj());
+gtk_tree_view_column_clear(gobj()); 
 }
 
 Glib::ListHandle<CellRenderer*> TreeViewColumn::get_cell_renderers()
@@ -286,17 +317,17 @@ Glib::ListHandle<const CellRenderer*> TreeViewColumn::get_cell_renderers() const
 
 void TreeViewColumn::add_attribute(CellRenderer& cell_renderer, const Glib::ustring& attribute, int column)
 {
-  gtk_tree_view_column_add_attribute(gobj(), (cell_renderer).gobj(), attribute.c_str(), column);
+gtk_tree_view_column_add_attribute(gobj(), (cell_renderer).gobj(), attribute.c_str(), column); 
 }
 
 void TreeViewColumn::clear_attributes(CellRenderer& cell_renderer)
 {
-  gtk_tree_view_column_clear_attributes(gobj(), (cell_renderer).gobj());
+gtk_tree_view_column_clear_attributes(gobj(), (cell_renderer).gobj()); 
 }
 
 void TreeViewColumn::set_spacing(int spacing)
 {
-  gtk_tree_view_column_set_spacing(gobj(), spacing);
+gtk_tree_view_column_set_spacing(gobj(), spacing); 
 }
 
 int TreeViewColumn::get_spacing() const
@@ -306,7 +337,7 @@ int TreeViewColumn::get_spacing() const
 
 void TreeViewColumn::set_visible(bool visible)
 {
-  gtk_tree_view_column_set_visible(gobj(), static_cast<int>(visible));
+gtk_tree_view_column_set_visible(gobj(), static_cast<int>(visible)); 
 }
 
 bool TreeViewColumn::get_visible() const
@@ -316,7 +347,7 @@ bool TreeViewColumn::get_visible() const
 
 void TreeViewColumn::set_resizable(bool resizable)
 {
-  gtk_tree_view_column_set_resizable(gobj(), static_cast<int>(resizable));
+gtk_tree_view_column_set_resizable(gobj(), static_cast<int>(resizable)); 
 }
 
 bool TreeViewColumn::get_resizable() const
@@ -326,7 +357,7 @@ bool TreeViewColumn::get_resizable() const
 
 void TreeViewColumn::set_sizing(TreeViewColumnSizing type)
 {
-  gtk_tree_view_column_set_sizing(gobj(), ((GtkTreeViewColumnSizing)(type)));
+gtk_tree_view_column_set_sizing(gobj(), ((GtkTreeViewColumnSizing)(type))); 
 }
 
 TreeViewColumnSizing TreeViewColumn::get_sizing()
@@ -346,12 +377,12 @@ int TreeViewColumn::get_fixed_width() const
 
 void TreeViewColumn::set_fixed_width(int fixed_width)
 {
-  gtk_tree_view_column_set_fixed_width(gobj(), fixed_width);
+gtk_tree_view_column_set_fixed_width(gobj(), fixed_width); 
 }
 
 void TreeViewColumn::set_min_width(int min_width)
 {
-  gtk_tree_view_column_set_min_width(gobj(), min_width);
+gtk_tree_view_column_set_min_width(gobj(), min_width); 
 }
 
 int TreeViewColumn::get_min_width() const
@@ -361,7 +392,7 @@ int TreeViewColumn::get_min_width() const
 
 void TreeViewColumn::set_max_width(int max_width)
 {
-  gtk_tree_view_column_set_max_width(gobj(), max_width);
+gtk_tree_view_column_set_max_width(gobj(), max_width); 
 }
 
 int TreeViewColumn::get_max_width() const
@@ -371,12 +402,12 @@ int TreeViewColumn::get_max_width() const
 
 void TreeViewColumn::clicked()
 {
-  gtk_tree_view_column_clicked(gobj());
+gtk_tree_view_column_clicked(gobj()); 
 }
 
 void TreeViewColumn::set_title(const Glib::ustring& title)
 {
-  gtk_tree_view_column_set_title(gobj(), title.c_str());
+gtk_tree_view_column_set_title(gobj(), title.c_str()); 
 }
 
 Glib::ustring TreeViewColumn::get_title() const
@@ -386,7 +417,7 @@ Glib::ustring TreeViewColumn::get_title() const
 
 void TreeViewColumn::set_expand(bool expand)
 {
-  gtk_tree_view_column_set_expand(gobj(), static_cast<int>(expand));
+gtk_tree_view_column_set_expand(gobj(), static_cast<int>(expand)); 
 }
 
 bool TreeViewColumn::get_expand() const
@@ -396,7 +427,7 @@ bool TreeViewColumn::get_expand() const
 
 void TreeViewColumn::set_clickable(bool clickable)
 {
-  gtk_tree_view_column_set_clickable(gobj(), static_cast<int>(clickable));
+gtk_tree_view_column_set_clickable(gobj(), static_cast<int>(clickable)); 
 }
 
 bool TreeViewColumn::get_clickable() const
@@ -406,7 +437,7 @@ bool TreeViewColumn::get_clickable() const
 
 void TreeViewColumn::set_widget(Gtk::Widget& widget)
 {
-  gtk_tree_view_column_set_widget(gobj(), (widget).gobj());
+gtk_tree_view_column_set_widget(gobj(), (widget).gobj()); 
 }
 
 Widget* TreeViewColumn::get_widget()
@@ -421,12 +452,12 @@ const Widget* TreeViewColumn::get_widget() const
 
 void TreeViewColumn::set_alignment(float xalign)
 {
-  gtk_tree_view_column_set_alignment(gobj(), xalign);
+gtk_tree_view_column_set_alignment(gobj(), xalign); 
 }
 
 void TreeViewColumn::set_alignment(AlignmentEnum xalign)
 {
-  gtk_tree_view_column_set_alignment(gobj(), _gtkmm_align_float_from_enum(xalign));
+gtk_tree_view_column_set_alignment(gobj(), _gtkmm_align_float_from_enum(xalign)); 
 }
 
 float TreeViewColumn::get_alignment() const
@@ -436,7 +467,7 @@ float TreeViewColumn::get_alignment() const
 
 void TreeViewColumn::set_reorderable(bool reorderable)
 {
-  gtk_tree_view_column_set_reorderable(gobj(), static_cast<int>(reorderable));
+gtk_tree_view_column_set_reorderable(gobj(), static_cast<int>(reorderable)); 
 }
 
 bool TreeViewColumn::get_reorderable() const
@@ -446,12 +477,12 @@ bool TreeViewColumn::get_reorderable() const
 
 void TreeViewColumn::set_sort_column(const TreeModelColumnBase& sort_column_id)
 {
-  gtk_tree_view_column_set_sort_column_id(gobj(), (sort_column_id).index());
+gtk_tree_view_column_set_sort_column_id(gobj(), (sort_column_id).index()); 
 }
 
 void TreeViewColumn::set_sort_column(int sort_column_id)
 {
-  gtk_tree_view_column_set_sort_column_id(gobj(), sort_column_id);
+gtk_tree_view_column_set_sort_column_id(gobj(), sort_column_id); 
 }
 
 int TreeViewColumn::get_sort_column_id() const
@@ -461,7 +492,7 @@ int TreeViewColumn::get_sort_column_id() const
 
 void TreeViewColumn::set_sort_indicator(bool setting)
 {
-  gtk_tree_view_column_set_sort_indicator(gobj(), static_cast<int>(setting));
+gtk_tree_view_column_set_sort_indicator(gobj(), static_cast<int>(setting)); 
 }
 
 bool TreeViewColumn::get_sort_indicator() const
@@ -471,7 +502,7 @@ bool TreeViewColumn::get_sort_indicator() const
 
 void TreeViewColumn::set_sort_order(SortType order)
 {
-  gtk_tree_view_column_set_sort_order(gobj(), ((GtkSortType)(order)));
+gtk_tree_view_column_set_sort_order(gobj(), ((GtkSortType)(order))); 
 }
 
 SortType TreeViewColumn::get_sort_order() const
@@ -481,12 +512,12 @@ SortType TreeViewColumn::get_sort_order() const
 
 void TreeViewColumn::cell_set_cell_data(const Glib::RefPtr<TreeModel>& tree_model, const TreeModel::iterator& iter, bool is_expander, bool is_expanded)
 {
-  gtk_tree_view_column_cell_set_cell_data(gobj(), Glib::unwrap(tree_model), const_cast<GtkTreeIter*>((iter).gobj()), static_cast<int>(is_expander), static_cast<int>(is_expanded));
+gtk_tree_view_column_cell_set_cell_data(gobj(), Glib::unwrap(tree_model), const_cast<GtkTreeIter*>((iter).gobj()), static_cast<int>(is_expander), static_cast<int>(is_expanded)); 
 }
 
 void TreeViewColumn::cell_get_size(Gdk::Rectangle& cell_area, int& x_offset, int& y_offset, int& width, int& height) const
 {
-  gtk_tree_view_column_cell_get_size(const_cast<GtkTreeViewColumn*>(gobj()), (cell_area).gobj(), &x_offset, &y_offset, &width, &height);
+gtk_tree_view_column_cell_get_size(const_cast<GtkTreeViewColumn*>(gobj()), (cell_area).gobj(), &x_offset, &y_offset, &width, &height); 
 }
 
 bool TreeViewColumn::cell_is_visible() const
@@ -496,7 +527,7 @@ bool TreeViewColumn::cell_is_visible() const
 
 void TreeViewColumn::focus_cell(CellRenderer& cell)
 {
-  gtk_tree_view_column_focus_cell(gobj(), (cell).gobj());
+gtk_tree_view_column_focus_cell(gobj(), (cell).gobj()); 
 }
 
 bool TreeViewColumn::get_cell_position(const CellRenderer& cell_renderer, int& start_pos, int& width) const
@@ -504,6 +535,11 @@ bool TreeViewColumn::get_cell_position(const CellRenderer& cell_renderer, int& s
   return gtk_tree_view_column_cell_get_position(const_cast<GtkTreeViewColumn*>(gobj()), const_cast<GtkCellRenderer*>((cell_renderer).gobj()), &start_pos, &width);
 }
 
+void TreeViewColumn::queue_resize()
+{
+gtk_tree_view_column_queue_resize(gobj()); 
+}
+
 
 Glib::SignalProxy0< void > TreeViewColumn::signal_clicked()
 {
@@ -511,142 +547,197 @@ Glib::SignalProxy0< void > TreeViewColumn::signal_clicked()
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeViewColumn::property_visible() 
 {
   return Glib::PropertyProxy<bool>(this, "visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeViewColumn::property_visible() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TreeViewColumn::property_width() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<TreeViewColumnSizing> TreeViewColumn::property_sizing() 
 {
   return Glib::PropertyProxy<TreeViewColumnSizing>(this, "sizing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<TreeViewColumnSizing> TreeViewColumn::property_sizing() const
 {
   return Glib::PropertyProxy_ReadOnly<TreeViewColumnSizing>(this, "sizing");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TreeViewColumn::property_fixed_width() 
 {
   return Glib::PropertyProxy<int>(this, "fixed-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TreeViewColumn::property_fixed_width() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "fixed-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TreeViewColumn::property_min_width() 
 {
   return Glib::PropertyProxy<int>(this, "min-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TreeViewColumn::property_min_width() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "min-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> TreeViewColumn::property_max_width() 
 {
   return Glib::PropertyProxy<int>(this, "max-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> TreeViewColumn::property_max_width() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "max-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> TreeViewColumn::property_title() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> TreeViewColumn::property_title() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeViewColumn::property_expand() 
 {
   return Glib::PropertyProxy<bool>(this, "expand");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeViewColumn::property_expand() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "expand");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeViewColumn::property_clickable() 
 {
   return Glib::PropertyProxy<bool>(this, "clickable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeViewColumn::property_clickable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "clickable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Widget*> TreeViewColumn::property_widget() 
 {
   return Glib::PropertyProxy<Widget*>(this, "widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Widget*> TreeViewColumn::property_widget() const
 {
   return Glib::PropertyProxy_ReadOnly<Widget*>(this, "widget");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<float> TreeViewColumn::property_alignment() 
 {
   return Glib::PropertyProxy<float>(this, "alignment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<float> TreeViewColumn::property_alignment() const
 {
   return Glib::PropertyProxy_ReadOnly<float>(this, "alignment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeViewColumn::property_reorderable() 
 {
   return Glib::PropertyProxy<bool>(this, "reorderable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeViewColumn::property_reorderable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "reorderable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> TreeViewColumn::property_sort_indicator() 
 {
   return Glib::PropertyProxy<bool>(this, "sort-indicator");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> TreeViewColumn::property_sort_indicator() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "sort-indicator");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<SortType> TreeViewColumn::property_sort_order() 
 {
   return Glib::PropertyProxy<SortType>(this, "sort-order");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<SortType> TreeViewColumn::property_sort_order() const
 {
   return Glib::PropertyProxy_ReadOnly<SortType>(this, "sort-order");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::TreeViewColumn::on_clicked()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -656,6 +747,10 @@ void Gtk::TreeViewColumn::on_clicked()
   if(base && base->clicked)
     (*base->clicked)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/treeviewcolumn.h b/libs/gtkmm2/gtk/gtkmm/treeviewcolumn.h
index e4b7ef9296..e6ba175e46 100644
--- a/libs/gtkmm2/gtk/gtkmm/treeviewcolumn.h
+++ b/libs/gtkmm2/gtk/gtkmm/treeviewcolumn.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_TREEVIEWCOLUMN_H
 #define _GTKMM_TREEVIEWCOLUMN_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -79,13 +80,19 @@ namespace Gtk
 {
 
 
+// We use GTKMM_API here because gcc needs the extra help on win32 , even 
+// when using --export-all and auto-import. 
+// See http://bugzilla.gnome.org/show_bug.cgi?id=309030.
+
+//TODO: This should derive+implement from CellLayout when we can break ABI.
+
 /** Typedefed as Gtk::TreeView::Column.
  * This is a visible column in a Gtk::TreeView widget. It determines the geometry, type.
  *
  * @ingroup TreeView
 */
 
-class TreeViewColumn : public Gtk::Object
+class GTKMM_API TreeViewColumn : public Gtk::Object
 {
   public:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -128,12 +135,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_clicked();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -238,7 +251,11 @@ public:
    */
   void add_attribute(CellRenderer& cell_renderer, const Glib::ustring& attribute, int column);
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
   void add_attribute(const Glib::PropertyProxy_Base& property, const TreeModelColumnBase& column);
+#endif
+
+  void add_attribute(Gtk::CellRenderer& cell, const Glib::ustring& property_name, const TreeModelColumnBase& column);
   
 
   /** Associate a view CellRenderer with a model column, so that the CellRenderer renders the data in the model column.
@@ -395,14 +412,15 @@ public:
    * option set, then the last column gets all extra space.  By default, every
    * column is created with this <tt>false</tt>.
    * 
-   * Since: 2.4
+   * @newin2p4
+   * @param expand <tt>true</tt> if the column should take available extra space, <tt>false</tt> if not.
    */
   void set_expand(bool expand = true);
   
   /** Return <tt>true</tt> if the column expands to take any available space.
    * @return <tt>true</tt>, if the column expands
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_expand() const;
 
@@ -483,6 +501,7 @@ public:
   void set_sort_column(int sort_column_id);
 
   #ifndef GTKMM_DISABLE_DEPRECATED
+
   /** @deprecated Use set_sort_column() instead.
    */
   void set_sort_column_id(const TreeModelColumnBase& sort_column_id);
@@ -490,9 +509,9 @@ public:
   /** @deprecated Use set_sort_column() instead.
    */
   void set_sort_column_id(int sort_column_id);
-  #endif //GTKMM_DISABLE_DEPRECATED
-  
-  
+  #endif // GTKMM_DISABLE_DEPRECATED
+
+
   /** Gets the logical @a sort_column_id  that the model sorts on when this
    * column is selected for sorting.
    * See set_sort_column_id().
@@ -566,7 +585,7 @@ public:
   /** Sets the current keyboard focus to be at @a cell , if the column contains
    * 2 or more editable and activatable cells.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param cell A Gtk::CellRenderer.
    */
   void focus_cell(CellRenderer& cell);
@@ -582,19 +601,34 @@ public:
    * @return <tt>true</tt> if @a cell  belongs to @a tree_column .
    */
   bool get_cell_position(const CellRenderer& cell_renderer, int& start_pos, int& width) const;
+  
+  /** Flags the column, and the cell renderers added to this column, to have
+   * their sizes renegotiated.
+   * 
+   * @newin2p8
+   */
+  void queue_resize();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %clicked()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_clicked();
 
 
-  /** Whether to display the column.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to display the column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_visible() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether to display the column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -602,24 +636,30 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_visible() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Current width of the column.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Current width of the column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** Resize mode of the column.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Resize mode of the column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<TreeViewColumnSizing> property_sizing() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Resize mode of the column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -627,15 +667,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<TreeViewColumnSizing> property_sizing() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Current fixed width of the column.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Current fixed width of the column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_fixed_width() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Current fixed width of the column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -643,15 +687,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_fixed_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Minimum allowed width of the column.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Minimum allowed width of the column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_min_width() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Minimum allowed width of the column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -659,15 +707,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_min_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Maximum allowed width of the column.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Maximum allowed width of the column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_max_width() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Maximum allowed width of the column.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -675,15 +727,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_max_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Title to appear in column header.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Title to appear in column header.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_title() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Title to appear in column header.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -691,15 +747,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_title() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Column gets share of extra width allocated to the widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Column gets share of extra width allocated to the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_expand() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Column gets share of extra width allocated to the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -707,15 +767,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_expand() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the header can be clicked.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the header can be clicked.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_clickable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the header can be clicked.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -723,15 +787,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_clickable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Widget to put in column header button instead of column title.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Widget to put in column header button instead of column title.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Widget*> property_widget() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Widget to put in column header button instead of column title.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -739,15 +807,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Widget*> property_widget() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** X Alignment of the column header text or widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** X Alignment of the column header text or widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<float> property_alignment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** X Alignment of the column header text or widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -755,15 +827,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<float> property_alignment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the column can be reordered around the headers.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the column can be reordered around the headers.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_reorderable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the column can be reordered around the headers.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -771,15 +847,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_reorderable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether to show a sort indicator.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether to show a sort indicator.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_sort_indicator() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether to show a sort indicator.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -787,15 +867,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_sort_indicator() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Sort direction the sort indicator should indicate.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Sort direction the sort indicator should indicate.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<SortType> property_sort_order() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Sort direction the sort indicator should indicate.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -803,6 +887,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<SortType> property_sort_order() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -816,7 +901,7 @@ private:
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-template<class T_ModelColumnType>
+template<class T_ModelColumnType> inline
 void TreeViewColumn::pack_start(const TreeModelColumn<T_ModelColumnType>& column, bool expand)
 {
   //Generate appropriate Renderer for the column:
@@ -827,7 +912,7 @@ void TreeViewColumn::pack_start(const TreeModelColumn<T_ModelColumnType>& column
   set_renderer(*pCellRenderer, column);
 }
 
-template<class T_ModelColumnType>
+template<class T_ModelColumnType> inline
 void TreeViewColumn::pack_end(const TreeModelColumn<T_ModelColumnType>& column, bool expand)
 {
   //Generate appropriate Renderer for the column:
@@ -839,7 +924,7 @@ void TreeViewColumn::pack_end(const TreeModelColumn<T_ModelColumnType>& column,
 }
 
 
-template <class T_ModelColumnType>
+template <class T_ModelColumnType> inline
 TreeViewColumn::TreeViewColumn(const Glib::ustring& title,
                                const TreeModelColumn<T_ModelColumnType>& column)
 :
@@ -863,6 +948,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::TreeViewColumn* wrap(GtkTreeViewColumn* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_TREEVIEWCOLUMN_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/uimanager.cc b/libs/gtkmm2/gtk/gtkmm/uimanager.cc
index 89088a1474..f38daaa209 100644
--- a/libs/gtkmm2/gtk/gtkmm/uimanager.cc
+++ b/libs/gtkmm2/gtk/gtkmm/uimanager.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/uimanager.h>
 #include <gtkmm/private/uimanager_p.h>
 
@@ -31,11 +32,23 @@ namespace Gtk
 
 typedef UIManager::ui_merge_id ui_merge_id; //Help gmmproc so that it does not need to add the full type name for the return type.
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 UIManager::ui_merge_id UIManager::add_ui_from_string(const Glib::ustring& buffer)
-{
-  GError *error = 0;
-  guint retvalue = gtk_ui_manager_add_ui_from_string(gobj(), buffer.c_str(), buffer.size(), &(error));
-  if(error) ::Glib::Error::throw_exception(error);
+#else
+UIManager::ui_merge_id UIManager::add_ui_from_string(const Glib::ustring& buffer, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  guint retvalue = gtk_ui_manager_add_ui_from_string(gobj(), buffer.c_str(), buffer.size(), &(gerror));
+
+  if (gerror)
+  { 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  ::Glib::Error::throw_exception(gerror);
+#else
+  error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+  }
   return retvalue;
 }
 
@@ -51,7 +64,8 @@ void UIManager::add_ui_separator(ui_merge_id merge_id, const Glib::ustring& path
 namespace
 {
 
-void UIManager_signal_add_widget_callback(GtkUIManager* self, GtkWidget* p0,void* data)
+
+static void UIManager_signal_add_widget_callback(GtkUIManager* self, GtkWidget* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Widget* > SlotType;
@@ -59,20 +73,24 @@ void UIManager_signal_add_widget_callback(GtkUIManager* self, GtkWidget* p0,void
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo UIManager_signal_add_widget_info =
+static const Glib::SignalProxyInfo UIManager_signal_add_widget_info =
 {
   "add_widget",
   (GCallback) &UIManager_signal_add_widget_callback,
@@ -80,7 +98,7 @@ const Glib::SignalProxyInfo UIManager_signal_add_widget_info =
 };
 
 
-const Glib::SignalProxyInfo UIManager_signal_actions_changed_info =
+static const Glib::SignalProxyInfo UIManager_signal_actions_changed_info =
 {
   "actions_changed",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -88,7 +106,7 @@ const Glib::SignalProxyInfo UIManager_signal_actions_changed_info =
 };
 
 
-void UIManager_signal_connect_proxy_callback(GtkUIManager* self, GtkAction* p0,GtkWidget* p1,void* data)
+static void UIManager_signal_connect_proxy_callback(GtkUIManager* self, GtkAction* p0,GtkWidget* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Action>&,Widget* > SlotType;
@@ -96,21 +114,25 @@ void UIManager_signal_connect_proxy_callback(GtkUIManager* self, GtkAction* p0,G
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo UIManager_signal_connect_proxy_info =
+static const Glib::SignalProxyInfo UIManager_signal_connect_proxy_info =
 {
   "connect_proxy",
   (GCallback) &UIManager_signal_connect_proxy_callback,
@@ -118,7 +140,7 @@ const Glib::SignalProxyInfo UIManager_signal_connect_proxy_info =
 };
 
 
-void UIManager_signal_disconnect_proxy_callback(GtkUIManager* self, GtkAction* p0,GtkWidget* p1,void* data)
+static void UIManager_signal_disconnect_proxy_callback(GtkUIManager* self, GtkAction* p0,GtkWidget* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Action>&,Widget* > SlotType;
@@ -126,21 +148,25 @@ void UIManager_signal_disconnect_proxy_callback(GtkUIManager* self, GtkAction* p
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo UIManager_signal_disconnect_proxy_info =
+static const Glib::SignalProxyInfo UIManager_signal_disconnect_proxy_info =
 {
   "disconnect_proxy",
   (GCallback) &UIManager_signal_disconnect_proxy_callback,
@@ -148,7 +174,7 @@ const Glib::SignalProxyInfo UIManager_signal_disconnect_proxy_info =
 };
 
 
-void UIManager_signal_pre_activate_callback(GtkUIManager* self, GtkAction* p0,void* data)
+static void UIManager_signal_pre_activate_callback(GtkUIManager* self, GtkAction* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Action>& > SlotType;
@@ -156,20 +182,24 @@ void UIManager_signal_pre_activate_callback(GtkUIManager* self, GtkAction* p0,vo
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo UIManager_signal_pre_activate_info =
+static const Glib::SignalProxyInfo UIManager_signal_pre_activate_info =
 {
   "pre_activate",
   (GCallback) &UIManager_signal_pre_activate_callback,
@@ -177,7 +207,7 @@ const Glib::SignalProxyInfo UIManager_signal_pre_activate_info =
 };
 
 
-void UIManager_signal_post_activate_callback(GtkUIManager* self, GtkAction* p0,void* data)
+static void UIManager_signal_post_activate_callback(GtkUIManager* self, GtkAction* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Action>& > SlotType;
@@ -185,26 +215,31 @@ void UIManager_signal_post_activate_callback(GtkUIManager* self, GtkAction* p0,v
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo UIManager_signal_post_activate_info =
+static const Glib::SignalProxyInfo UIManager_signal_post_activate_info =
 {
   "post_activate",
   (GCallback) &UIManager_signal_post_activate_callback,
   (GCallback) &UIManager_signal_post_activate_callback
 };
 
+
 } // anonymous namespace
 
 // static
@@ -257,11 +292,19 @@ void UIManager_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->add_widget = &add_widget_callback;
   klass->actions_changed = &actions_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void UIManager_Class::add_widget_callback(GtkUIManager* self, GtkWidget* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -274,16 +317,20 @@ void UIManager_Class::add_widget_callback(GtkUIManager* self, GtkWidget* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_add_widget(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -296,7 +343,6 @@ void UIManager_Class::add_widget_callback(GtkUIManager* self, GtkWidget* p0)
       (*base->add_widget)(self, p0);
   }
 }
-
 void UIManager_Class::actions_changed_callback(GtkUIManager* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -309,15 +355,19 @@ void UIManager_Class::actions_changed_callback(GtkUIManager* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_actions_changed();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -330,6 +380,7 @@ void UIManager_Class::actions_changed_callback(GtkUIManager* self)
       (*base->actions_changed)(self);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* UIManager_Class::wrap_new(GObject* object)
@@ -386,7 +437,7 @@ Glib::RefPtr<UIManager> UIManager::create()
 }
 void UIManager::set_add_tearoffs(bool add_tearoffs)
 {
-  gtk_ui_manager_set_add_tearoffs(gobj(), static_cast<int>(add_tearoffs));
+gtk_ui_manager_set_add_tearoffs(gobj(), static_cast<int>(add_tearoffs)); 
 }
 
 bool UIManager::get_add_tearoffs() const
@@ -396,17 +447,17 @@ bool UIManager::get_add_tearoffs() const
 
 void UIManager::insert_action_group(const Glib::RefPtr<ActionGroup>& action_group, int pos)
 {
-  gtk_ui_manager_insert_action_group(gobj(), Glib::unwrap(action_group), pos);
+gtk_ui_manager_insert_action_group(gobj(), Glib::unwrap(action_group), pos); 
 }
 
 void UIManager::remove_action_group(const Glib::RefPtr<ActionGroup>& action_group)
 {
-  gtk_ui_manager_remove_action_group(gobj(), Glib::unwrap(action_group));
+gtk_ui_manager_remove_action_group(gobj(), Glib::unwrap(action_group)); 
 }
 
 Glib::ListHandle< Glib::RefPtr<ActionGroup> > UIManager::get_action_groups()
 {
-  return Glib::ListHandle< Glib::RefPtr<ActionGroup> >(gtk_ui_manager_get_action_groups(gobj()), Glib::OWNERSHIP_SHALLOW);
+  return Glib::ListHandle< Glib::RefPtr<ActionGroup> >(gtk_ui_manager_get_action_groups(gobj()), Glib::OWNERSHIP_NONE);
 }
 
 Glib::ListHandle< Glib::RefPtr<const ActionGroup> > UIManager::get_action_groups() const
@@ -418,20 +469,15 @@ Glib::RefPtr<AccelGroup> UIManager::get_accel_group()
 {
 
   Glib::RefPtr<AccelGroup> retvalue = Glib::wrap(gtk_ui_manager_get_accel_group(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const AccelGroup> UIManager::get_accel_group() const
 {
-
-  Glib::RefPtr<const AccelGroup> retvalue = Glib::wrap(gtk_ui_manager_get_accel_group(const_cast<GtkUIManager*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<UIManager*>(this)->get_accel_group();
 }
 
 Widget* UIManager::get_widget(const Glib::ustring& path)
@@ -441,7 +487,7 @@ Widget* UIManager::get_widget(const Glib::ustring& path)
 
 const Widget* UIManager::get_widget(const Glib::ustring& path) const
 {
-  return Glib::wrap(gtk_ui_manager_get_widget(const_cast<GtkUIManager*>(gobj()), path.c_str()));
+  return const_cast<UIManager*>(this)->get_widget(path);
 }
 
 Glib::SListHandle<Widget*> UIManager::get_toplevels(UIManagerItemType types)
@@ -458,38 +504,45 @@ Glib::RefPtr<Action> UIManager::get_action(const Glib::ustring& path)
 {
 
   Glib::RefPtr<Action> retvalue = Glib::wrap(gtk_ui_manager_get_action(gobj(), path.c_str()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Action> UIManager::get_action(const Glib::ustring& path) const
 {
-
-  Glib::RefPtr<const Action> retvalue = Glib::wrap(gtk_ui_manager_get_action(const_cast<GtkUIManager*>(gobj()), path.c_str()));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<UIManager*>(this)->get_action(path);
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 ui_merge_id UIManager::add_ui_from_file(const Glib::ustring& filename)
-{
-  GError *error = 0;
-  ui_merge_id retvalue = gtk_ui_manager_add_ui_from_file(gobj(), filename.c_str(), &(error));
-  if(error) ::Glib::Error::throw_exception(error);
+#else
+ui_merge_id UIManager::add_ui_from_file(const Glib::ustring& filename, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  ui_merge_id retvalue = gtk_ui_manager_add_ui_from_file(gobj(), filename.c_str(), &(gerror));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   return retvalue;
+
 }
 
 void UIManager::add_ui(ui_merge_id merge_id, const Glib::ustring& path, const Glib::ustring& name, const Glib::ustring& action, UIManagerItemType type, bool top)
 {
-  gtk_ui_manager_add_ui(gobj(), merge_id, path.c_str(), name.c_str(), action.c_str(), ((GtkUIManagerItemType)(type)), static_cast<int>(top));
+gtk_ui_manager_add_ui(gobj(), merge_id, path.c_str(), name.c_str(), action.c_str(), ((GtkUIManagerItemType)(type)), static_cast<int>(top)); 
 }
 
 void UIManager::remove_ui(ui_merge_id merge_id)
 {
-  gtk_ui_manager_remove_ui(gobj(), merge_id);
+gtk_ui_manager_remove_ui(gobj(), merge_id); 
 }
 
 Glib::ustring UIManager::get_ui() const
@@ -499,7 +552,7 @@ Glib::ustring UIManager::get_ui() const
 
 void UIManager::ensure_update()
 {
-  gtk_ui_manager_ensure_update(gobj());
+gtk_ui_manager_ensure_update(gobj()); 
 }
 
 ui_merge_id UIManager::new_merge_id()
@@ -513,48 +566,60 @@ Glib::SignalProxy1< void,Widget* > UIManager::signal_add_widget()
   return Glib::SignalProxy1< void,Widget* >(this, &UIManager_signal_add_widget_info);
 }
 
+
 Glib::SignalProxy0< void > UIManager::signal_actions_changed()
 {
   return Glib::SignalProxy0< void >(this, &UIManager_signal_actions_changed_info);
 }
 
+
 Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* > UIManager::signal_connect_proxy()
 {
   return Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* >(this, &UIManager_signal_connect_proxy_info);
 }
 
+
 Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* > UIManager::signal_disconnect_proxy()
 {
   return Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* >(this, &UIManager_signal_disconnect_proxy_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<Action>& > UIManager::signal_pre_activate()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<Action>& >(this, &UIManager_signal_pre_activate_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<Action>& > UIManager::signal_post_activate()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<Action>& >(this, &UIManager_signal_post_activate_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> UIManager::property_add_tearoffs() 
 {
   return Glib::PropertyProxy<bool>(this, "add-tearoffs");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> UIManager::property_add_tearoffs() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "add-tearoffs");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> UIManager::property_ui() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "ui");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::UIManager::on_add_widget(Widget* widget)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -564,7 +629,6 @@ void Gtk::UIManager::on_add_widget(Widget* widget)
   if(base && base->add_widget)
     (*base->add_widget)(gobj(),(GtkWidget*)Glib::unwrap(widget));
 }
-
 void Gtk::UIManager::on_actions_changed()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -574,6 +638,10 @@ void Gtk::UIManager::on_actions_changed()
   if(base && base->actions_changed)
     (*base->actions_changed)(gobj());
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/uimanager.h b/libs/gtkmm2/gtk/gtkmm/uimanager.h
index 3adec8c251..9abb6c714e 100644
--- a/libs/gtkmm2/gtk/gtkmm/uimanager.h
+++ b/libs/gtkmm2/gtk/gtkmm/uimanager.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_UIMANAGER_H
 #define _GTKMM_UIMANAGER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -176,7 +177,7 @@ public:
    * Note that this only affects regular menus. Generated popup 
    * menus never have tearoff menu items.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param add_tearoffs Whether tearoff menu items are added.
    */
   void set_add_tearoffs(bool add_tearoffs = true);
@@ -185,7 +186,7 @@ public:
    * will have tearoff menu items.
    * @return Whether tearoff menu items are added
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_add_tearoffs() const;
   
@@ -193,7 +194,7 @@ public:
    * with @a self . Actions in earlier groups hide actions with the same 
    * name in later groups. 
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param action_group The action group to be inserted.
    * @param pos The position at which the group will be inserted.
    */
@@ -202,7 +203,7 @@ public:
   /** Removes an action group from the list of action groups associated 
    * with @a self .
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param action_group The action group to be removed.
    */
   void remove_action_group(const Glib::RefPtr<ActionGroup>& action_group);
@@ -212,7 +213,7 @@ public:
    * @return A G::List of action groups. The list is owned by GTK+ 
    * and should not be modified.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ListHandle< Glib::RefPtr<ActionGroup> > get_action_groups();
   
@@ -220,7 +221,7 @@ public:
    * @return A G::List of action groups. The list is owned by GTK+ 
    * and should not be modified.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ListHandle< Glib::RefPtr<const ActionGroup> > get_action_groups() const;
   
@@ -228,14 +229,14 @@ public:
   /** Returns the Gtk::AccelGroup associated with @a self .
    * @return The Gtk::AccelGroup.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<AccelGroup> get_accel_group();
   
   /** Returns the Gtk::AccelGroup associated with @a self .
    * @return The Gtk::AccelGroup.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<const AccelGroup> get_accel_group() const;
   
@@ -247,11 +248,16 @@ public:
    * 
    * Note that the widget found by following a path that ends in a &lt;menu&gt;
    * element is the menuitem to which the menu is attached, not the menu itself.
+   * 
+   * Also note that the widgets constructed by a ui manager are not tied to 
+   * the lifecycle of the ui manager. If you add the widgets returned by this 
+   * function to some container or explicitly ref them, they will survive the
+   * destruction of the ui manager.
    * @param path A path.
    * @return The widget found by following the path, or <tt>0</tt> if no widget
    * was found.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Widget* get_widget(const Glib::ustring& path);
   
@@ -263,11 +269,16 @@ public:
    * 
    * Note that the widget found by following a path that ends in a &lt;menu&gt;
    * element is the menuitem to which the menu is attached, not the menu itself.
+   * 
+   * Also note that the widgets constructed by a ui manager are not tied to 
+   * the lifecycle of the ui manager. If you add the widgets returned by this 
+   * function to some container or explicitly ref them, they will survive the
+   * destruction of the ui manager.
    * @param path A path.
    * @return The widget found by following the path, or <tt>0</tt> if no widget
    * was found.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   const Widget* get_widget(const Glib::ustring& path) const;
 
@@ -279,7 +290,7 @@ public:
    * @return A newly-allocated of all toplevel widgets of the requested 
    * types. 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::SListHandle<Widget*> get_toplevels(UIManagerItemType types);
   
@@ -290,7 +301,7 @@ public:
    * @return A newly-allocated of all toplevel widgets of the requested 
    * types. 
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::SListHandle<const Widget*> get_toplevels(UIManagerItemType types) const;
                  
@@ -301,7 +312,7 @@ public:
    * @return The action whose proxy widget is found by following the path, 
    * or <tt>0</tt> if no widget was found.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<Action> get_action(const Glib::ustring& path);
   
@@ -311,7 +322,7 @@ public:
    * @return The action whose proxy widget is found by following the path, 
    * or <tt>0</tt> if no widget was found.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::RefPtr<const Action> get_action(const Glib::ustring& path) const;
 
@@ -324,9 +335,13 @@ public:
    * @param buffer the string to parse
    * @result  The merge id for the merged UI. The merge id can be used to unmerge the UI with remove_ui(). If an error occurred, the return value is 0.
    * @throws exception
-   * Since: 2.4
+   * @newin2p4
    */ 
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   ui_merge_id add_ui_from_string(const Glib::ustring& buffer);
+  #else
+  ui_merge_id add_ui_from_string(const Glib::ustring& buffer, std::auto_ptr<Glib::Error>& error);
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
   
   
   /** Parses a file containing a UI definition and 
@@ -336,9 +351,14 @@ public:
    * to unmerge the UI with gtk_ui_manager_remove_ui(). If an error occurred,
    * the return value is 0.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   ui_merge_id add_ui_from_file(const Glib::ustring& filename);
+#else
+  ui_merge_id add_ui_from_file(const Glib::ustring& filename, std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
 
 //TODO: Is top=true a good default?
 
@@ -352,7 +372,7 @@ public:
    * 
    *  @a see  add_ui_separator().
    * 
-   * Since: 2.4
+   *  @a newin2p4 
    * @param merge_id The merge id for the merged UI, see gtk_ui_manager_new_merge_id().
    * @param path A path.
    * @param name The name for the added UI element.
@@ -372,7 +392,7 @@ public:
    *
    * @see add_ui().
    *
-   * Since: 2.4
+   * @newin2p4
    * @param merge_id The merge id for the merged UI, see gtk_ui_manager_new_merge_id().
    * @param path A path.
    * @param name The name for the added UI element.
@@ -385,7 +405,7 @@ public:
   
   /** Unmerges the part of @a self &lt;!-- --&gt;s content identified by @a merge_id .
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param merge_id A merge id as returned by gtk_ui_manager_add_ui_from_string().
    */
   void remove_ui(ui_merge_id merge_id);
@@ -394,7 +414,7 @@ public:
    * @return A newly allocated string containing an XML representation of 
    * the merged UI.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ustring get_ui() const;
   
@@ -416,7 +436,7 @@ public:
    * 
    * @endcode
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void ensure_update();
   
@@ -424,37 +444,116 @@ public:
    * gtk_ui_manager_add_ui().
    * @return An unused merge id.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   ui_merge_id new_merge_id();
 
+  /** The add_widget signal is emitted for each generated menubar and toolbar.
+   * It is not emitted for generated popup menus, which can be obtained by 
+   * get_widget().
+   * 
+   * @param widget the added widget
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %add_widget(Widget* widget)</tt>
+   */
 
   Glib::SignalProxy1< void,Widget* > signal_add_widget();
 
   
+  /** The "actions-changed" signal is emitted whenever the set of actions
+   * changes.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %actions_changed()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_actions_changed();
 
   
+  /** The connect_proxy signal is emitted after connecting a proxy to 
+   * an action in the group. 
+   *
+   * This is intended for simple customizations for which a custom action
+   * class would be too clumsy, e.g. showing tooltips for menuitems in the
+   * statusbar.
+   *
+   * @param action the action
+   * @param widget the proxy
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %connect_proxy(const Glib::RefPtr<Action>& action, Widget* widget)</tt>
+   */
+
   Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* > signal_connect_proxy();
 
   
+  /** The disconnect_proxy signal is emitted after disconnecting a proxy 
+   * from an action in the group. 
+   *
+   * @param action the action
+   * @param widget the proxy
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %disconnect_proxy(const Glib::RefPtr<Action>& action, Widget* widget)</tt>
+   */
+
   Glib::SignalProxy2< void,const Glib::RefPtr<Action>&,Widget* > signal_disconnect_proxy();
 
   
+  /** The pre_activate signal is emitted just before the @a action
+   * is activated.
+   *
+   * This is intended for applications to get notification
+   * just before any action is activated.
+   *
+   * @param action the action
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %pre_activate(const Glib::RefPtr<Action>& action)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<Action>& > signal_pre_activate();
 
   
+  /** The post_activate signal is emitted just after the @a action
+   * is activated.
+   *
+   * This is intended for applications to get notification
+   * just after any action is activated.
+   *
+   * @param action the action
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %post_activate(const Glib::RefPtr<Action>& action)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<Action>& > signal_post_activate();
 
 
-  /** Whether tearoff menu items should be added to menus.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether tearoff menu items should be added to menus.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_add_tearoffs() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether tearoff menu items should be added to menus.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -462,27 +561,36 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_add_tearoffs() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** An XML string describing the merged UI.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** An XML string describing the merged UI.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_ui() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_add_widget(Widget* widget);
   virtual void on_actions_changed();
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/gtk/gtkmm/viewport.cc b/libs/gtkmm2/gtk/gtkmm/viewport.cc
index c06abb80aa..f908ea78e9 100644
--- a/libs/gtkmm2/gtk/gtkmm/viewport.cc
+++ b/libs/gtkmm2/gtk/gtkmm/viewport.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/viewport.h>
 #include <gtkmm/private/viewport_p.h>
 
@@ -29,11 +30,11 @@
 #include <gtkmm/adjustment.h>
 #include <gtk/gtkviewport.h>
 
-
 namespace
 {
 
-void Viewport_signal_set_scroll_adjustments_callback(GtkViewport* self, GtkAdjustment* p0,GtkAdjustment* p1,void* data)
+
+static void Viewport_signal_set_scroll_adjustments_callback(GtkViewport* self, GtkAdjustment* p0,GtkAdjustment* p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Gtk::Adjustment*,Gtk::Adjustment* > SlotType;
@@ -41,27 +42,32 @@ void Viewport_signal_set_scroll_adjustments_callback(GtkViewport* self, GtkAdjus
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Viewport_signal_set_scroll_adjustments_info =
+static const Glib::SignalProxyInfo Viewport_signal_set_scroll_adjustments_info =
 {
   "set_scroll_adjustments",
   (GCallback) &Viewport_signal_set_scroll_adjustments_callback,
   (GCallback) &Viewport_signal_set_scroll_adjustments_callback
 };
 
+
 } // anonymous namespace
 
 
@@ -106,10 +112,18 @@ void Viewport_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->set_scroll_adjustments = &set_scroll_adjustments_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Viewport_Class::set_scroll_adjustments_callback(GtkViewport* self, GtkAdjustment* p0, GtkAdjustment* p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -122,17 +136,21 @@ void Viewport_Class::set_scroll_adjustments_callback(GtkViewport* self, GtkAdjus
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_set_scroll_adjustments(Glib::wrap(p0)
 , Glib::wrap(p1)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -145,6 +163,7 @@ void Viewport_Class::set_scroll_adjustments_callback(GtkViewport* self, GtkAdjus
       (*base->set_scroll_adjustments)(self, p0, p1);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Viewport_Class::wrap_new(GObject* o)
@@ -200,7 +219,7 @@ Gtk::Adjustment* Viewport::get_hadjustment()
 
 const Gtk::Adjustment* Viewport::get_hadjustment() const
 {
-  return Glib::wrap(gtk_viewport_get_hadjustment(const_cast<GtkViewport*>(gobj())));
+  return const_cast<Viewport*>(this)->get_hadjustment();
 }
 
 Gtk::Adjustment* Viewport::get_vadjustment()
@@ -210,32 +229,32 @@ Gtk::Adjustment* Viewport::get_vadjustment()
 
 const Gtk::Adjustment* Viewport::get_vadjustment() const
 {
-  return Glib::wrap(gtk_viewport_get_vadjustment(const_cast<GtkViewport*>(gobj())));
+  return const_cast<Viewport*>(this)->get_vadjustment();
 }
 
 void Viewport::set_hadjustment(Gtk::Adjustment* adjustment)
 {
-  gtk_viewport_set_hadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(adjustment));
+gtk_viewport_set_hadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(adjustment)); 
 }
 
 void Viewport::set_hadjustment(Gtk::Adjustment& adjustment)
 {
-  gtk_viewport_set_hadjustment(gobj(), (adjustment).gobj());
+gtk_viewport_set_hadjustment(gobj(), (adjustment).gobj()); 
 }
 
 void Viewport::set_vadjustment(Gtk::Adjustment* adjustment)
 {
-  gtk_viewport_set_vadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(adjustment));
+gtk_viewport_set_vadjustment(gobj(), (GtkAdjustment*)Glib::unwrap(adjustment)); 
 }
 
 void Viewport::set_vadjustment(Gtk::Adjustment& adjustment)
 {
-  gtk_viewport_set_vadjustment(gobj(), (adjustment).gobj());
+gtk_viewport_set_vadjustment(gobj(), (adjustment).gobj()); 
 }
 
 void Viewport::set_shadow_type(ShadowType type)
 {
-  gtk_viewport_set_shadow_type(gobj(), ((GtkShadowType)(type)));
+gtk_viewport_set_shadow_type(gobj(), ((GtkShadowType)(type))); 
 }
 
 ShadowType Viewport::get_shadow_type() const
@@ -250,37 +269,50 @@ Glib::SignalProxy2< void,Gtk::Adjustment*,Gtk::Adjustment* > Viewport::signal_se
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::Adjustment*> Viewport::property_hadjustment() 
 {
   return Glib::PropertyProxy<Gtk::Adjustment*>(this, "hadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> Viewport::property_hadjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*>(this, "hadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gtk::Adjustment*> Viewport::property_vadjustment() 
 {
   return Glib::PropertyProxy<Gtk::Adjustment*>(this, "vadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> Viewport::property_vadjustment() const
 {
   return Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*>(this, "vadjustment");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<ShadowType> Viewport::property_shadow_type() 
 {
   return Glib::PropertyProxy<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<ShadowType> Viewport::property_shadow_type() const
 {
   return Glib::PropertyProxy_ReadOnly<ShadowType>(this, "shadow-type");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Viewport::on_set_scroll_adjustments(Gtk::Adjustment* hadjustment, Gtk::Adjustment* vadjustment)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -290,6 +322,10 @@ void Gtk::Viewport::on_set_scroll_adjustments(Gtk::Adjustment* hadjustment, Gtk:
   if(base && base->set_scroll_adjustments)
     (*base->set_scroll_adjustments)(gobj(),(GtkAdjustment*)Glib::unwrap(hadjustment),(GtkAdjustment*)Glib::unwrap(vadjustment));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/viewport.h b/libs/gtkmm2/gtk/gtkmm/viewport.h
index 42d429c15d..1b9714587c 100644
--- a/libs/gtkmm2/gtk/gtkmm/viewport.h
+++ b/libs/gtkmm2/gtk/gtkmm/viewport.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_VIEWPORT_H
 #define _GTKMM_VIEWPORT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -89,12 +90,18 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_set_scroll_adjustments(Gtk::Adjustment* hadjustment, Gtk::Adjustment* vadjustment);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -161,17 +168,25 @@ public:
   ShadowType get_shadow_type() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %set_scroll_adjustments(Gtk::Adjustment* hadjustment, Gtk::Adjustment* vadjustment)</tt>
+   */
+
   Glib::SignalProxy2< void,Gtk::Adjustment*,Gtk::Adjustment* > signal_set_scroll_adjustments();
 
 
-  /** The GtkAdjustment that determines the values of the horizontal position for this viewport.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The GtkAdjustment that determines the values of the horizontal position for this viewport.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gtk::Adjustment*> property_hadjustment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The GtkAdjustment that determines the values of the horizontal position for this viewport.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -179,15 +194,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> property_hadjustment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The GtkAdjustment that determines the values of the vertical position for this viewport.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The GtkAdjustment that determines the values of the vertical position for this viewport.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gtk::Adjustment*> property_vadjustment() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The GtkAdjustment that determines the values of the vertical position for this viewport.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -195,15 +214,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gtk::Adjustment*> property_vadjustment() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Determines how the shadowed box around the viewport is drawn.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Determines how the shadowed box around the viewport is drawn.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<ShadowType> property_shadow_type() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Determines how the shadowed box around the viewport is drawn.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -211,6 +234,7 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<ShadowType> property_shadow_type() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 };
@@ -226,6 +250,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Viewport* wrap(GtkViewport* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_VIEWPORT_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/widget.cc b/libs/gtkmm2/gtk/gtkmm/widget.cc
index eabf1ed4a8..f756f57c9a 100644
--- a/libs/gtkmm2/gtk/gtkmm/widget.cc
+++ b/libs/gtkmm2/gtk/gtkmm/widget.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/widget.h>
 #include <gtkmm/private/widget_p.h>
 
@@ -31,11 +32,13 @@
 #include <gtkmm/style.h>
 #include <gtkmm/container.h>
 #include <gtkmm/selectiondata_private.h>
+#include <gtkmm/action.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtkselection.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkmain.h>
+#include <gtk/gtkaction.h> //For gtk_widget_get_action().
 
 
 namespace //anonymous
@@ -43,7 +46,7 @@ namespace //anonymous
 
 //These signal callbacks are custom implemented, so that we can create a temporary SelectionData instance.
 //To do this, we used the optional custom_c_callback paramater to _WRAP_SIGNAL() in the .hg file.
-void Widget_signal_drag_data_get_callback(GtkWidget* self, GdkDragContext* p0,GtkSelectionData* p1,guint p2,guint p3,void* data)
+static void Widget_signal_drag_data_get_callback(GtkWidget* self, GdkDragContext* p0,GtkSelectionData* p1,guint p2,guint p3,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Gdk::DragContext>&,SelectionData&,guint,guint > SlotType;
@@ -51,22 +54,26 @@ void Widget_signal_drag_data_get_callback(GtkWidget* self, GdkDragContext* p0,Gt
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
       {
         SelectionData_WithoutOwnership temp_instance(p1);
         (*static_cast<SlotType*>(slot))( Glib::wrap(p0, true), temp_instance, p2, p3 );
       }
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-void Widget_signal_selection_get_callback(GtkWidget* self, GtkSelectionData* p0,guint p1,guint p2,void* data)
+static void Widget_signal_selection_get_callback(GtkWidget* self, GtkSelectionData* p0,guint p1,guint p2,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void, SelectionData&, guint, guint > SlotType;
@@ -74,18 +81,22 @@ void Widget_signal_selection_get_callback(GtkWidget* self, GtkSelectionData* p0,
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
       {
         SelectionData_WithoutOwnership temp_instance(p0);
         (*static_cast<SlotType*>(slot))( temp_instance, p1, p2 );
       }
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
@@ -95,6 +106,7 @@ void Widget_signal_selection_get_callback(GtkWidget* self, GtkSelectionData* p0,
 namespace Gtk
 {
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 //These default handler callbacks are custom implemented, so that we can create a temporary SelectionData instance.
 //To do this, we used the optional custom_c_callback paramater to _WRAP_SIGNAL() in the .hg file.
 void Widget_Class::selection_get_callback(GtkWidget* self, GtkSelectionData* p0, guint p1, guint p2)
@@ -109,16 +121,20 @@ void Widget_Class::selection_get_callback(GtkWidget* self, GtkSelectionData* p0,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       SelectionData_WithoutOwnership temp_instance(p0);
       obj->on_selection_get(temp_instance, p1, p2);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -144,16 +160,20 @@ void Widget_Class::drag_data_get_callback(GtkWidget* self, GdkDragContext* p0, G
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       SelectionData_WithoutOwnership temp_instance(p1);
       obj->on_drag_data_get(Glib::wrap(p0, true), temp_instance, p2, p3);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -166,6 +186,7 @@ void Widget_Class::drag_data_get_callback(GtkWidget* self, GdkDragContext* p0, G
       (*base->drag_data_get)(self, p0, p1, p2, p3);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 Widget::~Widget()
 {}
@@ -371,6 +392,7 @@ void Widget::drag_set_as_icon(const Glib::RefPtr<Gdk::DragContext>& context, int
   gtk_drag_set_icon_widget(Glib::unwrap(context), gobj(), hot_x, hot_y);
 }
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Widget_Class::hierarchy_changed_callback_custom(GtkWidget* self, GtkWidget* p0)
 {
   //GTKMM_LIFECYCLE
@@ -416,6 +438,7 @@ void Widget_Class::parent_set_callback_custom(GtkWidget* self, GtkWidget* p0)
       (*base->parent_set)(self, p0);
   }
 }
+#endif //#GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 void Widget_Class::dispose_vfunc_callback(GObject* self)
 {
@@ -528,6 +551,11 @@ void Widget::unset_shape_combine_mask()
   gtk_widget_shape_combine_mask(gobj(), 0, 0, 0); /* See GTK+ docs */
 }
 
+void Widget::unset_input_shape_combine_mask()
+{            
+  gtk_widget_input_shape_combine_mask(gobj(), 0, 0, 0); /* See GTK+ docs */
+}
+
 void Widget::draw_insertion_cursor(Glib::RefPtr<Gdk::Drawable> drawable, const Gdk::Rectangle& area, const Gdk::Rectangle& location, bool is_primary, TextDirection direction, bool draw_arrow)
 {
   gtk_draw_insertion_cursor(gobj(), drawable->gobj(), const_cast<GdkRectangle*>(area.gobj()), const_cast<GdkRectangle*>(location.gobj()), is_primary, (GtkTextDirection)direction, draw_arrow);
@@ -547,7 +575,8 @@ Requisition Widget::size_request() const
 namespace
 {
 
-const Glib::SignalProxyInfo Widget_signal_show_info =
+
+static const Glib::SignalProxyInfo Widget_signal_show_info =
 {
   "show",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -555,7 +584,7 @@ const Glib::SignalProxyInfo Widget_signal_show_info =
 };
 
 
-const Glib::SignalProxyInfo Widget_signal_hide_info =
+static const Glib::SignalProxyInfo Widget_signal_hide_info =
 {
   "hide",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -563,7 +592,7 @@ const Glib::SignalProxyInfo Widget_signal_hide_info =
 };
 
 
-const Glib::SignalProxyInfo Widget_signal_map_info =
+static const Glib::SignalProxyInfo Widget_signal_map_info =
 {
   "map",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -571,7 +600,7 @@ const Glib::SignalProxyInfo Widget_signal_map_info =
 };
 
 
-const Glib::SignalProxyInfo Widget_signal_unmap_info =
+static const Glib::SignalProxyInfo Widget_signal_unmap_info =
 {
   "unmap",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -579,7 +608,7 @@ const Glib::SignalProxyInfo Widget_signal_unmap_info =
 };
 
 
-const Glib::SignalProxyInfo Widget_signal_realize_info =
+static const Glib::SignalProxyInfo Widget_signal_realize_info =
 {
   "realize",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -587,7 +616,7 @@ const Glib::SignalProxyInfo Widget_signal_realize_info =
 };
 
 
-const Glib::SignalProxyInfo Widget_signal_unrealize_info =
+static const Glib::SignalProxyInfo Widget_signal_unrealize_info =
 {
   "unrealize",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -595,7 +624,7 @@ const Glib::SignalProxyInfo Widget_signal_unrealize_info =
 };
 
 
-void Widget_signal_size_request_callback(GtkWidget* self, GtkRequisition* p0,void* data)
+static void Widget_signal_size_request_callback(GtkWidget* self, GtkRequisition* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Requisition* > SlotType;
@@ -603,20 +632,24 @@ void Widget_signal_size_request_callback(GtkWidget* self, GtkRequisition* p0,voi
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))((Requisition*)(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_size_request_info =
+static const Glib::SignalProxyInfo Widget_signal_size_request_info =
 {
   "size_request",
   (GCallback) &Widget_signal_size_request_callback,
@@ -624,7 +657,7 @@ const Glib::SignalProxyInfo Widget_signal_size_request_info =
 };
 
 
-void Widget_signal_size_allocate_callback(GtkWidget* self, GtkAllocation* p0,void* data)
+static void Widget_signal_size_allocate_callback(GtkWidget* self, GtkAllocation* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Allocation& > SlotType;
@@ -632,20 +665,24 @@ void Widget_signal_size_allocate_callback(GtkWidget* self, GtkAllocation* p0,voi
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))((Allocation&)(Glib::wrap(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_size_allocate_info =
+static const Glib::SignalProxyInfo Widget_signal_size_allocate_info =
 {
   "size_allocate",
   (GCallback) &Widget_signal_size_allocate_callback,
@@ -653,7 +690,7 @@ const Glib::SignalProxyInfo Widget_signal_size_allocate_info =
 };
 
 
-void Widget_signal_state_changed_callback(GtkWidget* self, GtkStateType p0,void* data)
+static void Widget_signal_state_changed_callback(GtkWidget* self, GtkStateType p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Gtk::StateType > SlotType;
@@ -661,20 +698,24 @@ void Widget_signal_state_changed_callback(GtkWidget* self, GtkStateType p0,void*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(((Gtk::StateType)(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_state_changed_info =
+static const Glib::SignalProxyInfo Widget_signal_state_changed_info =
 {
   "state_changed",
   (GCallback) &Widget_signal_state_changed_callback,
@@ -682,7 +723,7 @@ const Glib::SignalProxyInfo Widget_signal_state_changed_info =
 };
 
 
-void Widget_signal_parent_changed_callback(GtkWidget* self, GtkWidget* p0,void* data)
+static void Widget_signal_parent_changed_callback(GtkWidget* self, GtkWidget* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Widget* > SlotType;
@@ -690,20 +731,24 @@ void Widget_signal_parent_changed_callback(GtkWidget* self, GtkWidget* p0,void*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_parent_changed_info =
+static const Glib::SignalProxyInfo Widget_signal_parent_changed_info =
 {
   "parent_set",
   (GCallback) &Widget_signal_parent_changed_callback,
@@ -711,7 +756,7 @@ const Glib::SignalProxyInfo Widget_signal_parent_changed_info =
 };
 
 
-void Widget_signal_hierarchy_changed_callback(GtkWidget* self, GtkWidget* p0,void* data)
+static void Widget_signal_hierarchy_changed_callback(GtkWidget* self, GtkWidget* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Widget* > SlotType;
@@ -719,20 +764,24 @@ void Widget_signal_hierarchy_changed_callback(GtkWidget* self, GtkWidget* p0,voi
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_hierarchy_changed_info =
+static const Glib::SignalProxyInfo Widget_signal_hierarchy_changed_info =
 {
   "hierarchy_changed",
   (GCallback) &Widget_signal_hierarchy_changed_callback,
@@ -740,7 +789,7 @@ const Glib::SignalProxyInfo Widget_signal_hierarchy_changed_info =
 };
 
 
-void Widget_signal_style_changed_callback(GtkWidget* self, GtkStyle* p0,void* data)
+static void Widget_signal_style_changed_callback(GtkWidget* self, GtkStyle* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Style>& > SlotType;
@@ -748,20 +797,24 @@ void Widget_signal_style_changed_callback(GtkWidget* self, GtkStyle* p0,void* da
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_style_changed_info =
+static const Glib::SignalProxyInfo Widget_signal_style_changed_info =
 {
   "style_set",
   (GCallback) &Widget_signal_style_changed_callback,
@@ -769,7 +822,7 @@ const Glib::SignalProxyInfo Widget_signal_style_changed_info =
 };
 
 
-void Widget_signal_direction_changed_callback(GtkWidget* self, GtkTextDirection p0,void* data)
+static void Widget_signal_direction_changed_callback(GtkWidget* self, GtkTextDirection p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,TextDirection > SlotType;
@@ -777,20 +830,24 @@ void Widget_signal_direction_changed_callback(GtkWidget* self, GtkTextDirection
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(((TextDirection)(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_direction_changed_info =
+static const Glib::SignalProxyInfo Widget_signal_direction_changed_info =
 {
   "direction_changed",
   (GCallback) &Widget_signal_direction_changed_callback,
@@ -798,7 +855,7 @@ const Glib::SignalProxyInfo Widget_signal_direction_changed_info =
 };
 
 
-void Widget_signal_grab_notify_callback(GtkWidget* self, gboolean p0,void* data)
+static void Widget_signal_grab_notify_callback(GtkWidget* self, gboolean p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,bool > SlotType;
@@ -806,20 +863,24 @@ void Widget_signal_grab_notify_callback(GtkWidget* self, gboolean p0,void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_grab_notify_info =
+static const Glib::SignalProxyInfo Widget_signal_grab_notify_info =
 {
   "grab_notify",
   (GCallback) &Widget_signal_grab_notify_callback,
@@ -827,7 +888,7 @@ const Glib::SignalProxyInfo Widget_signal_grab_notify_info =
 };
 
 
-void Widget_signal_child_notify_callback(GtkWidget* self, GParamSpec* p0,void* data)
+static void Widget_signal_child_notify_callback(GtkWidget* self, GParamSpec* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GParamSpec* > SlotType;
@@ -835,19 +896,23 @@ void Widget_signal_child_notify_callback(GtkWidget* self, GParamSpec* p0,void* d
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_child_notify_info =
+static const Glib::SignalProxyInfo Widget_signal_child_notify_info =
 {
   "child_notify",
   (GCallback) &Widget_signal_child_notify_callback,
@@ -855,7 +920,7 @@ const Glib::SignalProxyInfo Widget_signal_child_notify_info =
 };
 
 
-gboolean Widget_signal_mnemonic_activate_callback(GtkWidget* self, gboolean p0,void* data)
+static gboolean Widget_signal_mnemonic_activate_callback(GtkWidget* self, gboolean p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,bool > SlotType;
@@ -863,23 +928,27 @@ gboolean Widget_signal_mnemonic_activate_callback(GtkWidget* self, gboolean p0,v
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_mnemonic_activate_notify_callback(GtkWidget* self, gboolean p0, void* data)
+static gboolean Widget_signal_mnemonic_activate_notify_callback(GtkWidget* self, gboolean p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,bool > SlotType;
@@ -887,23 +956,27 @@ gboolean Widget_signal_mnemonic_activate_notify_callback(GtkWidget* self, gboole
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_mnemonic_activate_info =
+static const Glib::SignalProxyInfo Widget_signal_mnemonic_activate_info =
 {
   "mnemonic_activate",
   (GCallback) &Widget_signal_mnemonic_activate_callback,
@@ -911,7 +984,7 @@ const Glib::SignalProxyInfo Widget_signal_mnemonic_activate_info =
 };
 
 
-const Glib::SignalProxyInfo Widget_signal_grab_focus_info =
+static const Glib::SignalProxyInfo Widget_signal_grab_focus_info =
 {
   "grab_focus",
   (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -919,7 +992,7 @@ const Glib::SignalProxyInfo Widget_signal_grab_focus_info =
 };
 
 
-gboolean Widget_signal_focus_callback(GtkWidget* self, GtkDirectionType p0,void* data)
+static gboolean Widget_signal_focus_callback(GtkWidget* self, GtkDirectionType p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,DirectionType > SlotType;
@@ -927,23 +1000,27 @@ gboolean Widget_signal_focus_callback(GtkWidget* self, GtkDirectionType p0,void*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(((DirectionType)(p0))
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_focus_notify_callback(GtkWidget* self, GtkDirectionType p0, void* data)
+static gboolean Widget_signal_focus_notify_callback(GtkWidget* self, GtkDirectionType p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,DirectionType > SlotType;
@@ -951,23 +1028,27 @@ gboolean Widget_signal_focus_notify_callback(GtkWidget* self, GtkDirectionType p
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(((DirectionType)(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_focus_info =
+static const Glib::SignalProxyInfo Widget_signal_focus_info =
 {
   "focus",
   (GCallback) &Widget_signal_focus_callback,
@@ -975,7 +1056,7 @@ const Glib::SignalProxyInfo Widget_signal_focus_info =
 };
 
 
-gboolean Widget_signal_event_callback(GtkWidget* self, GdkEvent* p0,void* data)
+static gboolean Widget_signal_event_callback(GtkWidget* self, GdkEvent* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEvent* > SlotType;
@@ -983,22 +1064,26 @@ gboolean Widget_signal_event_callback(GtkWidget* self, GdkEvent* p0,void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_event_notify_callback(GtkWidget* self, GdkEvent* p0, void* data)
+static gboolean Widget_signal_event_notify_callback(GtkWidget* self, GdkEvent* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEvent* > SlotType;
@@ -1006,22 +1091,26 @@ gboolean Widget_signal_event_notify_callback(GtkWidget* self, GdkEvent* p0, void
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_event_info =
+static const Glib::SignalProxyInfo Widget_signal_event_info =
 {
   "event",
   (GCallback) &Widget_signal_event_callback,
@@ -1029,7 +1118,7 @@ const Glib::SignalProxyInfo Widget_signal_event_info =
 };
 
 
-void Widget_signal_event_after_callback(GtkWidget* self, GdkEvent* p0,void* data)
+static void Widget_signal_event_after_callback(GtkWidget* self, GdkEvent* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEvent* > SlotType;
@@ -1037,19 +1126,23 @@ void Widget_signal_event_after_callback(GtkWidget* self, GdkEvent* p0,void* data
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_event_after_info =
+static const Glib::SignalProxyInfo Widget_signal_event_after_info =
 {
   "event_after",
   (GCallback) &Widget_signal_event_after_callback,
@@ -1057,7 +1150,7 @@ const Glib::SignalProxyInfo Widget_signal_event_after_info =
 };
 
 
-gboolean Widget_signal_button_press_event_callback(GtkWidget* self, GdkEventButton* p0,void* data)
+static gboolean Widget_signal_button_press_event_callback(GtkWidget* self, GdkEventButton* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventButton* > SlotType;
@@ -1065,22 +1158,26 @@ gboolean Widget_signal_button_press_event_callback(GtkWidget* self, GdkEventButt
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_button_press_event_notify_callback(GtkWidget* self, GdkEventButton* p0, void* data)
+static gboolean Widget_signal_button_press_event_notify_callback(GtkWidget* self, GdkEventButton* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventButton* > SlotType;
@@ -1088,22 +1185,26 @@ gboolean Widget_signal_button_press_event_notify_callback(GtkWidget* self, GdkEv
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_button_press_event_info =
+static const Glib::SignalProxyInfo Widget_signal_button_press_event_info =
 {
   "button_press_event",
   (GCallback) &Widget_signal_button_press_event_callback,
@@ -1111,7 +1212,7 @@ const Glib::SignalProxyInfo Widget_signal_button_press_event_info =
 };
 
 
-gboolean Widget_signal_button_release_event_callback(GtkWidget* self, GdkEventButton* p0,void* data)
+static gboolean Widget_signal_button_release_event_callback(GtkWidget* self, GdkEventButton* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventButton* > SlotType;
@@ -1119,22 +1220,26 @@ gboolean Widget_signal_button_release_event_callback(GtkWidget* self, GdkEventBu
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_button_release_event_notify_callback(GtkWidget* self, GdkEventButton* p0, void* data)
+static gboolean Widget_signal_button_release_event_notify_callback(GtkWidget* self, GdkEventButton* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventButton* > SlotType;
@@ -1142,22 +1247,26 @@ gboolean Widget_signal_button_release_event_notify_callback(GtkWidget* self, Gdk
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_button_release_event_info =
+static const Glib::SignalProxyInfo Widget_signal_button_release_event_info =
 {
   "button_release_event",
   (GCallback) &Widget_signal_button_release_event_callback,
@@ -1165,7 +1274,7 @@ const Glib::SignalProxyInfo Widget_signal_button_release_event_info =
 };
 
 
-gboolean Widget_signal_scroll_event_callback(GtkWidget* self, GdkEventScroll* p0,void* data)
+static gboolean Widget_signal_scroll_event_callback(GtkWidget* self, GdkEventScroll* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventScroll* > SlotType;
@@ -1173,22 +1282,26 @@ gboolean Widget_signal_scroll_event_callback(GtkWidget* self, GdkEventScroll* p0
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_scroll_event_notify_callback(GtkWidget* self, GdkEventScroll* p0, void* data)
+static gboolean Widget_signal_scroll_event_notify_callback(GtkWidget* self, GdkEventScroll* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventScroll* > SlotType;
@@ -1196,22 +1309,26 @@ gboolean Widget_signal_scroll_event_notify_callback(GtkWidget* self, GdkEventScr
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_scroll_event_info =
+static const Glib::SignalProxyInfo Widget_signal_scroll_event_info =
 {
   "scroll_event",
   (GCallback) &Widget_signal_scroll_event_callback,
@@ -1219,7 +1336,7 @@ const Glib::SignalProxyInfo Widget_signal_scroll_event_info =
 };
 
 
-gboolean Widget_signal_motion_notify_event_callback(GtkWidget* self, GdkEventMotion* p0,void* data)
+static gboolean Widget_signal_motion_notify_event_callback(GtkWidget* self, GdkEventMotion* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventMotion* > SlotType;
@@ -1227,22 +1344,26 @@ gboolean Widget_signal_motion_notify_event_callback(GtkWidget* self, GdkEventMot
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_motion_notify_event_notify_callback(GtkWidget* self, GdkEventMotion* p0, void* data)
+static gboolean Widget_signal_motion_notify_event_notify_callback(GtkWidget* self, GdkEventMotion* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventMotion* > SlotType;
@@ -1250,22 +1371,26 @@ gboolean Widget_signal_motion_notify_event_notify_callback(GtkWidget* self, GdkE
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_motion_notify_event_info =
+static const Glib::SignalProxyInfo Widget_signal_motion_notify_event_info =
 {
   "motion_notify_event",
   (GCallback) &Widget_signal_motion_notify_event_callback,
@@ -1273,7 +1398,7 @@ const Glib::SignalProxyInfo Widget_signal_motion_notify_event_info =
 };
 
 
-gboolean Widget_signal_delete_event_callback(GtkWidget* self, GdkEventAny* p0,void* data)
+static gboolean Widget_signal_delete_event_callback(GtkWidget* self, GdkEventAny* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventAny* > SlotType;
@@ -1281,22 +1406,26 @@ gboolean Widget_signal_delete_event_callback(GtkWidget* self, GdkEventAny* p0,vo
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_delete_event_notify_callback(GtkWidget* self, GdkEventAny* p0, void* data)
+static gboolean Widget_signal_delete_event_notify_callback(GtkWidget* self, GdkEventAny* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventAny* > SlotType;
@@ -1304,22 +1433,26 @@ gboolean Widget_signal_delete_event_notify_callback(GtkWidget* self, GdkEventAny
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_delete_event_info =
+static const Glib::SignalProxyInfo Widget_signal_delete_event_info =
 {
   "delete_event",
   (GCallback) &Widget_signal_delete_event_callback,
@@ -1327,7 +1460,7 @@ const Glib::SignalProxyInfo Widget_signal_delete_event_info =
 };
 
 
-gboolean Widget_signal_expose_event_callback(GtkWidget* self, GdkEventExpose* p0,void* data)
+static gboolean Widget_signal_expose_event_callback(GtkWidget* self, GdkEventExpose* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventExpose* > SlotType;
@@ -1335,22 +1468,26 @@ gboolean Widget_signal_expose_event_callback(GtkWidget* self, GdkEventExpose* p0
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_expose_event_notify_callback(GtkWidget* self, GdkEventExpose* p0, void* data)
+static gboolean Widget_signal_expose_event_notify_callback(GtkWidget* self, GdkEventExpose* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventExpose* > SlotType;
@@ -1358,22 +1495,26 @@ gboolean Widget_signal_expose_event_notify_callback(GtkWidget* self, GdkEventExp
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_expose_event_info =
+static const Glib::SignalProxyInfo Widget_signal_expose_event_info =
 {
   "expose_event",
   (GCallback) &Widget_signal_expose_event_callback,
@@ -1381,7 +1522,7 @@ const Glib::SignalProxyInfo Widget_signal_expose_event_info =
 };
 
 
-gboolean Widget_signal_key_press_event_callback(GtkWidget* self, GdkEventKey* p0,void* data)
+static gboolean Widget_signal_key_press_event_callback(GtkWidget* self, GdkEventKey* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventKey* > SlotType;
@@ -1389,22 +1530,26 @@ gboolean Widget_signal_key_press_event_callback(GtkWidget* self, GdkEventKey* p0
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_key_press_event_notify_callback(GtkWidget* self, GdkEventKey* p0, void* data)
+static gboolean Widget_signal_key_press_event_notify_callback(GtkWidget* self, GdkEventKey* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventKey* > SlotType;
@@ -1412,22 +1557,26 @@ gboolean Widget_signal_key_press_event_notify_callback(GtkWidget* self, GdkEvent
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_key_press_event_info =
+static const Glib::SignalProxyInfo Widget_signal_key_press_event_info =
 {
   "key_press_event",
   (GCallback) &Widget_signal_key_press_event_callback,
@@ -1435,7 +1584,7 @@ const Glib::SignalProxyInfo Widget_signal_key_press_event_info =
 };
 
 
-gboolean Widget_signal_key_release_event_callback(GtkWidget* self, GdkEventKey* p0,void* data)
+static gboolean Widget_signal_key_release_event_callback(GtkWidget* self, GdkEventKey* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventKey* > SlotType;
@@ -1443,22 +1592,26 @@ gboolean Widget_signal_key_release_event_callback(GtkWidget* self, GdkEventKey*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_key_release_event_notify_callback(GtkWidget* self, GdkEventKey* p0, void* data)
+static gboolean Widget_signal_key_release_event_notify_callback(GtkWidget* self, GdkEventKey* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventKey* > SlotType;
@@ -1466,22 +1619,26 @@ gboolean Widget_signal_key_release_event_notify_callback(GtkWidget* self, GdkEve
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_key_release_event_info =
+static const Glib::SignalProxyInfo Widget_signal_key_release_event_info =
 {
   "key_release_event",
   (GCallback) &Widget_signal_key_release_event_callback,
@@ -1489,7 +1646,7 @@ const Glib::SignalProxyInfo Widget_signal_key_release_event_info =
 };
 
 
-gboolean Widget_signal_enter_notify_event_callback(GtkWidget* self, GdkEventCrossing* p0,void* data)
+static gboolean Widget_signal_enter_notify_event_callback(GtkWidget* self, GdkEventCrossing* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventCrossing* > SlotType;
@@ -1497,22 +1654,26 @@ gboolean Widget_signal_enter_notify_event_callback(GtkWidget* self, GdkEventCros
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_enter_notify_event_notify_callback(GtkWidget* self, GdkEventCrossing* p0, void* data)
+static gboolean Widget_signal_enter_notify_event_notify_callback(GtkWidget* self, GdkEventCrossing* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventCrossing* > SlotType;
@@ -1520,22 +1681,26 @@ gboolean Widget_signal_enter_notify_event_notify_callback(GtkWidget* self, GdkEv
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_enter_notify_event_info =
+static const Glib::SignalProxyInfo Widget_signal_enter_notify_event_info =
 {
   "enter_notify_event",
   (GCallback) &Widget_signal_enter_notify_event_callback,
@@ -1543,7 +1708,7 @@ const Glib::SignalProxyInfo Widget_signal_enter_notify_event_info =
 };
 
 
-gboolean Widget_signal_leave_notify_event_callback(GtkWidget* self, GdkEventCrossing* p0,void* data)
+static gboolean Widget_signal_leave_notify_event_callback(GtkWidget* self, GdkEventCrossing* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventCrossing* > SlotType;
@@ -1551,22 +1716,26 @@ gboolean Widget_signal_leave_notify_event_callback(GtkWidget* self, GdkEventCros
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_leave_notify_event_notify_callback(GtkWidget* self, GdkEventCrossing* p0, void* data)
+static gboolean Widget_signal_leave_notify_event_notify_callback(GtkWidget* self, GdkEventCrossing* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventCrossing* > SlotType;
@@ -1574,22 +1743,26 @@ gboolean Widget_signal_leave_notify_event_notify_callback(GtkWidget* self, GdkEv
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_leave_notify_event_info =
+static const Glib::SignalProxyInfo Widget_signal_leave_notify_event_info =
 {
   "leave_notify_event",
   (GCallback) &Widget_signal_leave_notify_event_callback,
@@ -1597,7 +1770,7 @@ const Glib::SignalProxyInfo Widget_signal_leave_notify_event_info =
 };
 
 
-gboolean Widget_signal_configure_event_callback(GtkWidget* self, GdkEventConfigure* p0,void* data)
+static gboolean Widget_signal_configure_event_callback(GtkWidget* self, GdkEventConfigure* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventConfigure* > SlotType;
@@ -1605,22 +1778,26 @@ gboolean Widget_signal_configure_event_callback(GtkWidget* self, GdkEventConfigu
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_configure_event_notify_callback(GtkWidget* self, GdkEventConfigure* p0, void* data)
+static gboolean Widget_signal_configure_event_notify_callback(GtkWidget* self, GdkEventConfigure* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventConfigure* > SlotType;
@@ -1628,22 +1805,26 @@ gboolean Widget_signal_configure_event_notify_callback(GtkWidget* self, GdkEvent
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_configure_event_info =
+static const Glib::SignalProxyInfo Widget_signal_configure_event_info =
 {
   "configure_event",
   (GCallback) &Widget_signal_configure_event_callback,
@@ -1651,7 +1832,7 @@ const Glib::SignalProxyInfo Widget_signal_configure_event_info =
 };
 
 
-gboolean Widget_signal_focus_in_event_callback(GtkWidget* self, GdkEventFocus* p0,void* data)
+static gboolean Widget_signal_focus_in_event_callback(GtkWidget* self, GdkEventFocus* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventFocus* > SlotType;
@@ -1659,22 +1840,26 @@ gboolean Widget_signal_focus_in_event_callback(GtkWidget* self, GdkEventFocus* p
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_focus_in_event_notify_callback(GtkWidget* self, GdkEventFocus* p0, void* data)
+static gboolean Widget_signal_focus_in_event_notify_callback(GtkWidget* self, GdkEventFocus* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventFocus* > SlotType;
@@ -1682,22 +1867,26 @@ gboolean Widget_signal_focus_in_event_notify_callback(GtkWidget* self, GdkEventF
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_focus_in_event_info =
+static const Glib::SignalProxyInfo Widget_signal_focus_in_event_info =
 {
   "focus_in_event",
   (GCallback) &Widget_signal_focus_in_event_callback,
@@ -1705,7 +1894,7 @@ const Glib::SignalProxyInfo Widget_signal_focus_in_event_info =
 };
 
 
-gboolean Widget_signal_focus_out_event_callback(GtkWidget* self, GdkEventFocus* p0,void* data)
+static gboolean Widget_signal_focus_out_event_callback(GtkWidget* self, GdkEventFocus* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventFocus* > SlotType;
@@ -1713,22 +1902,26 @@ gboolean Widget_signal_focus_out_event_callback(GtkWidget* self, GdkEventFocus*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_focus_out_event_notify_callback(GtkWidget* self, GdkEventFocus* p0, void* data)
+static gboolean Widget_signal_focus_out_event_notify_callback(GtkWidget* self, GdkEventFocus* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventFocus* > SlotType;
@@ -1736,22 +1929,26 @@ gboolean Widget_signal_focus_out_event_notify_callback(GtkWidget* self, GdkEvent
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_focus_out_event_info =
+static const Glib::SignalProxyInfo Widget_signal_focus_out_event_info =
 {
   "focus_out_event",
   (GCallback) &Widget_signal_focus_out_event_callback,
@@ -1759,7 +1956,7 @@ const Glib::SignalProxyInfo Widget_signal_focus_out_event_info =
 };
 
 
-gboolean Widget_signal_map_event_callback(GtkWidget* self, GdkEventAny* p0,void* data)
+static gboolean Widget_signal_map_event_callback(GtkWidget* self, GdkEventAny* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventAny* > SlotType;
@@ -1767,22 +1964,26 @@ gboolean Widget_signal_map_event_callback(GtkWidget* self, GdkEventAny* p0,void*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_map_event_notify_callback(GtkWidget* self, GdkEventAny* p0, void* data)
+static gboolean Widget_signal_map_event_notify_callback(GtkWidget* self, GdkEventAny* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventAny* > SlotType;
@@ -1790,22 +1991,26 @@ gboolean Widget_signal_map_event_notify_callback(GtkWidget* self, GdkEventAny* p
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_map_event_info =
+static const Glib::SignalProxyInfo Widget_signal_map_event_info =
 {
   "map_event",
   (GCallback) &Widget_signal_map_event_callback,
@@ -1813,7 +2018,7 @@ const Glib::SignalProxyInfo Widget_signal_map_event_info =
 };
 
 
-gboolean Widget_signal_unmap_event_callback(GtkWidget* self, GdkEventAny* p0,void* data)
+static gboolean Widget_signal_unmap_event_callback(GtkWidget* self, GdkEventAny* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventAny* > SlotType;
@@ -1821,22 +2026,26 @@ gboolean Widget_signal_unmap_event_callback(GtkWidget* self, GdkEventAny* p0,voi
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_unmap_event_notify_callback(GtkWidget* self, GdkEventAny* p0, void* data)
+static gboolean Widget_signal_unmap_event_notify_callback(GtkWidget* self, GdkEventAny* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventAny* > SlotType;
@@ -1844,22 +2053,26 @@ gboolean Widget_signal_unmap_event_notify_callback(GtkWidget* self, GdkEventAny*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_unmap_event_info =
+static const Glib::SignalProxyInfo Widget_signal_unmap_event_info =
 {
   "unmap_event",
   (GCallback) &Widget_signal_unmap_event_callback,
@@ -1867,7 +2080,7 @@ const Glib::SignalProxyInfo Widget_signal_unmap_event_info =
 };
 
 
-gboolean Widget_signal_property_notify_event_callback(GtkWidget* self, GdkEventProperty* p0,void* data)
+static gboolean Widget_signal_property_notify_event_callback(GtkWidget* self, GdkEventProperty* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventProperty* > SlotType;
@@ -1875,22 +2088,26 @@ gboolean Widget_signal_property_notify_event_callback(GtkWidget* self, GdkEventP
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_property_notify_event_notify_callback(GtkWidget* self, GdkEventProperty* p0, void* data)
+static gboolean Widget_signal_property_notify_event_notify_callback(GtkWidget* self, GdkEventProperty* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventProperty* > SlotType;
@@ -1898,22 +2115,26 @@ gboolean Widget_signal_property_notify_event_notify_callback(GtkWidget* self, Gd
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_property_notify_event_info =
+static const Glib::SignalProxyInfo Widget_signal_property_notify_event_info =
 {
   "property_notify_event",
   (GCallback) &Widget_signal_property_notify_event_callback,
@@ -1921,7 +2142,7 @@ const Glib::SignalProxyInfo Widget_signal_property_notify_event_info =
 };
 
 
-gboolean Widget_signal_selection_clear_event_callback(GtkWidget* self, GdkEventSelection* p0,void* data)
+static gboolean Widget_signal_selection_clear_event_callback(GtkWidget* self, GdkEventSelection* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventSelection* > SlotType;
@@ -1929,22 +2150,26 @@ gboolean Widget_signal_selection_clear_event_callback(GtkWidget* self, GdkEventS
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_selection_clear_event_notify_callback(GtkWidget* self, GdkEventSelection* p0, void* data)
+static gboolean Widget_signal_selection_clear_event_notify_callback(GtkWidget* self, GdkEventSelection* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventSelection* > SlotType;
@@ -1952,22 +2177,26 @@ gboolean Widget_signal_selection_clear_event_notify_callback(GtkWidget* self, Gd
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_selection_clear_event_info =
+static const Glib::SignalProxyInfo Widget_signal_selection_clear_event_info =
 {
   "selection_clear_event",
   (GCallback) &Widget_signal_selection_clear_event_callback,
@@ -1975,7 +2204,7 @@ const Glib::SignalProxyInfo Widget_signal_selection_clear_event_info =
 };
 
 
-gboolean Widget_signal_selection_request_event_callback(GtkWidget* self, GdkEventSelection* p0,void* data)
+static gboolean Widget_signal_selection_request_event_callback(GtkWidget* self, GdkEventSelection* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventSelection* > SlotType;
@@ -1983,22 +2212,26 @@ gboolean Widget_signal_selection_request_event_callback(GtkWidget* self, GdkEven
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_selection_request_event_notify_callback(GtkWidget* self, GdkEventSelection* p0, void* data)
+static gboolean Widget_signal_selection_request_event_notify_callback(GtkWidget* self, GdkEventSelection* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventSelection* > SlotType;
@@ -2006,22 +2239,26 @@ gboolean Widget_signal_selection_request_event_notify_callback(GtkWidget* self,
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_selection_request_event_info =
+static const Glib::SignalProxyInfo Widget_signal_selection_request_event_info =
 {
   "selection_request_event",
   (GCallback) &Widget_signal_selection_request_event_callback,
@@ -2029,7 +2266,7 @@ const Glib::SignalProxyInfo Widget_signal_selection_request_event_info =
 };
 
 
-gboolean Widget_signal_selection_notify_event_callback(GtkWidget* self, GdkEventSelection* p0,void* data)
+static gboolean Widget_signal_selection_notify_event_callback(GtkWidget* self, GdkEventSelection* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventSelection* > SlotType;
@@ -2037,22 +2274,26 @@ gboolean Widget_signal_selection_notify_event_callback(GtkWidget* self, GdkEvent
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_selection_notify_event_notify_callback(GtkWidget* self, GdkEventSelection* p0, void* data)
+static gboolean Widget_signal_selection_notify_event_notify_callback(GtkWidget* self, GdkEventSelection* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventSelection* > SlotType;
@@ -2060,22 +2301,26 @@ gboolean Widget_signal_selection_notify_event_notify_callback(GtkWidget* self, G
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_selection_notify_event_info =
+static const Glib::SignalProxyInfo Widget_signal_selection_notify_event_info =
 {
   "selection_notify_event",
   (GCallback) &Widget_signal_selection_notify_event_callback,
@@ -2083,7 +2328,7 @@ const Glib::SignalProxyInfo Widget_signal_selection_notify_event_info =
 };
 
 
-gboolean Widget_signal_proximity_in_event_callback(GtkWidget* self, GdkEventProximity* p0,void* data)
+static gboolean Widget_signal_proximity_in_event_callback(GtkWidget* self, GdkEventProximity* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventProximity* > SlotType;
@@ -2091,22 +2336,26 @@ gboolean Widget_signal_proximity_in_event_callback(GtkWidget* self, GdkEventProx
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_proximity_in_event_notify_callback(GtkWidget* self, GdkEventProximity* p0, void* data)
+static gboolean Widget_signal_proximity_in_event_notify_callback(GtkWidget* self, GdkEventProximity* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventProximity* > SlotType;
@@ -2114,22 +2363,26 @@ gboolean Widget_signal_proximity_in_event_notify_callback(GtkWidget* self, GdkEv
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_proximity_in_event_info =
+static const Glib::SignalProxyInfo Widget_signal_proximity_in_event_info =
 {
   "proximity_in_event",
   (GCallback) &Widget_signal_proximity_in_event_callback,
@@ -2137,7 +2390,7 @@ const Glib::SignalProxyInfo Widget_signal_proximity_in_event_info =
 };
 
 
-gboolean Widget_signal_proximity_out_event_callback(GtkWidget* self, GdkEventProximity* p0,void* data)
+static gboolean Widget_signal_proximity_out_event_callback(GtkWidget* self, GdkEventProximity* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventProximity* > SlotType;
@@ -2145,22 +2398,26 @@ gboolean Widget_signal_proximity_out_event_callback(GtkWidget* self, GdkEventPro
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_proximity_out_event_notify_callback(GtkWidget* self, GdkEventProximity* p0, void* data)
+static gboolean Widget_signal_proximity_out_event_notify_callback(GtkWidget* self, GdkEventProximity* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventProximity* > SlotType;
@@ -2168,22 +2425,26 @@ gboolean Widget_signal_proximity_out_event_notify_callback(GtkWidget* self, GdkE
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_proximity_out_event_info =
+static const Glib::SignalProxyInfo Widget_signal_proximity_out_event_info =
 {
   "proximity_out_event",
   (GCallback) &Widget_signal_proximity_out_event_callback,
@@ -2191,7 +2452,7 @@ const Glib::SignalProxyInfo Widget_signal_proximity_out_event_info =
 };
 
 
-gboolean Widget_signal_visibility_notify_event_callback(GtkWidget* self, GdkEventVisibility* p0,void* data)
+static gboolean Widget_signal_visibility_notify_event_callback(GtkWidget* self, GdkEventVisibility* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventVisibility* > SlotType;
@@ -2199,22 +2460,26 @@ gboolean Widget_signal_visibility_notify_event_callback(GtkWidget* self, GdkEven
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_visibility_notify_event_notify_callback(GtkWidget* self, GdkEventVisibility* p0, void* data)
+static gboolean Widget_signal_visibility_notify_event_notify_callback(GtkWidget* self, GdkEventVisibility* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventVisibility* > SlotType;
@@ -2222,22 +2487,26 @@ gboolean Widget_signal_visibility_notify_event_notify_callback(GtkWidget* self,
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_visibility_notify_event_info =
+static const Glib::SignalProxyInfo Widget_signal_visibility_notify_event_info =
 {
   "visibility_notify_event",
   (GCallback) &Widget_signal_visibility_notify_event_callback,
@@ -2245,7 +2514,7 @@ const Glib::SignalProxyInfo Widget_signal_visibility_notify_event_info =
 };
 
 
-gboolean Widget_signal_client_event_callback(GtkWidget* self, GdkEventClient* p0,void* data)
+static gboolean Widget_signal_client_event_callback(GtkWidget* self, GdkEventClient* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventClient* > SlotType;
@@ -2253,22 +2522,26 @@ gboolean Widget_signal_client_event_callback(GtkWidget* self, GdkEventClient* p0
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_client_event_notify_callback(GtkWidget* self, GdkEventClient* p0, void* data)
+static gboolean Widget_signal_client_event_notify_callback(GtkWidget* self, GdkEventClient* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventClient* > SlotType;
@@ -2276,22 +2549,26 @@ gboolean Widget_signal_client_event_notify_callback(GtkWidget* self, GdkEventCli
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_client_event_info =
+static const Glib::SignalProxyInfo Widget_signal_client_event_info =
 {
   "client_event",
   (GCallback) &Widget_signal_client_event_callback,
@@ -2299,7 +2576,7 @@ const Glib::SignalProxyInfo Widget_signal_client_event_info =
 };
 
 
-gboolean Widget_signal_no_expose_event_callback(GtkWidget* self, GdkEventAny* p0,void* data)
+static gboolean Widget_signal_no_expose_event_callback(GtkWidget* self, GdkEventAny* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventAny* > SlotType;
@@ -2307,22 +2584,26 @@ gboolean Widget_signal_no_expose_event_callback(GtkWidget* self, GdkEventAny* p0
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_no_expose_event_notify_callback(GtkWidget* self, GdkEventAny* p0, void* data)
+static gboolean Widget_signal_no_expose_event_notify_callback(GtkWidget* self, GdkEventAny* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventAny* > SlotType;
@@ -2330,22 +2611,26 @@ gboolean Widget_signal_no_expose_event_notify_callback(GtkWidget* self, GdkEvent
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_no_expose_event_info =
+static const Glib::SignalProxyInfo Widget_signal_no_expose_event_info =
 {
   "no_expose_event",
   (GCallback) &Widget_signal_no_expose_event_callback,
@@ -2353,7 +2638,7 @@ const Glib::SignalProxyInfo Widget_signal_no_expose_event_info =
 };
 
 
-gboolean Widget_signal_window_state_event_callback(GtkWidget* self, GdkEventWindowState* p0,void* data)
+static gboolean Widget_signal_window_state_event_callback(GtkWidget* self, GdkEventWindowState* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEventWindowState* > SlotType;
@@ -2361,22 +2646,26 @@ gboolean Widget_signal_window_state_event_callback(GtkWidget* self, GdkEventWind
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_window_state_event_notify_callback(GtkWidget* self, GdkEventWindowState* p0, void* data)
+static gboolean Widget_signal_window_state_event_notify_callback(GtkWidget* self, GdkEventWindowState* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEventWindowState* > SlotType;
@@ -2384,22 +2673,26 @@ gboolean Widget_signal_window_state_event_notify_callback(GtkWidget* self, GdkEv
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_window_state_event_info =
+static const Glib::SignalProxyInfo Widget_signal_window_state_event_info =
 {
   "window_state_event",
   (GCallback) &Widget_signal_window_state_event_callback,
@@ -2407,7 +2700,7 @@ const Glib::SignalProxyInfo Widget_signal_window_state_event_info =
 };
 
 
-const Glib::SignalProxyInfo Widget_signal_selection_get_info =
+static const Glib::SignalProxyInfo Widget_signal_selection_get_info =
 {
   "selection_get",
   (GCallback) &Widget_signal_selection_get_callback,
@@ -2415,7 +2708,7 @@ const Glib::SignalProxyInfo Widget_signal_selection_get_info =
 };
 
 
-void Widget_signal_selection_received_callback(GtkWidget* self, GtkSelectionData* p0,guint p1,void* data)
+static void Widget_signal_selection_received_callback(GtkWidget* self, GtkSelectionData* p0,guint p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const SelectionData&,guint > SlotType;
@@ -2423,20 +2716,24 @@ void Widget_signal_selection_received_callback(GtkWidget* self, GtkSelectionData
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(SelectionData_WithoutOwnership(p0)
 , p1);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_selection_received_info =
+static const Glib::SignalProxyInfo Widget_signal_selection_received_info =
 {
   "selection_received",
   (GCallback) &Widget_signal_selection_received_callback,
@@ -2444,7 +2741,7 @@ const Glib::SignalProxyInfo Widget_signal_selection_received_info =
 };
 
 
-void Widget_signal_drag_begin_callback(GtkWidget* self, GdkDragContext* p0,void* data)
+static void Widget_signal_drag_begin_callback(GtkWidget* self, GdkDragContext* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Gdk::DragContext>& > SlotType;
@@ -2452,20 +2749,24 @@ void Widget_signal_drag_begin_callback(GtkWidget* self, GdkDragContext* p0,void*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_drag_begin_info =
+static const Glib::SignalProxyInfo Widget_signal_drag_begin_info =
 {
   "drag_begin",
   (GCallback) &Widget_signal_drag_begin_callback,
@@ -2473,7 +2774,7 @@ const Glib::SignalProxyInfo Widget_signal_drag_begin_info =
 };
 
 
-void Widget_signal_drag_end_callback(GtkWidget* self, GdkDragContext* p0,void* data)
+static void Widget_signal_drag_end_callback(GtkWidget* self, GdkDragContext* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Gdk::DragContext>& > SlotType;
@@ -2481,20 +2782,24 @@ void Widget_signal_drag_end_callback(GtkWidget* self, GdkDragContext* p0,void* d
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_drag_end_info =
+static const Glib::SignalProxyInfo Widget_signal_drag_end_info =
 {
   "drag_end",
   (GCallback) &Widget_signal_drag_end_callback,
@@ -2502,7 +2807,7 @@ const Glib::SignalProxyInfo Widget_signal_drag_end_info =
 };
 
 
-const Glib::SignalProxyInfo Widget_signal_drag_data_get_info =
+static const Glib::SignalProxyInfo Widget_signal_drag_data_get_info =
 {
   "drag_data_get",
   (GCallback) &Widget_signal_drag_data_get_callback,
@@ -2510,7 +2815,7 @@ const Glib::SignalProxyInfo Widget_signal_drag_data_get_info =
 };
 
 
-void Widget_signal_drag_data_delete_callback(GtkWidget* self, GdkDragContext* p0,void* data)
+static void Widget_signal_drag_data_delete_callback(GtkWidget* self, GdkDragContext* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Gdk::DragContext>& > SlotType;
@@ -2518,20 +2823,24 @@ void Widget_signal_drag_data_delete_callback(GtkWidget* self, GdkDragContext* p0
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_drag_data_delete_info =
+static const Glib::SignalProxyInfo Widget_signal_drag_data_delete_info =
 {
   "drag_data_delete",
   (GCallback) &Widget_signal_drag_data_delete_callback,
@@ -2539,7 +2848,7 @@ const Glib::SignalProxyInfo Widget_signal_drag_data_delete_info =
 };
 
 
-void Widget_signal_drag_leave_callback(GtkWidget* self, GdkDragContext* p0,guint p1,void* data)
+static void Widget_signal_drag_leave_callback(GtkWidget* self, GdkDragContext* p0,guint p1,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Gdk::DragContext>&,guint > SlotType;
@@ -2547,20 +2856,24 @@ void Widget_signal_drag_leave_callback(GtkWidget* self, GdkDragContext* p0,guint
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , p1);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_drag_leave_info =
+static const Glib::SignalProxyInfo Widget_signal_drag_leave_info =
 {
   "drag_leave",
   (GCallback) &Widget_signal_drag_leave_callback,
@@ -2568,7 +2881,7 @@ const Glib::SignalProxyInfo Widget_signal_drag_leave_info =
 };
 
 
-gboolean Widget_signal_drag_motion_callback(GtkWidget* self, GdkDragContext* p0,gint p1,gint p2,guint p3,void* data)
+static gboolean Widget_signal_drag_motion_callback(GtkWidget* self, GdkDragContext* p0,gint p1,gint p2,guint p3,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,const Glib::RefPtr<Gdk::DragContext>&,int,int,guint > SlotType;
@@ -2576,25 +2889,29 @@ gboolean Widget_signal_drag_motion_callback(GtkWidget* self, GdkDragContext* p0,
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , p1
 , p2
 , p3));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_drag_motion_notify_callback(GtkWidget* self, GdkDragContext* p0,gint p1,gint p2,guint p3, void* data)
+static gboolean Widget_signal_drag_motion_notify_callback(GtkWidget* self, GdkDragContext* p0,gint p1,gint p2,guint p3, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Gdk::DragContext>&,int,int,guint > SlotType;
@@ -2602,25 +2919,29 @@ gboolean Widget_signal_drag_motion_notify_callback(GtkWidget* self, GdkDragConte
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , p1
 , p2
 , p3);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_drag_motion_info =
+static const Glib::SignalProxyInfo Widget_signal_drag_motion_info =
 {
   "drag_motion",
   (GCallback) &Widget_signal_drag_motion_callback,
@@ -2628,7 +2949,7 @@ const Glib::SignalProxyInfo Widget_signal_drag_motion_info =
 };
 
 
-gboolean Widget_signal_drag_drop_callback(GtkWidget* self, GdkDragContext* p0,gint p1,gint p2,guint p3,void* data)
+static gboolean Widget_signal_drag_drop_callback(GtkWidget* self, GdkDragContext* p0,gint p1,gint p2,guint p3,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,const Glib::RefPtr<Gdk::DragContext>&,int,int,guint > SlotType;
@@ -2636,25 +2957,29 @@ gboolean Widget_signal_drag_drop_callback(GtkWidget* self, GdkDragContext* p0,gi
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , p1
 , p2
 , p3));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Widget_signal_drag_drop_notify_callback(GtkWidget* self, GdkDragContext* p0,gint p1,gint p2,guint p3, void* data)
+static gboolean Widget_signal_drag_drop_notify_callback(GtkWidget* self, GdkDragContext* p0,gint p1,gint p2,guint p3, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Gdk::DragContext>&,int,int,guint > SlotType;
@@ -2662,25 +2987,29 @@ gboolean Widget_signal_drag_drop_notify_callback(GtkWidget* self, GdkDragContext
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , p1
 , p2
 , p3);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_drag_drop_info =
+static const Glib::SignalProxyInfo Widget_signal_drag_drop_info =
 {
   "drag_drop",
   (GCallback) &Widget_signal_drag_drop_callback,
@@ -2688,7 +3017,7 @@ const Glib::SignalProxyInfo Widget_signal_drag_drop_info =
 };
 
 
-void Widget_signal_drag_data_received_callback(GtkWidget* self, GdkDragContext* p0,gint p1,gint p2,GtkSelectionData* p3,guint p4,guint p5,void* data)
+static void Widget_signal_drag_data_received_callback(GtkWidget* self, GdkDragContext* p0,gint p1,gint p2,GtkSelectionData* p3,guint p4,guint p5,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Gdk::DragContext>&,int,int,const SelectionData&,guint,guint > SlotType;
@@ -2696,23 +3025,27 @@ void Widget_signal_drag_data_received_callback(GtkWidget* self, GdkDragContext*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 , p1
 , p2
 , SelectionData_WithoutOwnership(p3)
 , p4, p5);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_drag_data_received_info =
+static const Glib::SignalProxyInfo Widget_signal_drag_data_received_info =
 {
   "drag_data_received",
   (GCallback) &Widget_signal_drag_data_received_callback,
@@ -2720,7 +3053,9 @@ const Glib::SignalProxyInfo Widget_signal_drag_data_received_info =
 };
 
 
-AtkObject* Widget_signal_get_accessible_callback(GtkWidget* self, void* data)
+#ifdef GTKMM_ATKMM_ENABLED
+
+static AtkObject* Widget_signal_get_accessible_callback(GtkWidget* self, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< Glib::RefPtr<Atk::Object> > SlotType;
@@ -2728,22 +3063,26 @@ AtkObject* Widget_signal_get_accessible_callback(GtkWidget* self, void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return Glib::unwrap((*static_cast<SlotType*>(slot))());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef AtkObject* RType;
   return RType();
 }
 
-AtkObject* Widget_signal_get_accessible_notify_callback(GtkWidget* self,  void* data)
+static AtkObject* Widget_signal_get_accessible_notify_callback(GtkWidget* self,  void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void > SlotType;
@@ -2751,30 +3090,36 @@ AtkObject* Widget_signal_get_accessible_notify_callback(GtkWidget* self,  void*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef AtkObject* RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Widget_signal_get_accessible_info =
+static const Glib::SignalProxyInfo Widget_signal_get_accessible_info =
 {
   "get_accessible",
   (GCallback) &Widget_signal_get_accessible_callback,
   (GCallback) &Widget_signal_get_accessible_notify_callback
 };
 
+#endif // GTKMM_ATKMM_ENABLED
+
 
-void Widget_signal_screen_changed_callback(GtkWidget* self, GdkScreen* p0,void* data)
+static void Widget_signal_screen_changed_callback(GtkWidget* self, GdkScreen* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,const Glib::RefPtr<Gdk::Screen>& > SlotType;
@@ -2782,26 +3127,39 @@ void Widget_signal_screen_changed_callback(GtkWidget* self, GdkScreen* p0,void*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Widget_signal_screen_changed_info =
+static const Glib::SignalProxyInfo Widget_signal_screen_changed_info =
 {
   "screen_changed",
   (GCallback) &Widget_signal_screen_changed_callback,
   (GCallback) &Widget_signal_screen_changed_callback
 };
 
+
+static const Glib::SignalProxyInfo Widget_signal_composited_changed_info =
+{
+  "composited_changed",
+  (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
+  (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
+};
+
+
 } // anonymous namespace
 
 // static
@@ -2854,7 +3212,10 @@ const Glib::Class& Widget_Class::init()
     register_derived_type(gtk_widget_get_type());
 
     // Add derived versions of interfaces, if the C type implements any interfaces:
+#ifdef GTKMM_ATKMM_ENABLED
   Atk::Implementor::add_interface(get_type());
+
+#endif // GTKMM_ATKMM_ENABLED
   }
 
   return *this;
@@ -2865,11 +3226,19 @@ void Widget_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED //We always need dispose_vfunc_callback
     reinterpret_cast<GObjectClass*>(klass)->dispose = &dispose_vfunc_callback;
+#ifdef GLIBMM_VFUNCS_ENABLED
     klass->dispatch_child_properties_changed = &dispatch_child_properties_changed_vfunc_callback;
   klass->show_all = &show_all_vfunc_callback;
   klass->hide_all = &hide_all_vfunc_callback;
+#ifdef GTKMM_ATKMM_ENABLED
   klass->get_accessible = &get_accessible_vfunc_callback;
+#endif // GTKMM_ATKMM_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   klass->show = &show_callback;
   klass->hide = &hide_callback;
   klass->map = &map_callback;
@@ -2924,12 +3293,16 @@ void Widget_Class::class_init_function(void* g_class, void* class_data)
   klass->drag_motion = &drag_motion_callback;
   klass->drag_drop = &drag_drop_callback;
   klass->drag_data_received = &drag_data_received_callback;
+#ifdef GTKMM_ATKMM_ENABLED
   klass->get_accessible = &get_accessible_callback;
+#endif // GTKMM_ATKMM_ENABLED
   klass->screen_changed = &screen_changed_callback;
     klass->hierarchy_changed = &hierarchy_changed_callback_custom;
       klass->parent_set = &parent_set_callback_custom;
-  }
+  #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+}
 
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Widget_Class::dispatch_child_properties_changed_vfunc_callback(GtkWidget* self, guint n_pspecs, GParamSpec** pspecs)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -2942,15 +3315,19 @@ void Widget_Class::dispatch_child_properties_changed_vfunc_callback(GtkWidget* s
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->dispatch_child_properties_changed_vfunc(n_pspecs, pspecs);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -2963,7 +3340,6 @@ void Widget_Class::dispatch_child_properties_changed_vfunc_callback(GtkWidget* s
       (*base->dispatch_child_properties_changed)(self, n_pspecs, pspecs);
   }
 }
-
 void Widget_Class::show_all_vfunc_callback(GtkWidget* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -2976,15 +3352,19 @@ void Widget_Class::show_all_vfunc_callback(GtkWidget* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->show_all_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -2997,7 +3377,6 @@ void Widget_Class::show_all_vfunc_callback(GtkWidget* self)
       (*base->show_all)(self);
   }
 }
-
 void Widget_Class::hide_all_vfunc_callback(GtkWidget* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3010,15 +3389,19 @@ void Widget_Class::hide_all_vfunc_callback(GtkWidget* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->hide_all_vfunc();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3031,7 +3414,7 @@ void Widget_Class::hide_all_vfunc_callback(GtkWidget* self)
       (*base->hide_all)(self);
   }
 }
-
+#ifdef GTKMM_ATKMM_ENABLED
 AtkObject* Widget_Class::get_accessible_vfunc_callback(GtkWidget* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3044,15 +3427,19 @@ AtkObject* Widget_Class::get_accessible_vfunc_callback(GtkWidget* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->get_accessible_vfunc());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3068,8 +3455,10 @@ AtkObject* Widget_Class::get_accessible_vfunc_callback(GtkWidget* self)
   typedef AtkObject* RType;
   return RType();
 }
+#endif // GTKMM_ATKMM_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
-
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Widget_Class::show_callback(GtkWidget* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3082,15 +3471,19 @@ void Widget_Class::show_callback(GtkWidget* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_show();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3103,7 +3496,6 @@ void Widget_Class::show_callback(GtkWidget* self)
       (*base->show)(self);
   }
 }
-
 void Widget_Class::hide_callback(GtkWidget* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3116,15 +3508,19 @@ void Widget_Class::hide_callback(GtkWidget* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_hide();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3137,7 +3533,6 @@ void Widget_Class::hide_callback(GtkWidget* self)
       (*base->hide)(self);
   }
 }
-
 void Widget_Class::map_callback(GtkWidget* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3150,15 +3545,19 @@ void Widget_Class::map_callback(GtkWidget* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_map();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3171,7 +3570,6 @@ void Widget_Class::map_callback(GtkWidget* self)
       (*base->map)(self);
   }
 }
-
 void Widget_Class::unmap_callback(GtkWidget* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3184,15 +3582,19 @@ void Widget_Class::unmap_callback(GtkWidget* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_unmap();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3205,7 +3607,6 @@ void Widget_Class::unmap_callback(GtkWidget* self)
       (*base->unmap)(self);
   }
 }
-
 void Widget_Class::realize_callback(GtkWidget* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3218,15 +3619,19 @@ void Widget_Class::realize_callback(GtkWidget* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_realize();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3239,7 +3644,6 @@ void Widget_Class::realize_callback(GtkWidget* self)
       (*base->realize)(self);
   }
 }
-
 void Widget_Class::unrealize_callback(GtkWidget* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3252,15 +3656,19 @@ void Widget_Class::unrealize_callback(GtkWidget* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_unrealize();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3273,7 +3681,6 @@ void Widget_Class::unrealize_callback(GtkWidget* self)
       (*base->unrealize)(self);
   }
 }
-
 void Widget_Class::size_request_callback(GtkWidget* self, GtkRequisition* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3286,16 +3693,20 @@ void Widget_Class::size_request_callback(GtkWidget* self, GtkRequisition* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_size_request((Requisition*)(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3308,7 +3719,6 @@ void Widget_Class::size_request_callback(GtkWidget* self, GtkRequisition* p0)
       (*base->size_request)(self, p0);
   }
 }
-
 void Widget_Class::size_allocate_callback(GtkWidget* self, GtkAllocation* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3321,16 +3731,20 @@ void Widget_Class::size_allocate_callback(GtkWidget* self, GtkAllocation* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_size_allocate((Allocation&)(Glib::wrap(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3343,7 +3757,6 @@ void Widget_Class::size_allocate_callback(GtkWidget* self, GtkAllocation* p0)
       (*base->size_allocate)(self, p0);
   }
 }
-
 void Widget_Class::state_changed_callback(GtkWidget* self, GtkStateType p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3356,16 +3769,20 @@ void Widget_Class::state_changed_callback(GtkWidget* self, GtkStateType p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_state_changed(((Gtk::StateType)(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3378,7 +3795,6 @@ void Widget_Class::state_changed_callback(GtkWidget* self, GtkStateType p0)
       (*base->state_changed)(self, p0);
   }
 }
-
 void Widget_Class::parent_set_callback(GtkWidget* self, GtkWidget* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3391,16 +3807,20 @@ void Widget_Class::parent_set_callback(GtkWidget* self, GtkWidget* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_parent_changed(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3413,7 +3833,6 @@ void Widget_Class::parent_set_callback(GtkWidget* self, GtkWidget* p0)
       (*base->parent_set)(self, p0);
   }
 }
-
 void Widget_Class::hierarchy_changed_callback(GtkWidget* self, GtkWidget* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3426,16 +3845,20 @@ void Widget_Class::hierarchy_changed_callback(GtkWidget* self, GtkWidget* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_hierarchy_changed(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3448,7 +3871,6 @@ void Widget_Class::hierarchy_changed_callback(GtkWidget* self, GtkWidget* p0)
       (*base->hierarchy_changed)(self, p0);
   }
 }
-
 void Widget_Class::style_set_callback(GtkWidget* self, GtkStyle* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3461,16 +3883,20 @@ void Widget_Class::style_set_callback(GtkWidget* self, GtkStyle* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_style_changed(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3483,7 +3909,6 @@ void Widget_Class::style_set_callback(GtkWidget* self, GtkStyle* p0)
       (*base->style_set)(self, p0);
   }
 }
-
 void Widget_Class::direction_changed_callback(GtkWidget* self, GtkTextDirection p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3496,16 +3921,20 @@ void Widget_Class::direction_changed_callback(GtkWidget* self, GtkTextDirection
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_direction_changed(((TextDirection)(p0))
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3518,7 +3947,6 @@ void Widget_Class::direction_changed_callback(GtkWidget* self, GtkTextDirection
       (*base->direction_changed)(self, p0);
   }
 }
-
 void Widget_Class::grab_notify_callback(GtkWidget* self, gboolean p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3531,16 +3959,20 @@ void Widget_Class::grab_notify_callback(GtkWidget* self, gboolean p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_grab_notify(p0
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3553,7 +3985,6 @@ void Widget_Class::grab_notify_callback(GtkWidget* self, gboolean p0)
       (*base->grab_notify)(self, p0);
   }
 }
-
 void Widget_Class::child_notify_callback(GtkWidget* self, GParamSpec* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3566,15 +3997,19 @@ void Widget_Class::child_notify_callback(GtkWidget* self, GParamSpec* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_child_notify(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3587,7 +4022,6 @@ void Widget_Class::child_notify_callback(GtkWidget* self, GParamSpec* p0)
       (*base->child_notify)(self, p0);
   }
 }
-
 gboolean Widget_Class::mnemonic_activate_callback(GtkWidget* self, gboolean p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3600,16 +4034,20 @@ gboolean Widget_Class::mnemonic_activate_callback(GtkWidget* self, gboolean p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_mnemonic_activate(p0
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3625,7 +4063,6 @@ gboolean Widget_Class::mnemonic_activate_callback(GtkWidget* self, gboolean p0)
   typedef gboolean RType;
   return RType();
 }
-
 void Widget_Class::grab_focus_callback(GtkWidget* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3638,15 +4075,19 @@ void Widget_Class::grab_focus_callback(GtkWidget* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_grab_focus();
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3659,7 +4100,6 @@ void Widget_Class::grab_focus_callback(GtkWidget* self)
       (*base->grab_focus)(self);
   }
 }
-
 gboolean Widget_Class::focus_callback(GtkWidget* self, GtkDirectionType p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3672,16 +4112,20 @@ gboolean Widget_Class::focus_callback(GtkWidget* self, GtkDirectionType p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_focus(((DirectionType)(p0))
 ));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3697,7 +4141,6 @@ gboolean Widget_Class::focus_callback(GtkWidget* self, GtkDirectionType p0)
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::event_callback(GtkWidget* self, GdkEvent* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3710,15 +4153,19 @@ gboolean Widget_Class::event_callback(GtkWidget* self, GdkEvent* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3734,7 +4181,6 @@ gboolean Widget_Class::event_callback(GtkWidget* self, GdkEvent* p0)
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::button_press_event_callback(GtkWidget* self, GdkEventButton* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3747,15 +4193,19 @@ gboolean Widget_Class::button_press_event_callback(GtkWidget* self, GdkEventButt
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_button_press_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3771,7 +4221,6 @@ gboolean Widget_Class::button_press_event_callback(GtkWidget* self, GdkEventButt
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::button_release_event_callback(GtkWidget* self, GdkEventButton* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3784,15 +4233,19 @@ gboolean Widget_Class::button_release_event_callback(GtkWidget* self, GdkEventBu
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_button_release_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3808,7 +4261,6 @@ gboolean Widget_Class::button_release_event_callback(GtkWidget* self, GdkEventBu
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::scroll_event_callback(GtkWidget* self, GdkEventScroll* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3821,15 +4273,19 @@ gboolean Widget_Class::scroll_event_callback(GtkWidget* self, GdkEventScroll* p0
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_scroll_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3845,7 +4301,6 @@ gboolean Widget_Class::scroll_event_callback(GtkWidget* self, GdkEventScroll* p0
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::motion_notify_event_callback(GtkWidget* self, GdkEventMotion* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3858,15 +4313,19 @@ gboolean Widget_Class::motion_notify_event_callback(GtkWidget* self, GdkEventMot
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_motion_notify_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3882,7 +4341,6 @@ gboolean Widget_Class::motion_notify_event_callback(GtkWidget* self, GdkEventMot
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::delete_event_callback(GtkWidget* self, GdkEventAny* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3895,15 +4353,19 @@ gboolean Widget_Class::delete_event_callback(GtkWidget* self, GdkEventAny* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_delete_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3919,7 +4381,6 @@ gboolean Widget_Class::delete_event_callback(GtkWidget* self, GdkEventAny* p0)
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::expose_event_callback(GtkWidget* self, GdkEventExpose* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3932,15 +4393,19 @@ gboolean Widget_Class::expose_event_callback(GtkWidget* self, GdkEventExpose* p0
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_expose_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3956,7 +4421,6 @@ gboolean Widget_Class::expose_event_callback(GtkWidget* self, GdkEventExpose* p0
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::key_press_event_callback(GtkWidget* self, GdkEventKey* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -3969,15 +4433,19 @@ gboolean Widget_Class::key_press_event_callback(GtkWidget* self, GdkEventKey* p0
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_key_press_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -3993,7 +4461,6 @@ gboolean Widget_Class::key_press_event_callback(GtkWidget* self, GdkEventKey* p0
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::key_release_event_callback(GtkWidget* self, GdkEventKey* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4006,15 +4473,19 @@ gboolean Widget_Class::key_release_event_callback(GtkWidget* self, GdkEventKey*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_key_release_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4030,7 +4501,6 @@ gboolean Widget_Class::key_release_event_callback(GtkWidget* self, GdkEventKey*
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::enter_notify_event_callback(GtkWidget* self, GdkEventCrossing* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4043,15 +4513,19 @@ gboolean Widget_Class::enter_notify_event_callback(GtkWidget* self, GdkEventCros
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_enter_notify_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4067,7 +4541,6 @@ gboolean Widget_Class::enter_notify_event_callback(GtkWidget* self, GdkEventCros
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::leave_notify_event_callback(GtkWidget* self, GdkEventCrossing* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4080,15 +4553,19 @@ gboolean Widget_Class::leave_notify_event_callback(GtkWidget* self, GdkEventCros
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_leave_notify_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4104,7 +4581,6 @@ gboolean Widget_Class::leave_notify_event_callback(GtkWidget* self, GdkEventCros
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::configure_event_callback(GtkWidget* self, GdkEventConfigure* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4117,15 +4593,19 @@ gboolean Widget_Class::configure_event_callback(GtkWidget* self, GdkEventConfigu
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_configure_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4141,7 +4621,6 @@ gboolean Widget_Class::configure_event_callback(GtkWidget* self, GdkEventConfigu
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::focus_in_event_callback(GtkWidget* self, GdkEventFocus* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4154,15 +4633,19 @@ gboolean Widget_Class::focus_in_event_callback(GtkWidget* self, GdkEventFocus* p
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_focus_in_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4178,7 +4661,6 @@ gboolean Widget_Class::focus_in_event_callback(GtkWidget* self, GdkEventFocus* p
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::focus_out_event_callback(GtkWidget* self, GdkEventFocus* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4191,15 +4673,19 @@ gboolean Widget_Class::focus_out_event_callback(GtkWidget* self, GdkEventFocus*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_focus_out_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4215,7 +4701,6 @@ gboolean Widget_Class::focus_out_event_callback(GtkWidget* self, GdkEventFocus*
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::map_event_callback(GtkWidget* self, GdkEventAny* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4228,15 +4713,19 @@ gboolean Widget_Class::map_event_callback(GtkWidget* self, GdkEventAny* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_map_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4252,7 +4741,6 @@ gboolean Widget_Class::map_event_callback(GtkWidget* self, GdkEventAny* p0)
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::unmap_event_callback(GtkWidget* self, GdkEventAny* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4265,15 +4753,19 @@ gboolean Widget_Class::unmap_event_callback(GtkWidget* self, GdkEventAny* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_unmap_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4289,7 +4781,6 @@ gboolean Widget_Class::unmap_event_callback(GtkWidget* self, GdkEventAny* p0)
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::property_notify_event_callback(GtkWidget* self, GdkEventProperty* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4302,15 +4793,19 @@ gboolean Widget_Class::property_notify_event_callback(GtkWidget* self, GdkEventP
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_property_notify_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4326,7 +4821,6 @@ gboolean Widget_Class::property_notify_event_callback(GtkWidget* self, GdkEventP
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::selection_clear_event_callback(GtkWidget* self, GdkEventSelection* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4339,15 +4833,19 @@ gboolean Widget_Class::selection_clear_event_callback(GtkWidget* self, GdkEventS
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_selection_clear_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4363,7 +4861,6 @@ gboolean Widget_Class::selection_clear_event_callback(GtkWidget* self, GdkEventS
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::selection_request_event_callback(GtkWidget* self, GdkEventSelection* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4376,15 +4873,19 @@ gboolean Widget_Class::selection_request_event_callback(GtkWidget* self, GdkEven
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_selection_request_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4400,7 +4901,6 @@ gboolean Widget_Class::selection_request_event_callback(GtkWidget* self, GdkEven
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::selection_notify_event_callback(GtkWidget* self, GdkEventSelection* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4413,15 +4913,19 @@ gboolean Widget_Class::selection_notify_event_callback(GtkWidget* self, GdkEvent
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_selection_notify_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4437,7 +4941,6 @@ gboolean Widget_Class::selection_notify_event_callback(GtkWidget* self, GdkEvent
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::proximity_in_event_callback(GtkWidget* self, GdkEventProximity* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4450,15 +4953,19 @@ gboolean Widget_Class::proximity_in_event_callback(GtkWidget* self, GdkEventProx
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_proximity_in_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4474,7 +4981,6 @@ gboolean Widget_Class::proximity_in_event_callback(GtkWidget* self, GdkEventProx
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::proximity_out_event_callback(GtkWidget* self, GdkEventProximity* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4487,15 +4993,19 @@ gboolean Widget_Class::proximity_out_event_callback(GtkWidget* self, GdkEventPro
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_proximity_out_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4511,7 +5021,6 @@ gboolean Widget_Class::proximity_out_event_callback(GtkWidget* self, GdkEventPro
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::visibility_notify_event_callback(GtkWidget* self, GdkEventVisibility* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4524,15 +5033,19 @@ gboolean Widget_Class::visibility_notify_event_callback(GtkWidget* self, GdkEven
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_visibility_notify_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4548,7 +5061,6 @@ gboolean Widget_Class::visibility_notify_event_callback(GtkWidget* self, GdkEven
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::client_event_callback(GtkWidget* self, GdkEventClient* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4561,15 +5073,19 @@ gboolean Widget_Class::client_event_callback(GtkWidget* self, GdkEventClient* p0
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_client_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4585,7 +5101,6 @@ gboolean Widget_Class::client_event_callback(GtkWidget* self, GdkEventClient* p0
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::no_expose_event_callback(GtkWidget* self, GdkEventAny* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4598,15 +5113,19 @@ gboolean Widget_Class::no_expose_event_callback(GtkWidget* self, GdkEventAny* p0
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_no_expose_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4622,7 +5141,6 @@ gboolean Widget_Class::no_expose_event_callback(GtkWidget* self, GdkEventAny* p0
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::window_state_event_callback(GtkWidget* self, GdkEventWindowState* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4635,15 +5153,19 @@ gboolean Widget_Class::window_state_event_callback(GtkWidget* self, GdkEventWind
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_window_state_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4659,7 +5181,6 @@ gboolean Widget_Class::window_state_event_callback(GtkWidget* self, GdkEventWind
   typedef gboolean RType;
   return RType();
 }
-
 void Widget_Class::selection_received_callback(GtkWidget* self, GtkSelectionData* p0, guint p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4672,16 +5193,20 @@ void Widget_Class::selection_received_callback(GtkWidget* self, GtkSelectionData
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_selection_received(SelectionData_WithoutOwnership(p0)
 , p1);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4694,7 +5219,6 @@ void Widget_Class::selection_received_callback(GtkWidget* self, GtkSelectionData
       (*base->selection_received)(self, p0, p1);
   }
 }
-
 void Widget_Class::drag_begin_callback(GtkWidget* self, GdkDragContext* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4707,16 +5231,20 @@ void Widget_Class::drag_begin_callback(GtkWidget* self, GdkDragContext* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_drag_begin(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4729,7 +5257,6 @@ void Widget_Class::drag_begin_callback(GtkWidget* self, GdkDragContext* p0)
       (*base->drag_begin)(self, p0);
   }
 }
-
 void Widget_Class::drag_end_callback(GtkWidget* self, GdkDragContext* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4742,16 +5269,20 @@ void Widget_Class::drag_end_callback(GtkWidget* self, GdkDragContext* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_drag_end(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4764,7 +5295,6 @@ void Widget_Class::drag_end_callback(GtkWidget* self, GdkDragContext* p0)
       (*base->drag_end)(self, p0);
   }
 }
-
 void Widget_Class::drag_data_delete_callback(GtkWidget* self, GdkDragContext* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4777,16 +5307,20 @@ void Widget_Class::drag_data_delete_callback(GtkWidget* self, GdkDragContext* p0
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_drag_data_delete(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4799,7 +5333,6 @@ void Widget_Class::drag_data_delete_callback(GtkWidget* self, GdkDragContext* p0
       (*base->drag_data_delete)(self, p0);
   }
 }
-
 void Widget_Class::drag_leave_callback(GtkWidget* self, GdkDragContext* p0, guint p1)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4812,16 +5345,20 @@ void Widget_Class::drag_leave_callback(GtkWidget* self, GdkDragContext* p0, guin
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_drag_leave(Glib::wrap(p0, true)
 , p1);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4834,7 +5371,6 @@ void Widget_Class::drag_leave_callback(GtkWidget* self, GdkDragContext* p0, guin
       (*base->drag_leave)(self, p0, p1);
   }
 }
-
 gboolean Widget_Class::drag_motion_callback(GtkWidget* self, GdkDragContext* p0, gint p1, gint p2, guint p3)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4847,18 +5383,22 @@ gboolean Widget_Class::drag_motion_callback(GtkWidget* self, GdkDragContext* p0,
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_drag_motion(Glib::wrap(p0, true)
 , p1
 , p2
 , p3));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4874,7 +5414,6 @@ gboolean Widget_Class::drag_motion_callback(GtkWidget* self, GdkDragContext* p0,
   typedef gboolean RType;
   return RType();
 }
-
 gboolean Widget_Class::drag_drop_callback(GtkWidget* self, GdkDragContext* p0, gint p1, gint p2, guint p3)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4887,18 +5426,22 @@ gboolean Widget_Class::drag_drop_callback(GtkWidget* self, GdkDragContext* p0, g
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_drag_drop(Glib::wrap(p0, true)
 , p1
 , p2
 , p3));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4914,7 +5457,6 @@ gboolean Widget_Class::drag_drop_callback(GtkWidget* self, GdkDragContext* p0, g
   typedef gboolean RType;
   return RType();
 }
-
 void Widget_Class::drag_data_received_callback(GtkWidget* self, GdkDragContext* p0, gint p1, gint p2, GtkSelectionData* p3, guint p4, guint p5)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4927,19 +5469,23 @@ void Widget_Class::drag_data_received_callback(GtkWidget* self, GdkDragContext*
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_drag_data_received(Glib::wrap(p0, true)
 , p1
 , p2
 , SelectionData_WithoutOwnership(p3)
 , p4, p5);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4952,7 +5498,7 @@ void Widget_Class::drag_data_received_callback(GtkWidget* self, GdkDragContext*
       (*base->drag_data_received)(self, p0, p1, p2, p3, p4, p5);
   }
 }
-
+#ifdef GTKMM_ATKMM_ENABLED
 AtkObject* Widget_Class::get_accessible_callback(GtkWidget* self)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -4965,15 +5511,19 @@ AtkObject* Widget_Class::get_accessible_callback(GtkWidget* self)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return Glib::unwrap(obj->on_get_accessible());
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -4989,7 +5539,7 @@ AtkObject* Widget_Class::get_accessible_callback(GtkWidget* self)
   typedef AtkObject* RType;
   return RType();
 }
-
+#endif // GTKMM_ATKMM_ENABLED
 void Widget_Class::screen_changed_callback(GtkWidget* self, GdkScreen* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -5002,16 +5552,20 @@ void Widget_Class::screen_changed_callback(GtkWidget* self, GdkScreen* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_screen_changed(Glib::wrap(p0, true)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -5024,6 +5578,7 @@ void Widget_Class::screen_changed_callback(GtkWidget* self, GdkScreen* p0)
       (*base->screen_changed)(self, p0);
   }
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Widget_Class::wrap_new(GObject* o)
@@ -5067,57 +5622,61 @@ bool Widget::set_scroll_adjustments(Adjustment& hadjustment, Adjustment& vadjust
 
 void Widget::show()
 {
-  gtk_widget_show(gobj());
+gtk_widget_show(gobj()); 
 }
 
 void Widget::show_now()
 {
-  gtk_widget_show_now(gobj());
+gtk_widget_show_now(gobj()); 
 }
 
 void Widget::hide()
 {
-  gtk_widget_hide(gobj());
+gtk_widget_hide(gobj()); 
 }
 
 void Widget::show_all()
 {
-  gtk_widget_show_all(gobj());
+gtk_widget_show_all(gobj()); 
 }
 
 void Widget::hide_all()
 {
-  gtk_widget_hide_all(gobj());
+gtk_widget_hide_all(gobj()); 
 }
 
 void Widget::queue_draw()
 {
-  gtk_widget_queue_draw(gobj());
+gtk_widget_queue_draw(gobj()); 
 }
 
 void Widget::queue_draw_area(int x, int y, int width, int height)
 {
-  gtk_widget_queue_draw_area(gobj(), x, y, width, height);
+gtk_widget_queue_draw_area(gobj(), x, y, width, height); 
 }
 
 void Widget::queue_resize()
 {
-  gtk_widget_queue_resize(gobj());
+gtk_widget_queue_resize(gobj()); 
 }
 
+#ifndef GTKMM_DISABLE_DEPRECATED
+
 void Widget::size_request(const Requisition& requisition)
 {
-  gtk_widget_size_request(gobj(), (GtkRequisition*)(&requisition));
+gtk_widget_size_request(gobj(), (GtkRequisition*)(&requisition)); 
 }
 
+#endif // GTKMM_DISABLE_DEPRECATED
+
 void Widget::size_allocate(const Allocation& allocation)
 {
-  gtk_widget_size_allocate(gobj(), (GtkAllocation*)(allocation.gobj()));
+gtk_widget_size_allocate(gobj(), (GtkAllocation*)(allocation.gobj())); 
 }
 
 void Widget::add_accelerator(const Glib::ustring& accel_signal, const Glib::RefPtr<AccelGroup>& accel_group, guint accel_key, Gdk::ModifierType accel_mods, AccelFlags accel_flags)
 {
-  gtk_widget_add_accelerator(gobj(), accel_signal.c_str(), Glib::unwrap(accel_group), accel_key, ((GdkModifierType)(accel_mods)), ((GtkAccelFlags)(accel_flags)));
+gtk_widget_add_accelerator(gobj(), accel_signal.c_str(), Glib::unwrap(accel_group), accel_key, ((GdkModifierType)(accel_mods)), ((GtkAccelFlags)(accel_flags))); 
 }
 
 bool Widget::remove_accelerator(const Glib::RefPtr<AccelGroup>& accel_group, guint accel_key, Gdk::ModifierType accel_mods)
@@ -5127,7 +5686,7 @@ bool Widget::remove_accelerator(const Glib::RefPtr<AccelGroup>& accel_group, gui
 
 void Widget::set_accel_path(const Glib::ustring& accel_path, const Glib::RefPtr<AccelGroup>& accel_group)
 {
-  gtk_widget_set_accel_path(gobj(), accel_path.c_str(), Glib::unwrap(accel_group));
+gtk_widget_set_accel_path(gobj(), accel_path.c_str(), Glib::unwrap(accel_group)); 
 }
 
 bool Widget::mnemonic_activate(bool group_cycling)
@@ -5152,7 +5711,7 @@ bool Widget::activate()
 
 void Widget::reparent(Widget & new_parent)
 {
-  gtk_widget_reparent(gobj(), (new_parent).gobj());
+gtk_widget_reparent(gobj(), (new_parent).gobj()); 
 }
 
 bool Widget::intersect(const Gdk::Rectangle& area, Gdk::Rectangle& intersection) const
@@ -5167,17 +5726,17 @@ Gdk::Region Widget::region_intersect(const Gdk::Region& region) const
 
 void Widget::freeze_child_notify()
 {
-  gtk_widget_freeze_child_notify(gobj());
+gtk_widget_freeze_child_notify(gobj()); 
 }
 
 void Widget::child_notify(const Glib::ustring& child_property)
 {
-  gtk_widget_child_notify(gobj(), child_property.c_str());
+gtk_widget_child_notify(gobj(), child_property.c_str()); 
 }
 
 void Widget::thaw_child_notify()
 {
-  gtk_widget_thaw_child_notify(gobj());
+gtk_widget_thaw_child_notify(gobj()); 
 }
 
 bool Widget::is_focus() const
@@ -5187,17 +5746,17 @@ bool Widget::is_focus() const
 
 void Widget::grab_focus()
 {
-  gtk_widget_grab_focus(gobj());
+gtk_widget_grab_focus(gobj()); 
 }
 
 void Widget::grab_default()
 {
-  gtk_widget_grab_default(gobj());
+gtk_widget_grab_default(gobj()); 
 }
 
 void Widget::set_name(const Glib::ustring& name)
 {
-  gtk_widget_set_name(gobj(), name.c_str());
+gtk_widget_set_name(gobj(), name.c_str()); 
 }
 
 Glib::ustring Widget::get_name() const
@@ -5207,32 +5766,32 @@ Glib::ustring Widget::get_name() const
 
 void Widget::set_state(Gtk::StateType state)
 {
-  gtk_widget_set_state(gobj(), ((GtkStateType)(state)));
+gtk_widget_set_state(gobj(), ((GtkStateType)(state))); 
 }
 
 void Widget::set_sensitive(bool sensitive)
 {
-  gtk_widget_set_sensitive(gobj(), static_cast<int>(sensitive));
+gtk_widget_set_sensitive(gobj(), static_cast<int>(sensitive)); 
 }
 
 void Widget::set_app_paintable(bool app_paintable)
 {
-  gtk_widget_set_app_paintable(gobj(), static_cast<int>(app_paintable));
+gtk_widget_set_app_paintable(gobj(), static_cast<int>(app_paintable)); 
 }
 
 void Widget::set_double_buffered(bool double_buffered)
 {
-  gtk_widget_set_double_buffered(gobj(), static_cast<int>(double_buffered));
+gtk_widget_set_double_buffered(gobj(), static_cast<int>(double_buffered)); 
 }
 
 void Widget::set_redraw_on_allocate(bool redraw_on_allocate)
 {
-  gtk_widget_set_redraw_on_allocate(gobj(), static_cast<int>(redraw_on_allocate));
+gtk_widget_set_redraw_on_allocate(gobj(), static_cast<int>(redraw_on_allocate)); 
 }
 
 void Widget::set_child_visible(bool is_visible)
 {
-  gtk_widget_set_child_visible(gobj(), static_cast<int>(is_visible));
+gtk_widget_set_child_visible(gobj(), static_cast<int>(is_visible)); 
 }
 
 bool Widget::get_child_visible() const
@@ -5247,32 +5806,27 @@ Container* Widget::get_parent()
 
 const Container* Widget::get_parent() const
 {
-  return Glib::wrap((GtkContainer*)(gtk_widget_get_parent(const_cast<GtkWidget*>(gobj()))));
+  return const_cast<Widget*>(this)->get_parent();
 }
 
 Glib::RefPtr<Gdk::Window> Widget::get_parent_window()
 {
 
   Glib::RefPtr<Gdk::Window> retvalue = Glib::wrap((GdkWindowObject*)(gtk_widget_get_parent_window(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Window> Widget::get_parent_window() const
 {
-
-  Glib::RefPtr<const Gdk::Window> retvalue = Glib::wrap((GdkWindowObject*)(gtk_widget_get_parent_window(const_cast<GtkWidget*>(gobj()))));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Widget*>(this)->get_parent_window();
 }
 
 void Widget::set_parent_window(const Glib::RefPtr<const Gdk::Window>& parent_window)
 {
-  gtk_widget_set_parent_window(gobj(), const_cast<GdkWindow*>(Glib::unwrap<Gdk::Window>(parent_window)));
+gtk_widget_set_parent_window(gobj(), const_cast<GdkWindow*>(Glib::unwrap<Gdk::Window>(parent_window))); 
 }
 
 bool Widget::child_focus(DirectionType direction)
@@ -5282,27 +5836,27 @@ bool Widget::child_focus(DirectionType direction)
 
 void Widget::set_size_request(int width, int height)
 {
-  gtk_widget_set_size_request(gobj(), width, height);
+gtk_widget_set_size_request(gobj(), width, height); 
 }
 
 void Widget::get_size_request(int& width, int& height) const
 {
-  gtk_widget_get_size_request(const_cast<GtkWidget*>(gobj()), &width, &height);
+gtk_widget_get_size_request(const_cast<GtkWidget*>(gobj()), &width, &height); 
 }
 
 void Widget::set_events(Gdk::EventMask events)
 {
-  gtk_widget_set_events(gobj(), events);
+gtk_widget_set_events(gobj(), events); 
 }
 
 void Widget::add_events(Gdk::EventMask events)
 {
-  gtk_widget_add_events(gobj(), events);
+gtk_widget_add_events(gobj(), events); 
 }
 
 void Widget::set_extension_events(Gdk::ExtensionMode mode)
 {
-  gtk_widget_set_extension_events(gobj(), ((GdkExtensionMode)(mode)));
+gtk_widget_set_extension_events(gobj(), ((GdkExtensionMode)(mode))); 
 }
 
 Gdk::ExtensionMode Widget::get_extension_events() const
@@ -5317,7 +5871,7 @@ Container* Widget::get_toplevel()
 
 const Container* Widget::get_toplevel() const
 {
-  return Glib::wrap((GtkContainer*)(gtk_widget_get_toplevel(const_cast<GtkWidget*>(gobj()))));
+  return const_cast<Widget*>(this)->get_toplevel();
 }
 
 Widget* Widget::get_ancestor(GType widget_type)
@@ -5327,47 +5881,42 @@ Widget* Widget::get_ancestor(GType widget_type)
 
 const Widget* Widget::get_ancestor(GType widget_type) const
 {
-  return Glib::wrap(gtk_widget_get_ancestor(const_cast<GtkWidget*>(gobj()), widget_type));
+  return const_cast<Widget*>(this)->get_ancestor(widget_type);
 }
 
 Glib::RefPtr<Gdk::Colormap> Widget::get_colormap()
 {
 
   Glib::RefPtr<Gdk::Colormap> retvalue = Glib::wrap(gtk_widget_get_colormap(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<Gdk::Visual> Widget::get_visual()
 {
 
   Glib::RefPtr<Gdk::Visual> retvalue = Glib::wrap(gtk_widget_get_visual(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<Gdk::Screen> Widget::get_screen()
 {
 
   Glib::RefPtr<Gdk::Screen> retvalue = Glib::wrap(gtk_widget_get_screen(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Screen> Widget::get_screen() const
 {
-
-  Glib::RefPtr<const Gdk::Screen> retvalue = Glib::wrap(gtk_widget_get_screen(const_cast<GtkWidget*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Widget*>(this)->get_screen();
 }
 
 bool Widget::has_screen() const
@@ -5379,85 +5928,73 @@ Glib::RefPtr<Gdk::Display> Widget::get_display()
 {
 
   Glib::RefPtr<Gdk::Display> retvalue = Glib::wrap(gtk_widget_get_display(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Display> Widget::get_display() const
 {
-
-  Glib::RefPtr<const Gdk::Display> retvalue = Glib::wrap(gtk_widget_get_display(const_cast<GtkWidget*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Widget*>(this)->get_display();
 }
 
 Glib::RefPtr<Gdk::Window> Widget::get_root_window()
 {
 
   Glib::RefPtr<Gdk::Window> retvalue = Glib::wrap((GdkWindowObject*)(gtk_widget_get_root_window(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Window> Widget::get_root_window() const
 {
-
-  Glib::RefPtr<const Gdk::Window> retvalue = Glib::wrap((GdkWindowObject*)(gtk_widget_get_root_window(const_cast<GtkWidget*>(gobj()))));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Widget*>(this)->get_root_window();
 }
 
 Glib::RefPtr<Settings> Widget::get_settings()
 {
 
   Glib::RefPtr<Settings> retvalue = Glib::wrap(gtk_widget_get_settings(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<Clipboard> Widget::get_clipboard(const Glib::ustring& selection)
 {
 
   Glib::RefPtr<Clipboard> retvalue = Glib::wrap(gtk_widget_get_clipboard(gobj(), Gdk::AtomString::to_c_type(selection)));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Clipboard> Widget::get_clipboard(const Glib::ustring& selection) const
 {
-
-  Glib::RefPtr<const Clipboard> retvalue = Glib::wrap(gtk_widget_get_clipboard(const_cast<GtkWidget*>(gobj()), Gdk::AtomString::to_c_type(selection)));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Widget*>(this)->get_clipboard(selection);
 }
 
+#ifdef GTKMM_ATKMM_ENABLED
 Glib::RefPtr<Atk::Object> Widget::get_accessible()
 {
 
   Glib::RefPtr<Atk::Object> retvalue = Glib::wrap(gtk_widget_get_accessible(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
+
+#endif // GTKMM_ATKMM_ENABLED
 void Widget::set_colormap(const Glib::RefPtr<const Gdk::Colormap> & colormap)
 {
-  gtk_widget_set_colormap(gobj(), const_cast<GdkColormap*>(Glib::unwrap<Gdk::Colormap>(colormap)));
+gtk_widget_set_colormap(gobj(), const_cast<GdkColormap*>(Glib::unwrap<Gdk::Colormap>(colormap))); 
 }
 
 Gdk::EventMask Widget::get_events() const
@@ -5467,7 +6004,7 @@ Gdk::EventMask Widget::get_events() const
 
 void Widget::get_pointer(int & x, int & y) const
 {
-  gtk_widget_get_pointer(const_cast<GtkWidget*>(gobj()), &x, &y);
+gtk_widget_get_pointer(const_cast<GtkWidget*>(gobj()), &x, &y); 
 }
 
 bool Widget::is_ancestor(Widget & ancestor) const
@@ -5482,82 +6019,72 @@ bool Widget::translate_coordinates(Widget& dest_widget, int src_x, int src_y, in
 
 void Widget::set_style(const Glib::RefPtr<Style>& style)
 {
-  gtk_widget_set_style(gobj(), Glib::unwrap(style));
+gtk_widget_set_style(gobj(), Glib::unwrap(style)); 
 }
 
 void Widget::ensure_style()
 {
-  gtk_widget_ensure_style(gobj());
+gtk_widget_ensure_style(gobj()); 
 }
 
 Glib::RefPtr<Style> Widget::get_style()
 {
 
   Glib::RefPtr<Style> retvalue = Glib::wrap(gtk_widget_get_style(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Style> Widget::get_style() const
 {
-
-  Glib::RefPtr<const Style> retvalue = Glib::wrap(gtk_widget_get_style(const_cast<GtkWidget*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Widget*>(this)->get_style();
 }
 
 void Widget::modify_style(const Glib::RefPtr<RcStyle>& style)
 {
-  gtk_widget_modify_style(gobj(), Glib::unwrap(style));
+gtk_widget_modify_style(gobj(), Glib::unwrap(style)); 
 }
 
 Glib::RefPtr<RcStyle> Widget::get_modifier_style()
 {
 
   Glib::RefPtr<RcStyle> retvalue = Glib::wrap(gtk_widget_get_modifier_style(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const RcStyle> Widget::get_modifier_style() const
 {
-
-  Glib::RefPtr<const RcStyle> retvalue = Glib::wrap(gtk_widget_get_modifier_style(const_cast<GtkWidget*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Widget*>(this)->get_modifier_style();
 }
 
 void Widget::modify_fg(StateType state, const Gdk::Color& color)
 {
-  gtk_widget_modify_fg(gobj(), ((GtkStateType)(state)), (color).gobj());
+gtk_widget_modify_fg(gobj(), ((GtkStateType)(state)), (color).gobj()); 
 }
 
 void Widget::modify_bg(StateType state, const Gdk::Color& color)
 {
-  gtk_widget_modify_bg(gobj(), ((GtkStateType)(state)), (color).gobj());
+gtk_widget_modify_bg(gobj(), ((GtkStateType)(state)), (color).gobj()); 
 }
 
 void Widget::modify_text(StateType state, const Gdk::Color& color)
 {
-  gtk_widget_modify_text(gobj(), ((GtkStateType)(state)), (color).gobj());
+gtk_widget_modify_text(gobj(), ((GtkStateType)(state)), (color).gobj()); 
 }
 
 void Widget::modify_base(StateType state, const Gdk::Color& color)
 {
-  gtk_widget_modify_base(gobj(), ((GtkStateType)(state)), (color).gobj());
+gtk_widget_modify_base(gobj(), ((GtkStateType)(state)), (color).gobj()); 
 }
 
 void Widget::modify_font(const Pango::FontDescription& font_desc)
 {
-  gtk_widget_modify_font(gobj(), const_cast<PangoFontDescription*>((font_desc).gobj()));
+gtk_widget_modify_font(gobj(), const_cast<PangoFontDescription*>((font_desc).gobj())); 
 }
 
 Glib::RefPtr<Pango::Context> Widget::create_pango_context()
@@ -5569,10 +6096,10 @@ Glib::RefPtr<Pango::Context> Widget::get_pango_context()
 {
 
   Glib::RefPtr<Pango::Context> retvalue = Glib::wrap(gtk_widget_get_pango_context(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<Pango::Layout> Widget::create_pango_layout(const Glib::ustring& text)
@@ -5587,7 +6114,7 @@ Glib::RefPtr<Gdk::Pixbuf> Widget::render_icon(const StockID& stock_id, IconSize
 
 void Widget::set_composite_name(const Glib::ustring& name)
 {
-  gtk_widget_set_composite_name(gobj(), name.c_str());
+gtk_widget_set_composite_name(gobj(), name.c_str()); 
 }
 
 Glib::ustring Widget::get_composite_name() const
@@ -5597,34 +6124,39 @@ Glib::ustring Widget::get_composite_name() const
 
 void Widget::reset_rc_styles()
 {
-  gtk_widget_reset_rc_styles(gobj());
+gtk_widget_reset_rc_styles(gobj()); 
 }
 
 void Widget::push_colormap(const Glib::RefPtr<const Gdk::Colormap>& cmap)
 {
-  gtk_widget_push_colormap(const_cast<GdkColormap*>(Glib::unwrap<Gdk::Colormap>(cmap)));
+gtk_widget_push_colormap(const_cast<GdkColormap*>(Glib::unwrap<Gdk::Colormap>(cmap)));
 }
 
+
 void Widget::pop_colormap()
 {
-  gtk_widget_pop_colormap();
+gtk_widget_pop_colormap();
 }
 
+
 void Widget::push_composite_child()
 {
-  gtk_widget_push_composite_child();
+gtk_widget_push_composite_child();
 }
 
+
 void Widget::pop_composite_child()
 {
-  gtk_widget_pop_composite_child();
+gtk_widget_pop_composite_child();
 }
 
+
 void Widget::set_default_colormap(const Glib::RefPtr<const Gdk::Colormap>& colormap)
 {
-  gtk_widget_set_default_colormap(const_cast<GdkColormap*>(Glib::unwrap<Gdk::Colormap>(colormap)));
+gtk_widget_set_default_colormap(const_cast<GdkColormap*>(Glib::unwrap<Gdk::Colormap>(colormap)));
 }
 
+
 Glib::RefPtr<Style> Widget::get_default_style()
 {
 
@@ -5635,6 +6167,7 @@ Glib::RefPtr<Style> Widget::get_default_style()
   return retvalue;
 }
 
+
 Glib::RefPtr<Gdk::Colormap> Widget::get_default_colormap()
 {
 
@@ -5645,6 +6178,7 @@ Glib::RefPtr<Gdk::Colormap> Widget::get_default_colormap()
   return retvalue;
 }
 
+
 Glib::RefPtr<Gdk::Visual> Widget::get_default_visual()
 {
 
@@ -5655,9 +6189,10 @@ Glib::RefPtr<Gdk::Visual> Widget::get_default_visual()
   return retvalue;
 }
 
+
 void Widget::set_direction(TextDirection dir)
 {
-  gtk_widget_set_direction(gobj(), ((GtkTextDirection)(dir)));
+gtk_widget_set_direction(gobj(), ((GtkTextDirection)(dir))); 
 }
 
 TextDirection Widget::get_direction()
@@ -5667,22 +6202,29 @@ TextDirection Widget::get_direction()
 
 void Widget::set_default_direction(TextDirection dir)
 {
-  gtk_widget_set_default_direction(((GtkTextDirection)(dir)));
+gtk_widget_set_default_direction(((GtkTextDirection)(dir)));
 }
 
+
 TextDirection Widget::get_default_direction()
 {
   return ((TextDirection)(gtk_widget_get_default_direction()));
 }
 
+
 void Widget::shape_combine_mask(const Glib::RefPtr<const Gdk::Bitmap>& shape_mask, int offset_x, int offset_y)
 {
-  gtk_widget_shape_combine_mask(gobj(), const_cast<GdkBitmap*>(Glib::unwrap<Gdk::Bitmap>(shape_mask)), offset_x, offset_y);
+gtk_widget_shape_combine_mask(gobj(), const_cast<GdkBitmap*>(Glib::unwrap<Gdk::Bitmap>(shape_mask)), offset_x, offset_y); 
+}
+
+void Widget::input_shape_combine_mask(const Glib::RefPtr<const Gdk::Bitmap>& shape_mask, int offset_x, int offset_y)
+{
+gtk_widget_input_shape_combine_mask(gobj(), const_cast<GdkBitmap*>(Glib::unwrap<Gdk::Bitmap>(shape_mask)), offset_x, offset_y); 
 }
 
 void Widget::reset_shapes()
 {
-  gtk_widget_reset_shapes(gobj());
+gtk_widget_reset_shapes(gobj()); 
 }
 
 Glib::ListHandle<Widget*> Widget::list_mnemonic_labels()
@@ -5697,37 +6239,37 @@ Glib::ListHandle<const Widget*> Widget::list_mnemonic_labels() const
 
 void Widget::add_mnemonic_label(Widget& label)
 {
-  gtk_widget_add_mnemonic_label(gobj(), (label).gobj());
+gtk_widget_add_mnemonic_label(gobj(), (label).gobj()); 
 }
 
 void Widget::remove_mnemonic_label(Widget& label)
 {
-  gtk_widget_remove_mnemonic_label(gobj(), (label).gobj());
+gtk_widget_remove_mnemonic_label(gobj(), (label).gobj()); 
 }
 
 void Widget::drag_get_data(const Glib::RefPtr<Gdk::DragContext>& context, Glib::ustring& target, guint32 time)
 {
-  gtk_drag_get_data(gobj(), Glib::unwrap(context), Gdk::AtomString::to_c_type(target), time);
+gtk_drag_get_data(gobj(), Glib::unwrap(context), Gdk::AtomString::to_c_type(target), time); 
 }
 
 void Widget::drag_highlight()
 {
-  gtk_drag_highlight(gobj());
+gtk_drag_highlight(gobj()); 
 }
 
 void Widget::drag_unhighlight()
 {
-  gtk_drag_unhighlight(gobj());
+gtk_drag_unhighlight(gobj()); 
 }
 
 void Widget::drag_dest_set_proxy(const Glib::RefPtr<Gdk::Window>& proxy_window, Gdk::DragProtocol protocol, bool use_coordinates)
 {
-  gtk_drag_dest_set_proxy(gobj(), Glib::unwrap(proxy_window), ((GdkDragProtocol)(protocol)), static_cast<int>(use_coordinates));
+gtk_drag_dest_set_proxy(gobj(), Glib::unwrap(proxy_window), ((GdkDragProtocol)(protocol)), static_cast<int>(use_coordinates)); 
 }
 
 void Widget::drag_dest_unset()
 {
-  gtk_drag_dest_unset(gobj());
+gtk_drag_dest_unset(gobj()); 
 }
 
 Glib::ustring Widget::drag_dest_find_target(const Glib::RefPtr<Gdk::DragContext>& context, const Glib::RefPtr<TargetList>& target_list) const
@@ -5739,85 +6281,85 @@ Glib::RefPtr<TargetList> Widget::drag_dest_get_target_list()
 {
 
   Glib::RefPtr<TargetList> retvalue = Glib::wrap(gtk_drag_dest_get_target_list(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const TargetList> Widget::drag_dest_get_target_list() const
 {
-
-  Glib::RefPtr<const TargetList> retvalue = Glib::wrap(gtk_drag_dest_get_target_list(const_cast<GtkWidget*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Widget*>(this)->drag_dest_get_target_list();
 }
 
 void Widget::drag_dest_set_target_list(const Glib::RefPtr<TargetList>& target_list)
 {
-  gtk_drag_dest_set_target_list(gobj(), const_cast<GtkTargetList*>(Glib::unwrap(target_list)));
+gtk_drag_dest_set_target_list(gobj(), const_cast<GtkTargetList*>(Glib::unwrap(target_list))); 
 }
 
 void Widget::drag_dest_add_text_targets()
 {
-  gtk_drag_dest_add_text_targets(gobj());
+gtk_drag_dest_add_text_targets(gobj()); 
 }
 
 void Widget::drag_dest_add_image_targets()
 {
-  gtk_drag_dest_add_image_targets(gobj());
+gtk_drag_dest_add_image_targets(gobj()); 
 }
 
 void Widget::drag_dest_add_uri_targets()
 {
-  gtk_drag_dest_add_uri_targets(gobj());
+gtk_drag_dest_add_uri_targets(gobj()); 
 }
 
 void Widget::drag_source_unset()
 {
-  gtk_drag_source_unset(gobj());
+gtk_drag_source_unset(gobj()); 
 }
 
 void Widget::drag_source_set_icon(const Glib::RefPtr<Gdk::Colormap>& colormap, const Glib::RefPtr<Gdk::Pixmap>& pixmap, const Glib::RefPtr<Gdk::Bitmap>& mask)
 {
-  gtk_drag_source_set_icon(gobj(), Glib::unwrap(colormap), Glib::unwrap(pixmap), Glib::unwrap(mask));
+gtk_drag_source_set_icon(gobj(), Glib::unwrap(colormap), Glib::unwrap(pixmap), Glib::unwrap(mask)); 
 }
 
 void Widget::drag_source_set_icon(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf)
 {
-  gtk_drag_source_set_icon_pixbuf(gobj(), Glib::unwrap(pixbuf));
+gtk_drag_source_set_icon_pixbuf(gobj(), Glib::unwrap(pixbuf)); 
 }
 
 void Widget::drag_source_set_icon(const StockID& stock_id)
 {
-  gtk_drag_source_set_icon_stock(gobj(), (stock_id).get_c_str());
+gtk_drag_source_set_icon_stock(gobj(), (stock_id).get_c_str()); 
+}
+
+void Widget::drag_source_set_icon(const Glib::ustring& icon_name)
+{
+gtk_drag_source_set_icon_name(gobj(), icon_name.c_str()); 
 }
 
 void Widget::drag_source_add_text_targets()
 {
-  gtk_drag_source_add_text_targets(gobj());
+gtk_drag_source_add_text_targets(gobj()); 
 }
 
 void Widget::drag_source_add_uri_targets()
 {
-  gtk_drag_source_add_uri_targets(gobj());
+gtk_drag_source_add_uri_targets(gobj()); 
 }
 
 void Widget::drag_source_add_image_targets()
 {
-  gtk_drag_source_add_image_targets(gobj());
+gtk_drag_source_add_image_targets(gobj()); 
 }
 
 Glib::RefPtr<Gdk::DragContext> Widget::drag_begin(const Glib::RefPtr<TargetList>& targets, Gdk::DragAction actions, int button, GdkEvent* event)
 {
 
   Glib::RefPtr<Gdk::DragContext> retvalue = Glib::wrap(gtk_drag_begin(gobj(), const_cast<GtkTargetList*>(Glib::unwrap(targets)), ((GdkDragAction)(actions)), button, event), true);
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 bool Widget::drag_check_threshold(int start_x, int start_y, int current_x, int current_y)
@@ -5827,7 +6369,7 @@ bool Widget::drag_check_threshold(int start_x, int start_y, int current_x, int c
 
 void Widget::queue_resize_no_redraw()
 {
-  gtk_widget_queue_resize_no_redraw(gobj());
+gtk_widget_queue_resize_no_redraw(gobj()); 
 }
 
 bool Widget::get_no_show_all() const
@@ -5837,40 +6379,70 @@ bool Widget::get_no_show_all() const
 
 void Widget::set_no_show_all(bool no_show_all)
 {
-  gtk_widget_set_no_show_all(gobj(), static_cast<int>(no_show_all));
+gtk_widget_set_no_show_all(gobj(), static_cast<int>(no_show_all)); 
 }
 
 void Widget::set_parent(Widget& parent)
 {
-  gtk_widget_set_parent(gobj(), (parent).gobj());
+gtk_widget_set_parent(gobj(), (parent).gobj()); 
 }
 
 void Widget::unparent()
 {
-  gtk_widget_unparent(gobj());
+gtk_widget_unparent(gobj()); 
 }
 
-Gtk::StateType Widget::get_state() const
+void Widget::map()
 {
-  return static_cast<StateType>(gobj()->state);
+gtk_widget_map(gobj()); 
 }
 
-Gtk::StateType Widget::get_saved_state() const
+void Widget::unmap()
 {
-  return static_cast<StateType>(gobj()->saved_state);
+gtk_widget_unmap(gobj()); 
 }
 
-Requisition Widget::get_requisition() const
+bool Widget::is_composited() const
 {
-  return (Requisition)(gobj()->requisition);
+  return gtk_widget_is_composited(const_cast<GtkWidget*>(gobj()));
 }
 
-Allocation Widget::get_allocation() const
+Glib::RefPtr<Action> Widget::get_action()
 {
-  return (Allocation)(Glib::wrap(&gobj()->allocation));
+
+  Glib::RefPtr<Action> retvalue = Glib::wrap(gtk_widget_get_action(gobj()));
+  if(retvalue)
+    retvalue->reference(); //The function does not do a ref for us.
+  return retvalue;
+
+}
+
+Glib::RefPtr<const Action> Widget::get_action() const
+{
+  return const_cast<Widget*>(this)->get_action();
 }
 
-Glib::RefPtr<Gdk::Window> Widget::get_window()
+ Gtk::StateType Widget::get_state() const
+{
+  return static_cast<StateType>(gobj()->state);
+}
+ 
+ Gtk::StateType Widget::get_saved_state() const
+{
+  return static_cast<StateType>(gobj()->saved_state);
+}
+ 
+ Requisition Widget::get_requisition() const
+{
+  return (Requisition)(gobj()->requisition);
+}
+ 
+ Allocation Widget::get_allocation() const
+{
+  return (Allocation)(Glib::wrap(&gobj()->allocation));
+}
+ 
+ Glib::RefPtr<Gdk::Window> Widget::get_window()
 {
   Glib::RefPtr<Gdk::Window> ref_ptr(Glib::wrap((GdkWindowObject*)(gobj()->window)));
 
@@ -5889,7 +6461,7 @@ Glib::RefPtr<const Gdk::Window> Widget::get_window() const
 
   return ref_ptr;
 }
-
+ 
 Widget::Widget()
 :
   Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
@@ -5897,42 +6469,32 @@ Widget::Widget()
 {
   }
 
-void Widget::map()
-{
-  gtk_widget_map(gobj());
-}
-
-void Widget::unmap()
-{
-  gtk_widget_unmap(gobj());
-}
-
 void Widget::realize()
 {
-  gtk_widget_realize(gobj());
+gtk_widget_realize(gobj()); 
 }
 
 void Widget::unrealize()
 {
-  gtk_widget_unrealize(gobj());
+gtk_widget_unrealize(gobj()); 
 }
 
 void Widget::get_child_requisition(Requisition& requisition) const
 {
-  gtk_widget_get_child_requisition(const_cast<GtkWidget*>(gobj()), (GtkRequisition*)(&requisition));
+gtk_widget_get_child_requisition(const_cast<GtkWidget*>(gobj()), (GtkRequisition*)(&requisition)); 
 }
 
 void Widget::get_style_property_value(const Glib::ustring& the_property_name, Glib::ValueBase& value) const
 {
-  gtk_widget_style_get_property(const_cast<GtkWidget*>(gobj()), the_property_name.c_str(), (value).gobj());
+gtk_widget_style_get_property(const_cast<GtkWidget*>(gobj()), the_property_name.c_str(), (value).gobj()); 
 }
 
-void Widget::set_allocation(const Allocation& value)
+ void Widget::set_allocation(const Allocation& value)
 {
   gobj()->allocation = (GtkAllocation)(*(value.gobj()));
 }
-
-void Widget::set_window(const Glib::RefPtr<Gdk::Window>& value)
+ 
+ void Widget::set_window(const Glib::RefPtr<Gdk::Window>& value)
 {
   Glib::RefPtr<Gdk::Window> valueOld(Glib::wrap((GdkWindowObject*)(gobj()->window))); //Take possession of the old one, unref-ing it in the destructor.
 
@@ -5941,287 +6503,345 @@ void Widget::set_window(const Glib::RefPtr<Gdk::Window>& value)
 
   gobj()->window = Glib::unwrap(value);
 }
-
+ 
 
 Glib::SignalProxy0< void > Widget::signal_show()
 {
   return Glib::SignalProxy0< void >(this, &Widget_signal_show_info);
 }
 
+
 Glib::SignalProxy0< void > Widget::signal_hide()
 {
   return Glib::SignalProxy0< void >(this, &Widget_signal_hide_info);
 }
 
+
 Glib::SignalProxy0< void > Widget::signal_map()
 {
   return Glib::SignalProxy0< void >(this, &Widget_signal_map_info);
 }
 
+
 Glib::SignalProxy0< void > Widget::signal_unmap()
 {
   return Glib::SignalProxy0< void >(this, &Widget_signal_unmap_info);
 }
 
+
 Glib::SignalProxy0< void > Widget::signal_realize()
 {
   return Glib::SignalProxy0< void >(this, &Widget_signal_realize_info);
 }
 
+
 Glib::SignalProxy0< void > Widget::signal_unrealize()
 {
   return Glib::SignalProxy0< void >(this, &Widget_signal_unrealize_info);
 }
 
+
 Glib::SignalProxy1< void,Requisition* > Widget::signal_size_request()
 {
   return Glib::SignalProxy1< void,Requisition* >(this, &Widget_signal_size_request_info);
 }
 
+
 Glib::SignalProxy1< void,Allocation& > Widget::signal_size_allocate()
 {
   return Glib::SignalProxy1< void,Allocation& >(this, &Widget_signal_size_allocate_info);
 }
 
+
 Glib::SignalProxy1< void,Gtk::StateType > Widget::signal_state_changed()
 {
   return Glib::SignalProxy1< void,Gtk::StateType >(this, &Widget_signal_state_changed_info);
 }
 
+
 Glib::SignalProxy1< void,Widget* > Widget::signal_parent_changed()
 {
   return Glib::SignalProxy1< void,Widget* >(this, &Widget_signal_parent_changed_info);
 }
 
+
 Glib::SignalProxy1< void,Widget* > Widget::signal_hierarchy_changed()
 {
   return Glib::SignalProxy1< void,Widget* >(this, &Widget_signal_hierarchy_changed_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<Style>& > Widget::signal_style_changed()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<Style>& >(this, &Widget_signal_style_changed_info);
 }
 
+
 Glib::SignalProxy1< void,TextDirection > Widget::signal_direction_changed()
 {
   return Glib::SignalProxy1< void,TextDirection >(this, &Widget_signal_direction_changed_info);
 }
 
+
 Glib::SignalProxy1< void,bool > Widget::signal_grab_notify()
 {
   return Glib::SignalProxy1< void,bool >(this, &Widget_signal_grab_notify_info);
 }
 
+
 Glib::SignalProxy1< void,GParamSpec* > Widget::signal_child_notify()
 {
   return Glib::SignalProxy1< void,GParamSpec* >(this, &Widget_signal_child_notify_info);
 }
 
+
 Glib::SignalProxy1< bool,bool > Widget::signal_mnemonic_activate()
 {
   return Glib::SignalProxy1< bool,bool >(this, &Widget_signal_mnemonic_activate_info);
 }
 
+
 Glib::SignalProxy0< void > Widget::signal_grab_focus()
 {
   return Glib::SignalProxy0< void >(this, &Widget_signal_grab_focus_info);
 }
 
+
 Glib::SignalProxy1< bool,DirectionType > Widget::signal_focus()
 {
   return Glib::SignalProxy1< bool,DirectionType >(this, &Widget_signal_focus_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEvent* > Widget::signal_event()
 {
   return Glib::SignalProxy1< bool,GdkEvent* >(this, &Widget_signal_event_info);
 }
 
+
 Glib::SignalProxy1< void,GdkEvent* > Widget::signal_event_after()
 {
   return Glib::SignalProxy1< void,GdkEvent* >(this, &Widget_signal_event_after_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventButton* > Widget::signal_button_press_event()
 {
   return Glib::SignalProxy1< bool,GdkEventButton* >(this, &Widget_signal_button_press_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventButton* > Widget::signal_button_release_event()
 {
   return Glib::SignalProxy1< bool,GdkEventButton* >(this, &Widget_signal_button_release_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventScroll* > Widget::signal_scroll_event()
 {
   return Glib::SignalProxy1< bool,GdkEventScroll* >(this, &Widget_signal_scroll_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventMotion* > Widget::signal_motion_notify_event()
 {
   return Glib::SignalProxy1< bool,GdkEventMotion* >(this, &Widget_signal_motion_notify_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventAny* > Widget::signal_delete_event()
 {
   return Glib::SignalProxy1< bool,GdkEventAny* >(this, &Widget_signal_delete_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventExpose* > Widget::signal_expose_event()
 {
   return Glib::SignalProxy1< bool,GdkEventExpose* >(this, &Widget_signal_expose_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventKey* > Widget::signal_key_press_event()
 {
   return Glib::SignalProxy1< bool,GdkEventKey* >(this, &Widget_signal_key_press_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventKey* > Widget::signal_key_release_event()
 {
   return Glib::SignalProxy1< bool,GdkEventKey* >(this, &Widget_signal_key_release_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventCrossing* > Widget::signal_enter_notify_event()
 {
   return Glib::SignalProxy1< bool,GdkEventCrossing* >(this, &Widget_signal_enter_notify_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventCrossing* > Widget::signal_leave_notify_event()
 {
   return Glib::SignalProxy1< bool,GdkEventCrossing* >(this, &Widget_signal_leave_notify_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventConfigure* > Widget::signal_configure_event()
 {
   return Glib::SignalProxy1< bool,GdkEventConfigure* >(this, &Widget_signal_configure_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventFocus* > Widget::signal_focus_in_event()
 {
   return Glib::SignalProxy1< bool,GdkEventFocus* >(this, &Widget_signal_focus_in_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventFocus* > Widget::signal_focus_out_event()
 {
   return Glib::SignalProxy1< bool,GdkEventFocus* >(this, &Widget_signal_focus_out_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventAny* > Widget::signal_map_event()
 {
   return Glib::SignalProxy1< bool,GdkEventAny* >(this, &Widget_signal_map_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventAny* > Widget::signal_unmap_event()
 {
   return Glib::SignalProxy1< bool,GdkEventAny* >(this, &Widget_signal_unmap_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventProperty* > Widget::signal_property_notify_event()
 {
   return Glib::SignalProxy1< bool,GdkEventProperty* >(this, &Widget_signal_property_notify_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventSelection* > Widget::signal_selection_clear_event()
 {
   return Glib::SignalProxy1< bool,GdkEventSelection* >(this, &Widget_signal_selection_clear_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventSelection* > Widget::signal_selection_request_event()
 {
   return Glib::SignalProxy1< bool,GdkEventSelection* >(this, &Widget_signal_selection_request_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventSelection* > Widget::signal_selection_notify_event()
 {
   return Glib::SignalProxy1< bool,GdkEventSelection* >(this, &Widget_signal_selection_notify_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventProximity* > Widget::signal_proximity_in_event()
 {
   return Glib::SignalProxy1< bool,GdkEventProximity* >(this, &Widget_signal_proximity_in_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventProximity* > Widget::signal_proximity_out_event()
 {
   return Glib::SignalProxy1< bool,GdkEventProximity* >(this, &Widget_signal_proximity_out_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventVisibility* > Widget::signal_visibility_notify_event()
 {
   return Glib::SignalProxy1< bool,GdkEventVisibility* >(this, &Widget_signal_visibility_notify_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventClient* > Widget::signal_client_event()
 {
   return Glib::SignalProxy1< bool,GdkEventClient* >(this, &Widget_signal_client_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventAny* > Widget::signal_no_expose_event()
 {
   return Glib::SignalProxy1< bool,GdkEventAny* >(this, &Widget_signal_no_expose_event_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEventWindowState* > Widget::signal_window_state_event()
 {
   return Glib::SignalProxy1< bool,GdkEventWindowState* >(this, &Widget_signal_window_state_event_info);
 }
 
+
 Glib::SignalProxy3< void,SelectionData&,guint,guint > Widget::signal_selection_get()
 {
   return Glib::SignalProxy3< void,SelectionData&,guint,guint >(this, &Widget_signal_selection_get_info);
 }
 
+
 Glib::SignalProxy2< void,const SelectionData&,guint > Widget::signal_selection_received()
 {
   return Glib::SignalProxy2< void,const SelectionData&,guint >(this, &Widget_signal_selection_received_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::DragContext>& > Widget::signal_drag_begin()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::DragContext>& >(this, &Widget_signal_drag_begin_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::DragContext>& > Widget::signal_drag_end()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::DragContext>& >(this, &Widget_signal_drag_end_info);
 }
 
+
 Glib::SignalProxy4< void,const Glib::RefPtr<Gdk::DragContext>&,SelectionData&,guint,guint > Widget::signal_drag_data_get()
 {
   return Glib::SignalProxy4< void,const Glib::RefPtr<Gdk::DragContext>&,SelectionData&,guint,guint >(this, &Widget_signal_drag_data_get_info);
 }
 
+
 Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::DragContext>& > Widget::signal_drag_data_delete()
 {
   return Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::DragContext>& >(this, &Widget_signal_drag_data_delete_info);
 }
 
+
 Glib::SignalProxy2< void,const Glib::RefPtr<Gdk::DragContext>&,guint > Widget::signal_drag_leave()
 {
   return Glib::SignalProxy2< void,const Glib::RefPtr<Gdk::DragContext>&,guint >(this, &Widget_signal_drag_leave_info);
 }
 
+
 Glib::SignalProxy4< bool,const Glib::RefPtr<Gdk::DragContext>&,int,int,guint > Widget::signal_drag_motion()
 {
   return Glib::SignalProxy4< bool,const Glib::RefPtr<Gdk::DragContext>&,int,int,guint >(this, &Widget_signal_drag_motion_info);
 }
 
+
 Glib::SignalProxy4< bool,const Glib::RefPtr<Gdk::DragContext>&,int,int,guint > Widget::signal_drag_drop()
 {
   return Glib::SignalProxy4< bool,const Glib::RefPtr<Gdk::DragContext>&,int,int,guint >(this, &Widget_signal_drag_drop_info);
 }
 
+
 Glib::SignalProxy6< void,const Glib::RefPtr<Gdk::DragContext>&,int,int,const SelectionData&,guint,guint > Widget::signal_drag_data_received()
 {
   return Glib::SignalProxy6< void,const Glib::RefPtr<Gdk::DragContext>&,int,int,const SelectionData&,guint,guint >(this, &Widget_signal_drag_data_received_info);
 }
 
+
+#ifdef GTKMM_ATKMM_ENABLED
 Glib::SignalProxy0< Glib::RefPtr<Atk::Object> > Widget::signal_get_accessible()
 {
   return Glib::SignalProxy0< Glib::RefPtr<Atk::Object> >(this, &Widget_signal_get_accessible_info);
 }
+#endif // GTKMM_ATKMM_ENABLED
+
 
 Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::Screen>& > Widget::signal_screen_changed()
 {
@@ -6229,162 +6849,231 @@ Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::Screen>& > Widget::signal_scree
 }
 
 
+Glib::SignalProxy0< void > Widget::signal_composited_changed()
+{
+  return Glib::SignalProxy0< void >(this, &Widget_signal_composited_changed_info);
+}
+
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Widget::property_name() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Widget::property_name() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "name");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Container*> Widget::property_parent() 
 {
   return Glib::PropertyProxy<Container*>(this, "parent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Container*> Widget::property_parent() const
 {
   return Glib::PropertyProxy_ReadOnly<Container*>(this, "parent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Widget::property_width_request() 
 {
   return Glib::PropertyProxy<int>(this, "width-request");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Widget::property_width_request() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "width-request");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Widget::property_height_request() 
 {
   return Glib::PropertyProxy<int>(this, "height-request");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Widget::property_height_request() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "height-request");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Widget::property_visible() 
 {
   return Glib::PropertyProxy<bool>(this, "visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Widget::property_visible() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "visible");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Widget::property_sensitive() 
 {
   return Glib::PropertyProxy<bool>(this, "sensitive");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Widget::property_sensitive() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "sensitive");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Widget::property_app_paintable() 
 {
   return Glib::PropertyProxy<bool>(this, "app-paintable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Widget::property_app_paintable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "app-paintable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Widget::property_can_focus() 
 {
   return Glib::PropertyProxy<bool>(this, "can-focus");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Widget::property_can_focus() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "can-focus");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Widget::property_has_focus() 
 {
   return Glib::PropertyProxy<bool>(this, "has-focus");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Widget::property_has_focus() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "has-focus");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Widget::property_can_default() 
 {
   return Glib::PropertyProxy<bool>(this, "can-default");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Widget::property_can_default() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "can-default");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Widget::property_has_default() 
 {
   return Glib::PropertyProxy<bool>(this, "has-default");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Widget::property_has_default() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "has-default");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Widget::property_receives_default() 
 {
   return Glib::PropertyProxy<bool>(this, "receives-default");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Widget::property_receives_default() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "receives-default");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Widget::property_composite_child() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "composite-child");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Style> > Widget::property_style() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Style> >(this, "style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Style> > Widget::property_style() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Style> >(this, "style");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gdk::EventMask> Widget::property_events() 
 {
   return Glib::PropertyProxy<Gdk::EventMask>(this, "events");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gdk::EventMask> Widget::property_events() const
 {
   return Glib::PropertyProxy_ReadOnly<Gdk::EventMask>(this, "events");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gdk::ExtensionMode> Widget::property_extension_events() 
 {
   return Glib::PropertyProxy<Gdk::ExtensionMode>(this, "extension-events");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gdk::ExtensionMode> Widget::property_extension_events() const
 {
   return Glib::PropertyProxy_ReadOnly<Gdk::ExtensionMode>(this, "extension-events");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Widget::on_show()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6394,7 +7083,6 @@ void Gtk::Widget::on_show()
   if(base && base->show)
     (*base->show)(gobj());
 }
-
 void Gtk::Widget::on_hide()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6404,7 +7092,6 @@ void Gtk::Widget::on_hide()
   if(base && base->hide)
     (*base->hide)(gobj());
 }
-
 void Gtk::Widget::on_map()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6414,7 +7101,6 @@ void Gtk::Widget::on_map()
   if(base && base->map)
     (*base->map)(gobj());
 }
-
 void Gtk::Widget::on_unmap()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6424,7 +7110,6 @@ void Gtk::Widget::on_unmap()
   if(base && base->unmap)
     (*base->unmap)(gobj());
 }
-
 void Gtk::Widget::on_realize()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6434,7 +7119,6 @@ void Gtk::Widget::on_realize()
   if(base && base->realize)
     (*base->realize)(gobj());
 }
-
 void Gtk::Widget::on_unrealize()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6444,7 +7128,6 @@ void Gtk::Widget::on_unrealize()
   if(base && base->unrealize)
     (*base->unrealize)(gobj());
 }
-
 void Gtk::Widget::on_size_request(Requisition* requisition)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6454,7 +7137,6 @@ void Gtk::Widget::on_size_request(Requisition* requisition)
   if(base && base->size_request)
     (*base->size_request)(gobj(),(GtkRequisition*)(requisition));
 }
-
 void Gtk::Widget::on_size_allocate(Allocation& allocation)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6464,7 +7146,6 @@ void Gtk::Widget::on_size_allocate(Allocation& allocation)
   if(base && base->size_allocate)
     (*base->size_allocate)(gobj(),(GtkAllocation*)(allocation.gobj()));
 }
-
 void Gtk::Widget::on_state_changed(Gtk::StateType previous_state)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6474,7 +7155,6 @@ void Gtk::Widget::on_state_changed(Gtk::StateType previous_state)
   if(base && base->state_changed)
     (*base->state_changed)(gobj(),((GtkStateType)(previous_state)));
 }
-
 void Gtk::Widget::on_parent_changed(Widget* previous_parent)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6484,7 +7164,6 @@ void Gtk::Widget::on_parent_changed(Widget* previous_parent)
   if(base && base->parent_set)
     (*base->parent_set)(gobj(),(GtkWidget*)Glib::unwrap(previous_parent));
 }
-
 void Gtk::Widget::on_hierarchy_changed(Widget* previous_toplevel)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6494,7 +7173,6 @@ void Gtk::Widget::on_hierarchy_changed(Widget* previous_toplevel)
   if(base && base->hierarchy_changed)
     (*base->hierarchy_changed)(gobj(),(GtkWidget*)Glib::unwrap(previous_toplevel));
 }
-
 void Gtk::Widget::on_style_changed(const Glib::RefPtr<Style>& previous_style)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6504,7 +7182,6 @@ void Gtk::Widget::on_style_changed(const Glib::RefPtr<Style>& previous_style)
   if(base && base->style_set)
     (*base->style_set)(gobj(),Glib::unwrap(previous_style));
 }
-
 void Gtk::Widget::on_direction_changed(TextDirection direction)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6514,7 +7191,6 @@ void Gtk::Widget::on_direction_changed(TextDirection direction)
   if(base && base->direction_changed)
     (*base->direction_changed)(gobj(),((GtkTextDirection)(direction)));
 }
-
 void Gtk::Widget::on_grab_notify(bool was_grabbed)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6524,7 +7200,6 @@ void Gtk::Widget::on_grab_notify(bool was_grabbed)
   if(base && base->grab_notify)
     (*base->grab_notify)(gobj(),static_cast<int>(was_grabbed));
 }
-
 void Gtk::Widget::on_child_notify(GParamSpec* pspec)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6534,7 +7209,6 @@ void Gtk::Widget::on_child_notify(GParamSpec* pspec)
   if(base && base->child_notify)
     (*base->child_notify)(gobj(),pspec);
 }
-
 bool Gtk::Widget::on_mnemonic_activate(bool group_cycling)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6547,7 +7221,6 @@ bool Gtk::Widget::on_mnemonic_activate(bool group_cycling)
   typedef bool RType;
   return RType();
 }
-
 void Gtk::Widget::on_grab_focus()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6557,7 +7230,6 @@ void Gtk::Widget::on_grab_focus()
   if(base && base->grab_focus)
     (*base->grab_focus)(gobj());
 }
-
 bool Gtk::Widget::on_focus(DirectionType direction)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6570,7 +7242,6 @@ bool Gtk::Widget::on_focus(DirectionType direction)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_event(GdkEvent* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6583,7 +7254,6 @@ bool Gtk::Widget::on_event(GdkEvent* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_button_press_event(GdkEventButton* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6596,7 +7266,6 @@ bool Gtk::Widget::on_button_press_event(GdkEventButton* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_button_release_event(GdkEventButton* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6609,7 +7278,6 @@ bool Gtk::Widget::on_button_release_event(GdkEventButton* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_scroll_event(GdkEventScroll* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6622,7 +7290,6 @@ bool Gtk::Widget::on_scroll_event(GdkEventScroll* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_motion_notify_event(GdkEventMotion* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6635,7 +7302,6 @@ bool Gtk::Widget::on_motion_notify_event(GdkEventMotion* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_delete_event(GdkEventAny* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6648,7 +7314,6 @@ bool Gtk::Widget::on_delete_event(GdkEventAny* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_expose_event(GdkEventExpose* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6661,7 +7326,6 @@ bool Gtk::Widget::on_expose_event(GdkEventExpose* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_key_press_event(GdkEventKey* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6674,7 +7338,6 @@ bool Gtk::Widget::on_key_press_event(GdkEventKey* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_key_release_event(GdkEventKey* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6687,7 +7350,6 @@ bool Gtk::Widget::on_key_release_event(GdkEventKey* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_enter_notify_event(GdkEventCrossing* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6700,7 +7362,6 @@ bool Gtk::Widget::on_enter_notify_event(GdkEventCrossing* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_leave_notify_event(GdkEventCrossing* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6713,7 +7374,6 @@ bool Gtk::Widget::on_leave_notify_event(GdkEventCrossing* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_configure_event(GdkEventConfigure* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6726,7 +7386,6 @@ bool Gtk::Widget::on_configure_event(GdkEventConfigure* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_focus_in_event(GdkEventFocus* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6739,7 +7398,6 @@ bool Gtk::Widget::on_focus_in_event(GdkEventFocus* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_focus_out_event(GdkEventFocus* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6752,7 +7410,6 @@ bool Gtk::Widget::on_focus_out_event(GdkEventFocus* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_map_event(GdkEventAny* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6765,7 +7422,6 @@ bool Gtk::Widget::on_map_event(GdkEventAny* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_unmap_event(GdkEventAny* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6778,7 +7434,6 @@ bool Gtk::Widget::on_unmap_event(GdkEventAny* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_property_notify_event(GdkEventProperty* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6791,7 +7446,6 @@ bool Gtk::Widget::on_property_notify_event(GdkEventProperty* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_selection_clear_event(GdkEventSelection* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6804,7 +7458,6 @@ bool Gtk::Widget::on_selection_clear_event(GdkEventSelection* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_selection_request_event(GdkEventSelection* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6817,7 +7470,6 @@ bool Gtk::Widget::on_selection_request_event(GdkEventSelection* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_selection_notify_event(GdkEventSelection* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6830,7 +7482,6 @@ bool Gtk::Widget::on_selection_notify_event(GdkEventSelection* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_proximity_in_event(GdkEventProximity* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6843,7 +7494,6 @@ bool Gtk::Widget::on_proximity_in_event(GdkEventProximity* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_proximity_out_event(GdkEventProximity* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6856,7 +7506,6 @@ bool Gtk::Widget::on_proximity_out_event(GdkEventProximity* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_visibility_notify_event(GdkEventVisibility* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6869,7 +7518,6 @@ bool Gtk::Widget::on_visibility_notify_event(GdkEventVisibility* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_client_event(GdkEventClient* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6882,7 +7530,6 @@ bool Gtk::Widget::on_client_event(GdkEventClient* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_no_expose_event(GdkEventAny* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6895,7 +7542,6 @@ bool Gtk::Widget::on_no_expose_event(GdkEventAny* event)
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_window_state_event(GdkEventWindowState* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6908,7 +7554,6 @@ bool Gtk::Widget::on_window_state_event(GdkEventWindowState* event)
   typedef bool RType;
   return RType();
 }
-
 void Gtk::Widget::on_selection_get(SelectionData& selection_data, guint info, guint time)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6918,7 +7563,6 @@ void Gtk::Widget::on_selection_get(SelectionData& selection_data, guint info, gu
   if(base && base->selection_get)
     (*base->selection_get)(gobj(),(selection_data).gobj(),info,time);
 }
-
 void Gtk::Widget::on_selection_received(const SelectionData& selection_data, guint time)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6928,7 +7572,6 @@ void Gtk::Widget::on_selection_received(const SelectionData& selection_data, gui
   if(base && base->selection_received)
     (*base->selection_received)(gobj(),const_cast<GtkSelectionData*>((selection_data).gobj()),time);
 }
-
 void Gtk::Widget::on_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6938,7 +7581,6 @@ void Gtk::Widget::on_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
   if(base && base->drag_begin)
     (*base->drag_begin)(gobj(),Glib::unwrap(context));
 }
-
 void Gtk::Widget::on_drag_end(const Glib::RefPtr<Gdk::DragContext>& context)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6948,7 +7590,6 @@ void Gtk::Widget::on_drag_end(const Glib::RefPtr<Gdk::DragContext>& context)
   if(base && base->drag_end)
     (*base->drag_end)(gobj(),Glib::unwrap(context));
 }
-
 void Gtk::Widget::on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, SelectionData& selection_data, guint info, guint time)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6958,7 +7599,6 @@ void Gtk::Widget::on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context
   if(base && base->drag_data_get)
     (*base->drag_data_get)(gobj(),Glib::unwrap(context),(selection_data).gobj(),info,time);
 }
-
 void Gtk::Widget::on_drag_data_delete(const Glib::RefPtr<Gdk::DragContext>& context)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6968,7 +7608,6 @@ void Gtk::Widget::on_drag_data_delete(const Glib::RefPtr<Gdk::DragContext>& cont
   if(base && base->drag_data_delete)
     (*base->drag_data_delete)(gobj(),Glib::unwrap(context));
 }
-
 void Gtk::Widget::on_drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, guint time)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6978,7 +7617,6 @@ void Gtk::Widget::on_drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, g
   if(base && base->drag_leave)
     (*base->drag_leave)(gobj(),Glib::unwrap(context),time);
 }
-
 bool Gtk::Widget::on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -6991,7 +7629,6 @@ bool Gtk::Widget::on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context,
   typedef bool RType;
   return RType();
 }
-
 bool Gtk::Widget::on_drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -7004,7 +7641,6 @@ bool Gtk::Widget::on_drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, in
   typedef bool RType;
   return RType();
 }
-
 void Gtk::Widget::on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const SelectionData& selection_data, guint info, guint time)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -7014,7 +7650,7 @@ void Gtk::Widget::on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& co
   if(base && base->drag_data_received)
     (*base->drag_data_received)(gobj(),Glib::unwrap(context),x,y,const_cast<GtkSelectionData*>((selection_data).gobj()),info,time);
 }
-
+#ifdef GTKMM_ATKMM_ENABLED
 Glib::RefPtr<Atk::Object> Gtk::Widget::on_get_accessible()
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -7027,7 +7663,7 @@ Glib::RefPtr<Atk::Object> Gtk::Widget::on_get_accessible()
   typedef Glib::RefPtr<Atk::Object> RType;
   return RType();
 }
-
+#endif // GTKMM_ATKMM_ENABLED
 void Gtk::Widget::on_screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_screen)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -7037,8 +7673,9 @@ void Gtk::Widget::on_screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_sc
   if(base && base->screen_changed)
     (*base->screen_changed)(gobj(),Glib::unwrap(previous_screen));
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
+#ifdef GLIBMM_VFUNCS_ENABLED
 void Gtk::Widget::dispatch_child_properties_changed_vfunc(guint p1, GParamSpec** p2) 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -7048,7 +7685,6 @@ void Gtk::Widget::dispatch_child_properties_changed_vfunc(guint p1, GParamSpec**
   if(base && base->dispatch_child_properties_changed)
     (*base->dispatch_child_properties_changed)(gobj(),p1,p2);
 }
-
 void Gtk::Widget::show_all_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -7058,7 +7694,6 @@ void Gtk::Widget::show_all_vfunc()
   if(base && base->show_all)
     (*base->show_all)(gobj());
 }
-
 void Gtk::Widget::hide_all_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -7068,7 +7703,7 @@ void Gtk::Widget::hide_all_vfunc()
   if(base && base->hide_all)
     (*base->hide_all)(gobj());
 }
-
+#ifdef GTKMM_ATKMM_ENABLED
 Glib::RefPtr<Atk::Object> Gtk::Widget::get_accessible_vfunc() 
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -7076,11 +7711,13 @@ Glib::RefPtr<Atk::Object> Gtk::Widget::get_accessible_vfunc()
   );
 
   if(base && base->get_accessible)
-    return Glib::wrap((*base->get_accessible)(gobj()));
+    return Glib::wrap((*base->get_accessible)(gobj()), true);
 
   typedef Glib::RefPtr<Atk::Object> RType;
   return RType();
 }
+#endif // GTKMM_ATKMM_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/widget.h b/libs/gtkmm2/gtk/gtkmm/widget.h
index 36877d402d..4f2e8fc6f3 100644
--- a/libs/gtkmm2/gtk/gtkmm/widget.h
+++ b/libs/gtkmm2/gtk/gtkmm/widget.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_WIDGET_H
 #define _GTKMM_WIDGET_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -26,8 +27,13 @@
  
 #include <pangomm/context.h>
 #include <pangomm/layout.h>
+
+#include <gtkmmconfig.h> //For GTKMM_ATKMM_ENABLED
+#ifdef GTKMM_ATKMM_ENABLED
 #include <atkmm/object.h>
 #include <atkmm/implementor.h>
+#endif //GTKMM_ATKMM_ENABLED
+
 #include <gdkmm/event.h>
 #include <gdkmm/types.h>
 #include <gdkmm/window.h>
@@ -41,6 +47,7 @@
 #include <gtkmm/rc.h>
 #include <gtkmm/object.h>
 #include <gtkmm/clipboard.h>
+//#include <gtkmm/action.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -48,6 +55,7 @@ extern "C"
 {
 typedef struct _GtkTargetEntry GtkTargetEntry;
 }
+
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -246,6 +254,7 @@ namespace Gtk
 {
 
 
+class Action;
 class Style;
 class AccelGroup;
 class Adjustment;
@@ -282,8 +291,10 @@ typedef Gdk::Rectangle Allocation;
  */
 
 class Widget
-: public Object,
-  public Atk::Implementor
+: public Object
+#ifdef GTKMM_ATKMM_ENABLED
+  ,public Atk::Implementor
+#endif //GTKMM_ATKMM_ENABLED
 {
   public:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -326,11 +337,16 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_show();
   virtual void on_hide();
   virtual void on_map();
@@ -385,8 +401,11 @@ protected:
   virtual bool on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time);
   virtual bool on_drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time);
   virtual void on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const SelectionData& selection_data, guint info, guint time);
+#ifdef GTKMM_ATKMM_ENABLED
   virtual Glib::RefPtr<Atk::Object> on_get_accessible();
+#endif // GTKMM_ATKMM_ENABLED
   virtual void on_screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_screen);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -508,9 +527,9 @@ public:
    */
   Requisition size_request() const;
   
-  
-  //Deprecated, because the Requisition should be an output parameter. This could never have been used.
-  
+
+#ifndef GTKMM_DISABLE_DEPRECATED
+
   /** This function is typically used when implementing a Gtk::Container
    * subclass.  Obtains the preferred size of a widget. The container
    * uses this information to arrange its child widgets and decide what
@@ -525,11 +544,13 @@ public:
    * a widget will actually be allocated.
    * 
    * See also get_child_requisition().
+   * @deprecated Use size_request() const.
    * @param requisition A Gtk::Requisition to be filled in.
    */
   void size_request(const Requisition& requisition);
+#endif // GTKMM_DISABLE_DEPRECATED
+
 
-  
   /** This function is only used by Gtk::Container subclasses, to assign a size
    * and position to their child widgets.
    * @param allocation Position and size to be allocated to @a widget .
@@ -582,7 +603,7 @@ public:
    * Even when you you aren't using Gtk::ItemFactory, if you only want to
    * set up accelerators on menu items Gtk::MenuItem::set_accel_path()
    * provides a somewhat more convenient interface.
-   * @param accel_path Path used to look up the the accelerator.
+   * @param accel_path Path used to look up the accelerator.
    * @param accel_group A Gtk::AccelGroup.
    */
   void set_accel_path(const Glib::ustring& accel_path,
@@ -769,6 +790,17 @@ public:
    */
   void set_sensitive(bool sensitive = true);
   
+  /** Sets whether the application intends to draw on the widget in
+   * an ::expose-event handler. 
+   * 
+   * This is a hint to the widget and does not affect the behavior of 
+   * the GTK+ core; many widgets ignore this flag entirely. For widgets 
+   * that do pay attention to the flag, such as Gtk::EventBox and Gtk::Window, 
+   * the effect is to suppress default themed drawing of the widget's 
+   * background. (Children of the widget will still be drawn.) The application 
+   * is then entirely responsible for drawing the widget background.
+   * @param app_paintable <tt>true</tt> if the application will paint on the widget.
+   */
   void set_app_paintable(bool app_paintable = true);
   
   /** Widgets are double buffered by default; you can use this function
@@ -784,13 +816,18 @@ public:
    * In very simple terms, double buffered widgets don't flicker,
    * so you would only use this function to turn off double buffering
    * if you had special needs and really knew what you were doing.
+   * 
+   * @note if you turn off double-buffering, you have to handle
+   * expose events, since even the clearing to the background color or 
+   * pixmap will not happen automatically (as it is done in 
+   * gdk_window_begin_paint()).
    * @param double_buffered <tt>true</tt> to double-buffer a widget.
    */
   void set_double_buffered(bool double_buffered = true);
 
   
-  /** Sets whether a when a widgets size allocation changes, the entire
-   * widget is queued for drawing. By default, this setting is <tt>true</tt> and
+  /** Sets whether the entire widget is queued for drawing when its size 
+   * allocation changes. By default, this setting is <tt>true</tt> and
    * the entire widget is redrawn on every size change. If your widget
    * leaves the upper left unchanged when made bigger, turning this
    * setting on will improve performance.
@@ -1091,7 +1128,7 @@ public:
    * free those resources when the widget is unrealized.
    * @return The Gdk::Screen for the toplevel for this widget.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Gdk::Screen> get_screen();
   
@@ -1105,7 +1142,7 @@ public:
    * free those resources when the widget is unrealized.
    * @return The Gdk::Screen for the toplevel for this widget.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Gdk::Screen> get_screen() const;
 
@@ -1117,7 +1154,7 @@ public:
    * @return <tt>true</tt> if there is a Gdk::Screen associcated
    * with the widget.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   bool has_screen() const;
 
@@ -1131,7 +1168,7 @@ public:
    * free those resources when the widget is unrealized.
    * @return The Gdk::Display for the toplevel for this widget.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Gdk::Display> get_display();
   
@@ -1144,7 +1181,7 @@ public:
    * free those resources when the widget is unrealized.
    * @return The Gdk::Display for the toplevel for this widget.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Gdk::Display> get_display() const;
 
@@ -1159,7 +1196,7 @@ public:
    * and you should free those resources when the widget is unrealized.
    * @return The Gdk::Window root window for the toplevel for this widget.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Gdk::Window> get_root_window();
   
@@ -1173,7 +1210,7 @@ public:
    * and you should free those resources when the widget is unrealized.
    * @return The Gdk::Window root window for the toplevel for this widget.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Gdk::Window> get_root_window() const;
   
@@ -1203,7 +1240,7 @@ public:
    * be created. Once a clipboard object has
    * been created, it is persistent for all time.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Clipboard> get_clipboard(const Glib::ustring& selection);
   
@@ -1221,15 +1258,32 @@ public:
    * be created. Once a clipboard object has
    * been created, it is persistent for all time.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Clipboard> get_clipboard(const Glib::ustring& selection) const;
 
   //TODO: This probably needs a special conversion to do an extra ref (take_copy=true) for the returned instance:
   
+  /** Returns the accessible object that describes the widget to an
+   * assistive technology. 
+   * 
+   * If no accessibility library is loaded (i.e. no ATK implementation library is 
+   * loaded via &lt;envar&gt;GTK_MODULES&lt;/envar&gt; or via another application library, 
+   * such as libgnome), then this Atk::Object instance may be a no-op. Likewise, 
+   * if no class-specific Atk::Object implementation is available for the widget 
+   * instance in question, it will inherit an Atk::Object implementation from the 
+   * first ancestor class for which such an implementation is defined.
+   * 
+   * The documentation of the ATK
+   * library contains more information about accessible objects and their uses.
+   * @return The Atk::Object associated with @a widget .
+   */
+
+#ifdef  GTKMM_ATKMM_ENABLED
   Glib::RefPtr<Atk::Object> get_accessible();
+#endif //  GTKMM_ATKMM_ENABLED
+
 
-  
   /** Sets the colormap for the widget to the given value. Widget must not
    * have been previously realized. This probably should only be used
    * from an <tt>init()</tt> function (i.e. from the constructor 
@@ -1522,7 +1576,7 @@ public:
 
   
   /** A convenience function that uses the theme engine and RC file
-   * settings for @a widget  to look up @a stock_id  and render it to
+   * settings for the widget to look up @a stock_id  and render it to
    * a pixbuf. @a stock_id  should be a stock icon ID such as
    * Gtk::STOCK_OPEN or Gtk::STOCK_OK. @a size  should be a size
    * such as Gtk::ICON_SIZE_MENU. @a detail  should be a string that
@@ -1537,7 +1591,7 @@ public:
    * the size of the source and don't scale (if there are multiple 
    * source sizes, GTK+ picks one of the available sizes).
    * @param detail Render detail to pass to theme engine.
-   * @return A new pixbuf, or <tt>0</tt> if the stock ID wasn't known.
+   * @return A new pixbuf if the stock ID was known.
    */
   Glib::RefPtr<Gdk::Pixbuf> render_icon(const StockID& stock_id, IconSize size, const Glib::ustring& detail = Glib::ustring());
 
@@ -1680,6 +1734,9 @@ public:
    */
   void shape_combine_mask(const Glib::RefPtr<const Gdk::Bitmap>& shape_mask, int offset_x, int offset_y);
   void unset_shape_combine_mask();
+  
+  void input_shape_combine_mask(const Glib::RefPtr<const Gdk::Bitmap>& shape_mask, int offset_x, int offset_y);
+  void unset_input_shape_combine_mask();
 
 
   // must be realized 
@@ -1707,7 +1764,7 @@ public:
    * @return The list of mnemonic labels; free this list
    * with Glib::list_free() when you are done with it.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ListHandle<Widget*> list_mnemonic_labels();
  
@@ -1724,7 +1781,7 @@ public:
    * @return The list of mnemonic labels; free this list
    * with Glib::list_free() when you are done with it.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   Glib::ListHandle<const Widget*> list_mnemonic_labels() const;
  
@@ -1732,10 +1789,9 @@ public:
    * this widget. (See list_mnemonic_labels()). Note the
    * list of mnemonic labels for the widget is cleared when the
    * widget is destroyed, so the caller must make sure to update
-   * it's internal state at this point as well, by using a connection
-   * to the ::destroy signal or a weak notifier.
+   * its internal state at this point as well.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param label A Gtk::Widget that acts as a mnemonic label for @a widget .
    */
   void add_mnemonic_label(Widget& label);
@@ -1745,7 +1801,7 @@ public:
    * must have previously been added to the list with
    * add_mnemonic_label().
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param label A Gtk::Widget that was previously set as a mnemnic label for
    *  @a widget  with add_mnemonic_label().
    */
@@ -1809,7 +1865,7 @@ public:
    * use gtk_target_list_add_text_targets() and
    * gtk_drag_dest_set_target_list().
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param widget A Gtk::Widget that's a drag destination.
    */
   void drag_dest_add_text_targets();  
@@ -1820,7 +1876,7 @@ public:
    * use gtk_target_list_add_image_targets() and
    * gtk_drag_dest_set_target_list().
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param widget A Gtk::Widget that's a drag destination.
    */
   void drag_dest_add_image_targets();
@@ -1831,7 +1887,7 @@ public:
    * use gtk_target_list_add_uri_targets() and
    * gtk_drag_dest_set_target_list().
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param widget A Gtk::Widget that's a drag destination.
    */
   void drag_dest_add_uri_targets();
@@ -1864,6 +1920,15 @@ public:
    * @param stock_id The ID of the stock icon to use.
    */
   void drag_source_set_icon(const StockID& stock_id);
+  
+  /** Sets the icon that will be used for drags from a particular source
+   * to a themed icon. See the docs for Gtk::IconTheme for more details.
+   * 
+   * @newin2p8
+   * @param widget A Gtk::Widget.
+   * @param icon_name Name of icon to use.
+   */
+  void drag_source_set_icon(const Glib::ustring& icon_name);
 
   
   /** Add the text targets supported by Gtk::Selection to
@@ -1872,7 +1937,7 @@ public:
    * use gtk_target_list_add_text_targets() and
    * gtk_drag_source_set_target_list().
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param widget A Gtk::Widget that's is a drag source.
    */
   void drag_source_add_text_targets();
@@ -1883,7 +1948,7 @@ public:
    * use gtk_target_list_add_uri_targets() and
    * gtk_drag_source_set_target_list().
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param widget A Gtk::Widget that's is a drag source.
    */
   void drag_source_add_uri_targets();
@@ -1894,7 +1959,7 @@ public:
    * use gtk_target_list_add_image_targets() and
    * gtk_drag_source_set_target_list().
    * 
-   * Since: 2.6
+   * @newin2p6
    * @param widget A Gtk::Widget that's is a drag source.
    */
   void drag_source_add_image_targets();
@@ -1933,7 +1998,7 @@ public:
   /** This function works like queue_resize(), except that the
    * widget is not invalidated.
    * 
-   * Since: 2.4
+   * @newin2p4
    */
   void queue_resize_no_redraw();
   
@@ -1942,7 +2007,7 @@ public:
    * will affect this widget.
    * @return The current value of the "no_show_all" property.
    * 
-   * Since: 2.4.
+   * @newin2p4.
    */
   bool get_no_show_all() const;
   
@@ -1952,7 +2017,7 @@ public:
    * This is mostly for use in constructing widget hierarchies with externally
    * controlled visibility, see Gtk::UIManager.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param no_show_all The new value for the "no_show_all" property.
    */
   void set_no_show_all(bool no_show_all = true);
@@ -1974,6 +2039,20 @@ public:
    */
   void unparent();
 
+  //TODO: When exactly do we need to custom containers need to call map() on the child widgets?
+  //Most containers that derive from GtkContainer do not need to, but GtkNotebook does.
+  
+  /** This function is only for use in widget implementations. Causes
+   * a widget to be mapped if it isn't already.
+   */
+  void map();
+  
+  /** This function is only for use in widget implementations. Causes
+   * a widget to be unmapped if it's currently mapped.
+   */
+  void unmap();
+
+  //TODO: The drawable should be passed by reference, when we can break API/ABI, but it's not the end of the world. murrayc.
   void draw_insertion_cursor(Glib::RefPtr<Gdk::Drawable> drawable, const Gdk::Rectangle& area, const Gdk::Rectangle& location, bool is_primary, TextDirection direction, bool draw_arrow = true);
   
          
@@ -2023,29 +2102,56 @@ public:
   int get_width() const;
   int get_height() const;
 
-  Gtk::StateType get_state() const;
-  Gtk::StateType get_saved_state() const;
-  Requisition get_requisition() const;
-  Allocation get_allocation() const;
-  Glib::RefPtr<Gdk::Window> get_window();
+  
+  bool is_composited() const;
+
+  //From gtkaction.h:
+  
+  Glib::RefPtr<Action> get_action();
+  
+  Glib::RefPtr<const Action> get_action() const;
+
+   Gtk::StateType get_state() const;
+    Gtk::StateType get_saved_state() const;
+    Requisition get_requisition() const;
+    Allocation get_allocation() const;
+    Glib::RefPtr<Gdk::Window> get_window();
   Glib::RefPtr<const Gdk::Window> get_window() const;
+ 
 
+/**
+   * @par Prototype:
+   * <tt>void %show()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_show();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %hide()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_hide();
 
 
   //: Emitted on mapping of a widget to the screen.
   //- See {flags.mapped}.
   
+/**
+   * @par Prototype:
+   * <tt>void %map()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_map();
 
 
   //- See {flags.mapped}.
   
+/**
+   * @par Prototype:
+   * <tt>void %unmap()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_unmap();
 
@@ -2056,6 +2162,10 @@ public:
   //- when overriding the impl method, you should call the 
   //- default realize method.
   
+/**
+   * @par Prototype:
+   * <tt>void %realize()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_realize();
 
@@ -2063,13 +2173,27 @@ public:
   //- See {flags.realized}.  This should not be called by the user.
   //__WRAP(meth|sig|impl,void unrealize_(),gtk_widget_unrealize,"unrealize")
   
+/**
+   * @par Prototype:
+   * <tt>void %unrealize()</tt>
+   */
 
   Glib::SignalProxy0< void > signal_unrealize();
 
 
+/**
+   * @par Prototype:
+   * <tt>void %size_request(Requisition* requisition)</tt>
+   */
+
   Glib::SignalProxy1< void,Requisition* > signal_size_request();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %size_allocate(Allocation& allocation)</tt>
+   */
+
   Glib::SignalProxy1< void,Allocation& > signal_size_allocate();
 
 
@@ -2078,9 +2202,11 @@ public:
 //  and      style_set  => style_changed 
 //  to avoid confusion with set_parent and set_style.
 
-  //: Informs objects that their state has changed.
-  //- The old state is passed as the argument.
   
+/**
+   * @par Prototype:
+   * <tt>void %state_changed(Gtk::StateType previous_state)</tt>
+   */
 
   Glib::SignalProxy1< void,Gtk::StateType > signal_state_changed();
 
@@ -2089,71 +2215,162 @@ public:
   //- The widget passed is the former parent, which may be 0 if 
   //- there was no parent. (was parent_set in GTK+)
   
+/**
+   * @par Prototype:
+   * <tt>void %parent_changed(Widget* previous_parent)</tt>
+   */
 
   Glib::SignalProxy1< void,Widget* > signal_parent_changed();
 
 
+/**
+   * @par Prototype:
+   * <tt>void %hierarchy_changed(Widget* previous_toplevel)</tt>
+   */
+
   Glib::SignalProxy1< void,Widget* > signal_hierarchy_changed();
 
 
-  //: Informs objects that their style has been changed.
-  //- The former style is passed as the argument. (was style_set in gtk+)
+  /** The style-set signal is emitted when a new style has been set 
+   * on a widget. Note that style-modifying functions like 
+   * modify_base() also cause this signal to be emitted.
+   *
+   * @param previous_style  the previous style, or an empty RefPtr if the widget 
+   * just got its initial style. 
+   */
   
+/**
+   * @par Prototype:
+   * <tt>void %style_changed(const Glib::RefPtr<Style>& previous_style)</tt>
+   */
 
   Glib::SignalProxy1< void,const Glib::RefPtr<Style>& > signal_style_changed();
 
 
+/**
+   * @par Prototype:
+   * <tt>void %direction_changed(TextDirection direction)</tt>
+   */
+
   Glib::SignalProxy1< void,TextDirection > signal_direction_changed();
 
 
+/**
+   * @par Prototype:
+   * <tt>void %grab_notify(bool was_grabbed)</tt>
+   */
+
   Glib::SignalProxy1< void,bool > signal_grab_notify();
 
 
+ /** The ::child-notify signal is emitted for each child property that has 
+  * changed on an object. The signal's detail holds the property name. 
+  *
+  * @param pspec The GParamSpec of the changed child property.
+  */
+  
+/**
+   * @par Prototype:
+   * <tt>void %child_notify(GParamSpec* pspec)</tt>
+   */
+
   Glib::SignalProxy1< void,GParamSpec* > signal_child_notify();
 
 
   //_WRAP_SIGNAL(void add_accelerator(guint, GtkAccelGroup*, guint accel_key, Gdk::ModifierType, AccelFlags), "add-accelerator")
   //_WRAP_SIGNAL(void remove_accelerator(GtkAccelGroup* accel_group, guint, Gdk::ModifierType), "remove-accelerator")
   
+/**
+   * @par Prototype:
+   * <tt>bool %mnemonic_activate(bool group_cycling)</tt>
+   */
 
   Glib::SignalProxy1< bool,bool > signal_mnemonic_activate();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %grab_focus()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_grab_focus();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %focus(DirectionType direction)</tt>
+   */
+
   Glib::SignalProxy1< bool,DirectionType > signal_focus();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %event(GdkEvent* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEvent* > signal_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %event_after(GdkEvent* event)</tt>
+   */
+
   Glib::SignalProxy1< void,GdkEvent* > signal_event_after();
 
 
   //: Event triggered by user pressing button.
   
+/**
+   * @par Prototype:
+   * <tt>bool %button_press_event(GdkEventButton* event)</tt>
+   */
 
   Glib::SignalProxy1< bool,GdkEventButton* > signal_button_press_event();
 
 
   //: Event triggered by user releasing button.
   
+/**
+   * @par Prototype:
+   * <tt>bool %button_release_event(GdkEventButton* event)</tt>
+   */
 
   Glib::SignalProxy1< bool,GdkEventButton* > signal_button_release_event();
 
 
+/**
+   * @par Prototype:
+   * <tt>bool %scroll_event(GdkEventScroll* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventScroll* > signal_scroll_event();
 
 
   //: Event triggered by user moving pointer.
   
+/**
+   * @par Prototype:
+   * <tt>bool %motion_notify_event(GdkEventMotion* event)</tt>
+   */
 
   Glib::SignalProxy1< bool,GdkEventMotion* > signal_motion_notify_event();
 
 
-  //: Event triggered by window being closed.
+ /** The delete_event signal is emitted if a user requests that
+  * a toplevel window is closed. The default handler for this signal
+  * hides the window.
+  *
+  * @param event the event which triggered this signal.
+  * @result true to stop other handlers from being invoked for the event, 
+  * or false to propagate the event. further.
+  */
   
+/**
+   * @par Prototype:
+   * <tt>bool %delete_event(GdkEventAny* event)</tt>
+   */
 
   Glib::SignalProxy1< bool,GdkEventAny* > signal_delete_event();
 
@@ -2168,139 +2385,406 @@ public:
   //- even indicated.  This is important for things such as 
   //- Gtk::DrawingArea. 
   
+/**
+   * @par Prototype:
+   * <tt>bool %expose_event(GdkEventExpose* event)</tt>
+   */
 
   Glib::SignalProxy1< bool,GdkEventExpose* > signal_expose_event();
 
 
   //: Event triggered by a key press will widget has focus.
   
+/**
+   * @par Prototype:
+   * <tt>bool %key_press_event(GdkEventKey* event)</tt>
+   */
 
   Glib::SignalProxy1< bool,GdkEventKey* > signal_key_press_event();
 
 
   //: Event triggered by a key release will widget has focus.
   
+/**
+   * @par Prototype:
+   * <tt>bool %key_release_event(GdkEventKey* event)</tt>
+   */
 
   Glib::SignalProxy1< bool,GdkEventKey* > signal_key_release_event();
 
 
   //: Event triggered by pointer entering widget area.
   
+/**
+   * @par Prototype:
+   * <tt>bool %enter_notify_event(GdkEventCrossing* event)</tt>
+   */
 
   Glib::SignalProxy1< bool,GdkEventCrossing* > signal_enter_notify_event();
 
 
   //: Event triggered by pointer leaving widget area.
   
+/**
+   * @par Prototype:
+   * <tt>bool %leave_notify_event(GdkEventCrossing* event)</tt>
+   */
 
   Glib::SignalProxy1< bool,GdkEventCrossing* > signal_leave_notify_event();
 
  
   //: Event triggered by a window resizing.
   
+/**
+   * @par Prototype:
+   * <tt>bool %configure_event(GdkEventConfigure* event)</tt>
+   */
 
   Glib::SignalProxy1< bool,GdkEventConfigure* > signal_configure_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %focus_in_event(GdkEventFocus* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventFocus* > signal_focus_in_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %focus_out_event(GdkEventFocus* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventFocus* > signal_focus_out_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %map_event(GdkEventAny* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventAny* > signal_map_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %unmap_event(GdkEventAny* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventAny* > signal_unmap_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %property_notify_event(GdkEventProperty* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventProperty* > signal_property_notify_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %selection_clear_event(GdkEventSelection* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventSelection* > signal_selection_clear_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %selection_request_event(GdkEventSelection* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventSelection* > signal_selection_request_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %selection_notify_event(GdkEventSelection* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventSelection* > signal_selection_notify_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %proximity_in_event(GdkEventProximity* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventProximity* > signal_proximity_in_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %proximity_out_event(GdkEventProximity* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventProximity* > signal_proximity_out_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %visibility_notify_event(GdkEventVisibility* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventVisibility* > signal_visibility_notify_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %client_event(GdkEventClient* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventClient* > signal_client_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %no_expose_event(GdkEventAny* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventAny* > signal_no_expose_event();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %window_state_event(GdkEventWindowState* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEventWindowState* > signal_window_state_event();
 
 
   //We use the optional custom_c_callback parameter with _WRAP_SIGNAL() for some of these,
-  //so that we can write special code to wrap the non-const SelectioData& output parameters:
+  //so that we can write special code to wrap the non-const SelectionData& output parameters:
   
+/**
+   * @par Prototype:
+   * <tt>void %selection_get(SelectionData& selection_data, guint info, guint time)</tt>
+   */
 
   Glib::SignalProxy3< void,SelectionData&,guint,guint > signal_selection_get();
 
   
+/**
+   * @par Prototype:
+   * <tt>void %selection_received(const SelectionData& selection_data, guint time)</tt>
+   */
+
   Glib::SignalProxy2< void,const SelectionData&,guint > signal_selection_received();
 
   
+  /** THe drag_begin signal is emitted on the drag source when a drag is started. 
+   * A typical reason to connect to this signal is to set up a custom drag icon with
+   * drag_source_set_icon().
+   *
+   * @param context the drag context
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::DragContext>& > signal_drag_begin();
 
   
+  /** The drag_end signal is emitted on the drag source when a drag is finished. 
+   * A typical reason to connect to this signal is to undo things done in the drag-begin 
+   * signal handler.
+   *
+   * @param context the drag context.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %drag_end(const Glib::RefPtr<Gdk::DragContext>& context)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::DragContext>& > signal_drag_end();
 
 
+  /** The drag_data_get signal is emitted on the drag source when the drop site requests
+   * the data which is dragged. It is the responsibility of the signal handler to fill @a data
+   * with the data in the format which is indicated by @a info. See SelectionData::set() and 
+   * SelectionData::set_text().
+   *
+   * @param context: the drag context.
+   * @param selection_data the SelectionData to be filled with the dragged data.
+   * @param info the info that has been registered with the target in the TargetList.
+   * @param time the timestamp at which the data was requested.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, SelectionData& selection_data, guint info, guint time)</tt>
+   */
+
   Glib::SignalProxy4< void,const Glib::RefPtr<Gdk::DragContext>&,SelectionData&,guint,guint > signal_drag_data_get();
 
   
+  /**  The drag_data_delete signal is emitted on the drag source when a drag with the action
+   * Gdk::ACTION_MOVE is successfully completed. The signal handler is responsible for deleting
+   * the data that has been dropped. What "delete" means, depends on the context of the drag
+   * operation. 
+   *
+   * @param context the drag context.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %drag_data_delete(const Glib::RefPtr<Gdk::DragContext>& context)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::DragContext>& > signal_drag_data_delete();
 
   
+  /**  The drag_leave signal is emitted on the drop site when the cursor leaves the widget.
+   * A typical reason to connect to this signal is to undo things done in the drag_motion signal handler, 
+   *  e.g. undo highlighting with drag_unhighlight().
+   *
+   * @param context the drag context.
+   * @param time the timestamp of the motion event.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %drag_leave(const Glib::RefPtr<Gdk::DragContext>& context, guint time)</tt>
+   */
+
   Glib::SignalProxy2< void,const Glib::RefPtr<Gdk::DragContext>&,guint > signal_drag_leave();
 
   
+  /** The drag_motion signal is emitted on the drop site when the user moves the cursor over
+   * the widget during a drag. The signal handler must determine whether the cursor position is in 
+   * a drop zone or not. If it is not in a drop zone, it returns false and no further processing is
+   * necessary. Otherwise, the handler returns true. In this case, the handler is responsible for
+   * providing the necessary information for displaying feedback to the user, by calling
+   * drag_status(). If the decision whether the drop will be accepted or rejected can't be made
+   * based solely on the cursor position and the type of the data, the handler may inspect the dragged 
+   * data by calling drag_get_data() and defer the drag_status() call to the drag_data_received 
+   * handler. 
+   *
+   * Note that there is no drag_enter signal. The drag receiver has to keep track of whether
+   * he has received any drag_motion signals since the last drag_leave and if not, treat the
+   * drag_motion signal as an "enter" signal. Upon an "enter", the handler will typically highlight 
+   * the drop site with drag_highlight().
+   * 
+   * @param context the drag context.
+   * @param x the x coordinate of the current cursor position.
+   * @param y the y coordinate of the current cursor position.
+   * @param time the timestamp of the motion event.
+   * @result whether the cursor position is in a drop zone.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>bool %drag_motion(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time)</tt>
+   */
+
   Glib::SignalProxy4< bool,const Glib::RefPtr<Gdk::DragContext>&,int,int,guint > signal_drag_motion();
 
   
+  /** The drag_drop signal is emitted on the drop site when the user drops the data
+   * onto the widget. The signal handler must determine whether the cursor position is in 
+   * a drop zone or not. If it is not in a drop zone, it returns false and no further 
+   * processing is necessary. Otherwise, the handler returns true. In this case, the handler 
+   * must ensure that gtk_drag_finish() is called to let the source know that the drop is done.
+   * The call to gtk_drag_finish() can be done either directly or in a drag_data_received handler
+   * which gets triggered by calling drop_get_data() to receive the data for one or more of the 
+   * supported targets.
+   *
+   * @param context the drag context.
+   * @param x the x coordinate of the current cursor position.
+   * @param y the y coordinate of the current cursor position.
+   * @param time: the timestamp of the motion event.
+   * @result whether the cursor position is in a drop zone
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>bool %drag_drop(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, guint time)</tt>
+   */
+
   Glib::SignalProxy4< bool,const Glib::RefPtr<Gdk::DragContext>&,int,int,guint > signal_drag_drop();
 
   
+  /** The drag_data_received signal is emitted on the drop site when the dragged data has been 
+   * received. If the data was received in order to determine whether the drop will be accepted, 
+   * the handler is expected to call drag_status() and <emphasis>not</emphasis> finish the drag. 
+   * If the data was received in response to a drag_drop signal (and this is the last target to be 
+   * received), the handler for this signal is expected to process the received data and then call 
+   * drag_finish(), setting the @a success parameter depending on whether the data was processed 
+   * successfully.
+   *
+   * The handler may inspect and modify @drag_context->action before calling gtk_drag_finish(), 
+   * e.g. to implement %Gdk::ACTION_ASK.
+   *
+   * @param drag_context the drag context
+   * @param x where the drop happened
+   * @param y where the drop happened
+   * @param data the received data
+   * @param info the info that has been registered with the target in the TargetList.
+   * @param time the timestamp at which the data was received.
+   */
+  
+/**
+   * @par Prototype:
+   * <tt>void %drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const SelectionData& selection_data, guint info, guint time)</tt>
+   */
+
   Glib::SignalProxy6< void,const Glib::RefPtr<Gdk::DragContext>&,int,int,const SelectionData&,guint,guint > signal_drag_data_received();
 
 
-  //accessibility signals:
+  //Note that the deprecated keyword has no effect on _WRAP_SIGNAL() yet.
+  //It doesn't seem like a good idea to put virtual functions in #ifdefs, because that would change the size of the class instances.
+  /** @deprecated This should never have been in the API. It was never meaningful.
+   */
   
+/**
+   * @par Prototype:
+   * <tt>Glib::RefPtr<Atk::Object> %get_accessible()</tt>
+   */
 
+#ifdef GTKMM_ATKMM_ENABLED
   Glib::SignalProxy0< Glib::RefPtr<Atk::Object> > signal_get_accessible();
+#endif // GTKMM_ATKMM_ENABLED
 
   
+/**
+   * @par Prototype:
+   * <tt>void %screen_changed(const Glib::RefPtr<Gdk::Screen>& previous_screen)</tt>
+   */
+
   Glib::SignalProxy1< void,const Glib::RefPtr<Gdk::Screen>& > signal_screen_changed();
 
 
+/**
+   * @par Prototype:
+   * <tt>void %composited_changed()</tt>
+   */
+
+  Glib::SignalProxy0< void > signal_composited_changed();
+
+
 //TODO: The signal_id is very C-like here:                                                                          
   //_WRAP_SIGNAL(bool can_activate_accel(guint signal_id), "can_activate_accel")
   
   //Keybinding signals:
+   //TODO: This might actually be useful. See the C docs.
   
-  
-  /** The name of the widget.
+
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The name of the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_name() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The name of the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2308,15 +2792,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_name() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The parent widget of this widget. Must be a Container widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The parent widget of this widget. Must be a Container widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Container*> property_parent() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The parent widget of this widget. Must be a Container widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2324,15 +2812,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Container*> property_parent() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Override for width request of the widget
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Override for width request of the widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_width_request() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Override for width request of the widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2340,15 +2832,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_width_request() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Override for height request of the widget
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Override for height request of the widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_height_request() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Override for height request of the widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2356,15 +2852,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_height_request() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the widget is visible.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the widget is visible.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_visible() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the widget is visible.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2372,15 +2872,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_visible() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the widget responds to input.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the widget responds to input.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_sensitive() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the widget responds to input.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2388,15 +2892,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_sensitive() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the application will paint directly on the widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the application will paint directly on the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_app_paintable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the application will paint directly on the widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2404,15 +2912,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_app_paintable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the widget can accept the input focus.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the widget can accept the input focus.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_can_focus() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the widget can accept the input focus.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2420,15 +2932,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_can_focus() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the widget has the input focus.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the widget has the input focus.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_has_focus() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the widget has the input focus.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2436,15 +2952,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_has_focus() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the widget can be the default widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the widget can be the default widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_can_default() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the widget can be the default widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2452,15 +2972,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_can_default() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the widget is the default widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the widget is the default widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_has_default() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the widget is the default widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2468,15 +2992,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_has_default() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If TRUE
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_receives_default() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2484,24 +3012,30 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_receives_default() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the widget is part of a composite widget.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the widget is part of a composite widget.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_composite_child() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** The style of the widget
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The style of the widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Style> > property_style() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The style of the widget
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2509,15 +3043,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Style> > property_style() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The event mask that decides what kind of GdkEvents this widget gets.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The event mask that decides what kind of GdkEvents this widget gets.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gdk::EventMask> property_events() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The event mask that decides what kind of GdkEvents this widget gets.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2525,15 +3063,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gdk::EventMask> property_events() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The mask that decides what kind of extension events this widget gets.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The mask that decides what kind of extension events this widget gets.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gdk::ExtensionMode> property_extension_events() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The mask that decides what kind of extension events this widget gets.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -2541,32 +3083,38 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gdk::ExtensionMode> property_extension_events() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
   //comment in GTK+ header: "seldomly overidden"
-    virtual void dispatch_child_properties_changed_vfunc(guint p1, GParamSpec** p2);
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void dispatch_child_properties_changed_vfunc(guint p1, GParamSpec** p2);
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void show_all_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual void hide_all_vfunc();
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
-    virtual void show_all_vfunc();
-    virtual void hide_all_vfunc();
+  #ifdef GLIBMM_VFUNCS_ENABLED
 
-    virtual Glib::RefPtr<Atk::Object> get_accessible_vfunc();
+#ifdef  GTKMM_ATKMM_ENABLED
+  virtual Glib::RefPtr<Atk::Object> get_accessible_vfunc();
+
+#endif //  GTKMM_ATKMM_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 protected:
   Widget();
 
   
-  /** This function is only for use in widget implementations. Causes
-   * a widget to be mapped if it isn't already.
-   */
-  void map();
-  
-  /** This function is only for use in widget implementations. Causes
-   * a widget to be unmapped if it's currently mapped.
-   */
-  void unmap();
-  
   /** Creates the GDK (windowing system) resources associated with a
    * widget.  For example, @a widget -&gt;window will be created when a widget
    * is realized.  Normally realization happens implicitly; if you show
@@ -2627,9 +3175,9 @@ protected:
 
   void realize_if_needed();
 
-  void set_allocation(const Allocation& value);
-  void set_window(const Glib::RefPtr<Gdk::Window>& value);
-
+   void set_allocation(const Allocation& value);
+    void set_window(const Glib::RefPtr<Gdk::Window>& value);
+ 
 
 };
 
@@ -2661,6 +3209,8 @@ namespace Glib
    * @result A C++ instance that wraps this C instance.
    */
   Gtk::Widget* wrap(GtkWidget* object, bool take_copy = false);
-}
+} //namespace Glib
+
+
 #endif /* _GTKMM_WIDGET_H */
 
diff --git a/libs/gtkmm2/gtk/gtkmm/window.cc b/libs/gtkmm2/gtk/gtkmm/window.cc
index 4be33fd86b..6da98aec21 100644
--- a/libs/gtkmm2/gtk/gtkmm/window.cc
+++ b/libs/gtkmm2/gtk/gtkmm/window.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <gtkmm/window.h>
 #include <gtkmm/private/window_p.h>
 
@@ -123,7 +124,7 @@ void Window::_destroy_c_instance()
     //Glib::Object::~Object() will not g_object_unref() it too. because gobject_ is now 0.
   }
 }
- 
+
 void Window_Class::dispose_vfunc_callback(GObject* self)
 {
   //Avoid disposal of Windows on delete_event (window close) signal.
@@ -212,7 +213,8 @@ void Window::unset_default()
 namespace
 {
 
-void Window_signal_set_focus_callback(GtkWindow* self, GtkWidget* p0,void* data)
+
+static void Window_signal_set_focus_callback(GtkWindow* self, GtkWidget* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,Widget* > SlotType;
@@ -220,20 +222,24 @@ void Window_signal_set_focus_callback(GtkWindow* self, GtkWidget* p0,void* data)
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 }
 
-const Glib::SignalProxyInfo Window_signal_set_focus_info =
+static const Glib::SignalProxyInfo Window_signal_set_focus_info =
 {
   "set_focus",
   (GCallback) &Window_signal_set_focus_callback,
@@ -241,7 +247,7 @@ const Glib::SignalProxyInfo Window_signal_set_focus_info =
 };
 
 
-gboolean Window_signal_frame_event_callback(GtkWindow* self, GdkEvent* p0,void* data)
+static gboolean Window_signal_frame_event_callback(GtkWindow* self, GdkEvent* p0,void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< bool,GdkEvent* > SlotType;
@@ -249,22 +255,26 @@ gboolean Window_signal_frame_event_callback(GtkWindow* self, GdkEvent* p0,void*
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         return static_cast<int>((*static_cast<SlotType*>(slot))(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-gboolean Window_signal_frame_event_notify_callback(GtkWindow* self, GdkEvent* p0, void* data)
+static gboolean Window_signal_frame_event_notify_callback(GtkWindow* self, GdkEvent* p0, void* data)
 {
   using namespace Gtk;
   typedef sigc::slot< void,GdkEvent* > SlotType;
@@ -272,34 +282,169 @@ gboolean Window_signal_frame_event_notify_callback(GtkWindow* self, GdkEvent* p0
   // Do not try to call a signal on a disassociated wrapper.
   if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
         (*static_cast<SlotType*>(slot))(p0);
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
 
   typedef gboolean RType;
   return RType();
 }
 
-const Glib::SignalProxyInfo Window_signal_frame_event_info =
+static const Glib::SignalProxyInfo Window_signal_frame_event_info =
 {
   "frame_event",
   (GCallback) &Window_signal_frame_event_callback,
   (GCallback) &Window_signal_frame_event_notify_callback
 };
 
+
 } // anonymous namespace
 
 
 namespace Glib
 {
 
+Glib::RefPtr<Gtk::WindowGroup> wrap(GtkWindowGroup* object, bool take_copy)
+{
+  return Glib::RefPtr<Gtk::WindowGroup>( dynamic_cast<Gtk::WindowGroup*> (Glib::wrap_auto ((GObject*)(object), take_copy)) );
+  //We use dynamic_cast<> in case of multiple inheritance.
+}
+
+} /* namespace Glib */
+
+
+namespace Gtk
+{
+
+
+/* The *_Class implementation: */
+
+const Glib::Class& WindowGroup_Class::init()
+{
+  if(!gtype_) // create the GType if necessary
+  {
+    // Glib::Class has to know the class init function to clone custom types.
+    class_init_func_ = &WindowGroup_Class::class_init_function;
+
+    // This is actually just optimized away, apparently with no harm.
+    // Make sure that the parent type has been created.
+    //CppClassParent::CppObjectType::get_type();
+
+    // Create the wrapper type, with the same class/instance size as the base type.
+    register_derived_type(gtk_window_group_get_type());
+
+    // Add derived versions of interfaces, if the C type implements any interfaces:
+  }
+
+  return *this;
+}
+
+void WindowGroup_Class::class_init_function(void* g_class, void* class_data)
+{
+  BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
+  CppClassParent::class_init_function(klass, class_data);
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+}
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+
+Glib::ObjectBase* WindowGroup_Class::wrap_new(GObject* object)
+{
+  return new WindowGroup((GtkWindowGroup*)object);
+}
+
+
+/* The implementation: */
+
+GtkWindowGroup* WindowGroup::gobj_copy()
+{
+  reference();
+  return gobj();
+}
+
+WindowGroup::WindowGroup(const Glib::ConstructParams& construct_params)
+:
+  Glib::Object(construct_params)
+{}
+
+WindowGroup::WindowGroup(GtkWindowGroup* castitem)
+:
+  Glib::Object((GObject*)(castitem))
+{}
+
+WindowGroup::~WindowGroup()
+{}
+
+
+WindowGroup::CppClassType WindowGroup::windowgroup_class_; // initialize static member
+
+GType WindowGroup::get_type()
+{
+  return windowgroup_class_.init().get_type();
+}
+
+GType WindowGroup::get_base_type()
+{
+  return gtk_window_group_get_type();
+}
+
+
+WindowGroup::WindowGroup()
+:
+  Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
+  Glib::Object(Glib::ConstructParams(windowgroup_class_.init()))
+{
+  }
+
+Glib::RefPtr<WindowGroup> WindowGroup::create()
+{
+  return Glib::RefPtr<WindowGroup>( new WindowGroup() );
+}
+void WindowGroup::add_window(Window& window)
+{
+gtk_window_group_add_window(gobj(), (window).gobj()); 
+}
+
+void WindowGroup::remove_window(Window& window)
+{
+gtk_window_group_remove_window(gobj(), (window).gobj()); 
+}
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
+} // namespace Gtk
+
+
+namespace Glib
+{
+
 Gtk::Window* wrap(GtkWindow* object, bool take_copy)
 {
   return dynamic_cast<Gtk::Window *> (Glib::wrap_auto ((GObject*)(object), take_copy));
@@ -338,12 +483,22 @@ void Window_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED //We always need dispose_vfunc_callback
     reinterpret_cast<GObjectClass*>(klass)->dispose = &dispose_vfunc_callback;
-    klass->set_focus = &set_focus_callback;
+#ifdef GLIBMM_VFUNCS_ENABLED
+  #endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+  klass->set_focus = &set_focus_callback;
   klass->frame_event = &frame_event_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Window_Class::set_focus_callback(GtkWindow* self, GtkWidget* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -356,16 +511,20 @@ void Window_Class::set_focus_callback(GtkWindow* self, GtkWidget* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       obj->on_set_focus(Glib::wrap(p0)
 );
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -378,7 +537,6 @@ void Window_Class::set_focus_callback(GtkWindow* self, GtkWidget* p0)
       (*base->set_focus)(self, p0);
   }
 }
-
 gboolean Window_Class::frame_event_callback(GtkWindow* self, GdkEvent* p0)
 {
   CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -391,15 +549,19 @@ gboolean Window_Class::frame_event_callback(GtkWindow* self, GdkEvent* p0)
   // being overridden:
   if(obj && obj->is_derived_())
   {
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     try // Trap C++ exceptions which would normally be lost because this is a C callback.
     {
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
       // Call the virtual member method, which derived classes might override.
       return static_cast<int>(obj->on_frame_event(p0));
+    #ifdef GLIBMM_EXCEPTIONS_ENABLED
     }
     catch(...)
     {
       Glib::exception_handlers_invoke();
     }
+    #endif //GLIBMM_EXCEPTIONS_ENABLED
   }
   else
   {
@@ -415,6 +577,7 @@ gboolean Window_Class::frame_event_callback(GtkWindow* self, GdkEvent* p0)
   typedef gboolean RType;
   return RType();
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 Glib::ObjectBase* Window_Class::wrap_new(GObject* o)
@@ -455,7 +618,6 @@ GType Window::get_base_type()
   return gtk_window_get_type();
 }
 
-
 Window::Window(WindowType type)
 :
   Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
@@ -463,12 +625,12 @@ Window::Window(WindowType type)
 {
   }
 
-WindowType Window::get_window_type() const
+ WindowType Window::get_window_type() const
 {
   return static_cast<WindowType>(gobj()->type);
 }
-
-Glib::RefPtr<Gdk::Window> Window::get_frame()
+ 
+ Glib::RefPtr<Gdk::Window> Window::get_frame()
 {
   Glib::RefPtr<Gdk::Window> ref_ptr(Glib::wrap((GdkWindowObject*)(gobj()->frame)));
 
@@ -487,10 +649,10 @@ Glib::RefPtr<const Gdk::Window> Window::get_frame() const
 
   return ref_ptr;
 }
-
+ 
 void Window::set_title(const Glib::ustring& title)
 {
-  gtk_window_set_title(gobj(), title.c_str());
+gtk_window_set_title(gobj(), title.c_str()); 
 }
 
 Glib::ustring Window::get_title() const
@@ -500,12 +662,12 @@ Glib::ustring Window::get_title() const
 
 void Window::set_wmclass(const Glib::ustring& wmclass_name, const Glib::ustring& wmclass_class)
 {
-  gtk_window_set_wmclass(gobj(), wmclass_name.c_str(), wmclass_class.c_str());
+gtk_window_set_wmclass(gobj(), wmclass_name.c_str(), wmclass_class.c_str()); 
 }
 
 void Window::set_role(const Glib::ustring& role)
 {
-  gtk_window_set_role(gobj(), role.c_str());
+gtk_window_set_role(gobj(), role.c_str()); 
 }
 
 Glib::ustring Window::get_role() const
@@ -515,17 +677,17 @@ Glib::ustring Window::get_role() const
 
 void Window::add_accel_group(const Glib::RefPtr<AccelGroup>& accel_group)
 {
-  gtk_window_add_accel_group(gobj(), Glib::unwrap(accel_group));
+gtk_window_add_accel_group(gobj(), Glib::unwrap(accel_group)); 
 }
 
 void Window::remove_accel_group(const Glib::RefPtr<AccelGroup>& accel_group)
 {
-  gtk_window_remove_accel_group(gobj(), Glib::unwrap(accel_group));
+gtk_window_remove_accel_group(gobj(), Glib::unwrap(accel_group)); 
 }
 
 void Window::set_position(WindowPosition position)
 {
-  gtk_window_set_position(gobj(), ((GtkWindowPosition)(position)));
+gtk_window_set_position(gobj(), ((GtkWindowPosition)(position))); 
 }
 
 bool Window::activate_focus()
@@ -535,7 +697,7 @@ bool Window::activate_focus()
 
 void Window::set_focus(Gtk::Widget& focus)
 {
-  gtk_window_set_focus(gobj(), (focus).gobj());
+gtk_window_set_focus(gobj(), (focus).gobj()); 
 }
 
 Widget* Window::get_focus()
@@ -545,12 +707,12 @@ Widget* Window::get_focus()
 
 const Widget* Window::get_focus() const
 {
-  return Glib::wrap(gtk_window_get_focus(const_cast<GtkWindow*>(gobj())));
+  return const_cast<Window*>(this)->get_focus();
 }
 
 void Window::set_default(Gtk::Widget& default_widget)
 {
-  gtk_window_set_default(gobj(), (default_widget).gobj());
+gtk_window_set_default(gobj(), (default_widget).gobj()); 
 }
 
 bool Window::activate_default()
@@ -560,7 +722,7 @@ bool Window::activate_default()
 
 void Window::set_transient_for(Window& parent)
 {
-  gtk_window_set_transient_for(gobj(), (parent).gobj());
+gtk_window_set_transient_for(gobj(), (parent).gobj()); 
 }
 
 Window* Window::get_transient_for()
@@ -570,12 +732,12 @@ Window* Window::get_transient_for()
 
 const Window* Window::get_transient_for() const
 {
-  return Glib::wrap(gtk_window_get_transient_for(const_cast<GtkWindow*>(gobj())));
+  return const_cast<Window*>(this)->get_transient_for();
 }
 
 void Window::set_type_hint(Gdk::WindowTypeHint hint)
 {
-  gtk_window_set_type_hint(gobj(), ((GdkWindowTypeHint)(hint)));
+gtk_window_set_type_hint(gobj(), ((GdkWindowTypeHint)(hint))); 
 }
 
 Gdk::WindowTypeHint Window::get_type_hint() const
@@ -585,7 +747,7 @@ Gdk::WindowTypeHint Window::get_type_hint() const
 
 void Window::set_skip_taskbar_hint(bool setting)
 {
-  gtk_window_set_skip_taskbar_hint(gobj(), static_cast<int>(setting));
+gtk_window_set_skip_taskbar_hint(gobj(), static_cast<int>(setting)); 
 }
 
 bool Window::get_skip_taskbar_hint() const
@@ -595,7 +757,7 @@ bool Window::get_skip_taskbar_hint() const
 
 void Window::set_skip_pager_hint(bool setting)
 {
-  gtk_window_set_skip_pager_hint(gobj(), static_cast<int>(setting));
+gtk_window_set_skip_pager_hint(gobj(), static_cast<int>(setting)); 
 }
 
 bool Window::get_skip_pager_hint() const
@@ -603,6 +765,16 @@ bool Window::get_skip_pager_hint() const
   return gtk_window_get_skip_pager_hint(const_cast<GtkWindow*>(gobj()));
 }
 
+void Window::set_urgency_hint(bool setting)
+{
+gtk_window_set_urgency_hint(gobj(), static_cast<int>(setting)); 
+}
+
+bool Window::get_urgency_hint() const
+{
+  return gtk_window_get_urgency_hint(const_cast<GtkWindow*>(gobj()));
+}
+
 bool Window::get_destroy_with_parent() const
 {
   return gtk_window_get_destroy_with_parent(const_cast<GtkWindow*>(gobj()));
@@ -610,7 +782,7 @@ bool Window::get_destroy_with_parent() const
 
 void Window::set_resizable(bool resizable)
 {
-  gtk_window_set_resizable(gobj(), static_cast<int>(resizable));
+gtk_window_set_resizable(gobj(), static_cast<int>(resizable)); 
 }
 
 bool Window::get_resizable() const
@@ -620,7 +792,7 @@ bool Window::get_resizable() const
 
 void Window::set_gravity(Gdk::Gravity gravity)
 {
-  gtk_window_set_gravity(gobj(), ((GdkGravity)(gravity)));
+gtk_window_set_gravity(gobj(), ((GdkGravity)(gravity))); 
 }
 
 Gdk::Gravity Window::get_gravity() const
@@ -630,37 +802,32 @@ Gdk::Gravity Window::get_gravity() const
 
 void Window::set_geometry_hints(Widget& geometry_widget, const Gdk::Geometry& geometry, Gdk::WindowHints geom_mask)
 {
-  gtk_window_set_geometry_hints(gobj(), (geometry_widget).gobj(), const_cast<GdkGeometry*>(&(geometry)), ((GdkWindowHints)(geom_mask)));
+gtk_window_set_geometry_hints(gobj(), (geometry_widget).gobj(), const_cast<GdkGeometry*>(&(geometry)), ((GdkWindowHints)(geom_mask))); 
 }
 
 void Window::set_screen(const Glib::RefPtr<Gdk::Screen>& screen)
 {
-  gtk_window_set_screen(gobj(), Glib::unwrap(screen));
+gtk_window_set_screen(gobj(), Glib::unwrap(screen)); 
 }
 
 Glib::RefPtr<Gdk::Screen> Window::get_screen()
 {
 
   Glib::RefPtr<Gdk::Screen> retvalue = Glib::wrap(gtk_window_get_screen(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Screen> Window::get_screen() const
 {
-
-  Glib::RefPtr<const Gdk::Screen> retvalue = Glib::wrap(gtk_window_get_screen(const_cast<GtkWindow*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Window*>(this)->get_screen();
 }
 
 void Window::set_has_frame(bool setting)
 {
-  gtk_window_set_has_frame(gobj(), static_cast<int>(setting));
+gtk_window_set_has_frame(gobj(), static_cast<int>(setting)); 
 }
 
 bool Window::get_has_frame() const
@@ -670,17 +837,17 @@ bool Window::get_has_frame() const
 
 void Window::set_frame_dimensions(int left, int top, int right, int bottom)
 {
-  gtk_window_set_frame_dimensions(gobj(), left, top, right, bottom);
+gtk_window_set_frame_dimensions(gobj(), left, top, right, bottom); 
 }
 
 void Window::get_frame_dimensions(int& left, int& top, int& right, int& bottom) const
 {
-  gtk_window_get_frame_dimensions(const_cast<GtkWindow*>(gobj()), &left, &top, &right, &bottom);
+gtk_window_get_frame_dimensions(const_cast<GtkWindow*>(gobj()), &left, &top, &right, &bottom); 
 }
 
 void Window::set_decorated(bool setting)
 {
-  gtk_window_set_decorated(gobj(), static_cast<int>(setting));
+gtk_window_set_decorated(gobj(), static_cast<int>(setting)); 
 }
 
 bool Window::get_decorated() const
@@ -688,6 +855,16 @@ bool Window::get_decorated() const
   return gtk_window_get_decorated(const_cast<GtkWindow*>(gobj()));
 }
 
+void Window::set_deletable(bool setting)
+{
+gtk_window_set_deletable(gobj(), static_cast<int>(setting)); 
+}
+
+bool Window::get_deletable() const
+{
+  return gtk_window_get_deletable(const_cast<GtkWindow*>(gobj()));
+}
+
 Glib::ListHandle< Glib::RefPtr<Gdk::Pixbuf> > Window::get_icon_list()
 {
   return Glib::ListHandle< Glib::RefPtr<Gdk::Pixbuf> >(gtk_window_get_icon_list(gobj()), Glib::OWNERSHIP_SHALLOW);
@@ -700,68 +877,91 @@ Glib::ListHandle< Glib::RefPtr<const Gdk::Pixbuf> > Window::get_icon_list() cons
 
 void Window::set_icon_list(const Glib::ListHandle< Glib::RefPtr<Gdk::Pixbuf> >& list)
 {
-  gtk_window_set_icon_list(gobj(), list.data());
+gtk_window_set_icon_list(gobj(), list.data()); 
 }
 
 void Window::set_icon(const Glib::RefPtr<Gdk::Pixbuf>& icon)
 {
-  gtk_window_set_icon(gobj(), Glib::unwrap(icon));
+gtk_window_set_icon(gobj(), Glib::unwrap(icon)); 
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 bool Window::set_icon_from_file(const std::string& filename)
-{
-  GError *error = 0;
-  bool retvalue = gtk_window_set_icon_from_file(gobj(), filename.c_str(), &(error));
-  if(error) ::Glib::Error::throw_exception(error);
+#else
+bool Window::set_icon_from_file(const std::string& filename, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  bool retvalue = gtk_window_set_icon_from_file(gobj(), filename.c_str(), &(gerror));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   return retvalue;
+
 }
 
 Glib::RefPtr<Gdk::Pixbuf> Window::get_icon()
 {
 
   Glib::RefPtr<Gdk::Pixbuf> retvalue = Glib::wrap(gtk_window_get_icon(gobj()));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const Gdk::Pixbuf> Window::get_icon() const
 {
-
-  Glib::RefPtr<const Gdk::Pixbuf> retvalue = Glib::wrap(gtk_window_get_icon(const_cast<GtkWindow*>(gobj())));
-
-  if(retvalue)
-    retvalue->reference(); //The function does not do a ref for us.
-  return retvalue;
+  return const_cast<Window*>(this)->get_icon();
 }
 
 void Window::set_default_icon_list(const Glib::ListHandle< Glib::RefPtr<Gdk::Pixbuf> >& list)
 {
-  gtk_window_set_default_icon_list(list.data());
+gtk_window_set_default_icon_list(list.data());
 }
 
+
 Glib::ListHandle< Glib::RefPtr<Gdk::Pixbuf> > Window::get_default_icon_list()
 {
   return Glib::ListHandle< Glib::RefPtr<Gdk::Pixbuf> >(gtk_window_get_default_icon_list(), Glib::OWNERSHIP_SHALLOW);
 }
 
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
 bool Window::set_default_icon_from_file(const std::string& filename)
+#else
+bool Window::set_default_icon_from_file(const std::string& filename, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
 {
-  GError *error = 0;
-  bool retvalue = gtk_window_set_default_icon_from_file(filename.c_str(), &(error));
-  if(error) ::Glib::Error::throw_exception(error);
+  GError* gerror = 0;
+  bool retvalue = gtk_window_set_default_icon_from_file(filename.c_str(), &(gerror));
+
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   return retvalue;
 }
 
+
 void Window::set_auto_startup_notification(bool setting)
 {
-  gtk_window_set_auto_startup_notification(static_cast<int>(setting));
+gtk_window_set_auto_startup_notification(static_cast<int>(setting));
 }
 
+
 void Window::set_modal(bool modal)
 {
-  gtk_window_set_modal(gobj(), static_cast<int>(modal));
+gtk_window_set_modal(gobj(), static_cast<int>(modal)); 
 }
 
 bool Window::get_modal() const
@@ -774,14 +974,15 @@ Glib::ListHandle<Window*> Window::list_toplevels()
   return Glib::ListHandle<Window*>(gtk_window_list_toplevels(), Glib::OWNERSHIP_SHALLOW);
 }
 
+
 void Window::add_mnemonic(guint keyval, Widget& target)
 {
-  gtk_window_add_mnemonic(gobj(), keyval, (target).gobj());
+gtk_window_add_mnemonic(gobj(), keyval, (target).gobj()); 
 }
 
 void Window::remove_mnemonic(guint keyval, Widget& target)
 {
-  gtk_window_remove_mnemonic(gobj(), keyval, (target).gobj());
+gtk_window_remove_mnemonic(gobj(), keyval, (target).gobj()); 
 }
 
 bool Window::mnemonic_activate(guint keyval, Gdk::ModifierType modifier)
@@ -791,7 +992,7 @@ bool Window::mnemonic_activate(guint keyval, Gdk::ModifierType modifier)
 
 void Window::set_mnemonic_modifier(Gdk::ModifierType modifier)
 {
-  gtk_window_set_mnemonic_modifier(gobj(), ((GdkModifierType)(modifier)));
+gtk_window_set_mnemonic_modifier(gobj(), ((GdkModifierType)(modifier))); 
 }
 
 Gdk::ModifierType Window::get_mnemonic_modifier()
@@ -801,87 +1002,92 @@ Gdk::ModifierType Window::get_mnemonic_modifier()
 
 void Window::present()
 {
-  gtk_window_present(gobj());
+gtk_window_present(gobj()); 
+}
+
+void Window::present(guint32 timestamp)
+{
+gtk_window_present_with_time(gobj(), timestamp); 
 }
 
 void Window::iconify()
 {
-  gtk_window_iconify(gobj());
+gtk_window_iconify(gobj()); 
 }
 
 void Window::deiconify()
 {
-  gtk_window_deiconify(gobj());
+gtk_window_deiconify(gobj()); 
 }
 
 void Window::stick()
 {
-  gtk_window_stick(gobj());
+gtk_window_stick(gobj()); 
 }
 
 void Window::unstick()
 {
-  gtk_window_unstick(gobj());
+gtk_window_unstick(gobj()); 
 }
 
 void Window::maximize()
 {
-  gtk_window_maximize(gobj());
+gtk_window_maximize(gobj()); 
 }
 
 void Window::unmaximize()
 {
-  gtk_window_unmaximize(gobj());
+gtk_window_unmaximize(gobj()); 
 }
 
 void Window::fullscreen()
 {
-  gtk_window_fullscreen(gobj());
+gtk_window_fullscreen(gobj()); 
 }
 
 void Window::unfullscreen()
 {
-  gtk_window_unfullscreen(gobj());
+gtk_window_unfullscreen(gobj()); 
 }
 
 void Window::begin_resize_drag(Gdk::WindowEdge edge, int button, int root_x, int root_y, guint32 timestamp)
 {
-  gtk_window_begin_resize_drag(gobj(), ((GdkWindowEdge)(edge)), button, root_x, root_y, timestamp);
+gtk_window_begin_resize_drag(gobj(), ((GdkWindowEdge)(edge)), button, root_x, root_y, timestamp); 
 }
 
 void Window::begin_move_drag(int button, int root_x, int root_y, guint32 timestamp)
 {
-  gtk_window_begin_move_drag(gobj(), button, root_x, root_y, timestamp);
+gtk_window_begin_move_drag(gobj(), button, root_x, root_y, timestamp); 
 }
 
 void Window::set_default_size(int width, int height)
 {
-  gtk_window_set_default_size(gobj(), width, height);
+gtk_window_set_default_size(gobj(), width, height); 
 }
 
 void Window::get_default_size(int& width, int& height) const
 {
-  gtk_window_get_default_size(const_cast<GtkWindow*>(gobj()), &width, &height);
+gtk_window_get_default_size(const_cast<GtkWindow*>(gobj()), &width, &height); 
 }
 
 void Window::resize(int width, int height)
 {
-  gtk_window_resize(gobj(), width, height);
+gtk_window_resize(gobj(), width, height); 
 }
 
 void Window::get_size(int& width, int& height) const
 {
-  gtk_window_get_size(const_cast<GtkWindow*>(gobj()), &width, &height);
+gtk_window_get_size(const_cast<GtkWindow*>(gobj()), &width, &height); 
 }
 
 void Window::move(int x, int y)
 {
-  gtk_window_move(gobj(), x, y);
+gtk_window_move(gobj(), x, y); 
 }
 
 void Window::get_position(int& root_x, int& root_y) const
 {
-  gtk_window_get_position(const_cast<GtkWindow*>(gobj()), &root_x, &root_y);
+gtk_window_get_position(const_cast<GtkWindow*>(gobj()), &root_x, &root_y); 
 }
 
 bool Window::parse_geometry(const Glib::ustring& geometry)
@@ -889,24 +1095,40 @@ bool Window::parse_geometry(const Glib::ustring& geometry)
   return gtk_window_parse_geometry(gobj(), geometry.c_str());
 }
 
+Glib::RefPtr<WindowGroup> Window::get_group()
+{
+
+  Glib::RefPtr<WindowGroup> retvalue = Glib::wrap(gtk_window_get_group(gobj()));
+  if(retvalue)
+    retvalue->reference(); //The function does not do a ref for us.
+  return retvalue;
+
+}
+
+Glib::RefPtr<const WindowGroup> Window::get_group() const
+{
+  return const_cast<Window*>(this)->get_group();
+}
+
 void Window::reshow_with_initial_size()
 {
-  gtk_window_reshow_with_initial_size(gobj());
+gtk_window_reshow_with_initial_size(gobj()); 
 }
 
 void Window::set_default_icon(const Glib::RefPtr<Gdk::Pixbuf>& icon)
 {
-  gtk_window_set_default_icon(Glib::unwrap(icon));
+gtk_window_set_default_icon(Glib::unwrap(icon));
 }
 
+
 void Window::set_keep_above(bool setting)
 {
-  gtk_window_set_keep_above(gobj(), static_cast<int>(setting));
+gtk_window_set_keep_above(gobj(), static_cast<int>(setting)); 
 }
 
 void Window::set_keep_below(bool setting)
 {
-  gtk_window_set_keep_below(gobj(), static_cast<int>(setting));
+gtk_window_set_keep_below(gobj(), static_cast<int>(setting)); 
 }
 
 
@@ -915,193 +1137,295 @@ Glib::SignalProxy1< void,Widget* > Window::signal_set_focus()
   return Glib::SignalProxy1< void,Widget* >(this, &Window_signal_set_focus_info);
 }
 
+
 Glib::SignalProxy1< bool,GdkEvent* > Window::signal_frame_event()
 {
   return Glib::SignalProxy1< bool,GdkEvent* >(this, &Window_signal_frame_event_info);
 }
 
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Window::property_title() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Window::property_title() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "title");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Window::property_allow_shrink() 
 {
   return Glib::PropertyProxy<bool>(this, "allow-shrink");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Window::property_allow_shrink() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "allow-shrink");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Window::property_allow_grow() 
 {
   return Glib::PropertyProxy<bool>(this, "allow-grow");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Window::property_allow_grow() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "allow-grow");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Window::property_resizable() 
 {
   return Glib::PropertyProxy<bool>(this, "resizable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Window::property_resizable() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "resizable");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Window::property_modal() 
 {
   return Glib::PropertyProxy<bool>(this, "modal");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Window::property_modal() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "modal");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<WindowPosition> Window::property_window_position() 
 {
   return Glib::PropertyProxy<WindowPosition>(this, "window-position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<WindowPosition> Window::property_window_position() const
 {
   return Glib::PropertyProxy_ReadOnly<WindowPosition>(this, "window-position");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Window::property_default_width() 
 {
   return Glib::PropertyProxy<int>(this, "default-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Window::property_default_width() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "default-width");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<int> Window::property_default_height() 
 {
   return Glib::PropertyProxy<int>(this, "default-height");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<int> Window::property_default_height() const
 {
   return Glib::PropertyProxy_ReadOnly<int>(this, "default-height");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Window::property_destroy_with_parent() 
 {
   return Glib::PropertyProxy<bool>(this, "destroy-with-parent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Window::property_destroy_with_parent() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "destroy-with-parent");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > Window::property_icon() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> >(this, "icon");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > Window::property_icon() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> >(this, "icon");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy< Glib::RefPtr<Gdk::Screen> > Window::property_screen() 
 {
   return Glib::PropertyProxy< Glib::RefPtr<Gdk::Screen> >(this, "screen");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Screen> > Window::property_screen() const
 {
   return Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Screen> >(this, "screen");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Window::property_is_active() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "is-active");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Window::property_has_toplevel_focus() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "has-toplevel-focus");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<GdkWindowTypeHint> Window::property_type_hint() 
 {
   return Glib::PropertyProxy<GdkWindowTypeHint>(this, "type-hint");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<GdkWindowTypeHint> Window::property_type_hint() const
 {
   return Glib::PropertyProxy_ReadOnly<GdkWindowTypeHint>(this, "type-hint");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Window::property_skip_taskbar_hint() 
 {
   return Glib::PropertyProxy<bool>(this, "skip-taskbar-hint");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Window::property_skip_taskbar_hint() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "skip-taskbar-hint");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Window::property_skip_pager_hint() 
 {
   return Glib::PropertyProxy<bool>(this, "skip-pager-hint");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Window::property_skip_pager_hint() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "skip-pager-hint");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Glib::ustring> Window::property_role() 
 {
   return Glib::PropertyProxy<Glib::ustring>(this, "role");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Glib::ustring> Window::property_role() const
 {
   return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "role");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<bool> Window::property_decorated() 
 {
   return Glib::PropertyProxy<bool>(this, "decorated");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<bool> Window::property_decorated() const
 {
   return Glib::PropertyProxy_ReadOnly<bool>(this, "decorated");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy<Gdk::Gravity> Window::property_gravity() 
 {
   return Glib::PropertyProxy<Gdk::Gravity>(this, "gravity");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 Glib::PropertyProxy_ReadOnly<Gdk::Gravity> Window::property_gravity() const
 {
   return Glib::PropertyProxy_ReadOnly<Gdk::Gravity>(this, "gravity");
 }
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> Window::property_urgency_hint() 
+{
+  return Glib::PropertyProxy<bool>(this, "urgency-hint");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> Window::property_urgency_hint() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "urgency-hint");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy<bool> Window::property_deletable() 
+{
+  return Glib::PropertyProxy<bool>(this, "deletable");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+Glib::PropertyProxy_ReadOnly<bool> Window::property_deletable() const
+{
+  return Glib::PropertyProxy_ReadOnly<bool>(this, "deletable");
+}
+#endif //GLIBMM_PROPERTIES_ENABLED
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 void Gtk::Window::on_set_focus(Widget* focus)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1111,7 +1435,6 @@ void Gtk::Window::on_set_focus(Widget* focus)
   if(base && base->set_focus)
     (*base->set_focus)(gobj(),(GtkWidget*)Glib::unwrap(focus));
 }
-
 bool Gtk::Window::on_frame_event(GdkEvent* event)
 {
   BaseClassType *const base = static_cast<BaseClassType*>(
@@ -1124,117 +1447,10 @@ bool Gtk::Window::on_frame_event(GdkEvent* event)
   typedef bool RType;
   return RType();
 }
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
-
-} // namespace Gtk
-
-
-namespace Glib
-{
-
-Glib::RefPtr<Gtk::WindowGroup> wrap(GtkWindowGroup* object, bool take_copy)
-{
-  return Glib::RefPtr<Gtk::WindowGroup>( dynamic_cast<Gtk::WindowGroup*> (Glib::wrap_auto ((GObject*)(object), take_copy)) );
-  //We use dynamic_cast<> in case of multiple inheritance.
-}
-
-} /* namespace Glib */
-
-
-namespace Gtk
-{
-
-
-/* The *_Class implementation: */
-
-const Glib::Class& WindowGroup_Class::init()
-{
-  if(!gtype_) // create the GType if necessary
-  {
-    // Glib::Class has to know the class init function to clone custom types.
-    class_init_func_ = &WindowGroup_Class::class_init_function;
-
-    // This is actually just optimized away, apparently with no harm.
-    // Make sure that the parent type has been created.
-    //CppClassParent::CppObjectType::get_type();
-
-    // Create the wrapper type, with the same class/instance size as the base type.
-    register_derived_type(gtk_window_group_get_type());
-
-    // Add derived versions of interfaces, if the C type implements any interfaces:
-  }
-
-  return *this;
-}
-
-void WindowGroup_Class::class_init_function(void* g_class, void* class_data)
-{
-  BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
-  CppClassParent::class_init_function(klass, class_data);
-
-}
-
-
-Glib::ObjectBase* WindowGroup_Class::wrap_new(GObject* object)
-{
-  return new WindowGroup((GtkWindowGroup*)object);
-}
-
-
-/* The implementation: */
-
-GtkWindowGroup* WindowGroup::gobj_copy()
-{
-  reference();
-  return gobj();
-}
-
-WindowGroup::WindowGroup(const Glib::ConstructParams& construct_params)
-:
-  Glib::Object(construct_params)
-{}
-
-WindowGroup::WindowGroup(GtkWindowGroup* castitem)
-:
-  Glib::Object((GObject*)(castitem))
-{}
-
-WindowGroup::~WindowGroup()
-{}
-
-
-WindowGroup::CppClassType WindowGroup::windowgroup_class_; // initialize static member
-
-GType WindowGroup::get_type()
-{
-  return windowgroup_class_.init().get_type();
-}
-
-GType WindowGroup::get_base_type()
-{
-  return gtk_window_group_get_type();
-}
-
-WindowGroup::WindowGroup()
-:
-  Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
-  Glib::Object(Glib::ConstructParams(windowgroup_class_.init()))
-{
-  }
-
-Glib::RefPtr<WindowGroup> WindowGroup::create()
-{
-  return Glib::RefPtr<WindowGroup>( new WindowGroup() );
-}
-void WindowGroup::add_window(Window& window)
-{
-  gtk_window_group_add_window(gobj(), (window).gobj());
-}
-
-void WindowGroup::remove_window(Window& window)
-{
-  gtk_window_group_remove_window(gobj(), (window).gobj());
-}
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 
 } // namespace Gtk
diff --git a/libs/gtkmm2/gtk/gtkmm/window.h b/libs/gtkmm2/gtk/gtkmm/window.h
index 442c68a011..f9424e2de9 100644
--- a/libs/gtkmm2/gtk/gtkmm/window.h
+++ b/libs/gtkmm2/gtk/gtkmm/window.h
@@ -3,6 +3,7 @@
 #ifndef _GTKMM_WINDOW_H
 #define _GTKMM_WINDOW_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -32,27 +33,112 @@
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-typedef struct _GtkWindow GtkWindow;
-typedef struct _GtkWindowClass GtkWindowClass;
+typedef struct _GtkWindowGroup GtkWindowGroup;
+typedef struct _GtkWindowGroupClass GtkWindowGroupClass;
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 
 namespace Gtk
-{ class Window_Class; } // namespace Gtk
+{ class WindowGroup_Class; } // namespace Gtk
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-typedef struct _GtkWindowGroup GtkWindowGroup;
-typedef struct _GtkWindowGroupClass GtkWindowGroupClass;
+typedef struct _GtkWindow GtkWindow;
+typedef struct _GtkWindowClass GtkWindowClass;
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 
 namespace Gtk
-{ class WindowGroup_Class; } // namespace Gtk
+{ class Window_Class; } // namespace Gtk
 namespace Gtk
 {
 
 class AccelGroup;
 class WindowGroup;
 
+/** TODO
+ */
+
+class WindowGroup : public Glib::Object
+{
+  
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+
+public:
+  typedef WindowGroup CppObjectType;
+  typedef WindowGroup_Class CppClassType;
+  typedef GtkWindowGroup BaseObjectType;
+  typedef GtkWindowGroupClass BaseClassType;
+
+private:  friend class WindowGroup_Class;
+  static CppClassType windowgroup_class_;
+
+private:
+  // noncopyable
+  WindowGroup(const WindowGroup&);
+  WindowGroup& operator=(const WindowGroup&);
+
+protected:
+  explicit WindowGroup(const Glib::ConstructParams& construct_params);
+  explicit WindowGroup(GtkWindowGroup* castitem);
+
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
+public:
+  virtual ~WindowGroup();
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+  static GType get_type()      G_GNUC_CONST;
+  static GType get_base_type() G_GNUC_CONST;
+#endif
+
+  ///Provides access to the underlying C GObject.
+  GtkWindowGroup*       gobj()       { return reinterpret_cast<GtkWindowGroup*>(gobject_); }
+
+  ///Provides access to the underlying C GObject.
+  const GtkWindowGroup* gobj() const { return reinterpret_cast<GtkWindowGroup*>(gobject_); }
+
+  ///Provides access to the underlying C instance. The caller is responsible for unrefing it. Use when directly setting fields in structs.
+  GtkWindowGroup* gobj_copy();
+
+private:
+
+
+protected:
+  WindowGroup();
+
+public:
+  
+  static Glib::RefPtr<WindowGroup> create();
+
+
+  /** Adds a window to a Gtk::WindowGroup.
+   * @param window The Gtk::Window to add.
+   */
+  void add_window(Window& window);
+  
+  /** Removes a window from a Gtk::WindowGroup.
+   * @param window The Gtk::Window to remove.
+   */
+  void remove_window(Window& window);
+
+
+public:
+
+public:
+  //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+protected:
+  //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+
+};
 
 /** Toplevel Window
  * This represents all widgets which are physical windows controlled
@@ -107,13 +193,19 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   virtual void on_set_focus(Widget* focus);
   virtual bool on_frame_event(GdkEvent* event);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 private:
@@ -122,14 +214,17 @@ private:
 public:
    explicit Window(WindowType type = WINDOW_TOPLEVEL);
 
-  /** The title of the window.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The title of the window.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_title() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The title of the window.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -137,15 +232,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_title() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If TRUE
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_allow_shrink() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -153,15 +252,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_allow_shrink() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If TRUE
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_allow_grow() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -169,15 +272,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_allow_grow() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If TRUE
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_resizable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -185,15 +292,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_resizable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If TRUE
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_modal() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If TRUE
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -201,15 +312,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_modal() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The initial position of the window.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The initial position of the window.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<WindowPosition> property_window_position() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The initial position of the window.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -217,15 +332,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<WindowPosition> property_window_position() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The default width of the window
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The default width of the window
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_default_width() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The default width of the window
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -233,15 +352,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_default_width() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The default height of the window
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The default height of the window
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<int> property_default_height() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The default height of the window
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -249,15 +372,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_default_height() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** If this window should be destroyed when the parent is destroyed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** If this window should be destroyed when the parent is destroyed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_destroy_with_parent() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** If this window should be destroyed when the parent is destroyed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -265,15 +392,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_destroy_with_parent() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Icon for this window.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Icon for this window.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Pixbuf> > property_icon() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Icon for this window.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -281,16 +412,20 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Pixbuf> > property_icon() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
   
-  /** The screen where this window will be displayed.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The screen where this window will be displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy< Glib::RefPtr<Gdk::Screen> > property_screen() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The screen where this window will be displayed.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -298,33 +433,41 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Gdk::Screen> > property_screen() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the toplevel is the current active window.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the toplevel is the current active window.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_is_active() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** Whether the input focus is within this GtkWindow.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the input focus is within this GtkWindow.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_has_toplevel_focus() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
-  /** Hint to help the desktop environment understand what kind of window this is and how to treat it.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Hint to help the desktop environment understand what kind of window this is and how to treat it.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<GdkWindowTypeHint> property_type_hint() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Hint to help the desktop environment understand what kind of window this is and how to treat it.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -332,15 +475,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<GdkWindowTypeHint> property_type_hint() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** TRUE if the window should not be in the task bar.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** TRUE if the window should not be in the task bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_skip_taskbar_hint() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** TRUE if the window should not be in the task bar.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -348,15 +495,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_skip_taskbar_hint() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** TRUE if the window should not be in the pager.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** TRUE if the window should not be in the pager.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_skip_pager_hint() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** TRUE if the window should not be in the pager.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -364,15 +515,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_skip_pager_hint() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
       
-  /** Unique identifier for the window to be used when restoring a session.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Unique identifier for the window to be used when restoring a session.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Glib::ustring> property_role() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Unique identifier for the window to be used when restoring a session.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -380,15 +535,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_role() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** Whether the window should be decorated by the window manager.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the window should be decorated by the window manager.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<bool> property_decorated() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** Whether the window should be decorated by the window manager.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -396,15 +555,19 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_decorated() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
-  /** The window gravity of the window.
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** The window gravity of the window.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
    * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
    * the value of the property changes.
    */
   Glib::PropertyProxy<Gdk::Gravity> property_gravity() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
 /** The window gravity of the window.
    *
    * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
@@ -412,22 +575,73 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Gdk::Gravity> property_gravity() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** TRUE if the window should be brought to the user's attention.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_urgency_hint() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** TRUE if the window should be brought to the user's attention.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_urgency_hint() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+ 
+  #ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the window frame should have a close button.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy<bool> property_deletable() ;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+
+#ifdef GLIBMM_PROPERTIES_ENABLED
+/** Whether the window frame should have a close button.
+   *
+   * You rarely need to use properties because there are get_ and set_ methods for almost all of them.
+   * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
+   * the value of the property changes.
+   */
+  Glib::PropertyProxy_ReadOnly<bool> property_deletable() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
+ 
 
   bool is_toplevel() const;
   bool is_dialog() const;
   bool is_popup() const;
 
-  WindowType get_window_type() const;
-
+   WindowType get_window_type() const;
+ 
   //: This is special to the GTK+ linux-fb port.
-  Glib::RefPtr<Gdk::Window> get_frame();
+   Glib::RefPtr<Gdk::Window> get_frame();
   Glib::RefPtr<const Gdk::Window> get_frame() const;
+ 
 
+/**
+   * @par Prototype:
+   * <tt>void %set_focus(Widget* focus)</tt>
+   */
 
   Glib::SignalProxy1< void,Widget* > signal_set_focus();
 
   
+/**
+   * @par Prototype:
+   * <tt>bool %frame_event(GdkEvent* event)</tt>
+   */
+
   Glib::SignalProxy1< bool,GdkEvent* > signal_frame_event();
 
 
@@ -627,7 +841,7 @@ public:
   /** Windows may set a hint asking the desktop environment not to display
    * the window in the task bar. This function sets this hint.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param setting <tt>true</tt> to keep this window from appearing in the task bar.
    */
   void set_skip_taskbar_hint(bool setting = true);
@@ -635,7 +849,7 @@ public:
   /** Gets the value set by set_skip_taskbar_hint()
    * @return <tt>true</tt> if window shouldn't be in taskbar
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   bool get_skip_taskbar_hint() const;
 
@@ -646,7 +860,7 @@ public:
    * switcher that displays a thumbnail representation of the windows
    * on the screen.)
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param setting <tt>true</tt> to keep this window from appearing in the pager.
    */
   void set_skip_pager_hint(bool setting = true);
@@ -654,10 +868,26 @@ public:
   /** Gets the value set by set_skip_pager_hint().
    * @return <tt>true</tt> if window shouldn't be in pager
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   bool get_skip_pager_hint() const;
 
+  
+  /** Windows may set a hint asking the desktop environment to draw
+   * the users attention to the window. This function sets this hint.
+   * 
+   * @newin2p8
+   * @param setting <tt>true</tt> to mark this window as urgent.
+   */
+  void set_urgency_hint(bool setting = true);
+  
+  /** Gets the value set by set_urgency_hint()
+   * @return <tt>true</tt> if window is urgent
+   * 
+   * @newin2p8.
+   */
+  bool get_urgency_hint() const;
+
   //_WRAP_METHOD(void set_destroy_with_parent(bool setting = true), gtk_window_set_destroy_with_parent)
   // I don't that that this is ever a good thing for C++.murrayc.
 
@@ -717,7 +947,7 @@ public:
    * the window is already mapped, it will be unmapped, and
    * then remapped on the new screen.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param screen A Gdk::Screen.
    */
   void set_screen(const Glib::RefPtr<Gdk::Screen>& screen);
@@ -726,14 +956,14 @@ public:
   /** Returns the Gdk::Screen associated with @a window .
    * @return A Gdk::Screen.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<Gdk::Screen> get_screen();
   
   /** Returns the Gdk::Screen associated with @a window .
    * @return A Gdk::Screen.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
   Glib::RefPtr<const Gdk::Screen> get_screen() const;
 
@@ -819,7 +1049,12 @@ public:
    */
   bool get_decorated() const;
 
+  
+  void set_deletable(bool setting = true);
+  
+  bool get_deletable() const;
 
+  
   /** Retrieves the list of icons set by set_icon_list().
    * The list is copied, but the reference count on each
    * member won't be incremented.
@@ -894,11 +1129,15 @@ public:
    * @param filename Location of icon file.
    * @return <tt>true</tt> if setting the icon succeeded.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool set_icon_from_file(const std::string& filename);
+#else
+  bool set_icon_from_file(const std::string& filename, std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
 
-  
   /** Gets the value set by set_icon() (or if you've
    * called set_icon_list(), gets the first icon in
    * the icon list).
@@ -938,9 +1177,14 @@ public:
    * @param filename Location of icon file.
    * @return <tt>true</tt> if setting the icon succeeded.
    * 
-   * Since: 2.2.
+   * @newin2p2.
    */
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
   static bool set_default_icon_from_file(const std::string& filename);
+#else
+  static bool set_default_icon_from_file(const std::string& filename, std::auto_ptr<Glib::Error>& error);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
   
   /** By default, after showing the first Gtk::Window for each Gdk::Screen,
    * GTK+ calls gdk_screen_notify_startup_complete().  Call this
@@ -953,7 +1197,7 @@ public:
    * temporarily, show your splash screen, then re-enable it so that
    * showing the main window would automatically result in notification.
    * 
-   * Since: 2.2
+   * @newin2p2
    * @param setting <tt>true</tt> to automatically do startup notification.
    */
   static void set_auto_startup_notification(bool setting = true);
@@ -1038,8 +1282,21 @@ public:
    * currently open, and the user chooses Preferences from the menu
    * a second time; use present() to move the already-open dialog
    * where the user can see it.
+   * 
+   * If you are calling this function in response to a user interaction,
+   * it is preferable to use gdk_window_present_with_time().
    */
   void present();
+  
+  /** Presents a window to the user in response to a user interaction.
+   * If you need to present a window without a timestamp, use 
+   * present(). See present() for details. 
+   * 
+   * @newin2p8
+   * @param timestamp The timestamp of the user interaction (typically a 
+   * button or key press event) which triggered this call.
+   */
+  void present(guint32 timestamp);
 
   
   /** Asks to iconify (i.e.\ minimize) the specified @a window . Note that
@@ -1135,7 +1392,7 @@ public:
    * You can track the fullscreen state via the "window_state_event" signal
    * on Gtk::Widget.
    * 
-   * Since: 2.2
+   * @newin2p2
    */
   void fullscreen();
   
@@ -1149,7 +1406,7 @@ public:
    * You can track the fullscreen state via the "window_state_event" signal
    * on Gtk::Widget.
    * 
-   * Since: 2.2
+   * @newin2p2
    */
   void unfullscreen();
         
@@ -1322,7 +1579,7 @@ public:
    * gdk_screen_height() - window_height)</tt>.
    * 
    * The Extended Window Manager Hints specification at 
-   * http://www.freedesktop.org/standards/wm-spec has a 
+   * http://www.freedesktop.org/Standards/wm-spec has a 
    * nice table of gravities in the "implementation notes" section.
    * 
    * The get_position() documentation may also be relevant.
@@ -1396,11 +1653,21 @@ public:
    * on the window.
    * 
    * @code
+   * #include &lt;gtk/gtk.h&gt;
+   * 
+   * static void
+   * fill_with_content (GtkWidget *vbox)
+   * {
+   * /&lt;!-- --&gt;* fill with content... *&lt;!-- --&gt;/
+   * }
+   * 
    * int
    * main (int argc, char *argv[])
    * {
-   * GtkWidget *window, vbox;
-   * GdkGeometry size_hints;
+   * GtkWidget *window, *vbox;
+   * GdkGeometry size_hints = {
+   * 100, 50, 0, 0, 100, 50, 10, 10, 0.0, 0.0, GDK_GRAVITY_NORTH_WEST  
+   * };
    * 
    * gtk_init (&amp;argc, &amp;argv);
    * 
@@ -1411,10 +1678,6 @@ public:
    * fill_with_content (vbox);
    * gtk_widget_show_all (vbox);
    * 
-   * size_hints = {
-   * 100, 50, 0, 0, 100, 50, 10, 10, 0.0, 0.0, GDK_GRAVITY_NORTH_WEST  
-   * };
-   * 
    * gtk_window_set_geometry_hints (GTK_WINDOW (window),
    * window,
    * &amp;size_hints,
@@ -1440,6 +1703,11 @@ public:
   bool parse_geometry(const Glib::ustring& geometry);
 
   
+  Glib::RefPtr<WindowGroup> get_group();
+  
+  Glib::RefPtr<const WindowGroup> get_group() const;
+
+  
   /** Hides @a window , then reshows it, resetting the
    * default size and position of the window. Used
    * by GUI builders only.
@@ -1450,7 +1718,7 @@ public:
   /** Sets an icon to be used as fallback for windows that haven't
    * had set_icon() called on them from a pixbuf.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param icon The icon.
    */
   static void set_default_icon(const Glib::RefPtr<Gdk::Pixbuf>& icon);
@@ -1469,11 +1737,12 @@ public:
    * You can track the above state via the "window_state_event" signal
    * on Gtk::Widget.
    * 
-   * Note that, according to the Extended Window Manager Hints
-   * specification, the above state is mainly meant for user preferences and should not be used 
-   * by applications e.g. for drawing attention to their dialogs.
+   * Note that, according to the Extended Window 
+   * Manager Hints specification, the above state is mainly meant 
+   * for user preferences and should not be used by applications e.g. for 
+   * drawing attention to their dialogs.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param setting Whether to keep @a window  above other windows.
    */
   void set_keep_above(bool setting = true);
@@ -1492,11 +1761,12 @@ public:
    * You can track the below state via the "window_state_event" signal
    * on Gtk::Widget.
    * 
-   * Note that, according to the Extended Window Manager Hints
-   * specification, the above state is mainly meant for user preferences and should not be used 
-   * by applications e.g. for drawing attention to their dialogs.
+   * Note that, according to the Extended Window 
+   * Manager Hints specification, the above state is mainly meant 
+   * for user preferences and should not be used by applications e.g. for 
+   * drawing attention to their dialogs.
    * 
-   * Since: 2.4
+   * @newin2p4
    * @param setting Whether to keep @a window  below other windows.
    */
   void set_keep_below(bool setting = true);
@@ -1532,105 +1802,29 @@ private:
 };
 
 
-class WindowGroup : public Glib::Object
-{
-  
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-
-public:
-  typedef WindowGroup CppObjectType;
-  typedef WindowGroup_Class CppClassType;
-  typedef GtkWindowGroup BaseObjectType;
-  typedef GtkWindowGroupClass BaseClassType;
-
-private:  friend class WindowGroup_Class;
-  static CppClassType windowgroup_class_;
-
-private:
-  // noncopyable
-  WindowGroup(const WindowGroup&);
-  WindowGroup& operator=(const WindowGroup&);
-
-protected:
-  explicit WindowGroup(const Glib::ConstructParams& construct_params);
-  explicit WindowGroup(GtkWindowGroup* castitem);
-
-#endif /* DOXYGEN_SHOULD_SKIP_THIS */
-
-public:
-  virtual ~WindowGroup();
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-  static GType get_type()      G_GNUC_CONST;
-  static GType get_base_type() G_GNUC_CONST;
-#endif
-
-  ///Provides access to the underlying C GObject.
-  GtkWindowGroup*       gobj()       { return reinterpret_cast<GtkWindowGroup*>(gobject_); }
-
-  ///Provides access to the underlying C GObject.
-  const GtkWindowGroup* gobj() const { return reinterpret_cast<GtkWindowGroup*>(gobject_); }
-
-  ///Provides access to the underlying C instance. The caller is responsible for unrefing it. Use when directly setting fields in structs.
-  GtkWindowGroup* gobj_copy();
-
-private:
-
-
-protected:
-  WindowGroup();
-
-public:
-  
-  static Glib::RefPtr<WindowGroup> create();
-
-
-  /** Adds a window to a Gtk::WindowGroup.
-   * @param window The Gtk::Window to add.
-   */
-  void add_window(Window& window);
-  
-  /** Removes a window from a Gtk::WindowGroup.
-   * @param window The Gtk::Window to remove.
-   */
-  void remove_window(Window& window);
-
-
-public:
-
-public:
-  //C++ methods used to invoke GTK+ virtual functions:
-
-protected:
-  //GTK+ Virtual Functions (override these to change behaviour):
-
-  //Default Signal Handlers::
-
-
-};
-
 } // namespace Gtk
 
 
 namespace Glib
 {
-  /** @relates Gtk::Window
+  /** @relates Gtk::WindowGroup
    * @param object The C instance
    * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
    * @result A C++ instance that wraps this C instance.
    */
-  Gtk::Window* wrap(GtkWindow* object, bool take_copy = false);
+  Glib::RefPtr<Gtk::WindowGroup> wrap(GtkWindowGroup* object, bool take_copy = false);
 }
 
+
 namespace Glib
 {
-  /** @relates Gtk::WindowGroup
+  /** @relates Gtk::Window
    * @param object The C instance
    * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
    * @result A C++ instance that wraps this C instance.
    */
-  Glib::RefPtr<Gtk::WindowGroup> wrap(GtkWindowGroup* object, bool take_copy = false);
-}
+  Gtk::Window* wrap(GtkWindow* object, bool take_copy = false);
+} //namespace Glib
 
 
 #endif /* _GTKMM_WINDOW_H */
diff --git a/libs/gtkmm2/gtk/gtkmm/wrap_init.cc b/libs/gtkmm2/gtk/gtkmm/wrap_init.cc
index 9c1713c033..6bf54af509 100644
--- a/libs/gtkmm2/gtk/gtkmm/wrap_init.cc
+++ b/libs/gtkmm2/gtk/gtkmm/wrap_init.cc
@@ -12,8 +12,10 @@
 
 // #include the widget headers so that we can call the get_type() static methods:
 
-#include "plug.h"
-#include "socket.h"
+#include "pagesetupunixdialog.h"
+#include "printunixdialog.h"
+#include "printer.h"
+#include "printjob.h"
 #include "aboutdialog.h"
 #include "accelgroup.h"
 #include "accellabel.h"
@@ -23,6 +25,7 @@
 #include "alignment.h"
 #include "arrow.h"
 #include "aspectframe.h"
+#include "assistant.h"
 #include "bin.h"
 #include "box.h"
 #include "button.h"
@@ -32,9 +35,11 @@
 #include "celllayout.h"
 #include "cellview.h"
 #include "cellrenderer.h"
+#include "cellrendereraccel.h"
 #include "cellrenderercombo.h"
 #include "cellrendererpixbuf.h"
 #include "cellrendererprogress.h"
+#include "cellrendererspin.h"
 #include "cellrenderertext.h"
 #include "cellrenderertoggle.h"
 #include "checkbutton.h"
@@ -78,6 +83,7 @@
 #include "item.h"
 #include "label.h"
 #include "layout.h"
+#include "linkbutton.h"
 #include "liststore.h"
 #include "main.h"
 #include "menu.h"
@@ -91,13 +97,27 @@
 #include "object.h"
 #include "optionmenu.h"
 #include "paned.h"
+#include "plug.h"
 #include "progressbar.h"
+#include "papersize.h"
+#include "pagesetup.h"
+#include "printsettings.h"
+#include "printcontext.h"
+#include "printoperation.h"
+#include "printoperationpreview.h"
 #include "radioaction.h"
 #include "radiobutton.h"
 #include "radiomenuitem.h"
 #include "radiotoolbutton.h"
 #include "range.h"
 #include "rc.h"
+#include "recentchooser.h"
+#include "recentchooserdialog.h"
+#include "recentchoosermenu.h"
+#include "recentchooserwidget.h"
+#include "recentfilter.h"
+#include "recentinfo.h"
+#include "recentmanager.h"
 #include "ruler.h"
 #include "scale.h"
 #include "scrollbar.h"
@@ -108,8 +128,10 @@
 #include "separatortoolitem.h"
 #include "settings.h"
 #include "sizegroup.h"
+#include "socket.h"
 #include "spinbutton.h"
 #include "statusbar.h"
+#include "statusicon.h"
 #include "stockitem.h"
 #include "style.h"
 #include "table.h"
@@ -163,15 +185,18 @@ GType gtk_adjustment_get_type(void);
 GType gtk_alignment_get_type(void);
 GType gtk_arrow_get_type(void);
 GType gtk_aspect_frame_get_type(void);
+GType gtk_assistant_get_type(void);
 GType gtk_bin_get_type(void);
 GType gtk_box_get_type(void);
 GType gtk_button_get_type(void);
 GType gtk_button_box_get_type(void);
 GType gtk_calendar_get_type(void);
 GType gtk_cell_renderer_get_type(void);
+GType gtk_cell_renderer_accel_get_type(void);
 GType gtk_cell_renderer_combo_get_type(void);
 GType gtk_cell_renderer_pixbuf_get_type(void);
 GType gtk_cell_renderer_progress_get_type(void);
+GType gtk_cell_renderer_spin_get_type(void);
 GType gtk_cell_renderer_text_get_type(void);
 GType gtk_cell_renderer_toggle_get_type(void);
 GType gtk_cell_view_get_type(void);
@@ -181,11 +206,17 @@ GType gtk_clipboard_get_type(void);
 GType gtk_color_button_get_type(void);
 GType gtk_color_selection_get_type(void);
 GType gtk_color_selection_dialog_get_type(void);
+#ifndef GTKMM_DISABLE_DEPRECATED
 GType gtk_combo_get_type(void);
+#endif // *_DISABLE_DEPRECATED
 GType gtk_combo_box_get_type(void);
 GType gtk_combo_box_entry_get_type(void);
+#ifndef GTKMM_DISABLE_DEPRECATED
 GType gtk_list_get_type(void);
+#endif // *_DISABLE_DEPRECATED
+#ifndef GTKMM_DISABLE_DEPRECATED
 GType gtk_list_item_get_type(void);
+#endif // *_DISABLE_DEPRECATED
 GType gtk_container_get_type(void);
 GType gtk_curve_get_type(void);
 GType gtk_dialog_get_type(void);
@@ -198,7 +229,9 @@ GType gtk_file_chooser_button_get_type(void);
 GType gtk_file_chooser_dialog_get_type(void);
 GType gtk_file_chooser_widget_get_type(void);
 GType gtk_file_filter_get_type(void);
+#ifndef GTKMM_DISABLE_DEPRECATED
 GType gtk_file_selection_get_type(void);
+#endif // *_DISABLE_DEPRECATED
 GType gtk_fixed_get_type(void);
 GType gtk_font_button_get_type(void);
 GType gtk_font_selection_get_type(void);
@@ -223,6 +256,7 @@ GType gtk_invisible_get_type(void);
 GType gtk_item_get_type(void);
 GType gtk_label_get_type(void);
 GType gtk_layout_get_type(void);
+GType gtk_link_button_get_type(void);
 GType gtk_list_store_get_type(void);
 GType gtk_menu_get_type(void);
 GType gtk_menu_bar_get_type(void);
@@ -233,11 +267,29 @@ GType gtk_message_dialog_get_type(void);
 GType gtk_misc_get_type(void);
 GType gtk_notebook_get_type(void);
 GType gtk_object_get_type(void);
+#ifndef GTKMM_DISABLE_DEPRECATED
 GType gtk_option_menu_get_type(void);
+#endif // *_DISABLE_DEPRECATED
+GType gtk_page_setup_get_type(void);
+#ifndef G_OS_WIN32
+GType gtk_page_setup_unix_dialog_get_type(void);
+#endif //G_OS_WIN32
 GType gtk_paned_get_type(void);
 #ifndef G_OS_WIN32
 GType gtk_plug_get_type(void);
 #endif //G_OS_WIN32
+GType gtk_print_context_get_type(void);
+#ifndef G_OS_WIN32
+GType gtk_print_job_get_type(void);
+#endif //G_OS_WIN32
+GType gtk_print_operation_get_type(void);
+GType gtk_print_settings_get_type(void);
+#ifndef G_OS_WIN32
+GType gtk_print_unix_dialog_get_type(void);
+#endif //G_OS_WIN32
+#ifndef G_OS_WIN32
+GType gtk_printer_get_type(void);
+#endif //G_OS_WIN32
 GType gtk_progress_bar_get_type(void);
 GType gtk_radio_action_get_type(void);
 GType gtk_radio_button_get_type(void);
@@ -245,6 +297,11 @@ GType gtk_radio_menu_item_get_type(void);
 GType gtk_radio_tool_button_get_type(void);
 GType gtk_range_get_type(void);
 GType gtk_rc_style_get_type(void);
+GType gtk_recent_chooser_dialog_get_type(void);
+GType gtk_recent_chooser_menu_get_type(void);
+GType gtk_recent_chooser_widget_get_type(void);
+GType gtk_recent_filter_get_type(void);
+GType gtk_recent_manager_get_type(void);
 GType gtk_ruler_get_type(void);
 GType gtk_scale_get_type(void);
 GType gtk_scrollbar_get_type(void);
@@ -258,6 +315,7 @@ GType gtk_size_group_get_type(void);
 GType gtk_socket_get_type(void);
 #endif //G_OS_WIN32
 GType gtk_spin_button_get_type(void);
+GType gtk_status_icon_get_type(void);
 GType gtk_statusbar_get_type(void);
 GType gtk_style_get_type(void);
 GType gtk_table_get_type(void);
@@ -298,6 +356,9 @@ GType gtk_window_group_get_type(void);
 
 GQuark gtk_file_chooser_error_quark(void);
 GQuark gtk_icon_theme_error_quark(void);
+GQuark gtk_print_error_quark(void);
+GQuark gtk_recent_chooser_error_quark(void);
+GQuark gtk_recent_manager_error_quark(void);
 } // extern "C"
 
 
@@ -312,15 +373,18 @@ namespace Gtk {  class Adjustment_Class { public: static Glib::ObjectBase* wrap_
 namespace Gtk {  class Alignment_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Arrow_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class AspectFrame_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+namespace Gtk {  class Assistant_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Bin_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Box_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Button_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class ButtonBox_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Calendar_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class CellRenderer_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+namespace Gtk {  class CellRendererAccel_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class CellRendererCombo_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class CellRendererPixbuf_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class CellRendererProgress_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+namespace Gtk {  class CellRendererSpin_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class CellRendererText_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class CellRendererToggle_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class CellView_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
@@ -330,11 +394,17 @@ namespace Gtk {  class Clipboard_Class { public: static Glib::ObjectBase* wrap_n
 namespace Gtk {  class ColorButton_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class ColorSelection_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class ColorSelectionDialog_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#ifndef GTKMM_DISABLE_DEPRECATED
 namespace Gtk {  class Combo_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#endif // *_DISABLE_DEPRECATED
 namespace Gtk {  class ComboBox_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class ComboBoxEntry_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#ifndef GTKMM_DISABLE_DEPRECATED
 namespace Gtk {  class ComboDropDown_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#endif // *_DISABLE_DEPRECATED
+#ifndef GTKMM_DISABLE_DEPRECATED
 namespace Gtk {  class ComboDropDownItem_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#endif // *_DISABLE_DEPRECATED
 namespace Gtk {  class Container_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Curve_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Dialog_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
@@ -347,7 +417,9 @@ namespace Gtk {  class FileChooserButton_Class { public: static Glib::ObjectBase
 namespace Gtk {  class FileChooserDialog_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class FileChooserWidget_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class FileFilter_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#ifndef GTKMM_DISABLE_DEPRECATED
 namespace Gtk {  class FileSelection_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#endif // *_DISABLE_DEPRECATED
 namespace Gtk {  class Fixed_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class FontButton_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class FontSelection_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
@@ -372,6 +444,7 @@ namespace Gtk {  class Invisible_Class { public: static Glib::ObjectBase* wrap_n
 namespace Gtk {  class Item_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Label_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Layout_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+namespace Gtk {  class LinkButton_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class ListStore_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Menu_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class MenuBar_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
@@ -382,11 +455,29 @@ namespace Gtk {  class MessageDialog_Class { public: static Glib::ObjectBase* wr
 namespace Gtk {  class Misc_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Notebook_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Object_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#ifndef GTKMM_DISABLE_DEPRECATED
 namespace Gtk {  class OptionMenu_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#endif // *_DISABLE_DEPRECATED
+namespace Gtk {  class PageSetup_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#ifndef G_OS_WIN32
+namespace Gtk {  class PageSetupUnixDialog_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#endif //G_OS_WIN32
 namespace Gtk {  class Paned_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 #ifndef G_OS_WIN32
 namespace Gtk {  class Plug_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 #endif //G_OS_WIN32
+namespace Gtk {  class PrintContext_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#ifndef G_OS_WIN32
+namespace Gtk {  class PrintJob_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#endif //G_OS_WIN32
+namespace Gtk {  class PrintOperation_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+namespace Gtk {  class PrintSettings_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#ifndef G_OS_WIN32
+namespace Gtk {  class PrintUnixDialog_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#endif //G_OS_WIN32
+#ifndef G_OS_WIN32
+namespace Gtk {  class Printer_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+#endif //G_OS_WIN32
 namespace Gtk {  class ProgressBar_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class RadioAction_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class RadioButton_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
@@ -394,6 +485,11 @@ namespace Gtk {  class RadioMenuItem_Class { public: static Glib::ObjectBase* wr
 namespace Gtk {  class RadioToolButton_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Range_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class RcStyle_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+namespace Gtk {  class RecentChooserDialog_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+namespace Gtk {  class RecentChooserMenu_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+namespace Gtk {  class RecentChooserWidget_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+namespace Gtk {  class RecentFilter_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+namespace Gtk {  class RecentManager_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Ruler_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Scale_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Scrollbar_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
@@ -407,6 +503,7 @@ namespace Gtk {  class SizeGroup_Class { public: static Glib::ObjectBase* wrap_n
 namespace Gtk {  class Socket_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 #endif //G_OS_WIN32
 namespace Gtk {  class SpinButton_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
+namespace Gtk {  class StatusIcon_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Statusbar_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Style_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
 namespace Gtk {  class Table_Class { public: static Glib::ObjectBase* wrap_new(GObject*); };  }
@@ -450,6 +547,9 @@ void wrap_init()
   // Register Error domains:
   Glib::Error::register_domain(gtk_file_chooser_error_quark(), &Gtk::FileChooserError::throw_func);
   Glib::Error::register_domain(gtk_icon_theme_error_quark(), &Gtk::IconThemeError::throw_func);
+  Glib::Error::register_domain(gtk_print_error_quark(), &Gtk::PrintError::throw_func);
+  Glib::Error::register_domain(gtk_recent_chooser_error_quark(), &Gtk::RecentChooserError::throw_func);
+  Glib::Error::register_domain(gtk_recent_manager_error_quark(), &Gtk::RecentManagerError::throw_func);
 
 // Map gtypes to gtkmm wrapper-creation functions:
   Glib::wrap_register(gtk_about_dialog_get_type(), &Gtk::AboutDialog_Class::wrap_new);
@@ -461,15 +561,18 @@ void wrap_init()
   Glib::wrap_register(gtk_alignment_get_type(), &Gtk::Alignment_Class::wrap_new);
   Glib::wrap_register(gtk_arrow_get_type(), &Gtk::Arrow_Class::wrap_new);
   Glib::wrap_register(gtk_aspect_frame_get_type(), &Gtk::AspectFrame_Class::wrap_new);
+  Glib::wrap_register(gtk_assistant_get_type(), &Gtk::Assistant_Class::wrap_new);
   Glib::wrap_register(gtk_bin_get_type(), &Gtk::Bin_Class::wrap_new);
   Glib::wrap_register(gtk_box_get_type(), &Gtk::Box_Class::wrap_new);
   Glib::wrap_register(gtk_button_get_type(), &Gtk::Button_Class::wrap_new);
   Glib::wrap_register(gtk_button_box_get_type(), &Gtk::ButtonBox_Class::wrap_new);
   Glib::wrap_register(gtk_calendar_get_type(), &Gtk::Calendar_Class::wrap_new);
   Glib::wrap_register(gtk_cell_renderer_get_type(), &Gtk::CellRenderer_Class::wrap_new);
+  Glib::wrap_register(gtk_cell_renderer_accel_get_type(), &Gtk::CellRendererAccel_Class::wrap_new);
   Glib::wrap_register(gtk_cell_renderer_combo_get_type(), &Gtk::CellRendererCombo_Class::wrap_new);
   Glib::wrap_register(gtk_cell_renderer_pixbuf_get_type(), &Gtk::CellRendererPixbuf_Class::wrap_new);
   Glib::wrap_register(gtk_cell_renderer_progress_get_type(), &Gtk::CellRendererProgress_Class::wrap_new);
+  Glib::wrap_register(gtk_cell_renderer_spin_get_type(), &Gtk::CellRendererSpin_Class::wrap_new);
   Glib::wrap_register(gtk_cell_renderer_text_get_type(), &Gtk::CellRendererText_Class::wrap_new);
   Glib::wrap_register(gtk_cell_renderer_toggle_get_type(), &Gtk::CellRendererToggle_Class::wrap_new);
   Glib::wrap_register(gtk_cell_view_get_type(), &Gtk::CellView_Class::wrap_new);
@@ -479,11 +582,17 @@ void wrap_init()
   Glib::wrap_register(gtk_color_button_get_type(), &Gtk::ColorButton_Class::wrap_new);
   Glib::wrap_register(gtk_color_selection_get_type(), &Gtk::ColorSelection_Class::wrap_new);
   Glib::wrap_register(gtk_color_selection_dialog_get_type(), &Gtk::ColorSelectionDialog_Class::wrap_new);
+#ifndef GTKMM_DISABLE_DEPRECATED
   Glib::wrap_register(gtk_combo_get_type(), &Gtk::Combo_Class::wrap_new);
+#endif // *_DISABLE_DEPRECATED
   Glib::wrap_register(gtk_combo_box_get_type(), &Gtk::ComboBox_Class::wrap_new);
   Glib::wrap_register(gtk_combo_box_entry_get_type(), &Gtk::ComboBoxEntry_Class::wrap_new);
+#ifndef GTKMM_DISABLE_DEPRECATED
   Glib::wrap_register(gtk_list_get_type(), &Gtk::ComboDropDown_Class::wrap_new);
+#endif // *_DISABLE_DEPRECATED
+#ifndef GTKMM_DISABLE_DEPRECATED
   Glib::wrap_register(gtk_list_item_get_type(), &Gtk::ComboDropDownItem_Class::wrap_new);
+#endif // *_DISABLE_DEPRECATED
   Glib::wrap_register(gtk_container_get_type(), &Gtk::Container_Class::wrap_new);
   Glib::wrap_register(gtk_curve_get_type(), &Gtk::Curve_Class::wrap_new);
   Glib::wrap_register(gtk_dialog_get_type(), &Gtk::Dialog_Class::wrap_new);
@@ -496,7 +605,9 @@ void wrap_init()
   Glib::wrap_register(gtk_file_chooser_dialog_get_type(), &Gtk::FileChooserDialog_Class::wrap_new);
   Glib::wrap_register(gtk_file_chooser_widget_get_type(), &Gtk::FileChooserWidget_Class::wrap_new);
   Glib::wrap_register(gtk_file_filter_get_type(), &Gtk::FileFilter_Class::wrap_new);
+#ifndef GTKMM_DISABLE_DEPRECATED
   Glib::wrap_register(gtk_file_selection_get_type(), &Gtk::FileSelection_Class::wrap_new);
+#endif // *_DISABLE_DEPRECATED
   Glib::wrap_register(gtk_fixed_get_type(), &Gtk::Fixed_Class::wrap_new);
   Glib::wrap_register(gtk_font_button_get_type(), &Gtk::FontButton_Class::wrap_new);
   Glib::wrap_register(gtk_font_selection_get_type(), &Gtk::FontSelection_Class::wrap_new);
@@ -521,6 +632,7 @@ void wrap_init()
   Glib::wrap_register(gtk_item_get_type(), &Gtk::Item_Class::wrap_new);
   Glib::wrap_register(gtk_label_get_type(), &Gtk::Label_Class::wrap_new);
   Glib::wrap_register(gtk_layout_get_type(), &Gtk::Layout_Class::wrap_new);
+  Glib::wrap_register(gtk_link_button_get_type(), &Gtk::LinkButton_Class::wrap_new);
   Glib::wrap_register(gtk_list_store_get_type(), &Gtk::ListStore_Class::wrap_new);
   Glib::wrap_register(gtk_menu_get_type(), &Gtk::Menu_Class::wrap_new);
   Glib::wrap_register(gtk_menu_bar_get_type(), &Gtk::MenuBar_Class::wrap_new);
@@ -531,11 +643,29 @@ void wrap_init()
   Glib::wrap_register(gtk_misc_get_type(), &Gtk::Misc_Class::wrap_new);
   Glib::wrap_register(gtk_notebook_get_type(), &Gtk::Notebook_Class::wrap_new);
   Glib::wrap_register(gtk_object_get_type(), &Gtk::Object_Class::wrap_new);
+#ifndef GTKMM_DISABLE_DEPRECATED
   Glib::wrap_register(gtk_option_menu_get_type(), &Gtk::OptionMenu_Class::wrap_new);
+#endif // *_DISABLE_DEPRECATED
+  Glib::wrap_register(gtk_page_setup_get_type(), &Gtk::PageSetup_Class::wrap_new);
+#ifndef G_OS_WIN32
+  Glib::wrap_register(gtk_page_setup_unix_dialog_get_type(), &Gtk::PageSetupUnixDialog_Class::wrap_new);
+#endif //G_OS_WIN32
   Glib::wrap_register(gtk_paned_get_type(), &Gtk::Paned_Class::wrap_new);
 #ifndef G_OS_WIN32
   Glib::wrap_register(gtk_plug_get_type(), &Gtk::Plug_Class::wrap_new);
 #endif //G_OS_WIN32
+  Glib::wrap_register(gtk_print_context_get_type(), &Gtk::PrintContext_Class::wrap_new);
+#ifndef G_OS_WIN32
+  Glib::wrap_register(gtk_print_job_get_type(), &Gtk::PrintJob_Class::wrap_new);
+#endif //G_OS_WIN32
+  Glib::wrap_register(gtk_print_operation_get_type(), &Gtk::PrintOperation_Class::wrap_new);
+  Glib::wrap_register(gtk_print_settings_get_type(), &Gtk::PrintSettings_Class::wrap_new);
+#ifndef G_OS_WIN32
+  Glib::wrap_register(gtk_print_unix_dialog_get_type(), &Gtk::PrintUnixDialog_Class::wrap_new);
+#endif //G_OS_WIN32
+#ifndef G_OS_WIN32
+  Glib::wrap_register(gtk_printer_get_type(), &Gtk::Printer_Class::wrap_new);
+#endif //G_OS_WIN32
   Glib::wrap_register(gtk_progress_bar_get_type(), &Gtk::ProgressBar_Class::wrap_new);
   Glib::wrap_register(gtk_radio_action_get_type(), &Gtk::RadioAction_Class::wrap_new);
   Glib::wrap_register(gtk_radio_button_get_type(), &Gtk::RadioButton_Class::wrap_new);
@@ -543,6 +673,11 @@ void wrap_init()
   Glib::wrap_register(gtk_radio_tool_button_get_type(), &Gtk::RadioToolButton_Class::wrap_new);
   Glib::wrap_register(gtk_range_get_type(), &Gtk::Range_Class::wrap_new);
   Glib::wrap_register(gtk_rc_style_get_type(), &Gtk::RcStyle_Class::wrap_new);
+  Glib::wrap_register(gtk_recent_chooser_dialog_get_type(), &Gtk::RecentChooserDialog_Class::wrap_new);
+  Glib::wrap_register(gtk_recent_chooser_menu_get_type(), &Gtk::RecentChooserMenu_Class::wrap_new);
+  Glib::wrap_register(gtk_recent_chooser_widget_get_type(), &Gtk::RecentChooserWidget_Class::wrap_new);
+  Glib::wrap_register(gtk_recent_filter_get_type(), &Gtk::RecentFilter_Class::wrap_new);
+  Glib::wrap_register(gtk_recent_manager_get_type(), &Gtk::RecentManager_Class::wrap_new);
   Glib::wrap_register(gtk_ruler_get_type(), &Gtk::Ruler_Class::wrap_new);
   Glib::wrap_register(gtk_scale_get_type(), &Gtk::Scale_Class::wrap_new);
   Glib::wrap_register(gtk_scrollbar_get_type(), &Gtk::Scrollbar_Class::wrap_new);
@@ -556,6 +691,7 @@ void wrap_init()
   Glib::wrap_register(gtk_socket_get_type(), &Gtk::Socket_Class::wrap_new);
 #endif //G_OS_WIN32
   Glib::wrap_register(gtk_spin_button_get_type(), &Gtk::SpinButton_Class::wrap_new);
+  Glib::wrap_register(gtk_status_icon_get_type(), &Gtk::StatusIcon_Class::wrap_new);
   Glib::wrap_register(gtk_statusbar_get_type(), &Gtk::Statusbar_Class::wrap_new);
   Glib::wrap_register(gtk_style_get_type(), &Gtk::Style_Class::wrap_new);
   Glib::wrap_register(gtk_table_get_type(), &Gtk::Table_Class::wrap_new);
@@ -602,15 +738,18 @@ void wrap_init()
   Gtk::Alignment::get_type();
   Gtk::Arrow::get_type();
   Gtk::AspectFrame::get_type();
+  Gtk::Assistant::get_type();
   Gtk::Bin::get_type();
   Gtk::Box::get_type();
   Gtk::Button::get_type();
   Gtk::ButtonBox::get_type();
   Gtk::Calendar::get_type();
   Gtk::CellRenderer::get_type();
+  Gtk::CellRendererAccel::get_type();
   Gtk::CellRendererCombo::get_type();
   Gtk::CellRendererPixbuf::get_type();
   Gtk::CellRendererProgress::get_type();
+  Gtk::CellRendererSpin::get_type();
   Gtk::CellRendererText::get_type();
   Gtk::CellRendererToggle::get_type();
   Gtk::CellView::get_type();
@@ -620,11 +759,17 @@ void wrap_init()
   Gtk::ColorButton::get_type();
   Gtk::ColorSelection::get_type();
   Gtk::ColorSelectionDialog::get_type();
+#ifndef GTKMM_DISABLE_DEPRECATED
   Gtk::Combo::get_type();
+#endif // *_DISABLE_DEPRECATED
   Gtk::ComboBox::get_type();
   Gtk::ComboBoxEntry::get_type();
+#ifndef GTKMM_DISABLE_DEPRECATED
   Gtk::ComboDropDown::get_type();
+#endif // *_DISABLE_DEPRECATED
+#ifndef GTKMM_DISABLE_DEPRECATED
   Gtk::ComboDropDownItem::get_type();
+#endif // *_DISABLE_DEPRECATED
   Gtk::Container::get_type();
   Gtk::Curve::get_type();
   Gtk::Dialog::get_type();
@@ -637,7 +782,9 @@ void wrap_init()
   Gtk::FileChooserDialog::get_type();
   Gtk::FileChooserWidget::get_type();
   Gtk::FileFilter::get_type();
+#ifndef GTKMM_DISABLE_DEPRECATED
   Gtk::FileSelection::get_type();
+#endif // *_DISABLE_DEPRECATED
   Gtk::Fixed::get_type();
   Gtk::FontButton::get_type();
   Gtk::FontSelection::get_type();
@@ -662,6 +809,7 @@ void wrap_init()
   Gtk::Item::get_type();
   Gtk::Label::get_type();
   Gtk::Layout::get_type();
+  Gtk::LinkButton::get_type();
   Gtk::ListStore::get_type();
   Gtk::Menu::get_type();
   Gtk::MenuBar::get_type();
@@ -672,11 +820,29 @@ void wrap_init()
   Gtk::Misc::get_type();
   Gtk::Notebook::get_type();
   Gtk::Object::get_type();
+#ifndef GTKMM_DISABLE_DEPRECATED
   Gtk::OptionMenu::get_type();
+#endif // *_DISABLE_DEPRECATED
+  Gtk::PageSetup::get_type();
+#ifndef G_OS_WIN32
+  Gtk::PageSetupUnixDialog::get_type();
+#endif //G_OS_WIN32
   Gtk::Paned::get_type();
 #ifndef G_OS_WIN32
   Gtk::Plug::get_type();
 #endif //G_OS_WIN32
+  Gtk::PrintContext::get_type();
+#ifndef G_OS_WIN32
+  Gtk::PrintJob::get_type();
+#endif //G_OS_WIN32
+  Gtk::PrintOperation::get_type();
+  Gtk::PrintSettings::get_type();
+#ifndef G_OS_WIN32
+  Gtk::PrintUnixDialog::get_type();
+#endif //G_OS_WIN32
+#ifndef G_OS_WIN32
+  Gtk::Printer::get_type();
+#endif //G_OS_WIN32
   Gtk::ProgressBar::get_type();
   Gtk::RadioAction::get_type();
   Gtk::RadioButton::get_type();
@@ -684,6 +850,11 @@ void wrap_init()
   Gtk::RadioToolButton::get_type();
   Gtk::Range::get_type();
   Gtk::RcStyle::get_type();
+  Gtk::RecentChooserDialog::get_type();
+  Gtk::RecentChooserMenu::get_type();
+  Gtk::RecentChooserWidget::get_type();
+  Gtk::RecentFilter::get_type();
+  Gtk::RecentManager::get_type();
   Gtk::Ruler::get_type();
   Gtk::Scale::get_type();
   Gtk::Scrollbar::get_type();
@@ -697,6 +868,7 @@ void wrap_init()
   Gtk::Socket::get_type();
 #endif //G_OS_WIN32
   Gtk::SpinButton::get_type();
+  Gtk::StatusIcon::get_type();
   Gtk::Statusbar::get_type();
   Gtk::Style::get_type();
   Gtk::Table::get_type();
diff --git a/libs/gtkmm2/gtk/gtkmmconfig.h b/libs/gtkmm2/gtk/gtkmmconfig.h
index b28315ec71..939e7fddbf 100644
--- a/libs/gtkmm2/gtk/gtkmmconfig.h
+++ b/libs/gtkmm2/gtk/gtkmmconfig.h
@@ -1,4 +1,4 @@
-/* gtk/gtkmmconfig.h.  Generated by configure.  */
+/* gtk/gtkmmconfig.h.  Generated from gtkmmconfig.h.in by configure.  */
 #ifndef _GTKMM_CONFIG_H
 #define _GTKMM_CONFIG_H 1
 
@@ -6,8 +6,12 @@
 
 /* version numbers */
 #define GTKMM_MAJOR_VERSION 2
-#define GTKMM_MINOR_VERSION 6
-#define GTKMM_MICRO_VERSION 1
+#define GTKMM_MINOR_VERSION 10
+#define GTKMM_MICRO_VERSION 8
+
+#define GTKMM_ATKMM_ENABLED 1
+/* #undef GTKMM_MAEMO_EXTENSIONS_ENABLED */
+
 
 #ifdef GLIBMM_CONFIGURE
 /* compiler feature tests that are used during compile time and run-time
@@ -17,17 +21,19 @@
    funlockfile - configure finds it but the compiler can not find it
    while compiling demowindow.cc. undef HAVE_FLOCKFILE and
    HAVE_FUNLOCKFILE for now, so that it builds on those platforms. */
-
-/* #undef HAVE_FLOCKFILE */
-/* #undef HAVE_FUNLOCKFILE */
+	
+#define HAVE_FLOCKFILE 1
+#define HAVE_FUNLOCKFILE 1
+#define HAVE_MKFIFO 1
 /* #undef GETC_UNLOCKED */
 
 #endif /* GLIBMM_CONFIGURE */
 
+
 #ifdef GLIBMM_DLL
   #if defined(GTKMM_BUILD) && defined(_WINDLL)
     // Do not dllexport as it is handled by gendef on MSVC
-    #define GTKMM_API
+    #define GTKMM_API 
   #elif !defined(GTKMM_BUILD)
     #define GTKMM_API __declspec(dllimport)
   #else
diff --git a/libs/gtkmm2/pango/SConscript b/libs/gtkmm2/pango/SConscript
index d045cf2043..1caa21376c 100644
--- a/libs/gtkmm2/pango/SConscript
+++ b/libs/gtkmm2/pango/SConscript
@@ -8,7 +8,7 @@ pangomm_files = glob.glob('pangomm/*.cc')
 
 Import('env libraries install_prefix')
 pangomm = env.Copy()
-pangomm.Merge([libraries['glibmm2'], libraries['pango'], libraries['sigc2']])
+pangomm.Merge([libraries['glibmm2'], libraries['pango'], libraries['sigc2'], libraries['cairomm'], libraries['cairo']])
 
 libpangomm = pangomm.SharedLibrary('pangomm', pangomm_files)
 Default(libpangomm)
diff --git a/libs/gtkmm2/pango/pangomm/attributes.cc b/libs/gtkmm2/pango/pangomm/attributes.cc
index 2d23e5d77b..abb9428989 100644
--- a/libs/gtkmm2/pango/pangomm/attributes.cc
+++ b/libs/gtkmm2/pango/pangomm/attributes.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/attributes.h>
 #include <pangomm/private/attributes_p.h>
 
@@ -377,26 +378,26 @@ namespace Pango
 {
 
 
-unsigned int Attribute::get_start_index() const
+ unsigned int Attribute::get_start_index() const
 {
   return gobj()->start_index;
 }
-
-unsigned int Attribute::get_end_index() const
+ 
+ unsigned int Attribute::get_end_index() const
 {
   return gobj()->end_index;
 }
-
-void Attribute::set_start_index(const unsigned int& value)
+ 
+ void Attribute::set_start_index(const unsigned int& value)
 {
   gobj()->start_index = value;
 }
-
-void Attribute::set_end_index(const unsigned int& value)
+ 
+ void Attribute::set_end_index(const unsigned int& value)
 {
   gobj()->end_index = value;
 }
-
+ 
 bool Attribute::equal(const Attribute& attr2) const
 {
   return pango_attribute_equal(const_cast<PangoAttribute*>(gobj()), (attr2).gobj());
@@ -410,11 +411,11 @@ namespace Pango
 {
 
 
-Glib::ustring AttrString::get_string() const
+ Glib::ustring AttrString::get_string() const
 {
   return Glib::convert_const_gchar_ptr_to_ustring(gobj()->value);
 }
-
+ 
 
 } // namespace Pango
 
@@ -423,16 +424,16 @@ namespace Pango
 {
 
 
-Language AttrLanguage::get_language() const
+ Language AttrLanguage::get_language() const
 {
   return Language(gobj()->value);
 }
-
-void AttrLanguage::set_language(const Language& value)
+ 
+ void AttrLanguage::set_language(const Language& value)
 {
   gobj()->value = const_cast<PangoLanguage*>((value).gobj());
 }
-
+ 
 
 } // namespace Pango
 
@@ -441,16 +442,16 @@ namespace Pango
 {
 
 
-Color AttrColor::get_color() const
+ Color AttrColor::get_color() const
 {
   return Color(&(gobj()->color));
 }
-
-void AttrColor::set_color(const Color& value)
+ 
+ void AttrColor::set_color(const Color& value)
 {
   gobj()->color = *(value).gobj();
 }
-
+ 
 
 } // namespace Pango
 
@@ -459,16 +460,16 @@ namespace Pango
 {
 
 
-int AttrInt::get_value() const
+ int AttrInt::get_value() const
 {
   return gobj()->value;
 }
-
-void AttrInt::set_value(const int& value)
+ 
+ void AttrInt::set_value(const int& value)
 {
   gobj()->value = value;
 }
-
+ 
 
 } // namespace Pango
 
@@ -477,16 +478,16 @@ namespace Pango
 {
 
 
-double AttrFloat::get_value() const
+ double AttrFloat::get_value() const
 {
   return gobj()->value;
 }
-
-void AttrFloat::set_value(const double& value)
+ 
+ void AttrFloat::set_value(const double& value)
 {
   gobj()->value = value;
 }
-
+ 
 
 } // namespace Pango
 
@@ -495,11 +496,11 @@ namespace Pango
 {
 
 
-FontDescription AttrFontDesc::get_desc() const
+ FontDescription AttrFontDesc::get_desc() const
 {
   return FontDescription((gobj()->desc));
 }
-
+ 
 
 } // namespace Pango
 
@@ -508,26 +509,26 @@ namespace Pango
 {
 
 
-Rectangle AttrShape::get_ink_rect() const
+ Rectangle AttrShape::get_ink_rect() const
 {
   return Rectangle(&(gobj()->ink_rect));
 }
-
-Rectangle AttrShape::get_logical_rect() const
+ 
+ Rectangle AttrShape::get_logical_rect() const
 {
   return Rectangle(&(gobj()->logical_rect));
 }
-
-void AttrShape::set_ink_rect(const Rectangle& value)
+ 
+ void AttrShape::set_ink_rect(const Rectangle& value)
 {
   gobj()->ink_rect = *(value).gobj();
 }
-
-void AttrShape::set_logical_rect(const Rectangle& value)
+ 
+ void AttrShape::set_logical_rect(const Rectangle& value)
 {
   gobj()->logical_rect = *(value).gobj();
 }
-
+ 
 
 } // namespace Pango
 
diff --git a/libs/gtkmm2/pango/pangomm/attributes.h b/libs/gtkmm2/pango/pangomm/attributes.h
index 25baa96475..4d25d39087 100644
--- a/libs/gtkmm2/pango/pangomm/attributes.h
+++ b/libs/gtkmm2/pango/pangomm/attributes.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_ATTRIBUTES_H
 #define _PANGOMM_ATTRIBUTES_H
 
+
 #include <glibmm.h>
 
 /* attributes.h
@@ -64,7 +65,8 @@ enum AttrType
   ATTR_FALLBACK,
   ATTR_LETTER_SPACING,
   ATTR_UNDERLINE_COLOR,
-  ATTR_STRIKETHROUGH_COLOR
+  ATTR_STRIKETHROUGH_COLOR,
+  ATTR_ABSOLUTE_SIZE
 };
 
 } // namespace Pango
@@ -179,23 +181,23 @@ public:
   /** Gets the start index of the range.
    * @return The start index of the range.
    */
-  unsigned int get_start_index() const;
-
+   unsigned int get_start_index() const;
+ 
   /** Gets the end index of the range. The character at this index is not included in the range.
    * @return The end index of the range.
    */
-  unsigned int get_end_index() const;
-
+   unsigned int get_end_index() const;
+ 
   /** Sets the start index of the range.
    * @param value The new start index.
    */
-  void set_start_index(const unsigned int& value);
-
+   void set_start_index(const unsigned int& value);
+ 
   /** Sets the end index of the range. The character at this index is not included in the range.
    * @param value The new end index.
    */
-  void set_end_index(const unsigned int& value);
-
+   void set_end_index(const unsigned int& value);
+ 
   
   /** Compare two attributes for equality. This compares only the
    * actual value of the two attributes and not the ranges that the
@@ -352,8 +354,8 @@ public:
   /** Gets the string which is the value of the attribute.
    * @return The string value of the attribute.
    */
-  Glib::ustring get_string() const;
-
+   Glib::ustring get_string() const;
+ 
   /** Sets the string which is the value of the attribute.
    * @param string The new string value for the attribute.
    */
@@ -392,13 +394,13 @@ public:
   /** Gets the language which is the value of the attribute.
    * @return The language tag of the attribute.
    */
-  Language get_language() const;
-
+   Language get_language() const;
+ 
   /** Sets the language which is the value of the attribute.
    * @param value The new language tag for the attribute.
    */
-  void set_language(const Language& value);
-
+   void set_language(const Language& value);
+ 
   /// Provides access to the underlying C GObject.  
   PangoAttrLanguage*       gobj()       { return reinterpret_cast<PangoAttrLanguage*>(gobject_); }
   /// Provides access to the underlying C GObject.
@@ -432,13 +434,13 @@ public:
   /** Gets the color which is the value of the attribute.
    * @return The color value of the attribute.
    */
-  Color get_color() const;
-
+   Color get_color() const;
+ 
   /** Sets the color which is the value of the attribute.
    * @param value The new color value for the attribute.
    */
-  void set_color(const Color& value);
-
+   void set_color(const Color& value);
+ 
   /// Provides access to the underlying C GObject.  
   PangoAttrColor*       gobj()       { return reinterpret_cast<PangoAttrColor*>(gobject_); }
   /// Provides access to the underlying C GObject.
@@ -472,13 +474,13 @@ public:
   /** Gets the integer value of the attribute.
    * @return The integer value of the attribute.
    */
-  int get_value() const;
-
+   int get_value() const;
+ 
   /** Sets the integer value of the attribute.
    * @param value The new integer value for the attribute.
    */
-  void set_value(const int& value);
-
+   void set_value(const int& value);
+ 
   /// Provides access to the underlying C GObject.  
   PangoAttrInt*       gobj()       { return reinterpret_cast<PangoAttrInt*>(gobject_); }
   /// Provides access to the underlying C GObject.
@@ -512,13 +514,13 @@ public:
   /** Gets the floating point value of the attribute.
    * @return The floating point value of the attribute.
    */
-  double get_value() const;
-
+   double get_value() const;
+ 
   /** Sets the floating point value of the attribute.
    * @param value The new floating point value for the attribute.
    */
-  void set_value(const double& value);
-
+   void set_value(const double& value);
+ 
   /// Provides access to the underlying C GObject.
   PangoAttrFloat*       gobj()       { return reinterpret_cast<PangoAttrFloat*>(gobject_); }
   /// Provides access to the underlying C GObject.
@@ -552,8 +554,8 @@ public:
   /** Gets the font description which is the value of the attribute.
    * @return The font description of the attribute.
    */
-  FontDescription get_desc() const;
-
+   FontDescription get_desc() const;
+ 
   /** Sets the font description which is the value of the attribute.
    * @param desc The new font description for the attribute.
    */
@@ -592,23 +594,23 @@ public:
   /** Gets the ink rectangle to restrict to.
    * @return The ink rectangle of the attribute.
    */
-  Rectangle get_ink_rect() const;
-
+   Rectangle get_ink_rect() const;
+ 
   /** Gets the logical rectangle to restrict to.
    * @return The logical rectangle of the attribute.
    */
-  Rectangle get_logical_rect() const;
-
+   Rectangle get_logical_rect() const;
+ 
   /** Sets the ink rectangle to restrict to.
    * @param value The new ink rectangle for the attribute.
    */
-  void set_ink_rect(const Rectangle& value);
-
+   void set_ink_rect(const Rectangle& value);
+ 
   /** Sets the logical rectangle to restrict to.
    * @param value The new logical rectangle for the attribute.
    */
-  void set_logical_rect(const Rectangle& value);
-
+   void set_logical_rect(const Rectangle& value);
+ 
   /// Provides access to the underlying C GObject.  
   PangoAttrShape*       gobj()       { return reinterpret_cast<PangoAttrShape*>(gobject_); }
   /// Provides access to the underlying C GObject.
diff --git a/libs/gtkmm2/pango/pangomm/attriter.cc b/libs/gtkmm2/pango/pangomm/attriter.cc
index 71fa57052a..29c55a6a4d 100644
--- a/libs/gtkmm2/pango/pangomm/attriter.cc
+++ b/libs/gtkmm2/pango/pangomm/attriter.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/attriter.h>
 #include <pangomm/private/attriter_p.h>
 
@@ -166,7 +167,7 @@ namespace Pango
 
 void AttrIter::get_range(int& start, int& end) const
 {
-  pango_attr_iterator_range(const_cast<PangoAttrIterator*>(gobj()), &start, &end);
+pango_attr_iterator_range(const_cast<PangoAttrIterator*>(gobj()), &start, &end); 
 }
 
 Attribute AttrIter::get_attribute(AttrType type) const
diff --git a/libs/gtkmm2/pango/pangomm/attriter.h b/libs/gtkmm2/pango/pangomm/attriter.h
index ce654e92dd..9f840d71a7 100644
--- a/libs/gtkmm2/pango/pangomm/attriter.h
+++ b/libs/gtkmm2/pango/pangomm/attriter.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_ATTRITER_H
 #define _PANGOMM_ATTRITER_H
 
+
 #include <glibmm.h>
 
 /* attriter.h
diff --git a/libs/gtkmm2/pango/pangomm/attrlist.cc b/libs/gtkmm2/pango/pangomm/attrlist.cc
index deba57a453..659ec91a68 100644
--- a/libs/gtkmm2/pango/pangomm/attrlist.cc
+++ b/libs/gtkmm2/pango/pangomm/attrlist.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/attrlist.h>
 #include <pangomm/private/attrlist_p.h>
 
@@ -37,6 +38,11 @@ AttrList::AttrList(const Glib::ustring& markup_text, gunichar accel_marker)
     gobject_ = 0;
 }
 
+AttrList::operator bool()
+{
+  return gobj() != 0;
+}
+
 AttrList::AttrList(const Glib::ustring& markup_text, gunichar accel_marker, Glib::ustring& text, gunichar& accel_char)
 {
   //initialize output parameters:
@@ -74,7 +80,6 @@ void AttrList::change(Attribute& attr)
  
 } /* namespace Pango */
 
-
 namespace
 {
 } // anonymous namespace
@@ -147,7 +152,7 @@ PangoAttrList* AttrList::gobj_copy() const
 
 void AttrList::splice(AttrList& other, int pos, int len)
 {
-  pango_attr_list_splice(gobj(), (other).gobj(), pos, len);
+pango_attr_list_splice(gobj(), (other).gobj(), pos, len); 
 }
 
 AttrIter AttrList::get_iter()
diff --git a/libs/gtkmm2/pango/pangomm/attrlist.h b/libs/gtkmm2/pango/pangomm/attrlist.h
index 78d435e729..10c2976d62 100644
--- a/libs/gtkmm2/pango/pangomm/attrlist.h
+++ b/libs/gtkmm2/pango/pangomm/attrlist.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_ATTRLIST_H
 #define _PANGOMM_ATTRLIST_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -43,6 +44,8 @@ namespace Pango
  *
  * Since the Pango::AttrList structure is stored as a linear list, it is not suitable for storing attributes for large amounts of text.
  * In general, you should not use a single Pango::AttrList for more than one paragraph of text.
+ *
+ * When obtaining an AttrList, you should check that it is valid. For instance, if(attrlist).
  */
 class AttrList
 {
@@ -110,6 +113,9 @@ public:
    */
   AttrList(const Glib::ustring& markup_text, gunichar accel_marker, Glib::ustring& text, gunichar& accel_char);
 
+  ///Tests whether the AttrList is valid.
+  operator bool();
+
   void insert(Attribute& attr);
    // hand code because we need to pass a copy of the attribute
   void insert_before(Attribute& attr);
@@ -119,9 +125,9 @@ public:
   
   /** This function splices attribute list @a other  into @a list .
    * This operation is equivalent to stretching every attribute
-   * applies at position @a pos  in @a list  by an amount @a len ,
+   * that applies at position @a pos  in @a list  by an amount @a len ,
    * and then calling pango_attr_list_change() with a copy
-   * of each attributes in @a other  in sequence (offset in position by @a pos ).
+   * of each attribute in @a other  in sequence (offset in position by @a pos ).
    * 
    * This operation proves useful for, for instance, inserting
    * a preedit string in the middle of an edit buffer.
@@ -178,5 +184,6 @@ class Value<Pango::AttrList> : public Glib::Value_Boxed<Pango::AttrList>
 
 } // namespace Glib
 
+
 #endif /* _PANGOMM_ATTRLIST_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/color.cc b/libs/gtkmm2/pango/pangomm/color.cc
index 946d7fcc37..50c8d2e2eb 100644
--- a/libs/gtkmm2/pango/pangomm/color.cc
+++ b/libs/gtkmm2/pango/pangomm/color.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/color.h>
 #include <pangomm/private/color_p.h>
 
@@ -37,7 +38,6 @@ Color::operator bool()
 
 } /* namespace Pango */
 
-
 namespace
 {
 } // anonymous namespace
@@ -83,36 +83,36 @@ Color::Color(const PangoColor* gobject)
 }
 
 
-guint16 Color::get_red() const
+ guint16 Color::get_red() const
 {
   return gobj()->red;
 }
-
-guint16 Color::get_green() const
+ 
+ guint16 Color::get_green() const
 {
   return gobj()->green;
 }
-
-guint16 Color::get_blue() const
+ 
+ guint16 Color::get_blue() const
 {
   return gobj()->blue;
 }
-
-void Color::set_red(const guint16& value)
+ 
+ void Color::set_red(const guint16& value)
 {
   gobj()->red = value;
 }
-
-void Color::set_green(const guint16& value)
+ 
+ void Color::set_green(const guint16& value)
 {
   gobj()->green = value;
 }
-
-void Color::set_blue(const guint16& value)
+ 
+ void Color::set_blue(const guint16& value)
 {
   gobj()->blue = value;
 }
-
+ 
 bool Color::parse(const Glib::ustring& spec)
 {
   return pango_color_parse(gobj(), spec.c_str());
diff --git a/libs/gtkmm2/pango/pangomm/color.h b/libs/gtkmm2/pango/pangomm/color.h
index 07ce119896..ac31d223f1 100644
--- a/libs/gtkmm2/pango/pangomm/color.h
+++ b/libs/gtkmm2/pango/pangomm/color.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_COLOR_H
 #define _PANGOMM_COLOR_H
 
+
 #include <glibmm.h>
 
 /* Copyright (C) 2002 The gtkmm Development Team
@@ -64,33 +65,33 @@ public:
   /** Gets the red component of the color.
    * @return The red component of the color. This is a value between 0 and 65535, with 65535 indicating full intensity.
    */
-  guint16 get_red() const;
-
+   guint16 get_red() const;
+ 
   /** Gets the green component of the color.
    * @return The green component of the color. This is a value between 0 and 65535, with 65535 indicating full intensity.
    */
-  guint16 get_green() const;
-
+   guint16 get_green() const;
+ 
   /** Gets the blue component of the color.
    * @return The blue component of the color. This is a value between 0 and 65535, with 65535 indicating full intensity.
    */
-  guint16 get_blue() const;
-
+   guint16 get_blue() const;
+ 
   /** Sets the red component of the color.
    * @param value The red component of the color. This is a value between 0 and 65535, with 65535 indicating full intensity.
    */
-  void set_red(const guint16& value);
-
+   void set_red(const guint16& value);
+ 
   /** Sets the green component of the color.
    * @param value The green component of the color. This is a value between 0 and 65535, with 65535 indicating full intensity.
    */
-  void set_green(const guint16& value);
-
+   void set_green(const guint16& value);
+ 
   /** Sets the blue component of the color.
    * @param value The blue component of the color. This is a value between 0 and 65535, with 65535 indicating full intensity.
    */
-  void set_blue(const guint16& value);
-
+   void set_blue(const guint16& value);
+ 
   
   /** Fill in the fields of a color from a string specification. The
    * string can either one of a large set of standard names. (Taken
@@ -134,5 +135,6 @@ class Value<Pango::Color> : public Glib::Value_Boxed<Pango::Color>
 
 } // namespace Glib
 
+
 #endif /* _PANGOMM_COLOR_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/context.cc b/libs/gtkmm2/pango/pangomm/context.cc
index 5acd2cc9cf..813f79c8f8 100644
--- a/libs/gtkmm2/pango/pangomm/context.cc
+++ b/libs/gtkmm2/pango/pangomm/context.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/context.h>
 #include <pangomm/private/context_p.h>
 
@@ -27,6 +28,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <pango/pangocairo.h>
+#include <pango/pango-types.h> //For PANGO_MATRIX_INIT
+
 namespace Pango
 {
 
@@ -65,6 +69,23 @@ ListHandle_Item Context::itemize(const Glib::ustring& text, int start_index, int
       Glib::OWNERSHIP_DEEP);
 }
 
+void Context::update_from_cairo_context(const Cairo::RefPtr<Cairo::Context>& context)
+{
+  pango_cairo_update_context(context->cobj(), gobj());
+}
+
+Matrix Context::get_matrix() const
+{
+  const PangoMatrix* matrix = pango_context_get_matrix(const_cast<PangoContext*>(gobj()));
+  if(matrix)
+    return *matrix;
+  else
+  {
+    PangoMatrix identity_transform = PANGO_MATRIX_INIT;
+    return identity_transform;
+  }
+}
+
 } /* namespace Pango */
 
 
@@ -122,8 +143,19 @@ void Context_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Context_Class::wrap_new(GObject* object)
 {
@@ -200,7 +232,7 @@ FontMetrics Context::get_metrics(const FontDescription& desc, const Language& la
 
 void Context::set_font_description(const FontDescription& desc)
 {
-  pango_context_set_font_description(gobj(), (desc).gobj());
+pango_context_set_font_description(gobj(), (desc).gobj()); 
 }
 
 FontDescription Context::get_font_description() const
@@ -215,12 +247,12 @@ Language Context::get_language() const
 
 void Context::set_language(const Language& language)
 {
-  pango_context_set_language(gobj(), const_cast<PangoLanguage*>((language).gobj()));
+pango_context_set_language(gobj(), const_cast<PangoLanguage*>((language).gobj())); 
 }
 
 void Context::set_base_dir(Direction direction)
 {
-  pango_context_set_base_dir(gobj(), ((PangoDirection)(direction)));
+pango_context_set_base_dir(gobj(), ((PangoDirection)(direction))); 
 }
 
 Direction Context::get_base_dir() const
@@ -230,10 +262,37 @@ Direction Context::get_base_dir() const
 
 void Context::set_matrix(const Matrix& matrix)
 {
-  pango_context_set_matrix(gobj(), &(matrix));
+pango_context_set_matrix(gobj(), &(matrix)); 
+}
+
+void Context::set_cairo_font_options(const Cairo::FontOptions& options)
+{
+pango_cairo_context_set_font_options(gobj(), (options).cobj()); 
+}
+
+Cairo::FontOptions Context::get_font_options() const
+{
+  return Cairo::FontOptions(const_cast< cairo_font_options_t*>(pango_cairo_context_get_font_options(const_cast<PangoContext*>(gobj()))), false /* take_copy */);
+}
+
+void Context::set_resolution(double dpi)
+{
+pango_cairo_context_set_resolution(gobj(), dpi); 
+}
+
+double Context::get_resolution() const
+{
+  return pango_cairo_context_get_resolution(const_cast<PangoContext*>(gobj()));
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Pango
 
 
diff --git a/libs/gtkmm2/pango/pangomm/context.h b/libs/gtkmm2/pango/pangomm/context.h
index 6ce379ff89..3e8a2f947b 100644
--- a/libs/gtkmm2/pango/pangomm/context.h
+++ b/libs/gtkmm2/pango/pangomm/context.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_CONTEXT_H
 #define _PANGOMM_CONTEXT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -38,6 +39,8 @@
 #include <pangomm/attrlist.h>
 #include <pangomm/types.h> //For Matrix
 #include <pango/pango-context.h>
+#include <cairomm/context.h>
+#include <cairomm/fontoptions.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -285,7 +288,9 @@ public:
    * (No matrix set is the same as setting the identity matrix.).
    */
   void set_matrix(const Matrix& matrix);
-  //TODO: _WRAP_METHOD(Matrix get_matrix() const, pango_context_get_matrix)
+
+  Matrix get_matrix() const;
+  
 
   /** Breaks a piece of text into segments with consistent directional level and shaping engine.
    * Each byte of @a text will be contained in exactly one of the items in the returned list.
@@ -317,16 +322,43 @@ public:
   ListHandle_Item itemize(const Glib::ustring& text, int start_index, int length,
                           const AttrList& attrs, AttrIter& cached_iter) const;
 
+  /** Updates a Pango Context previously created for use with Cairo to
+   * match the current transformation and target surface of a Cairo
+   * Context. If any layouts have been created for the context,
+   * it's necessary to call Pango::Layout::context_changed() on those
+   * layouts.
+   *
+   * @param context A Cairo context, from CairoFontMap::create_context().
+   */
+  void update_from_cairo_context(const Cairo::RefPtr<Cairo::Context>& context);
+
+
+  void set_cairo_font_options(const Cairo::FontOptions& options);
+
+ 
+  Cairo::FontOptions get_font_options() const;
+
+  
+  void set_resolution(double dpi);
+  
+  double get_resolution() const;
+
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/pango/pangomm/coverage.cc b/libs/gtkmm2/pango/pangomm/coverage.cc
index e755994012..b5b88afd10 100644
--- a/libs/gtkmm2/pango/pangomm/coverage.cc
+++ b/libs/gtkmm2/pango/pangomm/coverage.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/coverage.h>
 #include <pangomm/private/coverage_p.h>
 
@@ -40,7 +41,6 @@ Glib::ArrayHandle<unsigned char> Coverage::to_bytes() const
 
 } /* namespace Pango */
 
-
 namespace
 {
 } // anonymous namespace
@@ -130,6 +130,7 @@ Glib::RefPtr<Coverage> Coverage::create(const guchar* bytes, int n_bytes)
   return Glib::wrap(pango_coverage_from_bytes(const_cast<guchar*>(bytes), n_bytes));
 }
 
+
 CoverageLevel Coverage::get(int index) const
 {
   return ((CoverageLevel)(pango_coverage_get(const_cast<PangoCoverage*>(gobj()), index)));
@@ -137,12 +138,12 @@ CoverageLevel Coverage::get(int index) const
 
 void Coverage::set(int index, CoverageLevel level)
 {
-  pango_coverage_set(gobj(), index, ((PangoCoverageLevel)(level)));
+pango_coverage_set(gobj(), index, ((PangoCoverageLevel)(level))); 
 }
 
 void Coverage::max(const Glib::RefPtr<Coverage>& other) const
 {
-  pango_coverage_max(const_cast<PangoCoverage*>(gobj()), Glib::unwrap(other));
+pango_coverage_max(const_cast<PangoCoverage*>(gobj()), Glib::unwrap(other)); 
 }
 
 
diff --git a/libs/gtkmm2/pango/pangomm/coverage.h b/libs/gtkmm2/pango/pangomm/coverage.h
index eebbffd628..30e4ec608e 100644
--- a/libs/gtkmm2/pango/pangomm/coverage.h
+++ b/libs/gtkmm2/pango/pangomm/coverage.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_COVERAGE_H
 #define _PANGOMM_COVERAGE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -165,5 +166,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _PANGOMM_COVERAGE_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/font.cc b/libs/gtkmm2/pango/pangomm/font.cc
index b126931536..4df6f821bd 100644
--- a/libs/gtkmm2/pango/pangomm/font.cc
+++ b/libs/gtkmm2/pango/pangomm/font.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/font.h>
 #include <pangomm/private/font_p.h>
 
@@ -26,6 +27,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <pangomm/fontmap.h>
+
 namespace Pango
 {
 
@@ -99,8 +102,19 @@ void Font_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Font_Class::wrap_new(GObject* object)
 {
@@ -148,6 +162,11 @@ FontDescription Font::describe() const
   return FontDescription((pango_font_describe(const_cast<PangoFont*>(gobj()))));
 }
 
+FontDescription Font::describe_with_absolute_size() const
+{
+  return FontDescription((pango_font_describe_with_absolute_size(const_cast<PangoFont*>(gobj()))));
+}
+
 Glib::RefPtr<Coverage> Font::get_coverage(const Language& language) const
 {
   return Glib::wrap(pango_font_get_coverage(const_cast<PangoFont*>(gobj()), const_cast<PangoLanguage*>((language).gobj())));
@@ -160,9 +179,26 @@ FontMetrics Font::get_metrics(const Language& language) const
 
 void Font::get_glyph_extents(Glyph glyph, Rectangle& ink_rect, Rectangle& logical_rect) const
 {
-  pango_font_get_glyph_extents(const_cast<PangoFont*>(gobj()), glyph, (ink_rect).gobj(), (logical_rect).gobj());
+pango_font_get_glyph_extents(const_cast<PangoFont*>(gobj()), glyph, (ink_rect).gobj(), (logical_rect).gobj()); 
 }
 
+Glib::RefPtr<FontMap> Font::get_font_map()
+{
+  return Glib::wrap(pango_font_get_font_map(gobj()));
+}
+
+Glib::RefPtr<const FontMap> Font::get_font_map() const
+{
+  return const_cast<Font*>(this)->get_font_map();
+}
+
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
 
 } // namespace Pango
 
diff --git a/libs/gtkmm2/pango/pangomm/font.h b/libs/gtkmm2/pango/pangomm/font.h
index 6aa53a1629..ab7a221332 100644
--- a/libs/gtkmm2/pango/pangomm/font.h
+++ b/libs/gtkmm2/pango/pangomm/font.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_FONT_H
 #define _PANGOMM_FONT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -57,6 +58,9 @@ const double SCALE_LARGE    = 1.2;
 const double SCALE_X_LARGE  = 1.4399999999999;
 const double SCALE_XX_LARGE = 1.728;
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+class FontMap;
+#endif //DOXYGEN_SHOULD_SKIP_THIS
 
 /** A Pango::Font is used to represent a font in a rendering-system-independent matter.
  */
@@ -114,6 +118,8 @@ public:
    */
   FontDescription describe() const;
   
+  FontDescription describe_with_absolute_size() const;
+  
   /** Computes the coverage map for a given font and language tag.
    * @param language The language tag.
    * @return A newly-allocated Pango::Coverage object.
@@ -150,6 +156,17 @@ public:
    */
   void get_glyph_extents(Glyph glyph, Rectangle& ink_rect, Rectangle& logical_rect) const;
 
+  
+  /** Gets the font map for which the font was created.
+   * @return The Pango::FontMap for the font.
+   */
+  Glib::RefPtr<FontMap> get_font_map();
+  
+  /** Gets the font map for which the font was created.
+   * @return The Pango::FontMap for the font.
+   */
+  Glib::RefPtr<const FontMap> get_font_map() const;
+
   /** Get the ink extents of a glyph within the font.
    * @param glyph The glyph index.
    * @return The extents of the glyph as drawn.
@@ -167,11 +184,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/pango/pangomm/fontdescription.cc b/libs/gtkmm2/pango/pangomm/fontdescription.cc
index af866dc9cb..dc5bd3ef94 100644
--- a/libs/gtkmm2/pango/pangomm/fontdescription.cc
+++ b/libs/gtkmm2/pango/pangomm/fontdescription.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/fontdescription.h>
 #include <pangomm/private/fontdescription_p.h>
 
@@ -147,7 +148,7 @@ guint FontDescription::hash() const
 
 void FontDescription::set_family(const Glib::ustring& family)
 {
-  pango_font_description_set_family(gobj(), family.c_str());
+pango_font_description_set_family(gobj(), family.c_str()); 
 }
 
 Glib::ustring FontDescription::get_family() const
@@ -157,7 +158,7 @@ Glib::ustring FontDescription::get_family() const
 
 void FontDescription::set_style(Style style)
 {
-  pango_font_description_set_style(gobj(), ((PangoStyle)(style)));
+pango_font_description_set_style(gobj(), ((PangoStyle)(style))); 
 }
 
 Style FontDescription::get_style() const
@@ -167,7 +168,7 @@ Style FontDescription::get_style() const
 
 void FontDescription::set_variant(Variant variant)
 {
-  pango_font_description_set_variant(gobj(), ((PangoVariant)(variant)));
+pango_font_description_set_variant(gobj(), ((PangoVariant)(variant))); 
 }
 
 Variant FontDescription::get_variant() const
@@ -177,7 +178,7 @@ Variant FontDescription::get_variant() const
 
 void FontDescription::set_weight(Weight weight)
 {
-  pango_font_description_set_weight(gobj(), ((PangoWeight)(weight)));
+pango_font_description_set_weight(gobj(), ((PangoWeight)(weight))); 
 }
 
 Weight FontDescription::get_weight() const
@@ -187,7 +188,7 @@ Weight FontDescription::get_weight() const
 
 void FontDescription::set_stretch(Stretch stretch)
 {
-  pango_font_description_set_stretch(gobj(), ((PangoStretch)(stretch)));
+pango_font_description_set_stretch(gobj(), ((PangoStretch)(stretch))); 
 }
 
 Stretch FontDescription::get_stretch() const
@@ -197,7 +198,7 @@ Stretch FontDescription::get_stretch() const
 
 void FontDescription::set_size(int size)
 {
-  pango_font_description_set_size(gobj(), size);
+pango_font_description_set_size(gobj(), size); 
 }
 
 int FontDescription::get_size() const
@@ -205,6 +206,16 @@ int FontDescription::get_size() const
   return pango_font_description_get_size(const_cast<PangoFontDescription*>(gobj()));
 }
 
+void FontDescription::set_absolute_size(double size)
+{
+pango_font_description_set_absolute_size(gobj(), size); 
+}
+
+bool FontDescription::get_size_is_absolute() const
+{
+  return pango_font_description_get_size_is_absolute(const_cast<PangoFontDescription*>(gobj()));
+}
+
 FontMask FontDescription::get_set_fields() const
 {
   return ((FontMask)(pango_font_description_get_set_fields(const_cast<PangoFontDescription*>(gobj()))));
@@ -212,12 +223,12 @@ FontMask FontDescription::get_set_fields() const
 
 void FontDescription::unset_fields(FontMask to_unset)
 {
-  pango_font_description_unset_fields(gobj(), ((PangoFontMask)(to_unset)));
+pango_font_description_unset_fields(gobj(), ((PangoFontMask)(to_unset))); 
 }
 
 void FontDescription::merge(const FontDescription& desc_to_merge, bool replace_existing)
 {
-  pango_font_description_merge(gobj(), (desc_to_merge).gobj(), static_cast<int>(replace_existing));
+pango_font_description_merge(gobj(), (desc_to_merge).gobj(), static_cast<int>(replace_existing)); 
 }
 
 bool FontDescription::better_match(const FontDescription& old_match, const FontDescription& new_match) const
diff --git a/libs/gtkmm2/pango/pangomm/fontdescription.h b/libs/gtkmm2/pango/pangomm/fontdescription.h
index 1c51be840c..9d2def1537 100644
--- a/libs/gtkmm2/pango/pangomm/fontdescription.h
+++ b/libs/gtkmm2/pango/pangomm/fontdescription.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_FONTDESCRIPTION_H
 #define _PANGOMM_FONTDESCRIPTION_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -145,6 +146,7 @@ enum Weight
   WEIGHT_ULTRALIGHT = 200,
   WEIGHT_LIGHT = 300,
   WEIGHT_NORMAL = 400,
+  WEIGHT_SEMIBOLD = 600,
   WEIGHT_BOLD = 700,
   WEIGHT_ULTRABOLD = 800,
   WEIGHT_HEAVY = 900
@@ -414,6 +416,26 @@ public:
    */
   int get_size() const;
   
+  /** Sets the size field of a font description, in device units. This is mutually
+   * exclusive with pango_font_description_set_size().
+   * 
+   * Since: 1.8
+   * @param size The new size, in pango units. There are Pango::SCALE Pango units in one
+   * device unit. For an output backend where a device unit is a pixel, a @a size 
+   * value of 10 * PANGO_SCALE gives a 10 pixel font.
+   */
+  void set_absolute_size(double size);
+  
+  /** Determines whether the size of the font is in points or device units.
+   * See pango_font_description_set_size() and pango_font_description_set_absolute_size().
+   * @return Whether the the size for the font description is in
+   * points or device units.  Use pango_font_description_get_set_fields() to
+   * find out if the size field of the font description was explicitely set or not.
+   * 
+   * Since: 1.8.
+   */
+  bool get_size_is_absolute() const;
+  
   /** Determines which fields in a font description have been set.
    * @return A bitmask with bits set corresponding to the
    * fields in @a desc  that have been set.
@@ -525,5 +547,6 @@ class Value<Pango::FontDescription> : public Glib::Value_Boxed<Pango::FontDescri
 
 } // namespace Glib
 
+
 #endif /* _PANGOMM_FONTDESCRIPTION_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/fontface.cc b/libs/gtkmm2/pango/pangomm/fontface.cc
index 44c087aaef..ea64503e78 100644
--- a/libs/gtkmm2/pango/pangomm/fontface.cc
+++ b/libs/gtkmm2/pango/pangomm/fontface.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/fontface.h>
 #include <pangomm/private/fontface_p.h>
 
@@ -88,8 +89,19 @@ void FontFace_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* FontFace_Class::wrap_new(GObject* object)
 {
@@ -143,6 +155,13 @@ Glib::ustring FontFace::get_name() const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Pango
 
 
diff --git a/libs/gtkmm2/pango/pangomm/fontface.h b/libs/gtkmm2/pango/pangomm/fontface.h
index 64b0317c7c..7eea486ad5 100644
--- a/libs/gtkmm2/pango/pangomm/fontface.h
+++ b/libs/gtkmm2/pango/pangomm/fontface.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_FONTFACE_H
 #define _PANGOMM_FONTFACE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -124,11 +125,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/pango/pangomm/fontfamily.cc b/libs/gtkmm2/pango/pangomm/fontfamily.cc
index da7f0be452..12b164645b 100644
--- a/libs/gtkmm2/pango/pangomm/fontfamily.cc
+++ b/libs/gtkmm2/pango/pangomm/fontfamily.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/fontfamily.h>
 #include <pangomm/private/fontfamily_p.h>
 
@@ -89,8 +90,19 @@ void FontFamily_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* FontFamily_Class::wrap_new(GObject* object)
 {
@@ -144,6 +156,13 @@ bool FontFamily::is_monospace() const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Pango
 
 
diff --git a/libs/gtkmm2/pango/pangomm/fontfamily.h b/libs/gtkmm2/pango/pangomm/fontfamily.h
index f763866a19..363cb9644e 100644
--- a/libs/gtkmm2/pango/pangomm/fontfamily.h
+++ b/libs/gtkmm2/pango/pangomm/fontfamily.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_FONTFAMILY_H
 #define _PANGOMM_FONTFAMILY_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -130,11 +131,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/pango/pangomm/fontmap.cc b/libs/gtkmm2/pango/pangomm/fontmap.cc
index 1e5caa8ab4..a54704503a 100644
--- a/libs/gtkmm2/pango/pangomm/fontmap.cc
+++ b/libs/gtkmm2/pango/pangomm/fontmap.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/fontmap.h>
 #include <pangomm/private/fontmap_p.h>
 
@@ -93,8 +94,19 @@ void FontMap_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* FontMap_Class::wrap_new(GObject* object)
 {
@@ -148,6 +160,13 @@ Glib::RefPtr<Fontset> FontMap::load_fontset(const Glib::RefPtr<Context>& context
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Pango
 
 
diff --git a/libs/gtkmm2/pango/pangomm/fontmap.h b/libs/gtkmm2/pango/pangomm/fontmap.h
index c05fe7cc44..575186607f 100644
--- a/libs/gtkmm2/pango/pangomm/fontmap.h
+++ b/libs/gtkmm2/pango/pangomm/fontmap.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_FONTMAP_H
 #define _PANGOMM_FONTMAP_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -126,11 +127,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/pango/pangomm/fontmetrics.cc b/libs/gtkmm2/pango/pangomm/fontmetrics.cc
index d9ba904f5b..a70dae136b 100644
--- a/libs/gtkmm2/pango/pangomm/fontmetrics.cc
+++ b/libs/gtkmm2/pango/pangomm/fontmetrics.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/fontmetrics.h>
 #include <pangomm/private/fontmetrics_p.h>
 
@@ -26,7 +27,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 namespace
 {
 } // anonymous namespace
diff --git a/libs/gtkmm2/pango/pangomm/fontmetrics.h b/libs/gtkmm2/pango/pangomm/fontmetrics.h
index 8b66669f81..49369bf225 100644
--- a/libs/gtkmm2/pango/pangomm/fontmetrics.h
+++ b/libs/gtkmm2/pango/pangomm/fontmetrics.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_FONTMETRICS_H
 #define _PANGOMM_FONTMETRICS_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -183,5 +184,6 @@ class Value<Pango::FontMetrics> : public Glib::Value_Boxed<Pango::FontMetrics>
 
 } // namespace Glib
 
+
 #endif /* _PANGOMM_FONTMETRICS_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/fontset.cc b/libs/gtkmm2/pango/pangomm/fontset.cc
index 2d684bde16..4888102356 100644
--- a/libs/gtkmm2/pango/pangomm/fontset.cc
+++ b/libs/gtkmm2/pango/pangomm/fontset.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/fontset.h>
 #include <pangomm/private/fontset_p.h>
 
@@ -25,16 +26,17 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-namespace { //anonymous
-
-gboolean fontset_foreach_callback(PangoFontset* /* fontset */, PangoFont* font, gpointer data)
+static gboolean fontset_foreach_callback(PangoFontset* /* fontset */, PangoFont* font, gpointer data)
 {
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
   {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     Pango::Fontset::ForeachSlot& slot = *static_cast<Pango::Fontset::ForeachSlot*>(data);
     Glib::RefPtr<Pango::Font> cppFont = Glib::wrap(font, true /* take_copy */);
-    
+
     return slot(cppFont);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
   }
   catch(...)
   {
@@ -42,11 +44,10 @@ gboolean fontset_foreach_callback(PangoFontset* /* fontset */, PangoFont* font,
   }
 
   return false; //arbitrary default
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
 }
 
 
-} //anonymous namespace
-
 namespace Pango
 {
 
@@ -57,7 +58,6 @@ void Fontset::foreach(const ForeachSlot& slot)
            
 } //namespace
 
-
 namespace
 {
 } // anonymous namespace
@@ -106,8 +106,19 @@ void Fontset_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Fontset_Class::wrap_new(GObject* object)
 {
@@ -161,6 +172,13 @@ FontMetrics Fontset::get_metrics() const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Pango
 
 
diff --git a/libs/gtkmm2/pango/pangomm/fontset.h b/libs/gtkmm2/pango/pangomm/fontset.h
index d3baddfbea..eb8a1d1ea3 100644
--- a/libs/gtkmm2/pango/pangomm/fontset.h
+++ b/libs/gtkmm2/pango/pangomm/fontset.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_FONTSET_H
 #define _PANGOMM_FONTSET_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -116,7 +117,7 @@ public:
   /** Iterates through all the fonts in a fontset, calling @a slot for
    * each one. If @a slot returns true, that stops the iteration.
    *
-   * Since: 1.4
+   * @since-1.4
    *
    * @param slot Callback function
    */
@@ -127,11 +128,17 @@ public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/pango/pangomm/glyph.cc b/libs/gtkmm2/pango/pangomm/glyph.cc
index bf595ec5b0..c68065705b 100644
--- a/libs/gtkmm2/pango/pangomm/glyph.cc
+++ b/libs/gtkmm2/pango/pangomm/glyph.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/glyph.h>
 #include <pangomm/private/glyph_p.h>
 
@@ -91,7 +92,6 @@ const Pango::GlyphVisAttr& wrap(const PangoGlyphVisAttr* object)
 
 } //namespace Glib
 
-
 namespace
 {
 } // anonymous namespace
@@ -101,21 +101,21 @@ namespace Pango
 {
 
 
-Glyph GlyphInfo::get_glyph() const
+ Glyph GlyphInfo::get_glyph() const
 {
   return gobj()->glyph;
 }
-
-GlyphGeometry GlyphInfo::get_geometry() const
+ 
+ GlyphGeometry GlyphInfo::get_geometry() const
 {
   return GlyphGeometry(&(gobj()->geometry));
 }
-
-GlyphVisAttr GlyphInfo::get_attr() const
+ 
+ GlyphVisAttr GlyphInfo::get_attr() const
 {
   return gobj()->attr;
 }
-
+ 
 
 } // namespace Pango
 
@@ -124,21 +124,21 @@ namespace Pango
 {
 
 
-GlyphUnit GlyphGeometry::get_width() const
+ GlyphUnit GlyphGeometry::get_width() const
 {
   return gobj()->width;
 }
-
-GlyphUnit GlyphGeometry::get_x_offset() const
+ 
+ GlyphUnit GlyphGeometry::get_x_offset() const
 {
   return gobj()->x_offset;
 }
-
-GlyphUnit GlyphGeometry::get_y_offset() const
+ 
+ GlyphUnit GlyphGeometry::get_y_offset() const
 {
   return gobj()->y_offset;
 }
-
+ 
 
 } // namespace Pango
 
diff --git a/libs/gtkmm2/pango/pangomm/glyph.h b/libs/gtkmm2/pango/pangomm/glyph.h
index 387999d306..5f61e19b9b 100644
--- a/libs/gtkmm2/pango/pangomm/glyph.h
+++ b/libs/gtkmm2/pango/pangomm/glyph.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_GLYPH_H
 #define _PANGOMM_GLYPH_H
 
+
 #include <glibmm.h>
 
 /* glyph.h
@@ -68,18 +69,18 @@ public:
   /** Gets the glyph itself.
    * @return The glyph.
    */
-  Glyph get_glyph() const;
-
+   Glyph get_glyph() const;
+ 
   /** Gets the positional information about the glyph.
    * @return A GylphGeometry object.
    */
-  GlyphGeometry get_geometry() const;
-
+   GlyphGeometry get_geometry() const;
+ 
   /** Gets the visual attributes of the glyph.
    * @return A GlyphVisAttr structure.
    */
-  GlyphVisAttr get_attr() const;
-
+   GlyphVisAttr get_attr() const;
+ 
 //I don't think that we need these set_* functions!
 //TODO: Who wrote this? Investigate. murrayc.
   /* Sets the glyph itself.
@@ -129,18 +130,18 @@ public:
   /** Gets the logical width to use for the character.
    * @return The logical width.
    */
-  GlyphUnit get_width() const;
-
+   GlyphUnit get_width() const;
+ 
   /** Gets the horizontal offset from nominal character position.
    * @return The horizontal offset.
    */
-  GlyphUnit get_x_offset() const;
-
+   GlyphUnit get_x_offset() const;
+ 
   /** Gets the vertical offset from nominal character position.
    * @return The vertical offset.
    */
-  GlyphUnit get_y_offset() const;
-
+   GlyphUnit get_y_offset() const;
+ 
 //I don't think that we need these set_* functions!
   /* Sets the logical width to use for the character.
    * @param width The new logical width.
@@ -218,5 +219,6 @@ const Pango::GlyphGeometry& wrap(const PangoGlyphGeometry* object);
 
 } //namespace Glib
 
+
 #endif /* _PANGOMM_GLYPH_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/glyphstring.cc b/libs/gtkmm2/pango/pangomm/glyphstring.cc
index 38ba283c70..eb4d55b5d7 100644
--- a/libs/gtkmm2/pango/pangomm/glyphstring.cc
+++ b/libs/gtkmm2/pango/pangomm/glyphstring.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/glyphstring.h>
 #include <pangomm/private/glyphstring_p.h>
 
@@ -26,7 +27,7 @@
  */
 
 #include <glibmm/utility.h>
-
+#include <pango/pangocairo.h>
 
 namespace Pango
 {
@@ -94,7 +95,6 @@ Glib::ArrayHandle<GlyphInfo> GlyphString::get_glyphs() const
 
 } //namespace Pango
 
-
 namespace
 {
 } // anonymous namespace
@@ -167,17 +167,17 @@ PangoGlyphString* GlyphString::gobj_copy() const
 
 void GlyphString::set_size(int new_len)
 {
-  pango_glyph_string_set_size(gobj(), new_len);
+pango_glyph_string_set_size(gobj(), new_len); 
 }
 
 void GlyphString::get_extents(const Glib::RefPtr<const Font>& font, Rectangle& ink_rect, Rectangle& logical_rect) const
 {
-  pango_glyph_string_extents(const_cast<PangoGlyphString*>(gobj()), const_cast<PangoFont*>(Glib::unwrap<Font>(font)), (ink_rect).gobj(), (logical_rect).gobj());
+pango_glyph_string_extents(const_cast<PangoGlyphString*>(gobj()), const_cast<PangoFont*>(Glib::unwrap<Font>(font)), (ink_rect).gobj(), (logical_rect).gobj()); 
 }
 
 void GlyphString::get_extents(int start, int end, const Glib::RefPtr<const Font>& font, Rectangle& ink_rect, Rectangle& logical_rect) const
 {
-  pango_glyph_string_extents_range(const_cast<PangoGlyphString*>(gobj()), start, end, const_cast<PangoFont*>(Glib::unwrap<Font>(font)), (ink_rect).gobj(), (logical_rect).gobj());
+pango_glyph_string_extents_range(const_cast<PangoGlyphString*>(gobj()), start, end, const_cast<PangoFont*>(Glib::unwrap<Font>(font)), (ink_rect).gobj(), (logical_rect).gobj()); 
 }
 
 
diff --git a/libs/gtkmm2/pango/pangomm/glyphstring.h b/libs/gtkmm2/pango/pangomm/glyphstring.h
index 7313e41766..9f8dcf520e 100644
--- a/libs/gtkmm2/pango/pangomm/glyphstring.h
+++ b/libs/gtkmm2/pango/pangomm/glyphstring.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_GLYPHSTRING_H
 #define _PANGOMM_GLYPHSTRING_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -29,6 +30,7 @@
 #include <pangomm/font.h>
 #include <pangomm/glyph.h>
 #include <pangomm/item.h>
+#include <cairomm/context.h>
 #include <pango/pango-glyph.h>
 #include <pango/pango-item.h> //For PangoAnalysis.
 
@@ -183,6 +185,8 @@ public:
    */
   Glib::ArrayHandle<GlyphInfo> get_glyphs() const;
 
+  //TODO: Wrap pango_cairo_glyph_string_path().
+
 
 };
 
@@ -219,5 +223,6 @@ class Value<Pango::GlyphString> : public Glib::Value_Boxed<Pango::GlyphString>
 
 } // namespace Glib
 
+
 #endif /* _PANGOMM_GLYPHSTRING_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/item.cc b/libs/gtkmm2/pango/pangomm/item.cc
index f798552e1b..e120630df4 100644
--- a/libs/gtkmm2/pango/pangomm/item.cc
+++ b/libs/gtkmm2/pango/pangomm/item.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/item.h>
 #include <pangomm/private/item_p.h>
 
@@ -137,7 +138,7 @@ namespace Pango
 {
 
 
-Glib::RefPtr<Font> Analysis::get_font()
+ Glib::RefPtr<Font> Analysis::get_font()
 {
   Glib::RefPtr<Font> ref_ptr(Glib::wrap(gobj()->font));
 
@@ -156,17 +157,17 @@ Glib::RefPtr<const Font> Analysis::get_font() const
 
   return ref_ptr;
 }
-
-guint8 Analysis::get_level() const
+ 
+ guint8 Analysis::get_level() const
 {
   return gobj()->level;
 }
-
-Language Analysis::get_language() const
+ 
+ Language Analysis::get_language() const
 {
   return Language(gobj()->language);
 }
-
+ 
 
 } // namespace Pango
 
@@ -180,21 +181,21 @@ Item Item::split(int split_index, int split_offset)
   return Item((pango_item_split(gobj(), split_index, split_offset)));
 }
 
-int Item::get_offset() const
+ int Item::get_offset() const
 {
   return gobj()->offset;
 }
-
-int Item::get_length() const
+ 
+ int Item::get_length() const
 {
   return gobj()->length;
 }
-
-int Item::get_num_chars() const
+ 
+ int Item::get_num_chars() const
 {
   return gobj()->num_chars;
 }
-
+ 
 
 } // namespace Pango
 
diff --git a/libs/gtkmm2/pango/pangomm/item.h b/libs/gtkmm2/pango/pangomm/item.h
index 3e58b9a069..fd871f9273 100644
--- a/libs/gtkmm2/pango/pangomm/item.h
+++ b/libs/gtkmm2/pango/pangomm/item.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_ITEM_H
 #define _PANGOMM_ITEM_H
 
+
 #include <glibmm.h>
 
 /* Copyright (C) 2002 The gtkmm Development Team
@@ -64,19 +65,19 @@ public:
   /** Gets the font used to render this segment.
    * @return The font used to render this segment.
    */
-  Glib::RefPtr<Font> get_font();
+   Glib::RefPtr<Font> get_font();
   Glib::RefPtr<const Font> get_font() const;
-
+ 
   /** Gets the bidrectional level for this segment.
    * @return The bidirectional level for this segment.
    */
-  guint8 get_level() const;
-
+   guint8 get_level() const;
+ 
   /** Gets the language of this segment.
    * @return The language of this segment.
    */
-  Language get_language() const;
-
+   Language get_language() const;
+ 
   /** Gets a list of non-font attributes for this segment.
    * @return A list of non-font attributes for this segment.
    */
@@ -149,18 +150,18 @@ public:
   /** Gets the offset of the segment from the beginning of the string in bytes.
    * @return The offset of the segment from the beginning of the string in bytes.
    */
-  int get_offset() const;
-
+   int get_offset() const;
+ 
   /** Gets the length of the segment in bytes.
    * @return The length of the segment in bytes.
    */
-  int get_length() const;
-
+   int get_length() const;
+ 
   /** Gets the length of the segment in characters.
    * @return The length of the semgment in characters.
    */
-  int get_num_chars() const;
-
+   int get_num_chars() const;
+ 
   /** Gets the properties of the segment.
    * @return The properties of the segment.
    */
diff --git a/libs/gtkmm2/pango/pangomm/language.cc b/libs/gtkmm2/pango/pangomm/language.cc
index db2fd1fde4..120f6e7216 100644
--- a/libs/gtkmm2/pango/pangomm/language.cc
+++ b/libs/gtkmm2/pango/pangomm/language.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/language.h>
 #include <pangomm/private/language_p.h>
 
@@ -69,7 +70,6 @@ Glib::ustring Language::get_string() const
 
 } /* namespace Pango */
 
-
 namespace
 {
 } // anonymous namespace
diff --git a/libs/gtkmm2/pango/pangomm/language.h b/libs/gtkmm2/pango/pangomm/language.h
index f4f762eb39..9887f64bda 100644
--- a/libs/gtkmm2/pango/pangomm/language.h
+++ b/libs/gtkmm2/pango/pangomm/language.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_LANGUAGE_H
 #define _PANGOMM_LANGUAGE_H
 
+
 #include <glibmm.h>
 
 /* Copyright (C) 2002 The gtkmm Development Team
@@ -241,5 +242,6 @@ class Value<Pango::Language> : public Glib::Value_Boxed<Pango::Language>
 
 } // namespace Glib
 
+
 #endif /* _PANGOMM_LANGUAGE_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/layout.cc b/libs/gtkmm2/pango/pangomm/layout.cc
index 96d45e2037..91fbeb1a6e 100644
--- a/libs/gtkmm2/pango/pangomm/layout.cc
+++ b/libs/gtkmm2/pango/pangomm/layout.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/layout.h>
 #include <pangomm/private/layout_p.h>
 
@@ -26,6 +27,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <pango/pangocairo.h>
+
 namespace Pango
 {
 
@@ -34,6 +37,16 @@ Layout::Layout(const Glib::RefPtr<Context>& context)
   Glib::Object(G_OBJECT(pango_layout_new(context->gobj())))
 {}
 
+Glib::RefPtr<Layout> Layout::create(const Cairo::RefPtr<Cairo::Context>& context)
+{
+  return Glib::wrap( pango_cairo_create_layout(context->cobj()) );
+}
+
+void Layout::update_from_cairo_context(const Cairo::RefPtr<Cairo::Context>& context)
+{
+  pango_cairo_update_layout(context->cobj(), gobj());
+}
+
 void Layout::set_text(const Glib::ustring& text)
 {
   pango_layout_set_text(gobj(), text.c_str(), text.bytes());
@@ -118,8 +131,12 @@ void Layout::unset_font_description()
   pango_layout_set_font_description(gobj(), 0);
 }
 
-} /* namespace Pango */
+void Layout::add_to_cairo_context(const Cairo::RefPtr<Cairo::Context>& context)
+{
+  pango_cairo_layout_path(context->cobj(), gobj());
+}
 
+} /* namespace Pango */
 
 namespace
 {
@@ -187,8 +204,19 @@ void Layout_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Layout_Class::wrap_new(GObject* object)
 {
@@ -244,15 +272,15 @@ Glib::RefPtr<Context> Layout::get_context() const
 {
 
   Glib::RefPtr<Context> retvalue = Glib::wrap(pango_layout_get_context(const_cast<PangoLayout*>(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 void Layout::set_attributes(AttrList& attrs)
 {
-  pango_layout_set_attributes(gobj(), (attrs).gobj());
+pango_layout_set_attributes(gobj(), (attrs).gobj()); 
 }
 
 AttrList Layout::get_attributes() const
@@ -267,12 +295,17 @@ Glib::ustring Layout::get_text() const
 
 void Layout::set_font_description(const FontDescription& desc)
 {
-  pango_layout_set_font_description(gobj(), (desc).gobj());
+pango_layout_set_font_description(gobj(), (desc).gobj()); 
+}
+
+FontDescription Layout::get_font_description() const
+{
+  return FontDescription(const_cast<PangoFontDescription*>(pango_layout_get_font_description(const_cast<PangoLayout*>(gobj()))));
 }
 
 void Layout::set_width(int width)
 {
-  pango_layout_set_width(gobj(), width);
+pango_layout_set_width(gobj(), width); 
 }
 
 int Layout::get_width() const
@@ -282,7 +315,7 @@ int Layout::get_width() const
 
 void Layout::set_wrap(WrapMode wrap)
 {
-  pango_layout_set_wrap(gobj(), ((PangoWrapMode)(wrap)));
+pango_layout_set_wrap(gobj(), ((PangoWrapMode)(wrap))); 
 }
 
 WrapMode Layout::get_wrap() const
@@ -292,7 +325,7 @@ WrapMode Layout::get_wrap() const
 
 void Layout::set_indent(int indent)
 {
-  pango_layout_set_indent(gobj(), indent);
+pango_layout_set_indent(gobj(), indent); 
 }
 
 int Layout::get_indent() const
@@ -302,7 +335,7 @@ int Layout::get_indent() const
 
 void Layout::set_spacing(int spacing)
 {
-  pango_layout_set_spacing(gobj(), spacing);
+pango_layout_set_spacing(gobj(), spacing); 
 }
 
 int Layout::get_spacing() const
@@ -312,7 +345,7 @@ int Layout::get_spacing() const
 
 void Layout::set_justify(bool justify)
 {
-  pango_layout_set_justify(gobj(), static_cast<int>(justify));
+pango_layout_set_justify(gobj(), static_cast<int>(justify)); 
 }
 
 bool Layout::get_justify() const
@@ -327,12 +360,12 @@ bool Layout::get_auto_dir() const
 
 void Layout::set_auto_dir(bool auto_dir)
 {
-  pango_layout_set_auto_dir(gobj(), static_cast<int>(auto_dir));
+pango_layout_set_auto_dir(gobj(), static_cast<int>(auto_dir)); 
 }
 
 void Layout::set_alignment(Alignment alignment)
 {
-  pango_layout_set_alignment(gobj(), ((PangoAlignment)(alignment)));
+pango_layout_set_alignment(gobj(), ((PangoAlignment)(alignment))); 
 }
 
 Alignment Layout::get_alignment() const
@@ -342,7 +375,7 @@ Alignment Layout::get_alignment() const
 
 void Layout::set_tabs(TabArray& tabs)
 {
-  pango_layout_set_tabs(gobj(), (tabs).gobj());
+pango_layout_set_tabs(gobj(), (tabs).gobj()); 
 }
 
 TabArray Layout::get_tabs() const
@@ -352,7 +385,7 @@ TabArray Layout::get_tabs() const
 
 void Layout::set_single_paragraph_mode(bool setting)
 {
-  pango_layout_set_single_paragraph_mode(gobj(), static_cast<int>(setting));
+pango_layout_set_single_paragraph_mode(gobj(), static_cast<int>(setting)); 
 }
 
 bool Layout::get_single_paragraph_mode() const
@@ -362,7 +395,7 @@ bool Layout::get_single_paragraph_mode() const
 
 void Layout::set_ellipsize(EllipsizeMode ellipsize)
 {
-  pango_layout_set_ellipsize(gobj(), ((PangoEllipsizeMode)(ellipsize)));
+pango_layout_set_ellipsize(gobj(), ((PangoEllipsizeMode)(ellipsize))); 
 }
 
 EllipsizeMode Layout::get_ellipsize() const
@@ -372,17 +405,22 @@ EllipsizeMode Layout::get_ellipsize() const
 
 void Layout::context_changed()
 {
-  pango_layout_context_changed(gobj());
+pango_layout_context_changed(gobj()); 
+}
+
+void Layout::index_to_line_x(int index_, bool trailing, int& line, int& x_pos) const
+{
+pango_layout_index_to_line_x(const_cast<PangoLayout*>(gobj()), index_, static_cast<int>(trailing), &line, &x_pos); 
 }
 
 void Layout::get_cursor_pos(int index, Rectangle& strong_pos, Rectangle& weak_pos) const
 {
-  pango_layout_get_cursor_pos(const_cast<PangoLayout*>(gobj()), index, (strong_pos).gobj(), (weak_pos).gobj());
+pango_layout_get_cursor_pos(const_cast<PangoLayout*>(gobj()), index, (strong_pos).gobj(), (weak_pos).gobj()); 
 }
 
 void Layout::move_cursor_visually(bool strong, int old_index, int old_trailing, int direction, int& new_index, int& new_trailing) const
 {
-  pango_layout_move_cursor_visually(const_cast<PangoLayout*>(gobj()), static_cast<int>(strong), old_index, old_trailing, direction, &new_index, &new_trailing);
+pango_layout_move_cursor_visually(const_cast<PangoLayout*>(gobj()), static_cast<int>(strong), old_index, old_trailing, direction, &new_index, &new_trailing); 
 }
 
 bool Layout::xy_to_index(int x, int y, int& index, int& trailing) const
@@ -392,22 +430,22 @@ bool Layout::xy_to_index(int x, int y, int& index, int& trailing) const
 
 void Layout::get_extents(Rectangle& ink_rect, Rectangle& logical_rect) const
 {
-  pango_layout_get_extents(const_cast<PangoLayout*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj());
+pango_layout_get_extents(const_cast<PangoLayout*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj()); 
 }
 
 void Layout::get_pixel_extents(Rectangle& ink_rect, Rectangle& logical_rect) const
 {
-  pango_layout_get_pixel_extents(const_cast<PangoLayout*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj());
+pango_layout_get_pixel_extents(const_cast<PangoLayout*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj()); 
 }
 
 void Layout::get_size(int& width, int& height) const
 {
-  pango_layout_get_size(const_cast<PangoLayout*>(gobj()), &width, &height);
+pango_layout_get_size(const_cast<PangoLayout*>(gobj()), &width, &height); 
 }
 
 void Layout::get_pixel_size(int& width, int& height) const
 {
-  pango_layout_get_pixel_size(const_cast<PangoLayout*>(gobj()), &width, &height);
+pango_layout_get_pixel_size(const_cast<PangoLayout*>(gobj()), &width, &height); 
 }
 
 int Layout::get_line_count() const
@@ -419,20 +457,20 @@ Glib::RefPtr<LayoutLine> Layout::get_line(int line)
 {
 
   Glib::RefPtr<LayoutLine> retvalue = Glib::wrap(pango_layout_get_line(gobj(), line));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 Glib::RefPtr<const LayoutLine> Layout::get_line(int line) const
 {
 
   Glib::RefPtr<const LayoutLine> retvalue = Glib::wrap(pango_layout_get_line(const_cast<PangoLayout*>(gobj()), line));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 SListHandle_LayoutLine Layout::get_lines()
@@ -446,6 +484,13 @@ SListHandle_ConstLayoutLine Layout::get_lines() const
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Pango
 
 
diff --git a/libs/gtkmm2/pango/pangomm/layout.h b/libs/gtkmm2/pango/pangomm/layout.h
index dceee8c358..6c836c73d6 100644
--- a/libs/gtkmm2/pango/pangomm/layout.h
+++ b/libs/gtkmm2/pango/pangomm/layout.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_LAYOUT_H
 #define _PANGOMM_LAYOUT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -208,6 +209,32 @@ public:
   static Glib::RefPtr<Layout> create(const Glib::RefPtr<Context>& context);
 
 
+ /** Creates a layout object set up to match the current transformation
+  * and target surface of the Cairo context.  This layout can then be
+  * used for text measurement with functions like
+  * get_size() or drawing with methods like show_in_cairo_contet(). 
+  * If you change the transformation or target surface for @a context, 
+  * you need to call update_from_cairo_context()
+  *
+  * This is the most convenient way to use Cairo with Pango. 
+  * However it is slightly inefficient since it creates a separate
+  * Pango Context object for each layout. This might matter in an
+  * application that is laying out large amounts of text.
+  * 
+  * @param context A Cairo context.
+  * @result The newly created Pango Layout.
+  */
+  static Glib::RefPtr<Layout> create(const Cairo::RefPtr<Cairo::Context>& context);
+
+  /** Updates the private Pango Context of a Pango Layout created with
+   * create(const Cairo::RefPtr<Cairo::Context>&) to match the current transformation
+   * and target surface of a Cairo Context.
+   *
+   * @param context A Cairo context.
+   */
+  void update_from_cairo_context(const Cairo::RefPtr<Cairo::Context>& context);
+
+
   /** Does a deep copy-by-value of the @a src  layout. The attribute list,
    * tab array, and text from the original layout are all copied by
    * value.
@@ -275,6 +302,15 @@ public:
   void unset_font_description();
 
   
+  /** Gets the font description for the layout, if any.
+   * @return A pointer to the layout's font description,
+   * or <tt>0</tt> if the font description from the layout's
+   * context is inherited. This value is owned by the layout
+   * and must not be modified or freed.
+   */
+  FontDescription get_font_description() const;
+
+  
   /** Sets the width to which the lines of the Pango::Layout should be wrapped.
    * @param width The desired width, or -1 to indicate that no wrapping should be
    * performed.
@@ -456,6 +492,20 @@ public:
    * @return The position of the grapheme.
    */
   Rectangle index_to_pos(int index) const;
+  
+
+  /** Converts from byte @a index  within the @a layout  to line and X position.
+   * (X position is measured from the left edge of the line)
+   * @param index The byte index of a grapheme within the layout.
+   * @param trailing An integer indicating the edge of the grapheme to retrieve the 
+   * position of. If 0, the trailing edge of the grapheme, if &gt; 0, 
+   * the leading of the grapheme.
+   * @param line Location to store resulting line index. (which will
+   * between 0 and pango_layout_get_line_count(layout) - 1).
+   * @param x_pos Location to store resulting position within line
+   * (in thousandths of a device unit).
+   */
+  void index_to_line_x(int index_, bool trailing, int& line, int& x_pos) const;
 
   
   /** Given an index within a layout, determines the positions that of the
@@ -656,15 +706,30 @@ public:
   void get_iter(LayoutIter& iter);
 
 
+  /** Adds the text in this LayoutLine to the current path in the
+   * specified Cairo @a context. The origin of the glyphs (the left edge
+   * of the line) will be at the current point of the cairo context.
+   *
+   * @param context A Cairo context.
+   */
+  void add_to_cairo_context(const Cairo::RefPtr<Cairo::Context>& context);
+
+
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/pango/pangomm/layoutiter.cc b/libs/gtkmm2/pango/pangomm/layoutiter.cc
index 4ba4620c3e..6e09fbc85f 100644
--- a/libs/gtkmm2/pango/pangomm/layoutiter.cc
+++ b/libs/gtkmm2/pango/pangomm/layoutiter.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/layoutiter.h>
 #include <pangomm/private/layoutiter_p.h>
 
@@ -139,10 +140,10 @@ Glib::RefPtr<LayoutLine> LayoutIter::get_line() const
 {
 
   Glib::RefPtr<LayoutLine> retvalue = Glib::wrap(pango_layout_iter_get_line(const_cast<PangoLayoutIter*>(gobj())));
-
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
+
 }
 
 bool LayoutIter::at_last_line() const
@@ -172,27 +173,27 @@ bool LayoutIter::next_line()
 
 void LayoutIter::get_cluster_extents(Rectangle& ink_rect, Rectangle& logical_rect) const
 {
-  pango_layout_iter_get_cluster_extents(const_cast<PangoLayoutIter*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj());
+pango_layout_iter_get_cluster_extents(const_cast<PangoLayoutIter*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj()); 
 }
 
 void LayoutIter::get_run_extents(Rectangle& ink_rect, Rectangle& logical_rect) const
 {
-  pango_layout_iter_get_run_extents(const_cast<PangoLayoutIter*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj());
+pango_layout_iter_get_run_extents(const_cast<PangoLayoutIter*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj()); 
 }
 
 void LayoutIter::get_line_extents(Rectangle& ink_rect, Rectangle& logical_rect) const
 {
-  pango_layout_iter_get_line_extents(const_cast<PangoLayoutIter*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj());
+pango_layout_iter_get_line_extents(const_cast<PangoLayoutIter*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj()); 
 }
 
 void LayoutIter::get_line_yrange(int& y0, int& y1) const
 {
-  pango_layout_iter_get_line_yrange(const_cast<PangoLayoutIter*>(gobj()), &y0, &y1);
+pango_layout_iter_get_line_yrange(const_cast<PangoLayoutIter*>(gobj()), &y0, &y1); 
 }
 
 void LayoutIter::get_layout_extents(Rectangle& ink_rect, Rectangle& logical_rect) const
 {
-  pango_layout_iter_get_layout_extents(const_cast<PangoLayoutIter*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj());
+pango_layout_iter_get_layout_extents(const_cast<PangoLayoutIter*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj()); 
 }
 
 int LayoutIter::get_baseline() const
diff --git a/libs/gtkmm2/pango/pangomm/layoutiter.h b/libs/gtkmm2/pango/pangomm/layoutiter.h
index ccb24ded81..a76d73932e 100644
--- a/libs/gtkmm2/pango/pangomm/layoutiter.h
+++ b/libs/gtkmm2/pango/pangomm/layoutiter.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_LAYOUTITER_H
 #define _PANGOMM_LAYOUTITER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
diff --git a/libs/gtkmm2/pango/pangomm/layoutline.cc b/libs/gtkmm2/pango/pangomm/layoutline.cc
index f3ff372461..f6e97b78a6 100644
--- a/libs/gtkmm2/pango/pangomm/layoutline.cc
+++ b/libs/gtkmm2/pango/pangomm/layoutline.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/layoutline.h>
 #include <pangomm/private/layoutline_p.h>
 
@@ -26,6 +27,7 @@
  */
 
 #include <pangomm/layout.h>
+#include <pango/pangocairo.h>
 
 namespace Pango {
 
@@ -72,8 +74,17 @@ Glib::ArrayHandle<std::pair<int,int> > LayoutLine::get_x_ranges(int start_index,
   return Glib::ArrayHandle<std::pair<int,int> >(reinterpret_cast<std::pair<int,int>*>(ranges), n_ranges, Glib::OWNERSHIP_SHALLOW);
 }
 
-} /* namespace Pango */
+void LayoutLine::show_in_cairo_context(const Cairo::RefPtr<Cairo::Context>& context)
+{
+  pango_cairo_show_layout_line(context->cobj(), gobj());
+}
 
+void LayoutLine::add_to_cairo_context(const Cairo::RefPtr<Cairo::Context>& context)
+{
+  pango_cairo_layout_line_path(context->cobj(), gobj());
+}
+
+} /* namespace Pango */
 
 namespace
 {
@@ -153,15 +164,15 @@ bool LayoutLine::x_to_index(int x_pos, int& index, int& trailing) const
 
 void LayoutLine::get_extents(Rectangle& ink_rect, Rectangle& logical_rect) const
 {
-  pango_layout_line_get_extents(const_cast<PangoLayoutLine*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj());
+pango_layout_line_get_extents(const_cast<PangoLayoutLine*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj()); 
 }
 
 void LayoutLine::get_pixel_extents(Rectangle& ink_rect, Rectangle& logical_rect) const
 {
-  pango_layout_line_get_pixel_extents(const_cast<PangoLayoutLine*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj());
+pango_layout_line_get_pixel_extents(const_cast<PangoLayoutLine*>(gobj()), (ink_rect).gobj(), (logical_rect).gobj()); 
 }
 
-Glib::RefPtr<Pango::Layout> LayoutLine::get_layout()
+ Glib::RefPtr<Pango::Layout> LayoutLine::get_layout()
 {
   Glib::RefPtr<Pango::Layout> ref_ptr(Glib::wrap(gobj()->layout));
 
@@ -180,17 +191,17 @@ Glib::RefPtr<const Pango::Layout> LayoutLine::get_layout() const
 
   return ref_ptr;
 }
-
-int LayoutLine::get_length() const
+ 
+ int LayoutLine::get_length() const
 {
   return gobj()->length;
 }
-
-int LayoutLine::get_start_index() const
+ 
+ int LayoutLine::get_start_index() const
 {
   return gobj()->start_index;
 }
-
+ 
 
 } // namespace Pango
 
diff --git a/libs/gtkmm2/pango/pangomm/layoutline.h b/libs/gtkmm2/pango/pangomm/layoutline.h
index 594d5cc7a3..97ae47ba5b 100644
--- a/libs/gtkmm2/pango/pangomm/layoutline.h
+++ b/libs/gtkmm2/pango/pangomm/layoutline.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_LAYOUTLINE_H
 #define _PANGOMM_LAYOUTLINE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -28,6 +29,7 @@
 
 #include <glibmm/slisthandle.h> // For the Glib::SListHandle typedef
 #include <pangomm/rectangle.h>
+#include <cairomm/context.h>
 #include <pango/pango-layout.h>
 
 
@@ -163,12 +165,28 @@ public:
    */
   Rectangle get_pixel_logical_extents() const;
 
-  Glib::RefPtr<Pango::Layout> get_layout();
+  /** Draws this LayoutLine in the specified Cairo context.
+   * The origin of the glyphs (the left edge of the line) will
+   * be drawn at the current point of the cairo context.
+   *
+   * @param context A Cairo context.
+   */
+  void show_in_cairo_context(const Cairo::RefPtr<Cairo::Context>& context);
+
+  /** Adds the text in this LayoutLine to the current path in the
+   * specified Cairo @a context. The origin of the glyphs (the left edge
+   * of the line) will be at the current point of the cairo context.
+   *
+   * @param context A Cairo context.
+   */
+  void add_to_cairo_context(const Cairo::RefPtr<Cairo::Context>& context);
+
+   Glib::RefPtr<Pango::Layout> get_layout();
   Glib::RefPtr<const Pango::Layout> get_layout() const;
-  //_MEMBER_SET_GOBJECT(layout, layout, Pango::Layout, PangoLayout*)
-  int get_length() const;
-  int get_start_index() const;
-    
+   //_MEMBER_SET_GOBJECT(layout, layout, Pango::Layout, PangoLayout*)
+   int get_length() const;
+    int get_start_index() const;
+     
 
 };
 
@@ -218,5 +236,6 @@ namespace Glib
 
 } // namespace Glib
 
+
 #endif /* _PANGOMM_LAYOUTLINE_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/layoutrun.cc b/libs/gtkmm2/pango/pangomm/layoutrun.cc
index 6d797fc02c..f51982cad3 100644
--- a/libs/gtkmm2/pango/pangomm/layoutrun.cc
+++ b/libs/gtkmm2/pango/pangomm/layoutrun.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/layoutrun.h>
 #include <pangomm/private/layoutrun_p.h>
 
@@ -53,7 +54,6 @@ const Pango::LayoutRun& wrap(const PangoLayoutRun* object)
 
 } /* namespace Glib */
 
-
 namespace
 {
 } // anonymous namespace
@@ -63,16 +63,16 @@ namespace Pango
 {
 
 
-Item LayoutRun::get_item() const
+ Item LayoutRun::get_item() const
 {
   return Item((gobj()->item));
 }
-
-GlyphString LayoutRun::get_glyphs() const
+ 
+ GlyphString LayoutRun::get_glyphs() const
 {
   return GlyphString((gobj()->glyphs));
 }
-
+ 
 
 } // namespace Pango
 
diff --git a/libs/gtkmm2/pango/pangomm/layoutrun.h b/libs/gtkmm2/pango/pangomm/layoutrun.h
index 8a150646fa..24170abc3e 100644
--- a/libs/gtkmm2/pango/pangomm/layoutrun.h
+++ b/libs/gtkmm2/pango/pangomm/layoutrun.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_LAYOUTRUN_H
 #define _PANGOMM_LAYOUTRUN_H
 
+
 #include <glibmm.h>
 
 /* layoutrun.h
@@ -55,13 +56,13 @@ public:
   /** Gets the Pango::Item object that provides information about the segment of text in this run.
    * @return A Pango::Item object.
    */
-  Item get_item() const;
-
+   Item get_item() const;
+ 
   /** Gets the string of glyphs obtained by shaping the text for this item.
    * @return A Pango::GlyphString object.
    */
-  GlyphString get_glyphs() const;
-
+   GlyphString get_glyphs() const;
+ 
   /// Provides access to the underlying C GObject.  
   PangoLayoutRun*       gobj()       { return &gobject_; }
   /// Provides access to the underlying C GObject.
diff --git a/libs/gtkmm2/pango/pangomm/private/attributes_p.h b/libs/gtkmm2/pango/pangomm/private/attributes_p.h
index a2c62c09a6..522f33cf72 100644
--- a/libs/gtkmm2/pango/pangomm/private/attributes_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/attributes_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_ATTRIBUTES_P_H
 #define _PANGOMM_ATTRIBUTES_P_H
+
+
 #endif /* _PANGOMM_ATTRIBUTES_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/attriter_p.h b/libs/gtkmm2/pango/pangomm/private/attriter_p.h
index d8cc2fd346..1fa847304f 100644
--- a/libs/gtkmm2/pango/pangomm/private/attriter_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/attriter_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_ATTRITER_P_H
 #define _PANGOMM_ATTRITER_P_H
+
+
 #endif /* _PANGOMM_ATTRITER_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/attrlist_p.h b/libs/gtkmm2/pango/pangomm/private/attrlist_p.h
index 4c05d959d2..7a1188f8ef 100644
--- a/libs/gtkmm2/pango/pangomm/private/attrlist_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/attrlist_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_ATTRLIST_P_H
 #define _PANGOMM_ATTRLIST_P_H
+
+
 #endif /* _PANGOMM_ATTRLIST_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/color_p.h b/libs/gtkmm2/pango/pangomm/private/color_p.h
index 945c38bedb..cfdaa5b917 100644
--- a/libs/gtkmm2/pango/pangomm/private/color_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/color_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_COLOR_P_H
 #define _PANGOMM_COLOR_P_H
+
+
 #endif /* _PANGOMM_COLOR_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/context_p.h b/libs/gtkmm2/pango/pangomm/private/context_p.h
index a54c181ffd..be64b78f34 100644
--- a/libs/gtkmm2/pango/pangomm/private/context_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/context_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_CONTEXT_P_H
 #define _PANGOMM_CONTEXT_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Pango
 
+
 #endif /* _PANGOMM_CONTEXT_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/coverage_p.h b/libs/gtkmm2/pango/pangomm/private/coverage_p.h
index 129cefb95d..3ae8dcbb84 100644
--- a/libs/gtkmm2/pango/pangomm/private/coverage_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/coverage_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_COVERAGE_P_H
 #define _PANGOMM_COVERAGE_P_H
+
+
 #endif /* _PANGOMM_COVERAGE_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/font_p.h b/libs/gtkmm2/pango/pangomm/private/font_p.h
index 6ff30d4ddf..b24bdb3808 100644
--- a/libs/gtkmm2/pango/pangomm/private/font_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/font_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_FONT_P_H
 #define _PANGOMM_FONT_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Pango
 
+
 #endif /* _PANGOMM_FONT_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/fontdescription_p.h b/libs/gtkmm2/pango/pangomm/private/fontdescription_p.h
index 12ec7e662d..d68ba91e62 100644
--- a/libs/gtkmm2/pango/pangomm/private/fontdescription_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/fontdescription_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_FONTDESCRIPTION_P_H
 #define _PANGOMM_FONTDESCRIPTION_P_H
+
+
 #endif /* _PANGOMM_FONTDESCRIPTION_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/fontface_p.h b/libs/gtkmm2/pango/pangomm/private/fontface_p.h
index 66bddd9298..a7a114dac2 100644
--- a/libs/gtkmm2/pango/pangomm/private/fontface_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/fontface_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_FONTFACE_P_H
 #define _PANGOMM_FONTFACE_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Pango
 
+
 #endif /* _PANGOMM_FONTFACE_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/fontfamily_p.h b/libs/gtkmm2/pango/pangomm/private/fontfamily_p.h
index 657f7b266a..7367d51273 100644
--- a/libs/gtkmm2/pango/pangomm/private/fontfamily_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/fontfamily_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_FONTFAMILY_P_H
 #define _PANGOMM_FONTFAMILY_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Pango
 
+
 #endif /* _PANGOMM_FONTFAMILY_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/fontmap_p.h b/libs/gtkmm2/pango/pangomm/private/fontmap_p.h
index 88e898e016..8aedc96332 100644
--- a/libs/gtkmm2/pango/pangomm/private/fontmap_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/fontmap_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_FONTMAP_P_H
 #define _PANGOMM_FONTMAP_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Pango
 
+
 #endif /* _PANGOMM_FONTMAP_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/fontmetrics_p.h b/libs/gtkmm2/pango/pangomm/private/fontmetrics_p.h
index 80670d0639..5fa2c2110c 100644
--- a/libs/gtkmm2/pango/pangomm/private/fontmetrics_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/fontmetrics_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_FONTMETRICS_P_H
 #define _PANGOMM_FONTMETRICS_P_H
+
+
 #endif /* _PANGOMM_FONTMETRICS_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/fontset_p.h b/libs/gtkmm2/pango/pangomm/private/fontset_p.h
index ed012a1cbb..e4461dd89d 100644
--- a/libs/gtkmm2/pango/pangomm/private/fontset_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/fontset_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_FONTSET_P_H
 #define _PANGOMM_FONTSET_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Pango
 
+
 #endif /* _PANGOMM_FONTSET_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/glyph_p.h b/libs/gtkmm2/pango/pangomm/private/glyph_p.h
index 8c4b42f6c7..06686a932b 100644
--- a/libs/gtkmm2/pango/pangomm/private/glyph_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/glyph_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_GLYPH_P_H
 #define _PANGOMM_GLYPH_P_H
+
+
 #endif /* _PANGOMM_GLYPH_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/glyphstring_p.h b/libs/gtkmm2/pango/pangomm/private/glyphstring_p.h
index 6d9535bcda..a307fa2f37 100644
--- a/libs/gtkmm2/pango/pangomm/private/glyphstring_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/glyphstring_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_GLYPHSTRING_P_H
 #define _PANGOMM_GLYPHSTRING_P_H
+
+
 #endif /* _PANGOMM_GLYPHSTRING_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/item_p.h b/libs/gtkmm2/pango/pangomm/private/item_p.h
index a2015d337d..288ad5cded 100644
--- a/libs/gtkmm2/pango/pangomm/private/item_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/item_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_ITEM_P_H
 #define _PANGOMM_ITEM_P_H
+
+
 #endif /* _PANGOMM_ITEM_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/language_p.h b/libs/gtkmm2/pango/pangomm/private/language_p.h
index f9921544be..9445395c3c 100644
--- a/libs/gtkmm2/pango/pangomm/private/language_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/language_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_LANGUAGE_P_H
 #define _PANGOMM_LANGUAGE_P_H
+
+
 #endif /* _PANGOMM_LANGUAGE_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/layout_p.h b/libs/gtkmm2/pango/pangomm/private/layout_p.h
index d87fb6de2f..2e6a368425 100644
--- a/libs/gtkmm2/pango/pangomm/private/layout_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/layout_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_LAYOUT_P_H
 #define _PANGOMM_LAYOUT_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Pango
 
+
 #endif /* _PANGOMM_LAYOUT_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/layoutiter_p.h b/libs/gtkmm2/pango/pangomm/private/layoutiter_p.h
index e43c4334d2..fa0ec3f94b 100644
--- a/libs/gtkmm2/pango/pangomm/private/layoutiter_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/layoutiter_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_LAYOUTITER_P_H
 #define _PANGOMM_LAYOUTITER_P_H
+
+
 #endif /* _PANGOMM_LAYOUTITER_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/layoutline_p.h b/libs/gtkmm2/pango/pangomm/private/layoutline_p.h
index 2bccde57d1..f7b0610744 100644
--- a/libs/gtkmm2/pango/pangomm/private/layoutline_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/layoutline_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_LAYOUTLINE_P_H
 #define _PANGOMM_LAYOUTLINE_P_H
+
+
 #endif /* _PANGOMM_LAYOUTLINE_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/layoutrun_p.h b/libs/gtkmm2/pango/pangomm/private/layoutrun_p.h
index 3d9bb774f1..8e44d36a3f 100644
--- a/libs/gtkmm2/pango/pangomm/private/layoutrun_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/layoutrun_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_LAYOUTRUN_P_H
 #define _PANGOMM_LAYOUTRUN_P_H
+
+
 #endif /* _PANGOMM_LAYOUTRUN_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/rectangle_p.h b/libs/gtkmm2/pango/pangomm/private/rectangle_p.h
index 4b3e6f2481..18ee9f04f2 100644
--- a/libs/gtkmm2/pango/pangomm/private/rectangle_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/rectangle_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_RECTANGLE_P_H
 #define _PANGOMM_RECTANGLE_P_H
+
+
 #endif /* _PANGOMM_RECTANGLE_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/renderer_p.h b/libs/gtkmm2/pango/pangomm/private/renderer_p.h
index 1c24c86970..5909e8cfb0 100644
--- a/libs/gtkmm2/pango/pangomm/private/renderer_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/renderer_p.h
@@ -2,6 +2,8 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_RENDERER_P_H
 #define _PANGOMM_RENDERER_P_H
+
+
 #include <glibmm/private/object_p.h>
 
 #include <glibmm/class.h>
@@ -30,15 +32,20 @@ public:
 
 protected:
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
   //Callbacks (default signal handlers):
   //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
   //You could prevent the original default signal handlers being called by overriding the *_impl method.
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
   //Callbacks (virtual functions):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 };
 
 
 } // namespace Pango
 
+
 #endif /* _PANGOMM_RENDERER_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/private/tabarray_p.h b/libs/gtkmm2/pango/pangomm/private/tabarray_p.h
index d27ae8534a..ca33babdd8 100644
--- a/libs/gtkmm2/pango/pangomm/private/tabarray_p.h
+++ b/libs/gtkmm2/pango/pangomm/private/tabarray_p.h
@@ -2,5 +2,7 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 #ifndef _PANGOMM_TABARRAY_P_H
 #define _PANGOMM_TABARRAY_P_H
+
+
 #endif /* _PANGOMM_TABARRAY_P_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/rectangle.cc b/libs/gtkmm2/pango/pangomm/rectangle.cc
index 4686d3a7d0..9070af3cd2 100644
--- a/libs/gtkmm2/pango/pangomm/rectangle.cc
+++ b/libs/gtkmm2/pango/pangomm/rectangle.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/rectangle.h>
 #include <pangomm/private/rectangle_p.h>
 
@@ -69,7 +70,6 @@ const Pango::Rectangle& wrap(const PangoRectangle* object)
 
 } /* namespace Glib */
 
-
 namespace
 {
 } // anonymous namespace
diff --git a/libs/gtkmm2/pango/pangomm/rectangle.h b/libs/gtkmm2/pango/pangomm/rectangle.h
index beb6825406..9489d6d959 100644
--- a/libs/gtkmm2/pango/pangomm/rectangle.h
+++ b/libs/gtkmm2/pango/pangomm/rectangle.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_RECTANGLE_H
 #define _PANGOMM_RECTANGLE_H
 
+
 #include <glibmm.h>
 
 /* Copyright (C) 2002 The gtkmm Development Team
@@ -159,5 +160,6 @@ const Pango::Rectangle& wrap(const PangoRectangle* object);
 
 } /* namespace Glib */
 
+
 #endif /* _PANGOMM_RECTANGLE_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/renderer.cc b/libs/gtkmm2/pango/pangomm/renderer.cc
index e456fc19cf..0c3ec48cf2 100644
--- a/libs/gtkmm2/pango/pangomm/renderer.cc
+++ b/libs/gtkmm2/pango/pangomm/renderer.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/renderer.h>
 #include <pangomm/private/renderer_p.h>
 
@@ -27,12 +28,24 @@
  */
 
 #include <pango/pango-renderer.h>
+#include <pango/pango-types.h> //For PANGO_MATRIX_INIT
 
 namespace Pango
 {
 
-} /* namespace Pango */
+Matrix Renderer::get_matrix() const
+{
+  const PangoMatrix* matrix = pango_renderer_get_matrix(const_cast<PangoRenderer*>(gobj()));
+  if(matrix)
+    return *matrix;
+  else
+  {
+    PangoMatrix identity_transform = PANGO_MATRIX_INIT;
+    return identity_transform;
+  }
+}
 
+} /* namespace Pango */
 
 namespace
 {
@@ -88,8 +101,19 @@ void Renderer_Class::class_init_function(void* g_class, void* class_data)
   BaseClassType *const klass = static_cast<BaseClassType*>(g_class);
   CppClassParent::class_init_function(klass, class_data);
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 }
 
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
 
 Glib::ObjectBase* Renderer_Class::wrap_new(GObject* object)
 {
@@ -134,57 +158,57 @@ GType Renderer::get_base_type()
 
 void Renderer::draw_layout(const Glib::RefPtr<Layout>& layout, int x, int y)
 {
-  pango_renderer_draw_layout(gobj(), Glib::unwrap(layout), x, y);
+pango_renderer_draw_layout(gobj(), Glib::unwrap(layout), x, y); 
 }
 
 void Renderer::draw_layout_line(const Glib::RefPtr<LayoutLine>& line, int x, int y)
 {
-  pango_renderer_draw_layout_line(gobj(), Glib::unwrap(line), x, y);
+pango_renderer_draw_layout_line(gobj(), Glib::unwrap(line), x, y); 
 }
 
 void Renderer::draw_glyphs(const Glib::RefPtr<Font>& font, const GlyphString& glyphs, int x, int y)
 {
-  pango_renderer_draw_glyphs(gobj(), Glib::unwrap(font), const_cast<PangoGlyphString*>(glyphs.gobj()), x, y);
+pango_renderer_draw_glyphs(gobj(), Glib::unwrap(font), const_cast<PangoGlyphString*>(glyphs.gobj()), x, y); 
 }
 
 void Renderer::draw_rectangle(RenderPart part, int x, int y, int width, int height)
 {
-  pango_renderer_draw_rectangle(gobj(), ((PangoRenderPart)(part)), x, y, width, height);
+pango_renderer_draw_rectangle(gobj(), ((PangoRenderPart)(part)), x, y, width, height); 
 }
 
 void Renderer::draw_error_underline(int x, int y, int width, int height)
 {
-  pango_renderer_draw_error_underline(gobj(), x, y, width, height);
+pango_renderer_draw_error_underline(gobj(), x, y, width, height); 
 }
 
 void Renderer::draw_trapezoid(RenderPart part, double y1, double x11, double x21, double y2, double x12, double x22)
 {
-  pango_renderer_draw_trapezoid(gobj(), ((PangoRenderPart)(part)), y1, x11, x21, y2, x12, x22);
+pango_renderer_draw_trapezoid(gobj(), ((PangoRenderPart)(part)), y1, x11, x21, y2, x12, x22); 
 }
 
 void Renderer::draw_glyph(const Glib::RefPtr<Font>& font, Glyph glyph, double x, double y)
 {
-  pango_renderer_draw_glyph(gobj(), Glib::unwrap(font), glyph, x, y);
+pango_renderer_draw_glyph(gobj(), Glib::unwrap(font), glyph, x, y); 
 }
 
 void Renderer::activate()
 {
-  pango_renderer_activate(gobj());
+pango_renderer_activate(gobj()); 
 }
 
 void Renderer::deactivate()
 {
-  pango_renderer_deactivate(gobj());
+pango_renderer_deactivate(gobj()); 
 }
 
 void Renderer::part_changed(RenderPart part)
 {
-  pango_renderer_part_changed(gobj(), ((PangoRenderPart)(part)));
+pango_renderer_part_changed(gobj(), ((PangoRenderPart)(part))); 
 }
 
 void Renderer::set_color(RenderPart part, const Color& color)
 {
-  pango_renderer_set_color(gobj(), ((PangoRenderPart)(part)), (color).gobj());
+pango_renderer_set_color(gobj(), ((PangoRenderPart)(part)), (color).gobj()); 
 }
 
 Color Renderer::get_color(RenderPart part) const
@@ -194,10 +218,17 @@ Color Renderer::get_color(RenderPart part) const
 
 void Renderer::set_matrix(const Matrix& matrix)
 {
-  pango_renderer_set_matrix(gobj(), &(matrix));
+pango_renderer_set_matrix(gobj(), &(matrix)); 
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Pango
 
 
diff --git a/libs/gtkmm2/pango/pangomm/renderer.h b/libs/gtkmm2/pango/pangomm/renderer.h
index 8428c15b50..da16a59279 100644
--- a/libs/gtkmm2/pango/pangomm/renderer.h
+++ b/libs/gtkmm2/pango/pangomm/renderer.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_RENDERER_H
 #define _PANGOMM_RENDERER_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -32,7 +33,6 @@
 #include <pangomm/glyphstring.h>
 #include <pangomm/layout.h>
 #include <pangomm/layoutline.h>
-#include <pangomm/types.h> //For Matrix.
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -287,19 +287,24 @@ public:
    * (No matrix set is the same as setting the identity matrix.).
    */
   void set_matrix(const Matrix& matrix);
-  //TOOD: _WRAP_METHOD(Matrix get_matrix(), pango_renderer_get_matrix)
-  //Note: The returned matrix is owned by Pango and must not be modified or freed.
-
+  Matrix get_matrix() const;
+  
 
 public:
 
 public:
   //C++ methods used to invoke GTK+ virtual functions:
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
 protected:
   //GTK+ Virtual Functions (override these to change behaviour):
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
 
   //Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
 
 
 };
diff --git a/libs/gtkmm2/pango/pangomm/tabarray.cc b/libs/gtkmm2/pango/pangomm/tabarray.cc
index 57353f418a..2e750d49ea 100644
--- a/libs/gtkmm2/pango/pangomm/tabarray.cc
+++ b/libs/gtkmm2/pango/pangomm/tabarray.cc
@@ -1,5 +1,6 @@
 // Generated by gtkmmproc -- DO NOT MODIFY!
 
+
 #include <pangomm/tabarray.h>
 #include <pangomm/private/tabarray_p.h>
 
@@ -36,9 +37,11 @@ TabArray::TabArray(int initial_size, bool positions_in_pixels)
 
 std::pair<TabAlign,int> TabArray::get_tab(int tab_index) const
 {
+  PangoTabAlign p_alignment;
   TabAlign alignment;
   int location;
-  pango_tab_array_get_tab(const_cast<PangoTabArray*>(gobj()), tab_index, (PangoTabAlign*)&alignment, &location);
+  pango_tab_array_get_tab(const_cast<PangoTabArray*>(gobj()), tab_index, &p_alignment, &location);
+  alignment = static_cast<TabAlign>(p_alignment);
   return std::pair<TabAlign,int>(alignment, location);
 }
 
@@ -162,12 +165,12 @@ int TabArray::get_size() const
 
 void TabArray::resize(int new_size)
 {
-  pango_tab_array_resize(gobj(), new_size);
+pango_tab_array_resize(gobj(), new_size); 
 }
 
 void TabArray::set_tab(int tab_index, TabAlign alignment, int location)
 {
-  pango_tab_array_set_tab(gobj(), tab_index, ((PangoTabAlign)(alignment)), location);
+pango_tab_array_set_tab(gobj(), tab_index, ((PangoTabAlign)(alignment)), location); 
 }
 
 bool TabArray::get_positions_in_pixels() const
diff --git a/libs/gtkmm2/pango/pangomm/tabarray.h b/libs/gtkmm2/pango/pangomm/tabarray.h
index 7a5850c663..c8fc543933 100644
--- a/libs/gtkmm2/pango/pangomm/tabarray.h
+++ b/libs/gtkmm2/pango/pangomm/tabarray.h
@@ -3,6 +3,7 @@
 #ifndef _PANGOMM_TABARRAY_H
 #define _PANGOMM_TABARRAY_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -191,5 +192,6 @@ class Value<Pango::TabArray> : public Glib::Value_Boxed<Pango::TabArray>
 
 } // namespace Glib
 
+
 #endif /* _PANGOMM_TABARRAY_H */
 
diff --git a/libs/gtkmm2/pango/pangomm/wrap_init.cc b/libs/gtkmm2/pango/pangomm/wrap_init.cc
index 348d28fabd..d383d05187 100644
--- a/libs/gtkmm2/pango/pangomm/wrap_init.cc
+++ b/libs/gtkmm2/pango/pangomm/wrap_init.cc
@@ -15,6 +15,7 @@
 #include "attributes.h"
 #include "attriter.h"
 #include "attrlist.h"
+#include "cairofontmap.h"
 #include "color.h"
 #include "context.h"
 #include "coverage.h"