Changes 2.12.1:

* PrintOperation: Corrected a reference-counting problem that caused
  crashes.

Changes 2.12:
* New classes: Builder, RecentAction, Tooltip, VolumeButton.
* Deprecated the Tooltips class.
* More...

6 files changed, 119 insertions, 253 deletions

diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 67d986226b7..e463483140c 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2007/09/22 22:56:43 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2007/10/13 14:18:33 adam Exp $
 
-DISTNAME=	gtkmm-2.10.11
-PKGREVISION=	2
+DISTNAME=	gtkmm-2.12.1
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkmm/2.10/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkmm/2.12/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
diff --git a/x11/gtkmm/PLIST b/x11/gtkmm/PLIST
index 4a5c91de0e3..030631e87ae 100644
--- a/x11/gtkmm/PLIST
+++ b/x11/gtkmm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2007/08/12 12:24:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2007/10/13 14:18:33 adam Exp $
 bin/demo
 include/atkmm-1.6/atkmm.h
 include/atkmm-1.6/atkmm/action.h
@@ -112,6 +112,7 @@ include/gtkmm-2.4/gtkmm/assistant.h
 include/gtkmm-2.4/gtkmm/base.h
 include/gtkmm-2.4/gtkmm/bin.h
 include/gtkmm-2.4/gtkmm/box.h
+include/gtkmm-2.4/gtkmm/builder.h
 include/gtkmm-2.4/gtkmm/button.h
 include/gtkmm-2.4/gtkmm/buttonbox.h
 include/gtkmm-2.4/gtkmm/calendar.h
@@ -210,6 +211,7 @@ include/gtkmm-2.4/gtkmm/private/aspectframe_p.h
 include/gtkmm-2.4/gtkmm/private/assistant_p.h
 include/gtkmm-2.4/gtkmm/private/bin_p.h
 include/gtkmm-2.4/gtkmm/private/box_p.h
+include/gtkmm-2.4/gtkmm/private/builder_p.h
 include/gtkmm-2.4/gtkmm/private/button_p.h
 include/gtkmm-2.4/gtkmm/private/buttonbox_p.h
 include/gtkmm-2.4/gtkmm/private/calendar_p.h
@@ -298,6 +300,7 @@ include/gtkmm-2.4/gtkmm/private/radiomenuitem_p.h
 include/gtkmm-2.4/gtkmm/private/radiotoolbutton_p.h
 include/gtkmm-2.4/gtkmm/private/range_p.h
 include/gtkmm-2.4/gtkmm/private/rc_p.h
+include/gtkmm-2.4/gtkmm/private/recentaction_p.h
 include/gtkmm-2.4/gtkmm/private/recentchooser_p.h
 include/gtkmm-2.4/gtkmm/private/recentchooserdialog_p.h
 include/gtkmm-2.4/gtkmm/private/recentchoosermenu_p.h
@@ -307,6 +310,7 @@ include/gtkmm-2.4/gtkmm/private/recentinfo_p.h
 include/gtkmm-2.4/gtkmm/private/recentmanager_p.h
 include/gtkmm-2.4/gtkmm/private/ruler_p.h
 include/gtkmm-2.4/gtkmm/private/scale_p.h
+include/gtkmm-2.4/gtkmm/private/scalebutton_p.h
 include/gtkmm-2.4/gtkmm/private/scrollbar_p.h
 include/gtkmm-2.4/gtkmm/private/scrolledwindow_p.h
 include/gtkmm-2.4/gtkmm/private/selectiondata_p.h
@@ -338,6 +342,7 @@ include/gtkmm-2.4/gtkmm/private/toggletoolbutton_p.h
 include/gtkmm-2.4/gtkmm/private/toolbar_p.h
 include/gtkmm-2.4/gtkmm/private/toolbutton_p.h
 include/gtkmm-2.4/gtkmm/private/toolitem_p.h
+include/gtkmm-2.4/gtkmm/private/tooltip_p.h
 include/gtkmm-2.4/gtkmm/private/tooltips_p.h
 include/gtkmm-2.4/gtkmm/private/treedragdest_p.h
 include/gtkmm-2.4/gtkmm/private/treedragsource_p.h
