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

SConstruct

@@ -515,6 +515,12 @@ libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0')
 libraries['pango'] = LibraryInfo()
 libraries['pango'].ParseConfig ('pkg-config --cflags --libs pango')
 
+libraries['cairo'] = LibraryInfo()
+libraries['cairo'].ParseConfig ('pkg-config --cflags --libs cairo')
+
+libraries['gtk2-unix-print'] = LibraryInfo()
+libraries['gtk2-unix-print'].ParseConfig ('pkg-config --cflags --libs gtk+-unix-print-2.0')
+
 libraries['libgnomecanvas2'] = LibraryInfo()
 libraries['libgnomecanvas2'].ParseConfig ('pkg-config --cflags --libs libgnomecanvas-2.0')
 
@@ -905,6 +911,8 @@ if env['SYSLIBS']:
     libraries['atkmm'].ParseConfig ('pkg-config --cflags --libs atkmm-1.6')
     libraries['pangomm'] = LibraryInfo()
     libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4')
+    libraries['cairomm'] = LibraryInfo()
+    libraries['cairomm'].ParseConfig ('pkg-config --cflags --libs cairomm-1.0')
     libraries['libgnomecanvasmm'] = LibraryInfo()
     libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6')
 
@@ -963,7 +971,10 @@ else:
                                     CPPPATH='#libs/sigc++2')
     libraries['glibmm2'] = LibraryInfo(LIBS='glibmm2',
                                     LIBPATH='#libs/glibmm2',
-                                    CPPPATH='#libs/glibmm2')
+                                    CPPPATH=['#libs/glibmm2/glib', '#libs/glibmm2'])
+    libraries['cairomm'] = LibraryInfo(LIBS='cairomm',
+                                       LIBPATH="#libs/cairomm",
+                                       CPPPATH='#libs/cairomm')
     libraries['pangomm'] = LibraryInfo(LIBS='pangomm',
                                     LIBPATH='#libs/gtkmm2/pango',
                                     CPPPATH='#libs/gtkmm2/pango')
@@ -1022,6 +1033,7 @@ else:
 	'libs/gtkmm2/atk',
 	'libs/gtkmm2/gdk',
 	'libs/gtkmm2/gtk',
+        'libs/cairomm',
 	'libs/libgnomecanvasmm',
 #	'libs/flowcanvas',
         'libs/gtkmm2ext',

gtk2_ardour/SConscript

@@ -18,7 +18,7 @@ domain = 'gtk2_ardour'
 gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=2)
 gtkardour.Append(CCFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
 gtkardour.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
-gtkardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+gtkardour.Append(CXXFLAGS=["-DLIBSIGC_DISABLE_DEPRECATED", "-DGLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED", "-DGLIBMM_EXCEPTIONS_ENABLED", "-DGLIBMM_PROPERTIES_ENABLED"])
 gtkardour.Append(CPPPATH="#/")  # for top level svn_revision.h
 #gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA")
 gtkardour.Append(PACKAGE=domain)
@@ -53,7 +53,8 @@ gtkardour.Merge ([
     libraries['rubberband'],
     libraries['samplerate'],
     libraries['jack'],
-    libraries['sysaudio']
+    libraries['sysaudio'],
+    libraries['cairomm']
 ])
 
 gtkmmtests.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")

libs/ardour/SConscript

@@ -16,7 +16,7 @@ domain = 'libardour'
 
 ardour.Append(DOMAIN = domain, MAJOR = 2, MINOR = 0, MICRO = 0)
 ardour.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"")
-ardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+ardour.Append(CXXFLAGS=["-DLIBSIGC_DISABLE_DEPRECATED", "-DGLIBMM_EXCEPTIONS_ENABLED"])
 ardour.Append(PACKAGE = domain)
 ardour.Append(POTFILE = domain + '.pot')
 

libs/glibmm2/ChangeLog