@@ -354,6 +359,7 @@ include/gtkmm-2.4/gtkmm/private/treeview_p.h
 include/gtkmm-2.4/gtkmm/private/treeviewcolumn_p.h
 include/gtkmm-2.4/gtkmm/private/uimanager_p.h
 include/gtkmm-2.4/gtkmm/private/viewport_p.h
+include/gtkmm-2.4/gtkmm/private/volumebutton_p.h
 include/gtkmm-2.4/gtkmm/private/widget_p.h
 include/gtkmm-2.4/gtkmm/private/window_p.h
 include/gtkmm-2.4/gtkmm/progressbar.h
@@ -364,6 +370,7 @@ include/gtkmm-2.4/gtkmm/radiomenuitem.h
 include/gtkmm-2.4/gtkmm/radiotoolbutton.h
 include/gtkmm-2.4/gtkmm/range.h
 include/gtkmm-2.4/gtkmm/rc.h
+include/gtkmm-2.4/gtkmm/recentaction.h
 include/gtkmm-2.4/gtkmm/recentchooser.h
 include/gtkmm-2.4/gtkmm/recentchooserdialog.h
 include/gtkmm-2.4/gtkmm/recentchoosermenu.h
@@ -373,6 +380,7 @@ include/gtkmm-2.4/gtkmm/recentinfo.h
 include/gtkmm-2.4/gtkmm/recentmanager.h
 include/gtkmm-2.4/gtkmm/ruler.h
 include/gtkmm-2.4/gtkmm/scale.h
+include/gtkmm-2.4/gtkmm/scalebutton.h
 include/gtkmm-2.4/gtkmm/scrollbar.h
 include/gtkmm-2.4/gtkmm/scrolledwindow.h
 include/gtkmm-2.4/gtkmm/selectiondata.h
@@ -408,6 +416,7 @@ include/gtkmm-2.4/gtkmm/toggletoolbutton.h
 include/gtkmm-2.4/gtkmm/toolbar.h
 include/gtkmm-2.4/gtkmm/toolbutton.h
 include/gtkmm-2.4/gtkmm/toolitem.h
+include/gtkmm-2.4/gtkmm/tooltip.h
 include/gtkmm-2.4/gtkmm/tooltips.h
 include/gtkmm-2.4/gtkmm/treedragdest.h
 include/gtkmm-2.4/gtkmm/treedragsource.h
@@ -426,6 +435,7 @@ include/gtkmm-2.4/gtkmm/treeview_private.h
 include/gtkmm-2.4/gtkmm/treeviewcolumn.h
 include/gtkmm-2.4/gtkmm/uimanager.h
 include/gtkmm-2.4/gtkmm/viewport.h
+include/gtkmm-2.4/gtkmm/volumebutton.h
 include/gtkmm-2.4/gtkmm/widget.h
 include/gtkmm-2.4/gtkmm/window.h
 include/gtkmm-2.4/gtkmm/wrap_init.h
@@ -528,6 +538,7 @@ share/doc/gtkmm-2.4/docs/reference/html/base_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/bin_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/bitmap_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/box_8h.html
+share/doc/gtkmm-2.4/docs/reference/html/builder_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/button_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/buttonbox_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/cairofontmap_8h.html
@@ -677,14 +688,6 @@ share/doc/gtkmm-2.4/docs/reference/html/classGdk_1_1Visual__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGdk_1_1Window-members.html
 share/doc/gtkmm-2.4/docs/reference/html/classGdk_1_1Window.html
 share/doc/gtkmm-2.4/docs/reference/html/classGdk_1_1Window__inherit__graph.png
-share/doc/gtkmm-2.4/docs/reference/html/classGlib_1_1Error.html
-share/doc/gtkmm-2.4/docs/reference/html/classGlib_1_1Error__inherit__graph.png
-share/doc/gtkmm-2.4/docs/reference/html/classGlib_1_1HelperList.html
-share/doc/gtkmm-2.4/docs/reference/html/classGlib_1_1HelperList__inherit__graph.png
-share/doc/gtkmm-2.4/docs/reference/html/classGlib_1_1Interface.html
-share/doc/gtkmm-2.4/docs/reference/html/classGlib_1_1Interface__inherit__graph.png
-share/doc/gtkmm-2.4/docs/reference/html/classGlib_1_1Object.html
-share/doc/gtkmm-2.4/docs/reference/html/classGlib_1_1Object__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1AboutDialog-members.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1AboutDialog.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1AboutDialog__inherit__graph.png
@@ -732,6 +735,12 @@ share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Box__Helpers_1_1Element-memb
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Box__Helpers_1_1Element.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Box__Helpers_1_1Element__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Box__inherit__graph.png
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Builder-members.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Builder.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1BuilderError-members.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1BuilderError.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1BuilderError__inherit__graph.png
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Builder__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Button-members.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Button.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1ButtonBox-members.html
@@ -1105,6 +1114,9 @@ share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Range__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1RcStyle-members.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1RcStyle.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1RcStyle__inherit__graph.png
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1RecentAction-members.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1RecentAction.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1RecentAction__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1RecentChooser-members.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1RecentChooser.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1RecentChooserDialog-members.html
@@ -1140,6 +1152,9 @@ share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Ruler.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Ruler__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Scale-members.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Scale.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1ScaleButton-members.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1ScaleButton.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1ScaleButton__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Scale__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Scrollbar-members.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Scrollbar.html
@@ -1239,6 +1254,9 @@ share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1ToolItem__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Toolbar-members.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Toolbar.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Toolbar__inherit__graph.png
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Tooltip-members.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Tooltip.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Tooltip__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Tooltips-members.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Tooltips.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Tooltips__inherit__graph.png
@@ -1326,6 +1344,9 @@ share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1VSeparator__inherit__graph.p
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Viewport-members.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Viewport.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Viewport__inherit__graph.png
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1VolumeButton-members.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1VolumeButton.html
+share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1VolumeButton__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Widget-members.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Widget.html
 share/doc/gtkmm-2.4/docs/reference/html/classGtk_1_1Widget__inherit__graph.png
@@ -1425,8 +1446,6 @@ share/doc/gtkmm-2.4/docs/reference/html/class__GtkBoxChild__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/class__GtkTableChild.html
 share/doc/gtkmm-2.4/docs/reference/html/class__GtkTableChild__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/classes.html
-share/doc/gtkmm-2.4/docs/reference/html/classsigc_1_1trackable.html
-share/doc/gtkmm-2.4/docs/reference/html/classsigc_1_1trackable__inherit__graph.png
 share/doc/gtkmm-2.4/docs/reference/html/clipboard_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/colorbutton_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/colormap_8h.html
@@ -1445,22 +1464,22 @@ share/doc/gtkmm-2.4/docs/reference/html/curve_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/deprecated.html
 share/doc/gtkmm-2.4/docs/reference/html/device_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/dialog_8h.html