@@ -1,3 +1,653 @@
+2.13.3:
+
+2006-11-28  Daniel Elstner  <danielk@openismus.com>
+
+	* tools/pm/GtkDefs.pm (read_defs): Allow an empty pair of
+	parentheses in the innermost match.  This fixes the problem of
+	gmmproc choking on "()" in the documentation strings.  This would
+	still break on unmatched parentheses, though.  Of course the
+	parser should just skip over quoted strings, but I wasn't able
+	to get that to work.
+	* glib/src/glib_enums.defs (GNormalizeMode): Manually fix the
+	improperly parsed value of G_NORMALIZE_NFD.  Fortunately this
+	doesn't change anything since the "#error" token was interpreted
+	as zero, which happens to be the right value.
+	* glib/src/glib_functions.defs (g_iconv): Manually convert to
+	a function definition, as it was improperly parsed as a method
+	with a zero-length name (!) of object GIConv.  This fixes the
+	annoying gmmproc warning about an allegedly unwrapped method.
+
+2006-11-28  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/glibmm/propertyproxy_base.cc: Don't ifdef out 
+	PropertyProxy_Base when properties are disabled. It is needed 
+	for connect_property_changed().
+
+2006-11-27  Daniel Elstner  <danielk@openismus.com>
+
+	* tools/enum.pl (parse): Ignore whitespace in front of an enum
+	typedef.  This fixes parsing of HildonTelephoneEditorFormat in
+	hildon-libs.
+	* tools/pm/Enum.pm (parse_values): Check whether the enumeration
+	constants actually have a common module prefix before attempting
+	to remove it.  This fixes the incorrect parsing of inconsistently
+	named enums in hildon-libs.
+
+2006-11-27  Daniel Elstner  <danielk@openismus.com>
+
+	* tools/enum.pl (form_names): Break the loop if the length of the
+	common prefix reaches zero.  This fixes the infinite loop when
+	processing the inconsistently named enumeration constants of the
+	Hildon libraries.
+
+2006-11-20  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/reference/libstdc++.tag.xml: Updated from the libstdc++ site. 
+	Note that the original does not have an .xml extension. This is is 
+	lots bigger, but that should mean there is more documentation now.
+
+2006-11-22  Oliver Nittka  <oly@nittka.com>
+
+	* glib/src/value_basictypes.cc.m4: When registering float parameters, 
+	use -G_MAXFLOAT instead of G_MINFLOAT. Since we first implemented this, 
+	the glib documentation has been updated to make it cleare that this is 
+	the real minimum and G_MINFLOAT is the minimum positive value.
+	Do the same for doubles too.
+
+2006-11-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* tools/Makefile.am: Add enum.pl to the dist, so that it is in 
+	tarballs. Someone saw it mentioned in the appendix, but could not 
+	find it in the tarball.
+
+2006-11-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/reference/Doxyfile.in: Add PREDEFINES for the optional API, 
+	so that the documentation shows the regular API.
+
+2006-11-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/glibmm/objectbase.cc:
+	* glib/glibmm/objectbase.h: Added connect_property_changed(), 
+	as an alternative to use when the property proxies are not 
+	available because GLIBMM_PROPERTIES_ENABLED is not defined.
+	SignalProxyProperty::connect(): Use notify::propertyname instead of 
+	just notify, so do not have to check the property name later. This 
+	should be more efficient (when this is used, rarely).
+	* glib/glibmm/propertyproxy_base.cc:
+	* glib/glibmm/propertyproxy_base.h: Move PropertyProxyConnectionNode
+	into the header, so we can reuse it for connect_property_changed(). 
+
+2006-10-04  Murray Cumming  <murrayc@murrayc.com>
+
+        * glib/glibmm/class.cc:
+        * glib/src/iochannel.ccg:
+        * glib/src/markup.ccg: Add a silly line to avoid unused parameters
+        when GLIBMM_EXCEPTIONS_ENABLED is not set.
+        * glib/glibmm/error.h: Do not use G_GNU_NO_RETURN on the version
+        of throw_exception() that returns, to avoid a warning.
+
+2006-10-01  Murray Cumming  <murrayc@murrayc.com>
+
+	* Makefile.am:
+	* docs/Makefile.am:
+	* docs/Makefile_web.am_fragment:
+	* docs/images/Makefile.am:
+	* docs/reference/Makefile.am:
+	* docs/reference/README:
+	* 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.13.2:
+
+2006-09-28  Cedric Gustin  <cedric.gustin@gmail.com>
+	
+	* MSVC_Net2003/glibmm/glibmm.vcproj: Remove sarray from list of
+	source and header files.
+
+2006-09-26  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/glibmmconfig.h.in: For win32, define 
+	GLIBMM_ARG_ENABLE_API_DEFAULT_SIGNAL_HANDLERS to 1, 
+	instead of just defining it to nothing.
+	* scripts/reduced.m4: In the AC_ARG_ENABLE() to 
+	define (or not) GLIBMM_ARG_ENABLE_API_DEFAULT_SIGNAL_HANDLERS, 
+	use api-default-signal-handlers as the first parameter 
+	instead of api-exceptions (a copy/paste error), though it does 
+	not seem to make any difference.
+	Bug #357830.
+
+2006-09-23  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* glib/src/keyfile.ccg, glib/src/keyfile.hg: added new files that were
+	missed from an earlier commit
+
+2.13.1:
+
+2006-09-19  Ralf Stephan  <ralf@ark.in-berlin.de>
+
+	* glib/glibmm/ustring.h: 
+	ustring(const ustring& src, size_type i, size_type n=npos)
+	and 
+	ustring(const char* src, size_type n) constructors:
+	In the reference documentation, mention explicitly that 
+	n is the number of _UTF-8_ characters, rather than 
+	ASCII characters (bytes).
+
+2006-02-20  Rob Page  <page.rob@gmail.com>
+
+	Wraps GKeyFile (Bug #330535)
+	* glib/glibmm.h: Added include of keyfile.h
+	* glib/glibmm/Makefile.am: Added keyfile.h
+	* glib/glibmm/containerhandle_shared.h: Added a TypeTraits
+	specialization for converting between bool and gboolean*.
+	* glib/src/Makefile_list_of_hg.am_fragment: Added keyfile.hg
+	to files_general_hg.
+	* glib/src/keyfile.hg: KeyFile header
+	* glib/src/keyfile.ccg: KeyFile implementation
+	* tools/m4/convert_glib.m4: Added a conversion for KeyFileFlags
+
+2006-09-14  Johannes Schmid <jhs@gnome.org>
+
+	* tools/m4/class_shared.m4: Change _IMPLEMENTS_INTERFACE to 
+	_IMPLEMENTS_INTERFACE_CC so we can have more control over it, 
+	by generating the _IMPLEMENTS_INTERFACE_CC from the WrapParser.pm.
+	* tools/m4/method.m4:
+	* tools/m4/signal.m4:
+	* tools/m4/vfunc.m4: Added optional parameters that result in 
+	#ifdefs around methods, signals, vfuncs, etc.
+	* tools/pm/Output.pm: Addef ifdef() and endif().
+	output_wrap_vfunc_h(), output_wrap_vfunc_cc(),
+	output_wrap_default_signal_handler_h(), 
+	output_wrap_default_signal_handler_cc(),
+	output_wrap_meth(),
+	output_wrap_create(),
+	output_wrap_sig_decl(): Support optional ifdefs around  
+	declarations and implementations, by calling ifdef() and endif(), 
+	or by passing the extra argument to the m4 macros.
+	* tools/pm/WrapParser.pm: parse_and_build_output(): 
+	Parse _IMPLEMENTS_INTERFACE, and call the new on_implements_interface() 
+	method, which uses the new output_implements_interface() method, 
+	so it can have an optional ifdef parameter.
+	on_wrap_method(), on_wrap_create(), on_wrap_vfunc(), output_wrap_signal(),
+	output_wrap_vfunc(): Handle the optional ifdef (with a parameter) option 
+	for the _WRAP*() macros.
+
+	This adds support for disabling certain features by using the new
+	"ifdef" argument for methods, vfuncs, signals and interfaces.
+
+2006-09-05  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* docs/reference/Makefile.am: rebuild docs when a .h files changes in
+	glib/glibmm
+	* glib/glibmm/miscutils.cc:
+	* glib/glibmm/miscutils.h: wrap g_get_user_data_dir(),
+	g_get_user_config_dir(), and g_get_user_cache_dir()
+
+This is the HEAD branch, for new API. There is also a glib-2-12 branch for 
+maintenance of the stable API.
+
+2006-08-18  Cedric Gustin  <cedric.gustin@gmail.com>
+	
+	* MSVC_Net2003/*.vcproj: Updated for glibmm-2.12.
+
+2.12.0:
+
+2.11.3:
+
+2006-04-25  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in:
+	* glib/glibmmconfig.h.in:
+	* scripts/reduced.m4: Added a --enable-api-default-signal-handlers option. This defines 
+	GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED, which is used to #ifdef default signal handlers.
+	This saves on library code size (less code and API symbols) and application code size and 
+	loading time (less virtual methods, which must be imported and resolved at load time) and 
+	per-object memory size (smaller object sizes because of less virtual methods.) 
+	* tools/m4/class_interface.m4:
+	* tools/m4/class_shared.m4: Put default signal handler code in #ifdefs.
+
+2.11.2:
+
+2006-07-17  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in: Reverted the previous patch slightly to unbreak glibmmconfig.h.
+
+2.11.1:
+
+2006-07-16  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in: Quote GLIBMM_*_VERSION to avoid m4 warnings. Patch from 
+	Bug #347076 from Kevin McBride.
+	* scripts/sun.m4: Quote GLIBMM_PROG_CXX_SUN to avoid an m4 warning. 
+	Patch from Bug #347077 from Kevin McBride.  
+
+2006-07-16  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
+	* glib/src/date.ccg: fix implementation of Glib::Date::set_time_current() so
+	that it doesn't set the date to Dec 31, 1969.
+
+2006-06-19  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/glibmm/object.h: Check whether DestroyNotify is defined, so we can warn about 
+	including X11/Xlib.h before this header, which will break things. 
+	Bug #316726 from Mert Tugcu and Javeed Shaikh.
+
+2006-06-09  Cedric Gustin  <cedric.gustin@gmail.com>
+
+	* glib/glibmm/objectbase.h : Inline the set_property and
+	get_property methods. This is required by mingw32-gcc as
+	ObjectBase is explicitly dllexported.
+
+2006-06-05  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/src/convert.ccg: When using --enable-api-exception=no, only try to get the Glib::Error 
+	when the GError is not null.
+
+2006-05-18  Murray Cumming  <murrayc@murrayc.com>
+
+	* tools/m4/method.m4: _METHOD(): When using errthrow, actually print the function call even if 
+	the return type is 0.
+
+2006-05-16  Murray Cumming  <murrayc@murrayc.com>
+
+	* tools/m4/method.m4:  _METHOD(), _STATIC_METHOD(): Remove spaces before dnl statements, 
+	to avoid unwanted indentation in .cc files.
+
+2006-05-16  Murray Cumming  <murrayc@murrayc.com>
+
+	* tools/m4/convert_base.m4: _CONVERT(): If the return type is void, use the unconverted 
+	statement, not no statement. This prevents some void methods from being totally empty. 
+	This was a (very bad) regression introduced by the optional API changed. 
+	Bug #341895 from Philip Langdale.
+	* tools/m4/method.m4: _METHOD(), _STATIC_METHOD(): Attempt to remove unnecessary newlines, 
+	though some indenting spaces slipped in instead. Must fix that. 
+
+2006-05-14  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/glibmm/value.cc:
+	* glib/glibmm/value.h: Restored the init(GValue*) method that was lost when 
+	merging changes from the glibmm-2-10 branch.
+
+2006-05-09  Murray Cumming  <murrayc@murrayc.com>
+ 
+	* glib/glibmm/ustring.cc:
+	* glib/src/date.ccg:
+	* glib/src/convert.ccg:
+	* glib/src/convert.hg: Added #ifdefed versions for the case that 
+	exceptions are disabled.
+
+2006-05-10  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in:
+	* scripts/reduced.m4: Moved --enable-deprecated-api macro into scripts/reduced.m4.
+	Added the --enable-api-exceptions macro that was missing from my last commit.
+
+2006-04-05  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in:
+	* scripts/reduced.m4: Added --enable-api-exceptions option. When this 
+	is used, methods that would normally throw an exception will now take 
+	an extra std::auto_ptr<Glib::Error> argument that should be checked with 
+	auto_ptr::get().
+	* glib/glibmmconfig.h.in: Undef the GLIBMM_EXCEPTIONS_ENABLED, 
+	so it will be defined.
+	* tools/m4/gerror.m4: throw_func() returns an auto_ptr of a 
+	Glib::Error when exceptions are disabled.
+	* tools/m4/method.m4:
+	* tools/pm/Output.pm: on_wrap_method(): Added alternative API with 
+	#ifdefs
+	* tools/m4/signal.m4:
+	* tools/m4/signalproxy_custom.m4:
+	* tools/m4/vfunc.m4: Put #ifdefs around the exception re-throwing 
+	try/catch blocks.
+	* glib/glibmm/dispatcher.cc:
+	* glib/glibmm/dispatcher.h:
+	* glib/glibmm/error.cc:
+	* glib/glibmm/error.h:
+	* glib/glibmm/exceptionhandler.cc:
+	* glib/glibmm/exceptionhandler.h:
+	* glib/glibmm/main.cc:
+	* glib/glibmm/signalproxy.cc:
+	* glib/glibmm/streamiochannel.cc:
+	* glib/glibmm/stringutils.cc:
+	* glib/glibmm/threadpool.cc:
+	* glib/src/iochannel.ccg:
+	* glib/src/iochannel.hg:
+	* glib/src/markup.ccg:
+	* glib/src/spawn.ccg:
+	* glib/src/thread.ccg: Put #ifdefs around try/catch blocks, and 
+	use alternative API when appropriate.
+	* examples/iochannel_stream/fdstream.cc:
+	* examples/markup/parser.cc:
+	* examples/options/main.cc: Adapted examples to 
+	the alternative API, with #ifdefs
+	* tools/m4/convert_base.m4: Avoid any conversion if the result is 
+	void, to allow _WRAP_METHOD() to ignore bool results, so we can 
+	generate some methods that are currently hand-coded.
+
+2006-05-09  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/glibmm/value.cc:
+	* glib/glibmm/value.h: Added init(const GValue*), so that we can copy GValue instances 
+	of any type at runtime. Needed by libgdamm, which returns const GValue* instances.
+
+This is the HEAD branch, for API additions. See also the glibmm-2-10 branch.
+
+2.10.1:
+
+2006-04-12  Murray Cumming  <murrayc@murrayc.com>
+
+	* tools/m4/signalproxy_custom.m4: Remove this file because it is not installed and 
+	does not seem to be used.
+
+2006-04-12  Murray Cumming  <murrayc@murrayc.com>
+
+	* tools/m4/signal.m4: Mark the (private) signal info callback functions as 
+	static, to save on code size. 
+
+2006-04-12  Murray Cumming  <murrayc@murrayc.com>
+
+	* tools/pm/WrapParser.pm: Parse a new optional constversion parameter for 
+	_WRAP_METHOD(), to save on code size by just calling the non-const overload 
+	instead of generating almost identical code.
+ 	* tools/m4/method.m4: _METHOD(): Take extra parameters for use when constversion is used.
+	* tools/pm/Output.pm: Send the extra parameters to _METHOD().
+	* docs/internal/using_gmmproc.txt: Documented the new constversion option.
+
+2006-04-12  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/glibmm/main.cc:
+	* glib/glibmm/objectbase.cc:
+	* glib/glibmm/property.cc:
+	* glib/glibmm/ustring.cc:
+	* glib/glibmm/value_custom.cc: 
+	* glib/src/spawn.ccg: Mark private functions as 
+	static, to stop them being exported in the API, to reduce the 
+	library code size slightly.
+	* tools/m4/signal.m4: Make generated callback functions static, for 
+	the same reasons.
+
+2006-04-07  Cedric Gustin  <cedric.gustin@gmail.com>
+
+	* README.win32: Updated for Mingw-4.1.
+
+2006-04-06  Cedric Gustin  <cedric.gustin@gmail.com>
+
+	* MSVC_Net2003/*.vcproj: Embed the manifest file into executables
+	in the case of the Debug target.
+	* README.win32: Fixed a few typos.
+	* build_shared/Makefile_build.am_fragment: Add -DGLIBMM_BUILD to
+	the extra_defines compiler flags (switch between
+	dllexport/dllimport on win32).
+	* glib/glibmmconfig.h.in: Define GLIBMM_DLL when building with
+	mingw32/cygwin. This makes the GLIBMM_API tag (and GTKMM_API for
+	gtkmm) active with these two platforms, as required by bug
+	#309030.  
+	* glib/glibmm/object.h, glib/glibmm/objectbase.h : Tag the Object
+	and ObjectBase classes with GLIBMM_API to make Visual Studio happy.
+
+2.10.0:
+
+2006-02-25  Murray Cumming  <murrayc@murrayc.com>
+ 
+	* tools/pm/DocsParser.pm: looklookup_documentation(): Put the 
+	@deprecated text immediately after the main description, before 
+	the parameters, so that Doxygen actually uses it.
+ 
+2006-02-25  Murray Cumming  <murrayc@murrayc.com>
+ 
+	* tools/pm/DocsParser.pm: looklookup_documentation(): Accept an 
+	extra deprecated_documentation parameter, to be appended to the 
+	Doxygen documentation.
+	* tools/pm/Output.pm: output_wrap_meth(): Put the documentation 
+	inside the deprecation #ifdef, for neatness.
+	* tools/pm/WrapParser.pm: on_wrap_method(): Read an optional string 
+	after the optional deprecated parameter, used to say why the 
+	method is deprecated, in case it was not deprecated by the C API, 
+	in which case it would already have documentation for this.
+
+2006-02-27  Cedric Gustin <cedric.gustin@gmail.com>
+
+	* README.win32: Updated for glibmm-2.8 (MS Visual Studio 2005).
+	* glib/glibmm/ustring.h: Tag npos with GLIBMM_API, in order to
+	dllexport it on win32. Bug #332438.
+	* MSVC_Net2003/*.vcproj: Updated for Visual Studio 2005. Added the
+	/vd2 compiler flag (Bug #158040).
+	* MSVC_Net2003/glibmm.sln: Updated for Visual Studio 2005.
+	* MSVC_Net2003/gendef/gendef.cc: Redirect output of dumpbin to a
+	file.
+	* glib/glibmmconfig.h.in: Undefined
+	GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS for MSVC.
+
+2006-02-03  Murray Cumming  <murrayc@murrayc.com>
+
+	* docs/internal/using_gmmproc.txt: Section about regenerating .defs:
+	Repeat the hint about extra_defs_gen here.
+
+2006-02-27  Cedric Gustin <cedric.gustin@gmail.com>
+
+	* glib/glibmm/ustring.h: Tag npos with GLIBMM_API, in order to
+	dllexport it on win32. Bug #332438.
+
+2006-02-07  Rob Page  <page.rob@gmail.com>
+
+	* glib/glibmm/ustring.h: fix a typo in the documentation for uppercase()
+
+2.9.1:
+
+2006-01-28  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/src/optiongroup.ccg: add_entry_with_wrapper(): Copy the 
+	CppOptionEntry into the map _after_ setting entry_ so that we 
+	really delete it in release_c_arg(), to avoid a memory leak.
+
+2006-01-28  Rob Page <rob@gmail.com>
+
+	* docs/reference/glibmm_header.html_fragment: Fix the link 
+	to the Main page. Bug #328299.
+
+2006-01-27  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/src/optionentry.ccg: Constructor: Avoid memory 
+	leak caused by double instantiation of gobject_.
+
+2005-12-16  Murray Cumming <murrayc@murrayc.com>
+
+	* glib/glibmm/object.h:
+	* glib/glibmm/objectbase.h: Hide some internal stuff 
+	from Doxygen. Add/Improve the Doxygen documentation.
+	* glib/src/convert.hg: Correct the declaration of 
+	filename_display_name() to match the implementation. 
+	Previously this would have been unusable due to a linker 
+	error.
+
+2005-11-30  Murray Cumming <murrayc@murrayc.com>
+
+	* docs/reference/Doxyfile.in: Define the @newin aliases, 
+	as in gtkmm.
+	* tools/pm/DocsParser.pm: Convert Since: in gtk-doc 
+	text to @newin for our doxygen docs.
+
+2005-11-29  Murray Cumming <murrayc.com>
+
+	* build_shared/Makefile_build.am_fragment:
+	* configure.in: Added --enable-use-deprecations, 
+	defaulting to no (do not check for them), so that 
+	the tarball will still build when newer versions 
+	of glib deprecate some API. 
+	* examples/Makefile.am_fragment: Use the 
+	deprecation, if wanted.
+
+2005-11-29  Murray Cumming <murrayc@murrayc.com>
+
+	* build_shared/Makefile_build.am_fragment:
+	* configure.in: Added --enable-deprecated-api 
+	option. When set to disabled, it does not build 
+	deprecated API. This reduces the size of the library, 
+	and might be useful for embedded devices.
+	* glib/src/date.ccg:
+	* glib/src/date.hg: Use _DEPRECATE_IFDEF_START/END 
+	around the deprecated set_time() method.
+
+2005-11-29  Murray Cumming <murrayc@murrayc.com>
+
+	* tools/m4/base.m4: Add 
+        _DEPRECATE_IFDEF_START and _DEPRECATE_IFDEF_END 
+	macros, to #ifdef-out generated methods. 
+	Added _DEPRECATE_IFDEF_CLASS_START and 
+	_DEPRECATE_IFDEF_CLASS_END for whole classes. 
+	Put _DEPRECATE_IFDEF_CLASS* around all generated 
+	code. It does nothing if the class is not deprecated.
+	* tools/m4/class_gtkobject.m4: Add _DEPRECATED macro, 
+	used to mark a class as deprecated.
+	* tools/m4/method.m4: Take an extra parameter, to 
+	optionally mark the method as deprecated, to add 
+	#ifdefs around the code, with 
+	_DEPRECATE_IFDEF_START/END
+	* tools/pm/Output.pm: _DEPRECATE_IFDEF_START/END 
+	around the declarations of deprecated methods.
+	* tools/pm/WrapParser.pm: Check for an optional 
+	deprecated parameter to _WRAP_METHOD(). 
+	* tools/m4/member.m4: Allow optional deprecated 
+	method for _MEMBER_GET/SET*() to ifdef the code 
+	out.
+	* tools/generate_wrap_init.pl.in: Put an #ifdef 
+	around use of deprecated classes.
+
+2005-11-23  Murray Cumming <murrayc@murrayc.com>
+
+	* configure.in: Depend on glib 2.9, which 
+	has new API.
+	* glib/src/date.ccg:
+	* glib/src/date.hg: Wrap glib_date_set_time_t() 
+ 	and glib_date_set_time_val(). Deprecate  
+	set_time(GTime) in favour of the new method 
+	overloads. Added set_time_current(), wrapping the 
+	case that the time_t is 0.
+
+This is the HEAD branch, for new API, targetting glib 2.9. See also the 
+glibmm-2-8 branch.
+
+2.8.2:
+
+2005-11-23  Murray Cumming <murrayc@murrayc.com>
+
+	* glib/glibmm/containers.h: Do not use g_assert() in 
+	a header, because g++ sometimes warns that it has 
+	no effect.
+
+2005-10-29  Murray Cumming <murrayc@murrayc.com>
+
+	* scripts/macros.m4: AL_PROG_GNU_MAKE(): 
+	Use $MAKE-make instead of $ac_make, which 
+	apparently fixes a build problem on some 
+	Solaris systems. Thanks to Mark Rouchal in 
+	bug #307480.
+
+2.8.1:
+
+2005-10-19  Murray Cumming  <murrayc@murrayc.com>
+
+	* configure.in: Check for glib 2.8. Bug #317913.
+
+2.8.0:
+
+Updated NEWS and increased version to 2.8.0.
+
+2.7.3:
+
+2005-08-17  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/src/glib_docs.xml: Regenerated with docextract_to_xml.py
+	* glib/src/glib_enums.defs: Regenerated with enums.pl
+	* glib/src/glib_functions.defs: Regenerated with h2defs.py
+
+2.7.2:
+
+2005-07-16  Murray Cumming <murrayc@murrayc.com
+
+	* glib/glibmm/miscutils.cc: Reimplemented build_filename() and 
+	build_path() with the new non-vararg functions in glib 2.7, 
+	instead of implementing them in gtkmm.
+	* glib/src/glib_enums.defs: Regenerated with enums.pl
+	* glib/src/optionentry.hg: Added FLAG_NO_ARG, FLAG_FILENAME, 
+	FLAG_OPTIONAL_ARG, and FLAG_NOALIAS enum values.
+
+
+2.7.1:
+
+2005-06-08  Murray Cumming <murrayc@murrayc.com
+
+	* glib/glibmm/propertyproxy.h: 
+	PropertyProxy_ReadOnly<>::get_value(),
+  	PropertyProxy_WriteOnly<>::set_value(): Add implementations 
+	instead of casting to unrelated PropertyProxy() and calling it 
+	there. The AIX compiler did not like this hack. Bug #301610
+
+2005-06-07  Cedric Gustin <cedric.gustin@swing.be>
+
+	* glib/glibmm/miscutils.cc: In get_home_dir, return an empty
+	string when HOME is not defined (Win9x). Bug #306310 from Michael
+	Hofmann.
+	* glib/glibmm/miscutils.h: Updated docstring for the get_home_dir
+	method.
+
+2005-04-27  Murray Cumming <murrayc@murrayc.com>
+
+	* examples/child_watch/main.cc:
+	* examples/thread/dispatcher.cc:
+	* examples/thread/thread.cc:
+	* glib/glibmm/dispatcher.cc: Inherit signal handler objects from 
+	sigc::trackable. This is necessary with some libsigc++ patches, 
+	though not currently necessary with regular libsigc++.
+
+2005-04-22  Murray Cumming  <murrayc@murrayc.com>
+
+	* glib/src/gmodule_enums.defs: Regenerate with enums.pl
+	* glib/src/gmodule_functions.defs: Regenerate with h2defs.py
+	This adds the BIND_LOCAL enum value. Bug #172748 from 
+        Phillip Neiswanger.
+
+2005-04-05  Murray Cumming  <murrayc@murrayc.com>
+
+	* tool/pm/Output.pm: output_wrap_property(): Do not add the 
+	const read-only method override if the property can not be read. Be 
+	careful because this removes a little API from generated code. You 
+	should hand-code the wrongly-generated methods and mark them as 
+	deprecated.
+	* glib/glibmm/refptr.h: Added cast_const<>, like the existing 
+	cast_dynamic<> and cast_static.
+
+2005-03-31  Murray Cumming <murrayc@murrayc.com>
+
+	* glib/src/glib_functions.defs: Updated with 
+	h2defs.py.
+
+2005-03-13  Yair Hershkovitz <yairhr@gmail.com>
+
+	* glib/glibmm/main.h,
+	glib/glibmm/main.cc: Added MainContext::signal_child_watch()
+	* examples/: Added child_watch/ example   
+  
+2005-03-11  Yair Hershkovitz <yairhr@gmail.com>
+
+	* glib/glibmm/main.h, glib/glibmm/main.cc: 
+	Add Glib::SignalChildWatch class, Glib::signal_child_watch()
+
+This is the HEAD branch, for new API. Bug fixes that do not change or add 
+API should also be applied to the glibmm-2-6 branch.
+
+2005-03-09  Cedric Gustin <cedric.gustin@swing.be>
+
+	* MSVC_Net2003/Makefile.am: Add blank.cpp to EXTRA_DIST.
+	* MSVC_Net2003/glibmm/glibmm.vcproj: Remove sarray.cc from the
+	list of source files.
+	* MSVC_Net2003/examples/*/*.vcproj,
+	MSVC_Net2003/tests/glibmm_value/glibmmvalue.vcproj: Change name of
+	PDB file to $(OutDir)/$(TargetName).pdb. 
+	
 2.6.1:
 
 2005-03-07  Murray Cumming  <murrayc@murrayc.com>

libs/glibmm2/INSTALL

@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
 Software Foundation, Inc.
 
 This file is free documentation; the Free Software Foundation gives
@@ -102,16 +102,16 @@ for another architecture.
 Installation Names
 ==================
 
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
@@ -159,7 +159,7 @@ where SYSTEM can have one of these forms:
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
@@ -189,8 +189,13 @@ them in the `configure' command line, using `VAR=value'.  For example:
 
      ./configure CC=/usr/local2/bin/gcc
 
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
 
 `configure' Invocation
 ======================

libs/glibmm2/Makefile.am

@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS	= -I scripts
 
-SUBDIRS = glibmm
+SUBDIRS		= tools glib examples docs scripts tests MSVC_Net2003
 DIST_SUBDIRS	= $(SUBDIRS)
 
 EXTRA_DIST	= build_shared/Makefile_build.am_fragment \
@@ -8,16 +8,57 @@ EXTRA_DIST	= build_shared/Makefile_build.am_fragment \
 		  build_shared/Makefile_gensrc.am_fragment \
 		  build_shared/Makefile_gensrc_platform.am_fragment \
 		  build_shared/Makefile_build_extra.am_fragment \
-		  CHANGES glibmmconfig.h.in glibmm-2.4.pc.in
+		  CHANGES README.win32
 
-glibmm_includedir       = $(includedir)/glibmm-2.4
-glibmm_include_HEADERS  = glibmm.h
-
-glibmm_configdir        = $(libdir)/glibmm-2.4/include
-glibmm_config_DATA      = glibmmconfig.h
-
-pkgconfigdir            = $(libdir)/pkgconfig
-pkgconfig_DATA          = glibmm-2.4.pc
 
 all-local:
 	@echo "*** Everything completed ***"
+
+dist-hook:
+	@echo; echo; \
+	echo "**********************************************************"; \
+	echo "* IMPORTANT NOTICE:                                      *"; \
+	echo "*                                                        *"; \
+	echo "* Be sure you have done a complete build before running  *"; \
+	echo "* 'make dist' or 'make distcheck', because otherwise     *"; \
+	echo "* the tarball will _not_ contain the dependency rules    *"; \
+	echo "* generated by the compiler.                             *"; \
+	echo "**********************************************************"; \
+	echo; echo
+
+
+include $(top_srcdir)/docs/Makefile_web.am_fragment
+
+doc_tarball_files = \
+	docs/images/*.gif \
+	docs/internal/*.txt docs/internal/*.dia docs/reference/html
+
+# This doesn't work very well in a $(srcdir) != $(builddir) setup,
+# but this target is for maintainer use only anyway.
+
+glibmm-docs.tar.gz:
+	find examples -name '*.cc' -o -name '*.h' -o -name '*.xpm' -o -name '*.xml' | \
+	tar cf - --files-from - $(doc_tarball_files) | gzip -c --best >$@
+
+# Upload documentation and examples:
+
+post-html-recursive:
+	list='docs examples'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) post-html); \
+	done
+
+post-html-local: glibmm-docs.tar.gz
+	rsync $(rsync_args) glibmm-docs.tar.gz $$USER@$(web_host):$(web_path_gtkmm)
+
+post-html: post-html-recursive post-html-local
+
+doc-clean-recursive:
+	(cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-clean)
+
+doc-clean: doc-clean-recursive
+
+doc-rebuild:
+	(cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-rebuild)
+
+.PHONY: post-html post-html-local post-html-recursive doc-clean doc-clean-recursive doc-rebuild
+

libs/glibmm2/NEWS

@@ -1,3 +1,160 @@
+2.13.3:
+
+* gmmproc improvements:
+  - gmmproc: Allow () in property and signal docuemntation.
+  - gmmproc: Do not try to remove a common prefix from the 
+  C enam values, if there is no common prefix.
+  - enum.pl: Allow whitespace in front of an enum typedef. 
+  (Daniel Elstner)
+  - enum.pl: Fix an infinite loop.
+
+* ObjectBase: Added connect_property_changed(), 
+  as an alternative to use when the property proxies are not 
+  available because GLIBMM_PROPERTIES_ENABLED is not defined.
+  (Murray Cumming)
+* Value: When registering float parameters, use 
+  G_MAXFLOAT as the minimum, instead of G_MINFLOAT.
+  Likewise for doubles.
+  (Oliver Nittka)
+
+2.13.2:
+
+*Build:
+ - Fix for api-default-signal-handlers option.
+   Bug #357830 (Matt Hoosier)
+ - win32: Remove unused source file from Visual Studio project.
+   (Cedric Gustin)
+
+2.13.1:
+
+* KeyFile class added, wrapping GKeyFile, 
+  for parsing of .ini-style files.
+  (Rob Page)
+* Added get_user_data_dir(), get_user_config_dir(), and 
+  get_user_cache_dir().
+  (Jonathon Jongsma)
+* Support optional ifdef parameters in the .hg macros, 
+  to allow, for instance the --enable-atk=no option, 
+  to disable the build and use of the atkmm API, 
+  for use in embedded environments.
+  (Johannes Schimd, Murray Cuming, Openismus)
+* Documentation: 
+  - Small ustring reference documentation improvement.
+  (Ralf Stephan)
+
+2.12.0:
+
+Changes sinze 2.10:
+* Added the --enable-api-default-signal-handlers option, for use in 
+  embedded environments that have reduced resources. See configure --help 
+  for the other subsets.
+* Value: Added init(const GValue*), so we can copy GValue instances 
+  of any type at runtime. Needed by the new branch of libgdamm.
+
+2.11.3:
+
+* Build: Added the --enable-api-default-signal-handlers option, for use in 
+  embedded environments that have reduced resources. See configure --help 
+  for the other subsets.
+
+2.11.2:
+
+* Date: Fix implementation of Glib::Date::set_time_current() so
+  that it doesn't set the date to Dec 31, 1969.
+  (Jonathon Jongsma)
+* Value: Added init(const GValue*), so we can copy GValue instances 
+  of any type at runtime. Needed by the new branch of libgdamm.
+  (Murray Cumming)
+* Added a #warning to warn about including X11/Xlib.h before a glibmm header, 
+  which would break things. Bug #316726 from Mert Tugcu and Javeed Shaikh.
+  (Murray Cumming)
+* Build: 
+  - Quote some m4 macros to avoid warnings. Bugs (with patches) #347076 
+  and #347077
+  (Kevin McBride).
+  - Fix exporting of get/set_property() on mingw32-gcc.
+  (Cedric Gustin)
+
+
+
+
+2.10.1
+
+* Windows Build:
+ - Define GLIBMM_DLL when building with mingw32 or cygwin, 
+   because it is needed by gtkmm. Bug #309030
+ (Cedric Gustin)
+* OptionGroup: Allow default values, by not initializing them all.
+  (Armin Burgmeier)
+* Slight code size reduction by marking private functions as static.
+  (Murray Cumming)
+
+2.10.0:
+
+* Windows Build:
+ - ustring.h: Tag npos with GLIBMM_API, in order to
+   dllexport it on win32. Bug #332438.
+ - Updated MSVC++ build files and README, for MS Visual Studio 2005.
+ (Cedric Gustin)
+* gmmproc code generator: 
+ - WRAP_METHOD() Take an extra optional argument: deprecated deprecationtext - 
+  so that we can insert the appropriate doxygen tag in the documentation, where 
+  the C documentation does not do it for us.
+
+2.9.1:
+
+* Date:
+  - Added set_time(time_t), set_time(GTimeVal), and deprecated  
+    set_time(GTime)
+  - Added set_time_current().
+  (Murray Cumming)
+* Build: Added --enable-deprecated-api  option. When set to disabled, 
+  it does not build deprecated API. This reduces the size of the 
+  library, and might be useful for embedded devices.
+  (Murray Cumming)
+
+2.8.2:
+
+* Solaris build fix: Correct the detection 
+  of make. (Mark Rouchal)
+
+2.8.1:
+
+* Build: Check for glib 2.8.
+
+2.8.0:
+
+API additions since glibmm 2.6:
+
+* GModule: Add BIND_LOCAL enum value.
+  (Bug #172748 from Phillip Neiswanger).
+* MainContext Added signal_child_watch()
+  and examples/child_watch.
+  (Yair Hershkovitz)
+* OptionEntry: Added FLAG_NO_ARG, FLAG_FILENAME, 
+  FLAG_OPTIONAL_ARG, and FLAG_NOALIAS enum values.
+  (Murray Cumming)
+
+2.7.3:
+
+* Updated reference documentation from glib documentation.
+
+2.7.2:
+
+* OptionEntry: Added FLAG_NO_ARG, FLAG_FILENAME, 
+  FLAG_OPTIONAL_ARG, and FLAG_NOALIAS enum values.
+* build_filename() and build_path(): Now use the implementation 
+  from glib.
+
+2.7.1:
+
+* GModule: Add BIND_LOCAL enum value.
+  (Bug #172748 from Phillip Neiswanger).
+* MainContext Added signal_child_watch()
+  and examples/child_watch.
+  (Yair Hershkovitz)
+* Fixes from 2.6.2.
+
 2.6.1:
 
 * Interface::add_interface(): Disabled the check for a second call, 

libs/glibmm2/README

@@ -1,31 +1,4 @@
-This is the unstable version of gtkmm, aimed at Gtk+ 2.0.x.
-See CHANGES for a comparison with gtkmm 1.2.
-
-Contents:
-* Your unstable development environment
-* Required libraries:
-
-Your unstable development environment
--------------------------------------
-
-Until the GTK+ 2.0 / GNOME 2.0 platform is stable, you should try to separate these unstable libraries from your stable GTK+ 1.2 / GNOME 1.2/1.4 libraries. You can do this by installing the unstable libraries into a different prefix.
-e.g. ./configure --prefix=/usr/devgnome2
-
-When using the development libraries, you will need to modify some environment variables. This will be easier if you create a file (e.g. devgnome2) in your home directory that contains these commands:
-
-export PATH="/usr/devgnome2/bin:$PATH"; export LD_LIBRARY_PATH="/usr/devgnome2/lib" ; export PKG_CONFIG_PATH="/usr/devgnome2/lib/pkgconfig:$PKG_CONFIG_PATH" ;
-
-You can then type
-# source devgnome2
-to prepare your environment before building or working with the development libraries.
-
-You may also need to edit /etc/ld.so.conf to add /usr/devgnome2/lib, and then type /sbin/ldconfig to re-process the ld.so.conf.
+This is glibmm, a C++ API for parts of glib that are useful for C++.
+See http://www.gtkmm.org
 
 
-The vicious-build-scripts module in cvs.gnome.org might help you with this, if you can get it to work.
-
-Required Libraries
-------------------
-
-* Of course, you will need gtk+ 2 and its dependencies.
-* libsigc++ 1.2 (A release, or libsigc++-1.2 from cvs)

libs/glibmm2/SConscript

@@ -5,14 +5,14 @@ import os.path
 import glob
 
 
-glibmm2_files = glob.glob('glibmm/*.cc')
+glibmm2_files = glob.glob('glib/glibmm/*.cc')
 
 Import('env libraries install_prefix')
 
 glibmm2 = env.Copy()
-glibmm2.Merge([libraries['sigc2'], libraries['glib2']])
+glibmm2.Merge([libraries['sigc2'], libraries['glib2'], libraries['glibmm2']])
 
-glibmm2.Append(CXXFLAGS='-DHAVE_CONFIG_H')
+glibmm2.Append(CXXFLAGS=['-DHAVE_CONFIG_H', '-DGLIBMM_EXCEPTIONS_ENABLED', '-DGLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED', '-DGLIBMM_PROPERTIES_ENABLED'])
 #glibmm2.Append(CXXFLAGS='-DG_DISABLE_DEPRECATED')
 glibmm2.Append(CXXFLAGS='-DG_LOG_DOMAIN=\\\"glibmm\\\"')
 

libs/glibmm2/scripts/macros.m4

@@ -29,7 +29,7 @@ AC_DEFUN([AL_PROG_GNU_MAKE],[
 dnl 
 dnl Check for GNU make (stolen from gtk+/configure.in)
 AC_MSG_CHECKING(whether make is GNU Make)
-if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
+if ${MAKE-make} --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
         AC_MSG_RESULT(yes)
 else
         AC_MSG_RESULT(no)

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

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:
+  #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 */
 

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)
@@ -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

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:
+  #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
+
+  #ifdef GLIBMM_VFUNCS_ENABLED
   virtual void get_size_vfunc(int& width, int& height) const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+  #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 */
 

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

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:
+  #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 */
 

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)
@@ -420,6 +453,10 @@ void EditableText::paste_text(int 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

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:
+  #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 */
 

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

libs/gtkmm2/atk/atkmm/hyperlink.h

@@ -3,6 +3,7 @@
 #ifndef _ATKMM_HYPERLINK_H
 #define _ATKMM_HYPERLINK_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -170,9 +171,15 @@ public:
   bool is_selected_link() const;
 
   
+/**
+   * @par Prototype:
+   * <tt>void %link_activated()</tt>
+   */
+
   Glib::SignalProxy0< void > signal_link_activated();
 
 
+  #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.
@@ -180,8 +187,10 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<bool> property_selected_link() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
+  #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.
@@ -189,8 +198,10 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_number_of_anchors() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
+  #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.
@@ -198,8 +209,10 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_end_index() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
+  #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.
@@ -207,29 +220,59 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_start_index() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
 protected:
+  #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
 
 
 };

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

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();
 
 
+  #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 */
 

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)
@@ -293,6 +317,10 @@ void Image::get_image_position(int& x, int& y, CoordType coord_type) const
 }
 
 
+#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

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:
+  #ifdef GLIBMM_VFUNCS_ENABLED
   virtual bool set_image_description_vfunc(const Glib::ustring& description);
-    virtual const char* get_image_description_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
 
+  #ifdef GLIBMM_VFUNCS_ENABLED
+  virtual const char* get_image_description_vfunc() const;
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
+  #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 */
 

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

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:
+  #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 */
 

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
 
 

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
 
 
 };

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
@@ -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

libs/gtkmm2/atk/atkmm/object.h

@@ -3,6 +3,7 @@
 #ifndef _ATKMM_OBJECT_H
 #define _ATKMM_OBJECT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -320,24 +321,55 @@ 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();
 
 
+  #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.
@@ -345,7 +377,9 @@ public:
    * 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,7 +387,9 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_accessible_name() const;
+#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.
@@ -361,7 +397,9 @@ public:
    * 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,7 +407,9 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_accessible_description() const;
+#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.
@@ -377,7 +417,9 @@ public:
    * 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,7 +427,9 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> > property_accessible_parent() const;
+#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.
@@ -393,7 +437,9 @@ public:
    * 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,7 +447,9 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<double> property_accessible_value() const;
+#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.
@@ -409,7 +457,9 @@ public:
    * 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,7 +467,9 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_accessible_role() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
+  #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.
@@ -425,8 +477,10 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_accessible_component_layer() const;
+#endif //#GLIBMM_PROPERTIES_ENABLED
 
 
+  #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.
@@ -434,8 +488,10 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<int> property_accessible_component_mdi_zorder() const;
+#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.
@@ -443,7 +499,9 @@ public:
    * 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,7 +509,9 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_accessible_table_caption() const;
+#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.
@@ -459,7 +519,9 @@ public:
    * 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,7 +529,9 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_accessible_table_column_description() const;
+#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.
@@ -475,7 +539,9 @@ public:
    * 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,7 +549,9 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> > property_accessible_table_column_header() const;
+#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.
@@ -491,7 +559,9 @@ public:
    * 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,7 +569,9 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly<Glib::ustring> property_accessible_table_row_description() const;
+#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.
@@ -507,7 +579,9 @@ public:
    * 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,7 +589,9 @@ public:
    * the value of the property changes.
    */
   Glib::PropertyProxy_ReadOnly< Glib::RefPtr<Atk::Object> > property_accessible_table_row_header() const;
+#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.
@@ -523,7 +599,9 @@ public:
    * 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
 
 
 };

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
 
 

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
 
 
 };

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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 */
 

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)
 {
@@ -172,6 +184,13 @@ void Relation::add_target(const Glib::RefPtr<Atk::Object>& target)
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Atk
 
 

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
 
 
 };

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)
 {
@@ -154,20 +166,20 @@ 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)
@@ -176,6 +188,13 @@ void RelationSet::add_relation_by_type(RelationType relationship, const Glib::Re
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Atk
 
 

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
 
 
 };

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

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:
+  #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 */
 

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)
 {
@@ -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
 
 

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
 
 
 };

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

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:
+  #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 */
 

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:
+  #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 */
 

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
 
 
@@ -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)
@@ -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

libs/gtkmm2/atk/atkmm/text.h

@@ -3,6 +3,7 @@
 #ifndef _ATKMM_TEXT_H
 #define _ATKMM_TEXT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -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:
  
 
+  #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 */
 

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)
@@ -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

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:
+  #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 */
 

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)

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>
 

libs/gtkmm2/gdk/gdkmm/bitmap.h

@@ -3,6 +3,7 @@
 #ifndef _GDKMM_BITMAP_H
 #define _GDKMM_BITMAP_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */

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
 {

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 */
 

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,21 +174,12 @@ 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()); 
@@ -167,43 +189,40 @@ 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
 {
-
-  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;
+  return const_cast<Colormap*>(this)->get_screen();
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gdk
 
 

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);
+  void free_color(Color& color);
 
-  /** 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);
   
   /** 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
 
 
 };

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>
 
@@ -56,6 +57,11 @@ Cursor::Cursor(const Glib::RefPtr<Display>& display, const Glib::RefPtr<Pixbuf>&
   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();
 }
 
 

libs/gtkmm2/gdk/gdkmm/cursor.h

@@ -3,6 +3,7 @@
 #ifndef _GDKMM_CURSOR_H
 #define _GDKMM_CURSOR_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -195,23 +196,47 @@ 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;
+
+
 };
 
 } //namespace Gdk
@@ -247,5 +272,6 @@ class Value<Gdk::Cursor> : public Glib::Value_Boxed<Gdk::Cursor>
 
 } // namespace Glib
 
+
 #endif /* _GDKMM_CURSOR_H */
 

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)
 {
@@ -199,6 +211,13 @@ bool Device::get_has_cursor() const
 }
  
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gdk
 
 

libs/gtkmm2/gdk/gdkmm/device.h

@@ -3,6 +3,7 @@
 #ifndef _GDKMM_DEVICE_H
 #define _GDKMM_DEVICE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -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
 
 
 };

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,40 +328,30 @@ 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)
@@ -375,12 +386,12 @@ void Display::close()
 
 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,7 +411,7 @@ 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)
@@ -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,7 +523,7 @@ 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()
@@ -542,20 +555,15 @@ 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

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;
 
@@ -410,16 +411,36 @@ public:
   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
    * of getting the current location of the pointer on a particular
    * 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
 
 
 };

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,24 +221,20 @@ 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)
@@ -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

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,25 +116,27 @@ 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();
 
+  #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.
@@ -141,7 +144,9 @@ public:
    * 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
 
 
 };

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)
 {
@@ -229,6 +240,11 @@ 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); 
 }
 
+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()); 
@@ -305,6 +321,13 @@ guint32 DragContext::get_start_time() const
 }
  
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gdk
 
 

libs/gtkmm2/gdk/gdkmm/dragcontext.h

@@ -3,6 +3,7 @@
 #ifndef _GDKMM_DRAGCONTEXT_H
 #define _GDKMM_DRAGCONTEXT_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -269,6 +270,8 @@ 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.
@@ -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
 
 
 };

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)
 {
@@ -197,20 +209,20 @@ 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)
@@ -327,42 +339,44 @@ 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
 {
-
-  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;
+  return const_cast<Drawable*>(this)->get_display();
 }
 
+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
 

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>
 
 
@@ -96,6 +98,11 @@ 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. 
+ *
+ * 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
 
 
 };

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,16 +133,19 @@ 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()); 
@@ -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()));
@@ -182,11 +187,13 @@ void Event::set_show_events(bool 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)); 
@@ -196,20 +203,15 @@ 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)

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 */
 

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)
 {
@@ -245,6 +257,11 @@ void GC::set_clip_rectangle(Rectangle& rectangle)
 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())); 
@@ -284,10 +301,10 @@ 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)
@@ -304,23 +321,25 @@ 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
 {
-
-  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;
+  return const_cast<GC*>(this)->get_screen();
 }
 
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gdk
 
 

libs/gtkmm2/gdk/gdkmm/gc.h

@@ -3,6 +3,7 @@
 #ifndef _GDKMM_GC_H
 #define _GDKMM_GC_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -470,6 +471,9 @@ public:
    */
   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
    * origin. (See set_clip_origin()).
@@ -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
 
 
 };

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
 

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

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)
 {
@@ -158,20 +170,15 @@ 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
@@ -245,6 +252,13 @@ void* Image::get_windowing_data() const
 }
  
 
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
+
+#ifdef GLIBMM_VFUNCS_ENABLED
+#endif //GLIBMM_VFUNCS_ENABLED
+
+
 } // namespace Gdk
 
 

libs/gtkmm2/gdk/gdkmm/image.h

@@ -3,6 +3,7 @@
 #ifndef _GDKMM_IMAGE_H
 #define _GDKMM_IMAGE_H
 
+
 #include <glibmm.h>
 
 /* $Id$ */
@@ -150,7 +151,7 @@ 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);
@@ -204,11 +205,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
 
 
 };

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));
 }
 
-void Pixbuf::save(const std::string& filename, const Glib::ustring& type)
-{
-  GError* error = 0;
-  gdk_pixbuf_savev(gobj(), filename.c_str(), type.c_str(), 0, 0, &error);
 
-  if(error)
-    Glib::Error::throw_exception(error);
+#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* gerror = 0;
+  gdk_pixbuf_savev(gobj(), filename.c_str(), type.c_str(), 0, 0, &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(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);
 
-  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)
+#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);
+
+#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()))));
@@ -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
 
 

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,8 +482,53 @@ 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.
@@ -485,20 +584,55 @@ 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:
@@ -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
 
 
 };

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
 
 

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
 
 
 };

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