-share/doc/gtkmm-2.4/docs/reference/html/dir_0320531c1822c5e643a25cc1e6fddbe4.html
-share/doc/gtkmm-2.4/docs/reference/html/dir_0320531c1822c5e643a25cc1e6fddbe4_dep.png
-share/doc/gtkmm-2.4/docs/reference/html/dir_0a379d602b0d17196fb83ef86e13d140.html
-share/doc/gtkmm-2.4/docs/reference/html/dir_0a379d602b0d17196fb83ef86e13d140_dep.png
-share/doc/gtkmm-2.4/docs/reference/html/dir_156fe7e4cc9f90dee537314a77a1c336.html
-share/doc/gtkmm-2.4/docs/reference/html/dir_156fe7e4cc9f90dee537314a77a1c336_dep.png
-share/doc/gtkmm-2.4/docs/reference/html/dir_278e604d282c7332413738ec4077dd22.html
-share/doc/gtkmm-2.4/docs/reference/html/dir_278e604d282c7332413738ec4077dd22_dep.png
-share/doc/gtkmm-2.4/docs/reference/html/dir_9320277ccb4979efce7431360e40cbfb.html
-share/doc/gtkmm-2.4/docs/reference/html/dir_9320277ccb4979efce7431360e40cbfb_dep.png
-share/doc/gtkmm-2.4/docs/reference/html/dir_9d4fa28316f4796604b1262f50e0d9e6.html
-share/doc/gtkmm-2.4/docs/reference/html/dir_9d4fa28316f4796604b1262f50e0d9e6_dep.png
-share/doc/gtkmm-2.4/docs/reference/html/dir_b237b48635fb8b1fb42bdc2ade24898c.html
-share/doc/gtkmm-2.4/docs/reference/html/dir_b237b48635fb8b1fb42bdc2ade24898c_dep.png
-share/doc/gtkmm-2.4/docs/reference/html/dir_f4f00cbe8f9e688461365ba0c15c00fb.html
-share/doc/gtkmm-2.4/docs/reference/html/dir_f4f00cbe8f9e688461365ba0c15c00fb_dep.png
+share/doc/gtkmm-2.4/docs/reference/html/dir_10d2714506eb2f90bc6bdfa26011a2e5.html
+share/doc/gtkmm-2.4/docs/reference/html/dir_10d2714506eb2f90bc6bdfa26011a2e5_dep.png
+share/doc/gtkmm-2.4/docs/reference/html/dir_44bbae6f14fd5ba2f0608771229125d1.html
+share/doc/gtkmm-2.4/docs/reference/html/dir_44bbae6f14fd5ba2f0608771229125d1_dep.png
+share/doc/gtkmm-2.4/docs/reference/html/dir_683cb6bf6fc501ec2f587c0b1545ed4d.html
+share/doc/gtkmm-2.4/docs/reference/html/dir_683cb6bf6fc501ec2f587c0b1545ed4d_dep.png
+share/doc/gtkmm-2.4/docs/reference/html/dir_9ecd4740dc9e73ca6ceb5788aeca60cc.html
+share/doc/gtkmm-2.4/docs/reference/html/dir_9ecd4740dc9e73ca6ceb5788aeca60cc_dep.png
+share/doc/gtkmm-2.4/docs/reference/html/dir_aec23cce998621bd6546125afc6296e4.html
+share/doc/gtkmm-2.4/docs/reference/html/dir_aec23cce998621bd6546125afc6296e4_dep.png
+share/doc/gtkmm-2.4/docs/reference/html/dir_b565ec9602eae256b8df093d9e111985.html
+share/doc/gtkmm-2.4/docs/reference/html/dir_b565ec9602eae256b8df093d9e111985_dep.png
+share/doc/gtkmm-2.4/docs/reference/html/dir_c419baee9673d22ed0e5da687a3b59d5.html
+share/doc/gtkmm-2.4/docs/reference/html/dir_c419baee9673d22ed0e5da687a3b59d5_dep.png
+share/doc/gtkmm-2.4/docs/reference/html/dir_d0531cbed41c6e981fcc24a8a3b3bfe7.html
+share/doc/gtkmm-2.4/docs/reference/html/dir_d0531cbed41c6e981fcc24a8a3b3bfe7_dep.png
 share/doc/gtkmm-2.4/docs/reference/html/dirs.html
 share/doc/gtkmm-2.4/docs/reference/html/display_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/displaymanager_8h.html
@@ -1670,8 +1689,38 @@ share/doc/gtkmm-2.4/docs/reference/html/index.html
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__0.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__1.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__10.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__100.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__101.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__102.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__103.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__104.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__105.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__106.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__107.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__108.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__109.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__11.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__110.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__111.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__112.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__113.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__114.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__115.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__116.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__117.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__118.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__119.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__12.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__120.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__121.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__122.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__123.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__124.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__125.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__126.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__127.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__128.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__129.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__13.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__14.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__15.png
@@ -1736,8 +1785,37 @@ share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__68.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__69.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__7.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__70.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__71.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__72.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__73.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__74.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__75.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__76.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__77.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__78.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__79.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__8.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__80.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__81.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__82.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__83.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__84.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__85.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__86.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__87.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__88.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__89.png
 share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__9.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__90.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__91.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__92.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__93.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__94.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__95.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__96.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__97.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__98.png
+share/doc/gtkmm-2.4/docs/reference/html/inherit__graph__99.png
 share/doc/gtkmm-2.4/docs/reference/html/inherits.html
 share/doc/gtkmm-2.4/docs/reference/html/inputdialog_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/invisible_8h.html
@@ -1763,7 +1841,6 @@ share/doc/gtkmm-2.4/docs/reference/html/modules.html
 share/doc/gtkmm-2.4/docs/reference/html/namespaceAtk.html
 share/doc/gtkmm-2.4/docs/reference/html/namespaceGdk.html
 share/doc/gtkmm-2.4/docs/reference/html/namespaceGdk_1_1Cairo.html
-share/doc/gtkmm-2.4/docs/reference/html/namespaceGlib.html
 share/doc/gtkmm-2.4/docs/reference/html/namespaceGtk.html
 share/doc/gtkmm-2.4/docs/reference/html/namespaceGtk_1_1AccelMap.html
 share/doc/gtkmm-2.4/docs/reference/html/namespaceGtk_1_1Box__Helpers.html
@@ -1838,7 +1915,10 @@ share/doc/gtkmm-2.4/docs/reference/html/namespacemembers_func_0x75.html
 share/doc/gtkmm-2.4/docs/reference/html/namespacemembers_type.html
 share/doc/gtkmm-2.4/docs/reference/html/namespacemembers_vars.html
 share/doc/gtkmm-2.4/docs/reference/html/namespaces.html
+share/doc/gtkmm-2.4/docs/reference/html/namespacesigc.html
+share/doc/gtkmm-2.4/docs/reference/html/namespacestatic_01const_01std.html
 share/doc/gtkmm-2.4/docs/reference/html/newin2p10s.html
+share/doc/gtkmm-2.4/docs/reference/html/newin2p12s.html
 share/doc/gtkmm-2.4/docs/reference/html/newin2p2s.html
 share/doc/gtkmm-2.4/docs/reference/html/newin2p4s.html
 share/doc/gtkmm-2.4/docs/reference/html/newin2p6s.html
@@ -1880,6 +1960,7 @@ share/doc/gtkmm-2.4/docs/reference/html/radiomenuitem_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/radiotoolbutton_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/range_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/rc_8h.html
+share/doc/gtkmm-2.4/docs/reference/html/recentaction_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/recentchooser_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/recentchooserdialog_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/recentchoosermenu_8h.html
@@ -1895,6 +1976,7 @@ share/doc/gtkmm-2.4/docs/reference/html/rgb_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/rgbcmap_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/ruler_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/scale_8h.html
+share/doc/gtkmm-2.4/docs/reference/html/scalebutton_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/screen_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/scrollbar_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/scrolledwindow_8h.html
@@ -1955,6 +2037,7 @@ share/doc/gtkmm-2.4/docs/reference/html/toggletoolbutton_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/toolbar_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/toolbutton_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/toolitem_8h.html
+share/doc/gtkmm-2.4/docs/reference/html/tooltip_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/tooltips_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/treedragdest_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/treedragsource_8h.html
@@ -1975,6 +2058,7 @@ share/doc/gtkmm-2.4/docs/reference/html/uimanager_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/value_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/viewport_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/visual_8h.html
+share/doc/gtkmm-2.4/docs/reference/html/volumebutton_8h.html
 share/doc/gtkmm-2.4/docs/reference/html/widget_8h.html
 share/doc/gtkmm-2.4/docs/reference/widget_hierarchy.html
 share/doc/gtkmm-2.4/docs/reference/widget_hierarchy.png
diff --git a/x11/gtkmm/distinfo b/x11/gtkmm/distinfo
index 56179bfc07a..071b251f960 100644
--- a/x11/gtkmm/distinfo
+++ b/x11/gtkmm/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.28 2007/09/22 22:56:43 wiz Exp $
+$NetBSD: distinfo,v 1.29 2007/10/13 14:18:34 adam Exp $
 
-SHA1 (gtkmm-2.10.11.tar.bz2) = 1622ac1cf960227d72191349811aa84c1d5f657d
-RMD160 (gtkmm-2.10.11.tar.bz2) = 324a1f176b9b3dcf75061615e19884e8701547dd
-Size (gtkmm-2.10.11.tar.bz2) = 8173151 bytes
-SHA1 (patch-aa) = 02a326a4b1a374e0dfe7a36e1bf412a4f2353889
-SHA1 (patch-ab) = 62f067b89821fa672ef60c5811860fc525faf3fe
-SHA1 (patch-ac) = 87b28464392ac9d3de93ccf8e018608e7b2ebc23
+SHA1 (gtkmm-2.12.1.tar.bz2) = 9f20a32b2e0a3c43efb5732a0917db69ac9493a9
+RMD160 (gtkmm-2.12.1.tar.bz2) = 8dd06a1b6537cc8b02cb91aacc1d7e5d8c8fb5c1
+Size (gtkmm-2.12.1.tar.bz2) = 13325799 bytes
diff --git a/x11/gtkmm/patches/patch-aa b/x11/gtkmm/patches/patch-aa
deleted file mode 100644
index 5fcc9a594aa..00000000000
--- a/x11/gtkmm/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2007/09/22 22:56:43 wiz Exp $
-
---- gtk/gtkmm/toolbar.cc.orig	2007-05-03 14:51:49.000000000 +0000
-+++ gtk/gtkmm/toolbar.cc
-@@ -98,6 +98,14 @@ void Toolbar::unset_drop_highlight_item(
-   gtk_toolbar_set_drop_highlight_item(gobj(), 0, 0);
- }
- 
-+#ifndef GTKMM_DISABLE_DEPRECATED
-+Tooltips* Toolbar::get_tooltips_object() const
-+{
-+  //Note that the _tooltips field is deprecated and broken since GTK+ 2.12:
-+  return Glib::wrap((GtkTooltips*)gobj()->_tooltips);
-+}
-+#endif //GTKMM_DISABLE_DEPRECATED
-+
- } // namespace Gtk
- 
- 
-@@ -544,6 +552,16 @@ void Toolbar::unset_toolbar_style()
- gtk_toolbar_unset_style(gobj()); 
- }
- 
-+void Toolbar::set_icon_size(IconSize icon_size)
-+{
-+gtk_toolbar_set_icon_size(gobj(), static_cast<GtkIconSize>(int(icon_size))); 
-+}
-+
-+void Toolbar::unset_icon_size()
-+{
-+gtk_toolbar_unset_icon_size(gobj()); 
-+}
-+
- IconSize Toolbar::get_icon_size() const
- {
-   return IconSize(static_cast<int>(gtk_toolbar_get_icon_size(const_cast<GtkToolbar*>(gobj()))));
-@@ -564,11 +582,6 @@ void Toolbar::set_drop_highlight_item(To
- gtk_toolbar_set_drop_highlight_item(gobj(), (tool_item).gobj(), index); 
- }
- 
-- Tooltips* Toolbar::get_tooltips_object() const
--{
--  return Glib::wrap(gobj()->tooltips);
--}
-- 
- 
- Glib::SignalProxy1< void,Orientation > Toolbar::signal_orientation_changed()
- {
diff --git a/x11/gtkmm/patches/patch-ab b/x11/gtkmm/patches/patch-ab
deleted file mode 100644
index 433ef3440d6..00000000000
--- a/x11/gtkmm/patches/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2007/09/22 22:56:43 wiz Exp $
-
---- gtk/src/toolbar.hg.orig	2007-05-04 07:31:27.000000000 +0000
-+++ gtk/src/toolbar.hg
-@@ -74,7 +74,11 @@ public:
- 
-   _WRAP_METHOD(void unset_toolbar_style(), gtk_toolbar_unset_style)
-   
--  //Note that gtk_toolbar_set_icon_size() is deprecated, but gtk_toolbar_get_icon_size() is not.
-+  //Note that gtk_toolbar_set_icon_size() and gtk_toolbar_unset_icon_size() were 
-+  //deprecated sometime before GTK+ 2.4, but were undeprecated in GTK+ 2.12.
-+  _WRAP_METHOD(void set_icon_size(IconSize icon_size), gtk_toolbar_set_icon_size)
-+  _WRAP_METHOD(void unset_icon_size(), gtk_toolbar_unset_icon_size)
-+
-   _WRAP_METHOD(IconSize get_icon_size() const, gtk_toolbar_get_icon_size)
-  
-   _WRAP_METHOD(ReliefStyle get_relief_style() const, gtk_toolbar_get_relief_style)
-@@ -113,9 +117,11 @@ public:
-   _IGNORE_SIGNAL("move_focus")
-   _IGNORE_SIGNAL("focus_home_or_end")
- 
--  //This is called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
--  
--  _MEMBER_GET(tooltips_object, tooltips, Tooltips*, GtkTooltips*)
-+  #ifndef GTKMM_DISABLE_DEPRECATED
-+  //This was called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
-+  ///@deprecated Use the Gtk::Tooltip API instead. 
-+  Tooltips* get_tooltips_object() const;
-+  #endif //GTKMM_DISABLE_DEPRECATED
-   
-   //This is probably the same as Container::children().size(), which is deprecated anyway?
-   //_MEMBER_GET(num_children, num_children, int, gint)
-@@ -132,8 +138,7 @@ public:
-   //Ignore deprecated GtkToolbarAPI:
-   //Normally we just deprecate it in gtkmm too,
-   //but the GtkToolbar compatibility system is particularly unpleasant, so we just removed it in gtkmm 2.4. murrayc.
--  _IGNORE(gtk_toolbar_set_icon_size, gtk_toolbar_unset_icon_size,
--          gtk_toolbar_append_item, gtk_toolbar_prepend_item, gtk_toolbar_insert_item, gtk_toolbar_insert_stock
-+  _IGNORE(gtk_toolbar_append_item, gtk_toolbar_prepend_item, gtk_toolbar_insert_item, gtk_toolbar_insert_stock
-           gtk_toolbar_append_space, gtk_toolbar_prepend_space, gtk_toolbar_insert_space, gtk_toolbar_remove_space
-           gtk_toolbar_append_element, gtk_toolbar_prepend_element, gtk_toolbar_insert_element,
-           gtk_toolbar_append_widget, gtk_toolbar_prepend_widget, gtk_toolbar_insert_widget)
diff --git a/x11/gtkmm/patches/patch-ac b/x11/gtkmm/patches/patch-ac
deleted file mode 100644
index 622bcfe1a86..00000000000
--- a/x11/gtkmm/patches/patch-ac
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2007/09/22 22:56:44 wiz Exp $
-
---- gtk/gtkmm/toolbar.h.orig	2007-07-30 12:25:19.000000000 +0000
-+++ gtk/gtkmm/toolbar.h
-@@ -136,8 +136,7 @@ public:
-   void prepend(ToggleToolButton& item, const sigc::slot<void>& toggled_slot);
-   
-   
--  /** Returns the position of @a item  on the toolbar, starting from 0.
--   * It is an error if @a item  is not a child of the toolbar.
-+  /** Return value: the position of item on the toolbar.
-    * @param item A Gtk::ToolItem that is a child of @a toolbar .
-    * @return The position of item on the toolbar.
-    * 
-@@ -145,15 +144,14 @@ public:
-    */
-   int get_item_index(const ToolItem& item) const;
-   
--  /** Returns the number of items on the toolbar.
-+  /** Return value: the number of items on the toolbar
-    * @return The number of items on the toolbar
-    * 
-    * @newin2p4.
-    */
-   int get_n_items() const;
-   
--  /** Returns the @a n &lt;!-- --&gt;'th item on @a toolbar , or <tt>0</tt> if the
--   * toolbar does not contain an @a n &lt;!-- --&gt;'th item.
-+  /** Return value: The @a n &lt;!-- --&gt;'th Gtk::ToolItem on @a toolbar , or <tt>0</tt> if there
-    * @param n A position on the toolbar.
-    * @return The @a n &lt;!-- --&gt;'th Gtk::ToolItem on @a toolbar , or <tt>0</tt> if there
-    * isn't an @a n &lt;!-- --&gt;'th item.
-@@ -162,8 +160,7 @@ public:
-    */
-   ToolItem* get_nth_item(int n);
-   
--  /** Returns the @a n &lt;!-- --&gt;'th item on @a toolbar , or <tt>0</tt> if the
--   * toolbar does not contain an @a n &lt;!-- --&gt;'th item.
-+  /** Return value: The @a n &lt;!-- --&gt;'th Gtk::ToolItem on @a toolbar , or <tt>0</tt> if there
-    * @param n A position on the toolbar.
-    * @return The @a n &lt;!-- --&gt;'th Gtk::ToolItem on @a toolbar , or <tt>0</tt> if there
-    * isn't an @a n &lt;!-- --&gt;'th item.
-@@ -172,8 +169,7 @@ public:
-    */
-   const ToolItem* get_nth_item(int n) const;
-   
--  /** Returns whether the toolbar has an overflow menu.
--   * See set_show_arrow().
-+  /** Return value: <tt>true</tt> if the toolbar has an overflow menu.
-    * @return <tt>true</tt> if the toolbar has an overflow menu.
-    * 
-    * @newin2p4.
-@@ -234,28 +230,45 @@ public:
-    */
-   void unset_toolbar_style();
-   
--  //Note that gtk_toolbar_set_icon_size() is deprecated, but gtk_toolbar_get_icon_size() is not.
-+  //Note that gtk_toolbar_set_icon_size() and gtk_toolbar_unset_icon_size() were 
-+  //deprecated sometime before GTK+ 2.4, but were undeprecated in GTK+ 2.12.
-   
--  /** Retrieves the icon size fo the toolbar. See set_icon_size().
-+  /** This function sets the size of stock icons in the toolbar. You
-+   * can call it both before you add the icons and after they've been
-+   * added. The size you set will override user preferences for the default
-+   * icon size.
-+   * 
-+   * This should only be used for special-purpose toolbars, normal
-+   * application toolbars should respect the user preferences for the
-+   * size of icons.
-+   * 
-+   * @newin2p12
-+   * @param icon_size The Gtk::IconSize that stock icons in the toolbar shall have.
-+   */
-+  void set_icon_size(IconSize icon_size);
-+  
-+  /** Unsets toolbar icon size set with set_icon_size(), so that
-+   * user preferences will be used to determine the icon size.
-+   * 
-+   * @newin2p12
-+   */
-+  void unset_icon_size();
-+
-+  
-+  /** Retrieves the icon size for the toolbar. See set_icon_size().
-    * @return The current icon size for the icons on the toolbar.
-    */
-   IconSize get_icon_size() const;
-  
-   
--  /** Returns the relief style of buttons on @a toolbar . See
--   * Gtk::Button::set_relief().
-+  /** Return value: The relief style of buttons on @a toolbar .
-    * @return The relief style of buttons on @a toolbar .
-    * 
-    * @newin2p4.
-    */
-   ReliefStyle get_relief_style() const;
-   
--  /** Returns the position corresponding to the indicated point on
--   *  @a toolbar . This is useful when dragging items to the toolbar:
--   * this function returns the position a new item should be
--   * inserted.
--   * 
--   *  @a x  and @a y  are in @a toolbar  coordinates.
-+  /** Return value: The position corresponding to the point ( @a x , @a y ) on the toolbar.
-    * @param x X coordinate of a point on the toolbar.
-    * @param y Y coordinate of a point on the toolbar.
-    * @return The position corresponding to the point ( @a x , @a y ) on the toolbar.
-@@ -324,10 +337,12 @@ public:
-   Glib::SignalProxy3< bool,int,int,int > signal_popup_context_menu();
- 
-   
--  //This is called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
-+  #ifndef GTKMM_DISABLE_DEPRECATED
-+  //This was called get_tooltips_object() to avoid a clash with get_tooltips(), which just says whether they are enabled.
-+  ///@deprecated Use the Gtk::Tooltip API instead. 
-+  Tooltips* get_tooltips_object() const;
-+  #endif //GTKMM_DISABLE_DEPRECATED
-   
--   Tooltips* get_tooltips_object() const;
--   
-   //This is probably the same as Container::children().size(), which is deprecated anyway?
-   //_MEMBER_GET(num_children, num_children, int, gint)
-