[gtkmm/gtkmm-3-4] Many small cleanup fixes



commit 13e15723b01f5792bbb7d2b8a0e5b3da5b82b8a6
Author: Mark Vender <markv743 yahoo co uk>
Date:   Thu Aug 2 15:17:13 2012 +0300

    Many small cleanup fixes
    
     * *.[hg|ccg]: Trim trailing whitespace. Remove useless Subversion tags. Remove
        unused code format tags. Remove excessive whitespace.
     * gtk/src/layout.ccg: Remove bogus copyrigth header.

 gdk/src/color.ccg                 |    4 --
 gdk/src/color.hg                  |    2 -
 gdk/src/cursor.ccg                |    4 --
 gdk/src/cursor.hg                 |    9 +---
 gdk/src/device.ccg                |    3 -
 gdk/src/device.hg                 |   10 ++---
 gdk/src/devicemanager.ccg         |    2 -
 gdk/src/devicemanager.hg          |   10 ++---
 gdk/src/display.ccg               |    8 +---
 gdk/src/display.hg                |   14 ++----
 gdk/src/displaymanager.ccg        |    6 +--
 gdk/src/displaymanager.hg         |   11 ++---
 gdk/src/dragcontext.ccg           |    6 +--
 gdk/src/dragcontext.hg            |    7 +--
 gdk/src/pixbuf.ccg                |    6 +--
 gdk/src/pixbuf.hg                 |   16 +++---
 gdk/src/pixbufanimation.ccg       |    6 +--
 gdk/src/pixbufanimation.hg        |   17 +++----
 gdk/src/pixbufanimationiter.ccg   |    4 --
 gdk/src/pixbufanimationiter.hg    |   11 ++---
 gdk/src/pixbufformat.ccg          |    3 -
 gdk/src/pixbufformat.hg           |    2 -
 gdk/src/pixbufloader.ccg          |    4 --
 gdk/src/pixbufloader.hg           |   20 ++++-----
 gdk/src/rectangle.ccg             |    4 --
 gdk/src/rectangle.hg              |    5 +--
 gdk/src/rgba.ccg                  |   12 ++---
 gdk/src/rgba.hg                   |   25 ++++++-----
 gdk/src/screen.ccg                |    6 +--
 gdk/src/screen.hg                 |   11 +---
 gdk/src/timecoord.hg              |    2 +-
 gdk/src/types.ccg                 |    3 -
 gdk/src/types.hg                  |    6 +--
 gdk/src/visual.ccg                |    8 +---
 gdk/src/visual.hg                 |    8 +--
 gdk/src/window.ccg                |    5 +--
 gdk/src/window.hg                 |   23 +++++-----
 gtk/src/aboutdialog.ccg           |    8 +---
 gtk/src/aboutdialog.hg            |    4 +-
 gtk/src/accelgroup.ccg            |   11 ++---
 gtk/src/accelgroup.hg             |    2 -
 gtk/src/accellabel.ccg            |    6 +--
 gtk/src/accellabel.hg             |    8 +---
 gtk/src/action.ccg                |    5 +--
 gtk/src/actionable.ccg            |    2 -
 gtk/src/actionable.hg             |    2 -
 gtk/src/actiongroup.ccg           |   15 +++----
 gtk/src/actiongroup.hg            |   20 ++++-----
 gtk/src/activatable.ccg           |    3 -
 gtk/src/activatable.hg            |    6 +--
 gtk/src/adjustment.ccg            |    6 +--
 gtk/src/adjustment.hg             |    9 +---
 gtk/src/alignment.ccg             |    6 +--
 gtk/src/alignment.hg              |    9 +---
 gtk/src/appchooserdialog.ccg      |    2 +-
 gtk/src/application.ccg           |    7 +--
 gtk/src/application.hg            |   30 ++++++------
 gtk/src/arrow.ccg                 |    8 +---
 gtk/src/arrow.hg                  |    9 +---
 gtk/src/aspectframe.ccg           |    6 +--
 gtk/src/aspectframe.hg            |   25 +++++------
 gtk/src/assistant.ccg             |   10 +---
 gtk/src/assistant.hg              |    5 +--
 gtk/src/bin.ccg                   |    6 +--
 gtk/src/bin.hg                    |    7 +--
 gtk/src/border.ccg                |    3 +-
 gtk/src/border.hg                 |    7 +--
 gtk/src/box.ccg                   |    6 +--
 gtk/src/box.hg                    |    4 +-
 gtk/src/buildable.ccg             |    3 -
 gtk/src/buildable.hg              |   18 +++----
 gtk/src/builder.ccg               |    7 +--
 gtk/src/builder.hg                |   54 +++++++++++------------
 gtk/src/button.ccg                |    6 +--
 gtk/src/button.hg                 |    5 +--
 gtk/src/buttonbox.ccg             |    4 --
 gtk/src/buttonbox.hg              |   11 ++---
 gtk/src/calendar.ccg              |   12 ++---
 gtk/src/cellarea.ccg              |    8 ++--
 gtk/src/cellarea.hg               |   10 ++--
 gtk/src/cellareabox.hg            |    4 +-
 gtk/src/cellareacontext.ccg       |    2 +-
 gtk/src/cellareacontext.hg        |    2 +-
 gtk/src/celleditable.ccg          |    3 -
 gtk/src/celleditable.hg           |    6 +--
 gtk/src/celllayout.ccg            |    3 -
 gtk/src/celllayout.hg             |    2 -
 gtk/src/cellrenderer.ccg          |   11 ++---
 gtk/src/cellrenderer.hg           |    8 ++--
 gtk/src/cellrendereraccel.ccg     |    8 +---
 gtk/src/cellrendereraccel.hg      |   11 ++---
 gtk/src/cellrenderercombo.ccg     |    8 +---
 gtk/src/cellrenderercombo.hg      |   21 ++++-----
 gtk/src/cellrendererpixbuf.ccg    |    6 +--
 gtk/src/cellrendererpixbuf.hg     |   13 ++---
 gtk/src/cellrendererprogress.ccg  |    8 +---
 gtk/src/cellrendererprogress.hg   |    4 +-
 gtk/src/cellrendererspin.hg       |   20 ++++----
 gtk/src/cellrendererspinner.ccg   |    3 -
 gtk/src/cellrendererspinner.hg    |    5 +-
 gtk/src/cellrenderertext.ccg      |    6 +--
 gtk/src/cellrenderertext.hg       |    2 -
 gtk/src/cellrenderertoggle.ccg    |    6 +--
 gtk/src/cellrenderertoggle.hg     |   11 ++---
 gtk/src/cellview.ccg              |    6 +--
 gtk/src/cellview.hg               |    4 +-
 gtk/src/checkbutton.ccg           |    6 +--
 gtk/src/checkbutton.hg            |    7 +--
 gtk/src/checkmenuitem.ccg         |    6 +--
 gtk/src/checkmenuitem.hg          |    7 +--
 gtk/src/clipboard.ccg             |    7 +--
 gtk/src/clipboard.hg              |   87 ++++++++++++++++++-------------------
 gtk/src/colorbutton.ccg           |    4 --
 gtk/src/colorbutton.hg            |    5 +--
 gtk/src/colorchooser.ccg          |    2 +-
 gtk/src/colorselection.ccg        |    3 -
 gtk/src/colorselection.hg         |   10 ++---
 gtk/src/combobox.ccg              |    4 --
 gtk/src/combobox.hg               |   11 ++---
 gtk/src/comboboxtext.ccg          |    1 -
 gtk/src/comboboxtext.hg           |    5 +-
 gtk/src/container.ccg             |    3 -
 gtk/src/container.hg              |   20 ++++-----
 gtk/src/cssprovider.ccg           |    4 +-
 gtk/src/cssprovider.hg            |    8 ++--
 gtk/src/dialog.ccg                |    3 -
 gtk/src/dialog.hg                 |    7 +--
 gtk/src/drawingarea.ccg           |    6 +--
 gtk/src/drawingarea.hg            |    9 +---
 gtk/src/editable.ccg              |    3 -
 gtk/src/editable.hg               |    2 -
 gtk/src/entry.ccg                 |   26 +++++------
 gtk/src/entry.hg                  |   19 +++-----
 gtk/src/entrybuffer.ccg           |    7 +--
 gtk/src/entrybuffer.hg            |    4 +-
 gtk/src/entrycompletion.ccg       |    3 -
 gtk/src/entrycompletion.hg        |   60 ++++++++++++-------------
 gtk/src/enums.ccg                 |    6 +--
 gtk/src/enums.hg                  |    5 +--
 gtk/src/eventbox.ccg              |    6 +--
 gtk/src/eventbox.hg               |   11 ++---
 gtk/src/expander.ccg              |    6 +--
 gtk/src/expander.hg               |    7 +--
 gtk/src/filechooser.ccg           |    3 -
 gtk/src/filechooser.hg            |    2 -
 gtk/src/filechooserbutton.ccg     |    6 +--
 gtk/src/filechooserbutton.hg      |    5 +--
 gtk/src/filechooserdialog.ccg     |    4 --
 gtk/src/filechooserdialog.hg      |    5 +--
 gtk/src/filechooserwidget.ccg     |    4 --
 gtk/src/filechooserwidget.hg      |    9 +---
 gtk/src/filefilter.ccg            |   11 ++---
 gtk/src/filefilter.hg             |    2 -
 gtk/src/fixed.ccg                 |    6 +--
 gtk/src/fixed.hg                  |    7 +--
 gtk/src/fontbutton.ccg            |    4 --
 gtk/src/fontbutton.hg             |    9 +---
 gtk/src/fontchooser.ccg           |    4 +-
 gtk/src/fontchooser.hg            |    6 +-
 gtk/src/fontchooserdialog.hg      |    2 +-
 gtk/src/fontselection.ccg         |    3 -
 gtk/src/fontselection.hg          |    2 -
 gtk/src/frame.ccg                 |    3 -
 gtk/src/frame.hg                  |    5 +--
 gtk/src/grid.ccg                  |    3 +-
 gtk/src/grid.hg                   |    6 +--
 gtk/src/handlebox.ccg             |    6 +--
 gtk/src/handlebox.hg              |    7 +--
 gtk/src/hvbox.ccg                 |    2 +-
 gtk/src/hvscale.ccg               |    4 --
 gtk/src/hvscale.hg                |    7 +--
 gtk/src/hvscrollbar.ccg           |    4 --
 gtk/src/hvscrollbar.hg            |   11 ++---
 gtk/src/hvseparator.hg            |    6 +-
 gtk/src/iconfactory.ccg           |    6 +--
 gtk/src/iconfactory.hg            |    2 -
 gtk/src/iconinfo.hg               |    8 ++--
 gtk/src/iconset.ccg               |    6 +--
 gtk/src/iconset.hg                |   17 +++----
 gtk/src/iconsource.ccg            |    4 --
 gtk/src/iconsource.hg             |   11 ++---
 gtk/src/icontheme.ccg             |    4 +-
 gtk/src/icontheme.hg              |    8 ++--
 gtk/src/iconview.ccg              |    5 +--
 gtk/src/iconview.hg               |    5 +--
 gtk/src/image.ccg                 |    4 --
 gtk/src/image.hg                  |    7 +--
 gtk/src/imagemenuitem.ccg         |    8 +---
 gtk/src/imagemenuitem.hg          |   15 +++----
 gtk/src/infobar.ccg               |    6 +--
 gtk/src/infobar.hg                |    2 -
 gtk/src/invisible.ccg             |    6 +--
 gtk/src/invisible.hg              |   11 ++---
 gtk/src/label.ccg                 |    3 -
 gtk/src/label.hg                  |    4 +-
 gtk/src/layout.ccg                |   25 -----------
 gtk/src/layout.hg                 |   11 ++---
 gtk/src/linkbutton.ccg            |    4 --
 gtk/src/linkbutton.hg             |    5 +--
 gtk/src/liststore.ccg             |    5 +--
 gtk/src/liststore.hg              |   10 ++---
 gtk/src/main.ccg                  |    8 +---
 gtk/src/main.hg                   |   47 +++++++++-----------
 gtk/src/menu.ccg                  |    5 +--
 gtk/src/menu.hg                   |   12 ++---
 gtk/src/menubar.ccg               |    3 -
 gtk/src/menubar.hg                |   12 ++---
 gtk/src/menuitem.ccg              |    4 --
 gtk/src/menushell.ccg             |    5 +--
 gtk/src/menushell.hg              |    8 +--
 gtk/src/menutoolbutton.ccg        |    6 +--
 gtk/src/messagedialog.ccg         |    4 --
 gtk/src/messagedialog.hg          |    5 +--
 gtk/src/misc.ccg                  |    6 +--
 gtk/src/misc.hg                   |    7 +--
 gtk/src/notebook.ccg              |    3 -
 gtk/src/offscreenwindow.ccg       |    6 +--
 gtk/src/orientable.ccg            |    3 -
 gtk/src/orientable.hg             |    2 -
 gtk/src/pagesetup.ccg             |    2 +-
 gtk/src/pagesetup.hg              |   26 ++++++------
 gtk/src/pagesetupunixdialog.ccg   |    1 -
 gtk/src/paned.ccg                 |    6 +--
 gtk/src/paned.hg                  |    8 +---
 gtk/src/papersize.hg              |    4 +-
 gtk/src/plug.ccg                  |    6 +--
 gtk/src/plug.hg                   |    8 +--
 gtk/src/printcontext.hg           |    8 ++--
 gtk/src/printer.ccg               |    3 +-
 gtk/src/printjob.ccg              |    3 +-
 gtk/src/printjob.hg               |   16 +++---
 gtk/src/printoperation.ccg        |    1 -
 gtk/src/printoperationpreview.ccg |    1 -
 gtk/src/printoperationpreview.hg  |    2 +-
 gtk/src/printsettings.ccg         |    2 +-
 gtk/src/printsettings.hg          |   18 ++++----
 gtk/src/printunixdialog.ccg       |    3 +-
 gtk/src/progressbar.ccg           |    6 +--
 gtk/src/progressbar.hg            |    9 +---
 gtk/src/radioaction.ccg           |    3 -
 gtk/src/radioaction.hg            |    2 -
 gtk/src/radiobutton.ccg           |    6 +--
 gtk/src/radiobutton.hg            |    7 +--
 gtk/src/radiomenuitem.ccg         |    6 +--
 gtk/src/radiomenuitem.hg          |    9 +---
 gtk/src/radiotoolbutton.ccg       |    6 +--
 gtk/src/radiotoolbutton.hg        |   17 +++----
 gtk/src/range.ccg                 |    3 -
 gtk/src/range.hg                  |    4 +-
 gtk/src/recentaction.ccg          |    3 -
 gtk/src/recentaction.hg           |   16 +++----
 gtk/src/recentchooserdialog.hg    |    3 +-
 gtk/src/recentchoosermenu.hg      |    5 +-
 gtk/src/recentchooserwidget.hg    |    2 +-
 gtk/src/recentfilter.ccg          |   10 ++--
 gtk/src/recentmanager.ccg         |    4 +-
 gtk/src/requisition.ccg           |    2 -
 gtk/src/requisition.hg            |    2 -
 gtk/src/scale.ccg                 |    4 --
 gtk/src/scale.hg                  |   11 ++---
 gtk/src/scalebutton.ccg           |    4 --
 gtk/src/scrollbar.ccg             |    4 --
 gtk/src/scrollbar.hg              |   13 ++---
 gtk/src/scrolledwindow.ccg        |    6 +--
 gtk/src/scrolledwindow.hg         |    7 +--
 gtk/src/selectiondata.ccg         |    3 -
 gtk/src/selectiondata.hg          |    6 +--
 gtk/src/separator.ccg             |    6 +--
 gtk/src/separator.hg              |   15 +++----
 gtk/src/separatormenuitem.ccg     |    6 +--
 gtk/src/separatormenuitem.hg      |    7 +--
 gtk/src/separatortoolitem.ccg     |    6 +--
 gtk/src/separatortoolitem.hg      |   11 ++---
 gtk/src/settings.ccg              |    6 +--
 gtk/src/settings.hg               |    9 +---
 gtk/src/sizegroup.ccg             |    6 +--
 gtk/src/sizegroup.hg              |   29 ++++++-------
 gtk/src/socket.ccg                |    3 -
 gtk/src/socket.hg                 |    6 +--
 gtk/src/spinbutton.ccg            |    3 -
 gtk/src/spinbutton.hg             |    2 -
 gtk/src/spinner.ccg               |    3 -
 gtk/src/spinner.hg                |    5 +-
 gtk/src/statusbar.ccg             |    8 +---
 gtk/src/statusbar.hg              |    7 +--
 gtk/src/statusicon.ccg            |    3 -
 gtk/src/stockitem.ccg             |    5 +--
 gtk/src/stockitem.hg              |    2 -
 gtk/src/stylecontext.ccg          |   15 +++----
 gtk/src/stylecontext.hg           |   16 +++---
 gtk/src/styleprovider.ccg         |    2 +-
 gtk/src/switch.ccg                |    3 +-
 gtk/src/table.ccg                 |    6 +--
 gtk/src/table.hg                  |    2 -
 gtk/src/targetlist.hg             |    6 +-
 gtk/src/tearoffmenuitem.ccg       |    8 +---
 gtk/src/tearoffmenuitem.hg        |    7 +--
 gtk/src/textattributes.ccg        |    4 --
 gtk/src/textattributes.hg         |    5 +--
 gtk/src/textbuffer.ccg            |    7 +--
 gtk/src/textbuffer.hg             |    2 -
 gtk/src/textchildanchor.ccg       |    6 +--
 gtk/src/textchildanchor.hg        |   11 ++---
 gtk/src/textiter.ccg              |    5 +--
 gtk/src/textiter.hg               |    2 -
 gtk/src/textmark.ccg              |    6 +--
 gtk/src/textmark.hg               |   51 ++++++++++-----------
 gtk/src/texttag.ccg               |    6 +--
 gtk/src/texttag.hg                |    9 +---
 gtk/src/texttagtable.ccg          |    8 +---
 gtk/src/texttagtable.hg           |    7 +--
 gtk/src/textview.ccg              |    3 -
 gtk/src/textview.hg               |    6 +--
 gtk/src/toggleaction.ccg          |    3 -
 gtk/src/toggleaction.hg           |    6 +--
 gtk/src/togglebutton.ccg          |    6 +--
 gtk/src/togglebutton.hg           |    9 +---
 gtk/src/toggletoolbutton.ccg      |    6 +--
 gtk/src/toggletoolbutton.hg       |   15 +++----
 gtk/src/toolbar.ccg               |    6 +--
 gtk/src/toolbutton.ccg            |    6 +--
 gtk/src/toolitem.ccg              |    6 +--
 gtk/src/toolitemgroup.ccg         |    8 +---
 gtk/src/toolitemgroup.hg          |    8 ++--
 gtk/src/toolpalette.ccg           |    6 +--
 gtk/src/toolshell.ccg             |    3 -
 gtk/src/toolshell.hg              |    6 +--
 gtk/src/tooltip.ccg               |    1 -
 gtk/src/tooltip.hg                |   10 ++--
 gtk/src/treedragdest.ccg          |    3 -
 gtk/src/treedragdest.hg           |    6 +--
 gtk/src/treedragsource.ccg        |    3 -
 gtk/src/treedragsource.hg         |    6 +--
 gtk/src/treeiter.ccg              |    7 +--
 gtk/src/treeiter.hg               |   20 ++++-----
 gtk/src/treemodel.ccg             |    6 +--
 gtk/src/treemodel.hg              |   30 ++++++-------
 gtk/src/treemodelfilter.ccg       |    9 +---
 gtk/src/treemodelfilter.hg        |   18 +++----
 gtk/src/treemodelsort.ccg         |    8 +---
 gtk/src/treemodelsort.hg          |   12 ++---
 gtk/src/treepath.ccg              |    6 +--
 gtk/src/treepath.hg               |   10 ++---
 gtk/src/treerowreference.ccg      |    3 -
 gtk/src/treerowreference.hg       |    9 ++--
 gtk/src/treeselection.ccg         |    4 --
 gtk/src/treeselection.hg          |   12 ++---
 gtk/src/treesortable.ccg          |    4 --
 gtk/src/treesortable.hg           |    8 +--
 gtk/src/treestore.ccg             |    6 +--
 gtk/src/treestore.hg              |    6 +--
 gtk/src/treeview.ccg              |    4 --
 gtk/src/treeview.hg               |    6 +-
 gtk/src/treeviewcolumn.ccg        |    4 --
 gtk/src/treeviewcolumn.hg         |    2 +-
 gtk/src/uimanager.ccg             |    9 +---
 gtk/src/uimanager.hg              |   79 ++++++++++++++++-----------------
 gtk/src/viewport.ccg              |    6 +--
 gtk/src/viewport.hg               |    7 +--
 gtk/src/volumebutton.ccg          |    4 --
 gtk/src/volumebutton.hg           |    9 +---
 gtk/src/widget.ccg                |   33 ++++++--------
 gtk/src/widget.hg                 |   24 +++++-----
 gtk/src/widgetpath.ccg            |    2 +-
 gtk/src/widgetpath.hg             |    6 +--
 gtk/src/window.ccg                |    4 --
 gtk/src/window.hg                 |   12 ++---
 367 files changed, 976 insertions(+), 1965 deletions(-)
---
diff --git a/gdk/src/color.ccg b/gdk/src/color.ccg
index 121a16d..504a25e 100644
--- a/gdk/src/color.ccg
+++ b/gdk/src/color.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: color.ccg,v 1.4 2005/11/29 16:38:10 murrayc Exp $ */
-
 /*
- *
  * Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gdk/src/color.hg b/gdk/src/color.hg
index 8d68668..d668781 100644
--- a/gdk/src/color.hg
+++ b/gdk/src/color.hg
@@ -1,5 +1,3 @@
-/* $Id: color.hg,v 1.5 2005/11/29 16:38:10 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gdk/src/cursor.ccg b/gdk/src/cursor.ccg
index d1e06db..ee567b3 100644
--- a/gdk/src/cursor.ccg
+++ b/gdk/src/cursor.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: cursor.ccg,v 1.3 2005/07/10 19:24:21 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gdk/src/cursor.hg b/gdk/src/cursor.hg
index f1d2497..244a794 100644
--- a/gdk/src/cursor.hg
+++ b/gdk/src/cursor.hg
@@ -1,7 +1,4 @@
-/* $Id: cursor.hg,v 1.8 2006/04/12 11:11:24 murrayc Exp $ */
-
-/* drawable.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -44,9 +41,9 @@ protected:
 
   explicit Cursor(const Glib::RefPtr<Display>& display, const Glib::ustring& name);
   _IGNORE(gdk_cursor_new_from_name)
-  
+
 public:
-  //We use _WRAP_METHOD() instead of _WRAP_CREATE() and constructors, 
+  //We use _WRAP_METHOD() instead of _WRAP_CREATE() and constructors,
   //because the gdk_cursor_new_*() functions actually return existing instances sometimes,
   //but constructors assume that they own the instance.
   //And we would have to have to use the gdk_cursor_new_*() functions in the constructors anyway,
diff --git a/gdk/src/device.ccg b/gdk/src/device.ccg
index deff9d2..2809c10 100644
--- a/gdk/src/device.ccg
+++ b/gdk/src/device.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: device.ccg,v 1.1 2003/01/21 13:38:07 murrayc Exp $ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gdk/src/device.hg b/gdk/src/device.hg
index d0adc0a..8a75e5a 100644
--- a/gdk/src/device.hg
+++ b/gdk/src/device.hg
@@ -1,5 +1,3 @@
-/* $Id: device.hg,v 1.3 2004/02/10 17:29:54 mxpxpod Exp $ */
-
 /* Copyright (C) 2002-2004 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -106,7 +104,7 @@ public:
 
   // TODO: docs.
   void get_position(int& x, int& y) const;
-  
+
   // TODO: docs.
   void get_position(Glib::RefPtr<Screen>& screen, int& x, int& y) const;
   _IGNORE(gdk_device_get_position)
@@ -114,13 +112,13 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Window> get_window_at_position(int& win_x, int& win_y), gdk_device_get_window_at_position, refreturn)
 
   _WRAP_METHOD(Glib::RefPtr<const Window> get_window_at_position(int& win_x, int& win_y) const, gdk_device_get_window_at_position, refreturn, constversion)
-  
+
   //TODO: Documentation
   Glib::RefPtr<Window> get_window_at_position();
-  
+
   //TODO: Documentation
   Glib::RefPtr<const Window> get_window_at_position() const;
-  
+
 };
 
 } // namespace Gdk
diff --git a/gdk/src/devicemanager.ccg b/gdk/src/devicemanager.ccg
index c10ab19..f06b3d5 100644
--- a/gdk/src/devicemanager.ccg
+++ b/gdk/src/devicemanager.ccg
@@ -1,5 +1,3 @@
-/* $Id: devicemanager.ccg,v 1.3 2004/02/10 17:29:54 mxpxpod Exp $ */
-
 /* Copyright (C) 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gdk/src/devicemanager.hg b/gdk/src/devicemanager.hg
index 68de808..8a2f2f3 100644
--- a/gdk/src/devicemanager.hg
+++ b/gdk/src/devicemanager.hg
@@ -1,5 +1,3 @@
-/* $Id: devicemanager.hg,v 1.3 2004/02/10 17:29:54 mxpxpod Exp $ */
-
 /* Copyright (C) 20010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -66,7 +64,7 @@ namespace Gdk
  * By default, GDK will automatically listen for events coming from all
  * master devices, setting the Gdk::Device for all events coming from input
  * devices,
- * 
+ *
  * Events containing device information are GDK_MOTION_NOTIFY,
  * GDK_BUTTON_PRESS, GDK_2BUTTON_PRESS, GDK_3BUTTON_PRESS,
  * GDK_BUTTON_RELEASE, GDK_SCROLL, GDK_KEY_PRESS, GDK_KEY_RELEASE,
@@ -74,7 +72,7 @@ namespace Gdk
  * GDK_PROXIMITY_IN, GDK_PROXIMITY_OUT, GDK_DRAG_ENTER, GDK_DRAG_LEAVE,
  * GDK_DRAG_MOTION, GDK_DRAG_STATUS, GDK_DROP_START, GDK_DROP_FINISHED
  * and GDK_GRAB_BROKEN.
- * 
+ *
  * Although gdk_window_set_support_multidevice() must be called on
  * #GdkWindows in order to support additional features of multiple pointer
  * interaction, such as multiple per-device enter/leave events, the default
@@ -124,11 +122,11 @@ public:
   _WRAP_METHOD(std::vector< Glib::RefPtr<Device> > list_devices(DeviceType type), gdk_device_manager_list_devices)
 #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<const Device> >',`Glib::ListHandler<Glib::RefPtr<const Device> >::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
   _WRAP_METHOD(std::vector< Glib::RefPtr<const Device> > list_devices(DeviceType type) const, gdk_device_manager_list_devices)
-  
+
 
   _WRAP_METHOD(Glib::RefPtr<Device> get_client_pointer(), gdk_device_manager_get_client_pointer, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Device> get_client_pointer() const, gdk_device_manager_get_client_pointer, refreturn, constversion)
-   
+
   //TODO: Signals, properties.
 
 };
diff --git a/gdk/src/display.ccg b/gdk/src/display.ccg
index 1974a0b..c6cf5a2 100644
--- a/gdk/src/display.ccg
+++ b/gdk/src/display.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: display.ccg,v 1.5 2005/01/05 17:30:16 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -60,6 +56,6 @@ void Display::store_clipboard(const Glib::RefPtr<Gdk::Window>& clipboard_window,
                                 Glib::ArrayHandler<Glib::ustring, AtomUstringTraits>::vector_to_array(targets).data (),
                                 targets.size ());
   }
- }
+}
 
-} //Gdk
+} //namespace Gdk
diff --git a/gdk/src/display.hg b/gdk/src/display.hg
index 67ca7d9..92c0927 100644
--- a/gdk/src/display.hg
+++ b/gdk/src/display.hg
@@ -1,7 +1,4 @@
-/* $Id: display.hg,v 1.22 2006/04/12 11:11:24 murrayc Exp $ */
-
-/* display.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -23,7 +20,6 @@
 
 #include <gdkmm/screen.h>
 #include <gdkmm/applaunchcontext.h>
-//#include <gdkmm/devicemanager.h>
 #include <gdkmm/types.h> //For ModifierType
 _DEFS(gdkmm,gdk)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -88,8 +84,8 @@ public:
   _WRAP_METHOD(void set_double_click_distance(guint distance), gdk_display_set_double_click_distance, deprecated "No replacement method. Applications should not set this.")
 
   _WRAP_METHOD(static Glib::RefPtr<Display> get_default(), gdk_display_get_default, refreturn)
- 
-  
+
+
   _IGNORE(gdk_display_get_pointer, gdk_display_get_core_pointer,
     gdk_display_get_window_at_pointer, gdk_display_warp_pointer) //deprecated
 
@@ -160,9 +156,9 @@ public:
 
 
   //We use no_default_handler because GdkDisplayClass is private.
-  
+
   _WRAP_SIGNAL(void closed(bool is_error), closed, no_default_handler)
   _WRAP_SIGNAL(void opened(), opened, no_default_handler)
 };
 
-} /* namespace Gdk */
+} // namespace Gdk
diff --git a/gdk/src/displaymanager.ccg b/gdk/src/displaymanager.ccg
index 8ee511e..1d0547f 100644
--- a/gdk/src/displaymanager.ccg
+++ b/gdk/src/displaymanager.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: displaymanager.ccg,v 1.1 2003/01/21 13:38:07 murrayc Exp $ */
-
 /*
- *
  * Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -25,5 +21,5 @@ namespace Gdk
 {
 
 
-} //Gdk
+} //namespace Gdk
 
diff --git a/gdk/src/displaymanager.hg b/gdk/src/displaymanager.hg
index 864cf9f..cbe54d7 100644
--- a/gdk/src/displaymanager.hg
+++ b/gdk/src/displaymanager.hg
@@ -1,7 +1,4 @@
-/* $Id: displaymanager.hg,v 1.8 2006/04/12 11:11:24 murrayc Exp $ */
-
-/* displaymanager.h
- *
+/*
  * Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -53,14 +50,14 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Display> open_display(const Glib::ustring& name), gdk_display_manager_open_display, refreturn)
 
   _WRAP_PROPERTY("default-display", Glib::RefPtr<Display>)
-  
+
 
 #m4 _CONVERSION(`GdkDisplay*',`const Glib::RefPtr<Display>&', Glib::wrap($3, true))
 
   //We use no_default_handler because GdkDisplayManagerClass is private.
-  
+
   _WRAP_SIGNAL(void display_opened(const Glib::RefPtr<Display>& display), display-opened, no_default_handler)
 };
 
-} /* namespace Gdk */
+} // namespace Gdk
 
diff --git a/gdk/src/dragcontext.ccg b/gdk/src/dragcontext.ccg
index c920cfe..0bbfba8 100644
--- a/gdk/src/dragcontext.ccg
+++ b/gdk/src/dragcontext.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: dragcontext.ccg,v 1.7 2005/02/13 13:01:36 murrayc Exp $ */
-
 /*
- *
  * Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -50,4 +46,4 @@ std::vector<std::string> DragContext::list_targets() const
   return Glib::ListHandler<std::string, AtomStringTraits>::list_to_vector( gdk_drag_context_list_targets(const_cast<GdkDragContext*>(gobj())), Glib::OWNERSHIP_NONE);
 }
 
-} /* namespace Gdk */
+} // namespace Gdk
diff --git a/gdk/src/dragcontext.hg b/gdk/src/dragcontext.hg
index 77132c4..e0fddd7 100644
--- a/gdk/src/dragcontext.hg
+++ b/gdk/src/dragcontext.hg
@@ -1,7 +1,4 @@
-/* $Id: dragcontext.hg,v 1.11 2006/03/22 16:53:21 murrayc Exp $ */
-
-/* dragcontext.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -112,4 +109,4 @@ public:
   _IGNORE(gdk_drag_find_window_for_screen)
 };
 
-} /* namespace Gdk */
+} // namespace Gdk
diff --git a/gdk/src/pixbuf.ccg b/gdk/src/pixbuf.ccg
index be1cd16..d12631b 100644
--- a/gdk/src/pixbuf.ccg
+++ b/gdk/src/pixbuf.ccg
@@ -1,7 +1,5 @@
-// -*- c++ -*-
-/* $Id: pixbuf.ccg,v 1.8 2006/05/11 11:40:23 murrayc Exp $ */
-
-/* Copyright 1998-2002 The gtkmm Development Team
+/*
+ * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index f0465cc..3c296d1 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -63,7 +63,7 @@ protected:
    * representation inside a Gdk::Pixbuf. In other words, copies
    * image data from a server-side drawable to a client-side RGB(A) buffer.
    * This allows you to efficiently read individual pixels on the client side.
-   * 
+   *
    * This function will create an RGB pixbuf with 8 bits per channel with
    * the same size specified by the @a width and @a height arguments. The pixbuf
    * will contain an alpha channel if the @a window contains one.
@@ -109,7 +109,7 @@ public:
    * representation inside a Gdk::Pixbuf. In other words, copies
    * image data from a server-side drawable to a client-side RGB(A) buffer.
    * This allows you to efficiently read individual pixels on the client side.
-   * 
+   *
    * This function will create an RGB pixbuf with 8 bits per channel with
    * the same size specified by the @a width and @a height arguments. The pixbuf
    * will contain an alpha channel if the @a window contains one.
@@ -308,10 +308,10 @@ public:
             const std::vector<Glib::ustring>& option_values);
 
   _IGNORE(gdk_pixbuf_savev)
-  
+
 #if 0 //TODO:
   typedef sigc::slot<const char* buf, gsize> SlotSave;
-  
+
   /** @throws TODO
    */
   void save(const SlotSave& slot, const std::string& type);
@@ -320,7 +320,7 @@ public:
   /** A map of option keys to option values.
    */
   typepdef std::map<Glib::ustring, Glib::ustring> SaveValuesMap;
-  
+
   void save(const SlotSave& slot, const std::string& type, const SaveValuesMap& options);
 #endif
 
@@ -444,18 +444,18 @@ gboolean gdk_pixbuf_save_to_callbackv   (GdkPixbuf  *pixbuf,
   _IGNORE(gdk_pixbuf_render_to_drawable, gdk_pixbuf_render_to_drawable_alpha,)
 
   _WRAP_METHOD(Glib::ustring get_option(const Glib::ustring& key) const, gdk_pixbuf_get_option)
-  
+
   _IGNORE(gdk_pixbuf_set_option) //gdk_pixbuf_set_option() is only available when GDK_PIXBUF_ENABLE_BACKEND is defined.
 
   //This creates a new GdkPixbuf or returns the original with a reference.
   _WRAP_METHOD(Glib::RefPtr<Pixbuf> apply_embedded_orientation(), gdk_pixbuf_apply_embedded_orientation)
 
   /** Obtains the available information about the image formats supported by GdkPixbuf.
-   * @result A list of PixbufFormats describing the supported image formats. 
+   * @result A list of PixbufFormats describing the supported image formats.
    */
   static std::vector<PixbufFormat> get_formats();
   _IGNORE(gdk_pixbuf_get_formats)
-  
+
   _WRAP_PROPERTY("colorspace", Colorspace)
   _WRAP_PROPERTY("n-channels", int)
   _WRAP_PROPERTY("has-alpha", bool)
diff --git a/gdk/src/pixbufanimation.ccg b/gdk/src/pixbufanimation.ccg
index 57e1a5a..43cf215 100644
--- a/gdk/src/pixbufanimation.ccg
+++ b/gdk/src/pixbufanimation.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: pixbufanimation.ccg,v 1.1 2003/01/21 13:38:36 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -34,6 +30,6 @@ Glib::RefPtr<PixbufAnimation> PixbufAnimation::create_from_file(const Glib::ustr
     ::Glib::Error::throw_exception(gerror);
 }
 
-} //Gdk
+} //namespace Gdk
 
 
diff --git a/gdk/src/pixbufanimation.hg b/gdk/src/pixbufanimation.hg
index 99a259d..84b1df9 100644
--- a/gdk/src/pixbufanimation.hg
+++ b/gdk/src/pixbufanimation.hg
@@ -1,7 +1,4 @@
-/* $Id: pixbufanimation.hg,v 1.1 2003/01/21 13:38:37 murrayc Exp $ */
-
-/* box.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -31,11 +28,11 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gdk
 {
 
-/** The gdk-pixbuf library provides a simple mechanism to load and represent animations. 
- * An animation is conceptually a series of frames to be displayed over time. 
- * Each frame is the same size. The animation may not be represented as a series of frames internally; 
- * for example, it may be stored as a sprite and instructions for moving the sprite around a background. 
- * To display an animation you don't need to understand its representation, however; you just ask 
+/** The gdk-pixbuf library provides a simple mechanism to load and represent animations.
+ * An animation is conceptually a series of frames to be displayed over time.
+ * Each frame is the same size. The animation may not be represented as a series of frames internally;
+ * for example, it may be stored as a sprite and instructions for moving the sprite around a background.
+ * To display an animation you don't need to understand its representation, however; you just ask
  * gdk-pixbuf what should be displayed at a given point in time.
  */
 class PixbufAnimation : public Glib::Object
@@ -55,5 +52,5 @@ public:
   _WRAP_METHOD(Glib::RefPtr<PixbufAnimationIter> get_iter(const GTimeVal* start_time), gdk_pixbuf_animation_get_iter, refreturn)
 };
 
-} /* namespace Gdk */
+} // namespace Gdk
 
diff --git a/gdk/src/pixbufanimationiter.ccg b/gdk/src/pixbufanimationiter.ccg
index 8d12729..410ecae 100644
--- a/gdk/src/pixbufanimationiter.ccg
+++ b/gdk/src/pixbufanimationiter.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: pixbufanimationiter.ccg,v 1.1 2003/01/21 13:38:37 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gdk/src/pixbufanimationiter.hg b/gdk/src/pixbufanimationiter.hg
index deeefec..39b439d 100644
--- a/gdk/src/pixbufanimationiter.hg
+++ b/gdk/src/pixbufanimationiter.hg
@@ -1,7 +1,4 @@
-/* $Id: pixbufanimationiter.hg,v 1.2 2004/04/12 11:04:05 murrayc Exp $ */
-
-/* pixbufanimationiter.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -51,10 +48,10 @@ public:
 
 #m4 _CONVERSION(`const Glib::TimeVal&', `const GTimeVal*', static_cast<$2>(&$3))
   _WRAP_METHOD(bool advance(const Glib::TimeVal& current_time), gdk_pixbuf_animation_iter_advance)
-  
+
   /** Possibly advances an animation to a new frame. Chooses the frame based
    * on the start time passed to Gdk::PixbufAnimation::get_iter().
-   * 
+   *
    * If this function returns false, there's no need to update the animation
    * display, assuming the display had been rendered prior to advancing;
    * if true, you need to call get_pixbuf() and update the
@@ -67,5 +64,5 @@ public:
   bool advance();
 };
 
-} /* namespace Gdk */
+} // namespace Gdk
 
diff --git a/gdk/src/pixbufformat.ccg b/gdk/src/pixbufformat.ccg
index 314f2f0..0473286 100644
--- a/gdk/src/pixbufformat.ccg
+++ b/gdk/src/pixbufformat.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: pixbufformat.ccg,v 1.2 2003/11/22 18:58:20 murrayc Exp $ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gdk/src/pixbufformat.hg b/gdk/src/pixbufformat.hg
index 12c7c5f..3255ce6 100644
--- a/gdk/src/pixbufformat.hg
+++ b/gdk/src/pixbufformat.hg
@@ -1,5 +1,3 @@
-/* $Id: pixbufformat.hg,v 1.4 2005/01/05 17:30:16 murrayc Exp $ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gdk/src/pixbufloader.ccg b/gdk/src/pixbufloader.ccg
index 7324f42..d5c9710 100644
--- a/gdk/src/pixbufloader.ccg
+++ b/gdk/src/pixbufloader.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: pixbufloader.ccg,v 1.6 2006/05/11 11:40:23 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -21,7 +18,6 @@
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-
 namespace
 {
 
diff --git a/gdk/src/pixbufloader.hg b/gdk/src/pixbufloader.hg
index 35e7b3e..3963e95 100644
--- a/gdk/src/pixbufloader.hg
+++ b/gdk/src/pixbufloader.hg
@@ -1,5 +1,3 @@
-/* $Id: pixbufloader.hg,v 1.13 2006/05/18 17:53:14 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -53,9 +51,9 @@ protected:
    * http://www.freedesktop.org/Software/shared-mime-info
    *
    * The list of non-mime-type image formats depends on what image loaders
-   * are installed, but typically "png", "jpeg", "gif", "tiff" and 
+   * are installed, but typically "png", "jpeg", "gif", "tiff" and
    * "xpm" are among the supported formats. To obtain the full list of
-   * supported image formats, call PixbufFormat::get_name() on each 
+   * supported image formats, call PixbufFormat::get_name() on each
    * of the PixbufFormats returned by Gdk::Pixbuf::get_formats().
    *
    * @param image_type Name of the image format to be loaded with the image.
@@ -86,9 +84,9 @@ public:
    * http://www.freedesktop.org/Software/shared-mime-info
    *
    * The list of non-mime-type image formats depends on what image loaders
-   * are installed, but typically "png", "jpeg", "gif", "tiff" and 
+   * are installed, but typically "png", "jpeg", "gif", "tiff" and
    * "xpm" are among the supported formats. To obtain the full list of
-   * supported image formats, call PixbufFormat::get_name() on each 
+   * supported image formats, call PixbufFormat::get_name() on each
    * of the PixbufFormats returned by Gdk::Pixbuf::get_formats().
    *
    * @param image_type Name of the image format to be loaded with the image.
@@ -128,11 +126,11 @@ public:
 
   _WRAP_METHOD(PixbufFormat get_format() const, gdk_pixbuf_loader_get_format)
 
-  /** This signal is emitted when the pixbuf loader has allocated the 
-   * pixbuf in the desired size.  After this signal is emitted, 
-   * applications can call get_pixbuf() to fetch 
+  /** This signal is emitted when the pixbuf loader has allocated the
+   * pixbuf in the desired size.  After this signal is emitted,
+   * applications can call get_pixbuf() to fetch
    * the partially-loaded pixbuf.
-   */ 
+   */
   _WRAP_SIGNAL(void area_prepared(), "area_prepared")
 
   /** This signal is emitted when a significant area of the image being
@@ -157,7 +155,7 @@ public:
 
   /** This signal is emitted when the pixbuf loader has been fed the
    * initial amount of data that is required to figure out the size
-   * of the image that it will create.  Applications can call  
+   * of the image that it will create.  Applications can call
    * set_size() in response to this signal to set
    * the desired size to which the image should be scaled.
    *
diff --git a/gdk/src/rectangle.ccg b/gdk/src/rectangle.ccg
index a2a6cde..f31dd3a 100644
--- a/gdk/src/rectangle.ccg
+++ b/gdk/src/rectangle.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: rectangle.ccg,v 1.1 2003/01/21 13:38:38 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gdk/src/rectangle.hg b/gdk/src/rectangle.hg
index 0548276..22c418e 100644
--- a/gdk/src/rectangle.hg
+++ b/gdk/src/rectangle.hg
@@ -1,7 +1,4 @@
-/* $Id: rectangle.hg,v 1.2 2004/01/05 17:32:12 murrayc Exp $ */
-
-/* rectangle.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gdk/src/rgba.ccg b/gdk/src/rgba.ccg
index d110ca5..703b03a 100644
--- a/gdk/src/rgba.ccg
+++ b/gdk/src/rgba.ccg
@@ -1,5 +1,4 @@
 /*
- *
  * Copyright 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -23,7 +22,7 @@ namespace Gdk
 {
 
  const double MULTIPLIER = 65535.0;
- 
+
 RGBA::RGBA()
 {
   GdkRGBA tmp = { 0, 0, 0, 0, };
@@ -46,7 +45,7 @@ void RGBA::set_grey_u(gushort value, gushort alpha)
 
 void RGBA::set_grey(double g, double alpha)
 {
-  gobject_->red = gobject_->green = gobject_->blue = g; 
+  gobject_->red = gobject_->green = gobject_->blue = g;
   gobject_->alpha = alpha;
 }
 
@@ -155,12 +154,12 @@ gushort RGBA::get_green_u() const
 
 gushort RGBA::get_blue_u() const
 {
- return gobject_->blue *  MULTIPLIER;
+  return gobject_->blue *  MULTIPLIER;
 }
 
 gushort RGBA::get_alpha_u() const
 {
- return gobject_->alpha *  MULTIPLIER;
+  return gobject_->alpha *  MULTIPLIER;
 }
 
 void RGBA::set_red_u(gushort value)
@@ -204,7 +203,6 @@ void RGBA::set_alpha(double value)
 }
 
 
-
 double RGBA::get_red() const
 {
   return gobject_->red;
@@ -225,6 +223,4 @@ double RGBA::get_alpha() const
   return gobject_->alpha;
 }
 
-
-
 } //namespace Gdk
diff --git a/gdk/src/rgba.hg b/gdk/src/rgba.hg
index b9d0a5c..f61c9ed 100644
--- a/gdk/src/rgba.hg
+++ b/gdk/src/rgba.hg
@@ -1,4 +1,5 @@
-/* Copyright (C) 2010 The gtkmm Development Team
+/*
+ * Copyright (C) 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,11 +25,11 @@ namespace Gdk
 {
 
 /** An RGBA Color.
- * The RGBA class is a convenient way to pass rgba colors around. 
- * It's based on cairo's way to deal with (possibly translucent) colors and mirrors its behavior. 
- * All values are in the range from 0.0 to 1.0 inclusive. 
- * So the color (0.0, 0.0, 0.0, 0.0) represents transparent black and (1.0, 1.0, 1.0, 1.0) is opaque white. 
- * Other values will be clamped to this range when drawing. 
+ * The RGBA class is a convenient way to pass rgba colors around.
+ * It's based on cairo's way to deal with (possibly translucent) colors and mirrors its behavior.
+ * All values are in the range from 0.0 to 1.0 inclusive.
+ * So the color (0.0, 0.0, 0.0, 0.0) represents transparent black and (1.0, 1.0, 1.0, 1.0) is opaque white.
+ * Other values will be clamped to this range when drawing.
  */
 class RGBA
 {
@@ -90,7 +91,7 @@ public:
    * @result The blue component of the color.
    */
   gushort get_blue_u() const;
-  
+
   /** Get the alpha component of the color.
    * @result The alpha component of the color.
    */
@@ -110,7 +111,7 @@ public:
    * @param value The blue component of the color.
    */
   void set_blue_u(gushort value);
-  
+
   /** Set the alpha component of the color.
    * @param value The alpha component of the color.
    */
@@ -131,12 +132,12 @@ public:
    * @result The blue component of the color, as a percentage.
    */
   double get_blue() const;
-  
+
   /** Get the alpha component of the color, as a percentage.
    * @result The alpha component of the color, as a percentage.
    */
   double get_alpha() const;
-  
+
   /** Set the red component of the color, as a percentage.
    * @param value The red component of the color.
    */
@@ -151,12 +152,12 @@ public:
    * @param value The blue component of the color.
    */
   void set_blue(double value);
-  
+
   /** Set the alpha component of the color, as a percentage.
    * @param value The blue component of the color.
    */
   void set_alpha(double value);
-  
+
   /** Set the alpha component of the color.
    * @param value The alpha component of the color.
    */
diff --git a/gdk/src/screen.ccg b/gdk/src/screen.ccg
index 7658330..d727f3f 100644
--- a/gdk/src/screen.ccg
+++ b/gdk/src/screen.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: screen.ccg,v 1.1 2003/01/21 13:38:38 murrayc Exp $ */
-
 /*
- *
  * Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -29,6 +25,6 @@
 namespace Gdk
 {
 
-} //Gdk
+} // namespace Gdk
 
 
diff --git a/gdk/src/screen.hg b/gdk/src/screen.hg
index f804904..acdbdf9 100644
--- a/gdk/src/screen.hg
+++ b/gdk/src/screen.hg
@@ -1,7 +1,4 @@
-/* $Id: screen.hg,v 1.8 2006/06/10 15:26:24 murrayc Exp $ */
-
-/* screen.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -19,15 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-//#include <gdkmm/visual.h>
-//#include <gdkmm/window.h>
 #include <gdkmm/rectangle.h>
 #include <glibmm/object.h>
 #include <cairomm/fontoptions.h>
+
 _DEFS(gdkmm,gdk)
 _PINCLUDE(glibmm/private/object_p.h)
 
-
 namespace Gdk
 {
 
@@ -128,4 +123,4 @@ bool Screen::get_setting(const Glib::ustring& name, ValueType& value) const
   return result;
 }
 
-} /* namespace Gdk */
+} // namespace Gdk
diff --git a/gdk/src/timecoord.hg b/gdk/src/timecoord.hg
index aa89d59..f004ca8 100644
--- a/gdk/src/timecoord.hg
+++ b/gdk/src/timecoord.hg
@@ -40,7 +40,7 @@ public:
    * @return A value at @a index.
    */
   double get_value_at_axis(guint index) const;
- 
+
   ///Provides access to the underlying C object.
   GdkTimeCoord* gobj() {return gobject_;}
   ///Provides access to the underlying C object.
diff --git a/gdk/src/types.ccg b/gdk/src/types.ccg
index 8ddbe00..75480f1 100644
--- a/gdk/src/types.ccg
+++ b/gdk/src/types.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: types.ccg,v 1.3 2004/02/10 17:29:54 mxpxpod Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gdk/src/types.hg b/gdk/src/types.hg
index ea1f35d..fa813d2 100644
--- a/gdk/src/types.hg
+++ b/gdk/src/types.hg
@@ -1,5 +1,3 @@
-/* $Id: types.hg,v 1.6 2005/12/14 15:36:23 murrayc Exp $ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -83,9 +81,9 @@ public:
 
   bool equal(const Gdk::Point& rhs) const;
 
-  /// Provides access to the underlying C GObject.  
+  /// Provides access to the underlying C GObject.
   GdkPoint*       gobj()       { return &gobject_; }
-  /// Provides access to the underlying C GObject.  
+  /// Provides access to the underlying C GObject.
   const GdkPoint* gobj() const { return &gobject_; }
 
 protected:
diff --git a/gdk/src/visual.ccg b/gdk/src/visual.ccg
index 4087347..0e5e164 100644
--- a/gdk/src/visual.ccg
+++ b/gdk/src/visual.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: visual.ccg,v 1.1 2003/01/21 13:38:39 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -25,7 +21,5 @@
 namespace Gdk
 {
 
-
-
-} //namespace
+} //namespace Gdk
 
diff --git a/gdk/src/visual.hg b/gdk/src/visual.hg
index 294c6ce..7fd3752 100644
--- a/gdk/src/visual.hg
+++ b/gdk/src/visual.hg
@@ -1,5 +1,3 @@
-/* $Id: visual.hg,v 1.4 2006/04/12 11:11:24 murrayc Exp $ */
-
 /* visual.h
  *
  * Copyright (C) 1998-2002 The gtkmm Development Team
@@ -69,8 +67,8 @@ public:
 
    _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_visual_get_screen, refreturn)
    _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_visual_get_screen, refreturn, constversion)
-   
-   
+
+
    _WRAP_METHOD(VisualType get_visual_type() const, gdk_visual_get_visual_type)
    _WRAP_METHOD(int get_depth() const, gdk_visual_get_depth)
    _WRAP_METHOD(ByteOrder get_byte_order(), gdk_visual_get_byte_order)
@@ -79,7 +77,7 @@ public:
    _WRAP_METHOD(void get_red_pixel_details(guint32& mask, int& shift, int& precision) const, gdk_visual_get_red_pixel_details)
    _WRAP_METHOD(void get_green_pixel_details(guint32& mask, int& shift, int& precision) const, gdk_visual_get_green_pixel_details)
    _WRAP_METHOD(void get_blue_pixel_details(guint32& mask, int& shift, int& precision) const, gdk_visual_get_blue_pixel_details)
-                                                  
+
 };
 
 } //namespace Gdk
diff --git a/gdk/src/window.ccg b/gdk/src/window.ccg
index d309d8c..b2560f2 100644
--- a/gdk/src/window.ccg
+++ b/gdk/src/window.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: window.ccg,v 1.7 2004/03/09 17:36:25 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -70,7 +67,7 @@ DragProtocol Window::get_drag_protocol(Glib::RefPtr<Window>& target) const
   GdkDragProtocol result = gdk_window_get_drag_protocol(
     const_cast<GdkWindow*>(gobj()),
     &window);
-    
+
   target = Glib::wrap(window, true /* take ref */);
   return (DragProtocol)result;
 }
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 623da85..d1d9e0b 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -18,7 +18,6 @@
 _CONFIGINCLUDE(gdkmmconfig.h)
 
 #include <glibmm/object.h>
-//#include <gdkmm/cursor.h>
 #include <gdkmm/dragcontext.h>
 #include <gdkmm/types.h>
 #include <cairomm/region.h>
@@ -72,16 +71,16 @@ public:
   _WRAP_CREATE(const Glib::RefPtr<Window>& parent, GdkWindowAttr* attributes, int attributes_mask)
 
   _WRAP_METHOD(WindowType get_window_type() const, gdk_window_get_window_type)
-  
+
   _WRAP_METHOD(Glib::RefPtr<Visual> get_visual(), gdk_window_get_visual, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Visual> get_visual() const, gdk_window_get_visual, refreturn, constversion)
-  
+
   _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_window_get_screen, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_window_get_screen, refreturn, constversion)
-  
+
   _WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_window_get_display, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_window_get_display, refreturn, constversion)
-  
+
   _WRAP_METHOD(void show(), gdk_window_show)
   _WRAP_METHOD(void hide(), gdk_window_hide)
   _WRAP_METHOD(void withdraw(), gdk_window_withdraw)
@@ -175,7 +174,7 @@ public:
    * For top-level windows this means that it will use the default cursor for the ROOT window.
    */
   void set_device_cursor(const Glib::RefPtr<Device>& device);
-  
+
   _WRAP_METHOD(Glib::RefPtr<Cursor> get_device_cursor(const Glib::RefPtr<Device>& device), gdk_window_get_device_cursor, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Cursor> get_device_cursor(const Glib::RefPtr<const Device>& device) const, gdk_window_get_device_cursor, refreturn)
 
@@ -221,7 +220,7 @@ public:
 
   _WRAP_METHOD(EventMask get_device_events(const Glib::RefPtr<const Device>& device) const, gdk_window_get_device_events)
   _WRAP_METHOD(void set_device_events(const Glib::RefPtr<Device>& device, EventMask event_mask), gdk_window_set_device_events)
-  
+
   _WRAP_METHOD(EventMask get_source_events(InputSource source) const, gdk_window_get_source_events)
   _WRAP_METHOD(void set_source_events(InputSource source, EventMask event_mask), gdk_window_set_source_events)
 
@@ -253,15 +252,15 @@ public:
   _WRAP_METHOD(void maximize(), gdk_window_maximize)
   _WRAP_METHOD(void unmaximize(), gdk_window_unmaximize)
   _WRAP_METHOD(void register_dnd(), gdk_window_register_dnd)
-  
+
   _WRAP_METHOD_DOCS_ONLY(gdk_window_get_drag_protocol)
   DragProtocol get_drag_protocol(Glib::RefPtr<Window>& target) const;
 
-  //TODO: Documentation  
+  //TODO: Documentation
   DragProtocol get_drag_protocol() const;
-  
+
   _IGNORE(gdk_window_get_drag_protocol)
-  
+
   _WRAP_METHOD(void begin_resize_drag(WindowEdge edge, int button, int root_x, int root_y, guint32 timestamp), gdk_window_begin_resize_drag)
 
   _WRAP_METHOD(void resize_drag(WindowEdge edge, const Glib::RefPtr<Device>& device, int button, int root_x, int root_y, guint32 timestamp), gdk_window_begin_resize_drag_for_device)
@@ -271,7 +270,7 @@ public:
   _WRAP_METHOD(void begin_move_drag(const Glib::RefPtr<Device>& device, int button, int root_x, int root_y, guint32 timestamp), gdk_window_begin_move_drag_for_device)
 
   /** Starts a drag and creates a new drag context for it.
-   * 
+   *
    * This method is called by the drag source.
    * @param window The source window for this drag.
    * @param targets A list of the offered targets names.
diff --git a/gtk/src/aboutdialog.ccg b/gtk/src/aboutdialog.ccg
index 0c1f7e4..81f4c34 100644
--- a/gtk/src/aboutdialog.ccg
+++ b/gtk/src/aboutdialog.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: aboutdialog.ccg,v 1.5 2006/06/13 17:24:35 murrayc Exp $ */
-
 /*
- *
  * Copyright 2004 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -29,12 +25,12 @@ namespace Gtk
 
 void AboutDialog::unset_license()
 {
-  gtk_about_dialog_set_license(gobj(), 0); 
+  gtk_about_dialog_set_license(gobj(), 0);
 }
 
 void AboutDialog::set_logo_default()
 {
-  gtk_about_dialog_set_logo(gobj(), 0); 
+  gtk_about_dialog_set_logo(gobj(), 0);
 }
 
 } // namespace Gtk
diff --git a/gtk/src/aboutdialog.hg b/gtk/src/aboutdialog.hg
index 3ea2e8f..b4dc372 100644
--- a/gtk/src/aboutdialog.hg
+++ b/gtk/src/aboutdialog.hg
@@ -67,7 +67,7 @@ public:
   _WRAP_METHOD(void set_license(const Glib::ustring& license), gtk_about_dialog_set_license)
 
   /** Hides the license button.
-   * 
+   *
    * @newin{3,4}
    */
   void unset_license();
@@ -100,7 +100,7 @@ public:
   /** Sets the pixbuf to be displayed as logo in the about dialog.
    * The logo is set to the default window icon set with
    * Gtk::Window::set_default_icon() or Gtk::Window::set_default_icon_list().
-   * 
+   *
    * @newin{3,4}
    */
   void set_logo_default();
diff --git a/gtk/src/accelgroup.ccg b/gtk/src/accelgroup.ccg
index d9b1b0b..331d16d 100644
--- a/gtk/src/accelgroup.ccg
+++ b/gtk/src/accelgroup.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: accelgroup.ccg,v 1.1 2003/01/21 13:38:41 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -24,7 +21,7 @@
 namespace Gtk
 {
 
-bool AccelGroup::valid(guint keyval, Gdk::ModifierType modifiers) 
+bool AccelGroup::valid(guint keyval, Gdk::ModifierType modifiers)
 {
   return gtk_accelerator_valid(keyval, (GdkModifierType) modifiers);
 }
@@ -39,17 +36,17 @@ void AccelGroup::parse(const Glib::ustring& accelerator,
   accelerator_mods = (Gdk::ModifierType) mods;
 }
 
-Glib::ustring AccelGroup::name(guint accelerator_key, Gdk::ModifierType accelerator_mods) 
+Glib::ustring AccelGroup::name(guint accelerator_key, Gdk::ModifierType accelerator_mods)
 {
   return gtk_accelerator_name(accelerator_key, (GdkModifierType) accelerator_mods);
 }
 
-void AccelGroup::set_default_mod_mask(Gdk::ModifierType default_mod_mask) 
+void AccelGroup::set_default_mod_mask(Gdk::ModifierType default_mod_mask)
 {
   gtk_accelerator_set_default_mod_mask((GdkModifierType) default_mod_mask);
 }
 
-Gdk::ModifierType AccelGroup::get_default_mod_mask() 
+Gdk::ModifierType AccelGroup::get_default_mod_mask()
 {
   return (Gdk::ModifierType) gtk_accelerator_get_default_mod_mask();
 }
diff --git a/gtk/src/accelgroup.hg b/gtk/src/accelgroup.hg
index edeaf73..2c86b9b 100644
--- a/gtk/src/accelgroup.hg
+++ b/gtk/src/accelgroup.hg
@@ -1,5 +1,3 @@
-/* $Id: accelgroup.hg,v 1.8 2005/04/07 08:46:44 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/accellabel.ccg b/gtk/src/accellabel.ccg
index 6f4e60b..18ab3e7 100644
--- a/gtk/src/accellabel.ccg
+++ b/gtk/src/accellabel.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: accellabel.ccg,v 1.2 2003/05/10 07:16:52 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/accellabel.hg b/gtk/src/accellabel.hg
index 54a3596..62ea9f5 100644
--- a/gtk/src/accellabel.hg
+++ b/gtk/src/accellabel.hg
@@ -1,7 +1,4 @@
-/* $Id: accellabel.hg,v 1.5 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* accellabel.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -64,5 +61,4 @@ public:
   _WRAP_PROPERTY("accel-widget", Gtk::Widget*)
 };
 
-} /* namespace Gtk */
-
+} // namespace Gtk
diff --git a/gtk/src/action.ccg b/gtk/src/action.ccg
index 0dcd20b..989f386 100644
--- a/gtk/src/action.ccg
+++ b/gtk/src/action.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: action.ccg,v 1.11 2006/05/10 20:59:27 murrayc Exp $ */
-
 /* Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -28,7 +25,7 @@
 #include <gtkmm/image.h>
 #include <gtkmm/widget.h>
 
-typedef Gtk::Action Action; 
+typedef Gtk::Action Action;
 
 namespace Gtk
 {
diff --git a/gtk/src/actionable.ccg b/gtk/src/actionable.ccg
index acae810..24e0cf0 100644
--- a/gtk/src/actionable.ccg
+++ b/gtk/src/actionable.ccg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2011 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/actionable.hg b/gtk/src/actionable.hg
index 039f9f6..3bfd7e2 100644
--- a/gtk/src/actionable.hg
+++ b/gtk/src/actionable.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2012 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/actiongroup.ccg b/gtk/src/actiongroup.ccg
index b958c09..61acad8 100644
--- a/gtk/src/actiongroup.ccg
+++ b/gtk/src/actiongroup.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: actiongroup.ccg,v 1.10 2006/05/16 20:36:24 murrayc Exp $ */
-
 /* Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -68,21 +65,21 @@ void ActionGroup::add(const Glib::RefPtr<Action>& action, const AccelKey& accel_
   gtk_action_group_add_action(gobj(), action->gobj());
 }
 
-  
+
 
 void ActionGroup::add(const Glib::RefPtr<Action>& action, const Action::SlotActivate& slot)
 {
   //This is meant to be similar to the gtk_action_group_add_actions() convenience method that is used from C.
   //This also does the work of gtk_action_group_add_toggle_actions() and gtk_action_group_add_radio_actions_full(),
   //because the extra stuff there is already done when the Action (or a derived type, such as ToggleAction) is create()ed.
-  
+
   action->signal_activate().connect(slot);
-  
+
   //We probably don't need to use translate_string(), because the label and tooltip will be regular translated strings in our C++ application code.
-  //But C needs it because gtk_action_group_add_actions() takes a static array of GtkActionEntrys  whose fields 
+  //But C needs it because gtk_action_group_add_actions() takes a static array of GtkActionEntrys  whose fields
   //can not be translated with gettext macros.
   //But we should soon know if menus and toolbars are not translated in non-english locales. murrayc.
-  
+
   add(action);
 }
 
@@ -105,7 +102,7 @@ void ActionGroup::add(const Glib::RefPtr<Action>& action, const AccelKey& accel_
   //USe the accel path:
   action->set_accel_path(accel_path);
   */
-}  
+}
 
 
 } // namespace Gtk
diff --git a/gtk/src/actiongroup.hg b/gtk/src/actiongroup.hg
index 0c6a5c3..04b9ba6 100644
--- a/gtk/src/actiongroup.hg
+++ b/gtk/src/actiongroup.hg
@@ -1,5 +1,3 @@
-/* $Id: actiongroup.hg,v 1.17 2006/04/12 11:11:25 murrayc Exp $ */
-
 /* Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -22,14 +20,14 @@
 #include <gtkmm/widget.h>
 #include <gtkmm/action.h>
 #include <gtkmm/accelkey.h>
- 
+
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/object_p.h)
 
 
 namespace Gtk
 {
-  
+
 class ActionGroup
   : public Glib::Object,
     public Buildable
@@ -42,14 +40,14 @@ protected:
 
 public:
   _WRAP_CREATE(const Glib::ustring& name = Glib::ustring())
-  
+
   _WRAP_METHOD(Glib::ustring get_name() const, gtk_action_group_get_name)
 
   _WRAP_METHOD(bool get_sensitive() const, gtk_action_group_get_sensitive)
   _WRAP_METHOD(void set_sensitive(bool sensitive = true), gtk_action_group_set_sensitive)
   _WRAP_METHOD(bool get_visible() const, gtk_action_group_get_visible)
   _WRAP_METHOD(void set_visible(bool visible = true), gtk_action_group_set_visible)
-                                      
+
   _WRAP_METHOD(Glib::RefPtr<Action> get_action(const Glib::ustring& action_name), gtk_action_group_get_action, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Action> get_action(const Glib::ustring& action_name) const, gtk_action_group_get_action, refreturn, constversion)
 
@@ -57,7 +55,7 @@ public:
   _WRAP_METHOD(std::vector< Glib::RefPtr<Action> > get_actions(), gtk_action_group_list_actions)
 #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<const Action> >',`Glib::ListHandler< Glib::RefPtr<const Action> >::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
   _WRAP_METHOD(std::vector< Glib::RefPtr<const Action> > get_actions() const, gtk_action_group_list_actions)
-    
+
   void add(const Glib::RefPtr<Action>& action);
   _IGNORE(gtk_action_group_add_action)
   //We want it to always try to use the stock accelerator,
@@ -68,15 +66,15 @@ public:
   _IGNORE(gtk_action_group_add_action_with_accel)
   //We need to duplicate the gtk_action_group_add_action_with_accel() implementation, because we want to
   //use AccelKey, not just the accelerator string format that is _one_ of the ways to create an AccelKey.
-   
+
   //TODO: Could this whole class have an STL-style interface?
   void add(const Glib::RefPtr<Action>& action, const Action::SlotActivate& slot);
   void add(const Glib::RefPtr<Action>& action, const AccelKey& accel_key, const Action::SlotActivate& slot);
   _WRAP_METHOD(void remove(const Glib::RefPtr<Action>& action), gtk_action_group_remove_action)
-  
+
    //TODO: We probably need to use this in our add_actions() implementation:
   _WRAP_METHOD(Glib::ustring translate_string(const Glib::ustring& str) const, gtk_action_group_translate_string)
-  
+
 
   //These are just C convenience methods:
   _IGNORE(gtk_action_group_add_actions, gtk_action_group_add_toggle_actions, gtk_action_group_add_radio_actions,
@@ -89,7 +87,7 @@ public:
   _WRAP_SIGNAL(void disconnect_proxy(const Glib::RefPtr<Action>& action, Widget* proxy), "disconnect_proxy", no_default_handler)
   _WRAP_SIGNAL(void pre_activate(const Glib::RefPtr<Action>& action), "pre_activate", no_default_handler)
   _WRAP_SIGNAL(void post_activate(const Glib::RefPtr<Action>& action), "post_activate", no_default_handler)
-  
+
   _WRAP_PROPERTY("name", Glib::ustring)
   _WRAP_PROPERTY("sensitive", bool)
   _WRAP_PROPERTY("visible", bool)
diff --git a/gtk/src/activatable.ccg b/gtk/src/activatable.ccg
index 3fbab4b..f10e0ef 100644
--- a/gtk/src/activatable.ccg
+++ b/gtk/src/activatable.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: activatable.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
-
 /* Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/activatable.hg b/gtk/src/activatable.hg
index 317faf4..9bd2590 100644
--- a/gtk/src/activatable.hg
+++ b/gtk/src/activatable.hg
@@ -1,5 +1,3 @@
-/* $Id: activatable.hg,v 1.3 2006/05/18 17:53:15 murrayc Exp $ */
-
 /* Copyright (C) 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -32,8 +30,8 @@ typedef struct _GtkActivatableIface GtkActivatableIface;
 namespace Gtk
 {
 
-/** Activatable widgets can be connected to a Gtk::Action and reflect the state 
- * of the action. An Activatable can also provide feedback through its action, 
+/** Activatable widgets can be connected to a Gtk::Action and reflect the state
+ * of the action. An Activatable can also provide feedback through its action,
  * as it is responsible for activating the related action.
  *
  * @newin{2,16}
diff --git a/gtk/src/adjustment.ccg b/gtk/src/adjustment.ccg
index c646afb..f6bd7cb 100644
--- a/gtk/src/adjustment.ccg
+++ b/gtk/src/adjustment.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: adjustment.ccg,v 1.3 2006/11/08 21:51:35 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/adjustment.hg b/gtk/src/adjustment.hg
index 15bf7a0..6a5ea76 100644
--- a/gtk/src/adjustment.hg
+++ b/gtk/src/adjustment.hg
@@ -1,7 +1,4 @@
-/* $Id: adjustment.hg,v 1.5 2006/11/08 21:51:35 murrayc Exp $ */
-
-/* adjustment.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -92,7 +89,7 @@ public:
   _WRAP_METHOD(double get_page_size() const, gtk_adjustment_get_page_size)
 
   _WRAP_METHOD(void configure(double value, double lower, double upper, double step_increment, double page_increment, double page_size), gtk_adjustment_configure)
-  
+
   _WRAP_METHOD(double get_minimum_increment() const, gtk_adjustment_get_minimum_increment)
 
   _WRAP_SIGNAL(void changed(), "changed")
@@ -107,4 +104,4 @@ public:
 
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/alignment.ccg b/gtk/src/alignment.ccg
index af8d6a5..76e984b 100644
--- a/gtk/src/alignment.ccg
+++ b/gtk/src/alignment.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: alignment.ccg,v 1.1 2003/01/21 13:38:41 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/alignment.hg b/gtk/src/alignment.hg
index 45d7101..0b347ed 100644
--- a/gtk/src/alignment.hg
+++ b/gtk/src/alignment.hg
@@ -1,7 +1,4 @@
-/* $Id: alignment.hg,v 1.5 2004/04/29 19:58:02 murrayc Exp $ */
-
-/* alignment.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -68,7 +65,7 @@ public:
   //New in GTK+ 2.4
   _WRAP_METHOD(void set_padding(guint padding_top, guint padding_bottom, guint padding_left, guint padding_right), gtk_alignment_set_padding)
   _WRAP_METHOD(void get_padding(guint& padding_top, guint& padding_bottom, guint& padding_left, guint& padding_right), gtk_alignment_get_padding)
-              
+
   _WRAP_PROPERTY("xalign", float)
   _WRAP_PROPERTY("yalign", float)
   _WRAP_PROPERTY("xscale", float)
@@ -81,5 +78,5 @@ public:
   _WRAP_PROPERTY("right_padding", guint)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/appchooserdialog.ccg b/gtk/src/appchooserdialog.ccg
index 69a8eb3..7e1aff3 100644
--- a/gtk/src/appchooserdialog.ccg
+++ b/gtk/src/appchooserdialog.ccg
@@ -45,6 +45,6 @@ AppChooserDialog::AppChooserDialog(const Glib::RefPtr<Gio::File>& file, Gtk::Win
 {
   set_transient_for(parent);
 }
-  
+
 } // namespace Gtk
 
diff --git a/gtk/src/application.ccg b/gtk/src/application.ccg
index a3b6091..69ae4ac 100644
--- a/gtk/src/application.ccg
+++ b/gtk/src/application.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: action.ccg,v 1.11 2006/05/10 20:59:27 murrayc Exp $ */
-
 /* Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -116,8 +113,8 @@ void Application::add_window(Window& window)
     sigc::bind(
       sigc::mem_fun(*this, &Application::on_window_hide),
       &window));
-    
-  gtk_application_add_window(gobj(), (window).gobj()); 
+
+  gtk_application_add_window(gobj(), (window).gobj());
 }
 
 int Application::run(int argc, char** argv)
diff --git a/gtk/src/application.hg b/gtk/src/application.hg
index 9150afa..b7b7a70 100644
--- a/gtk/src/application.hg
+++ b/gtk/src/application.hg
@@ -89,7 +89,7 @@ public:
   _WRAP_METHOD(std::vector<const Window*> get_windows() const, gtk_application_get_windows)
 
   /** Adds a window to the Gtk::Application.
-   * 
+   *
    * If all the windows managed by Gtk::Application are closed or removed from
    * the application then the Gtk::Application will call quit(), and quit
    * the application.
@@ -99,7 +99,7 @@ public:
    * Normally, the connection between the application and the window
    * will remain until the window is closed or destroyed, but you can explicitly
    * remove it with remove_window().
-   * 
+   *
    * @newin{3,4}
    * @param window A toplevel window to add to the application.
    */
@@ -109,27 +109,27 @@ public:
   _WRAP_METHOD(void remove_window(Window& window), gtk_application_remove_window)
 
   /** Starts the application.
-   * 
+   *
    * The default implementation of this virtual function will simply run
    * a main loop.
-   * 
+   *
    * It is an error to call this function if @a application is a proxy for
    * a remote application.
-   * 
+   *
    * @newin{3,4}
    */
   int run(int argc, char** argv);
-  
+
   /** Starts the application.
-   * 
+   *
    * The default implementation of this virtual function will simply run
    * a main loop.
-   * 
+   *
    * It is an error to call this function if @a application is a proxy for
    * a remote application.
    *
    * @param window The window to show. This method will return when the window is hidden.
-   * 
+   *
    * @newin{3,4}
    */
   int run(Window& window, int argc, char** argv);
@@ -137,15 +137,15 @@ public:
   //TODO: If argc and argv are necessary at all, document the need to call that constructor first.
   //See https://bugzilla.gnome.org/show_bug.cgi?id=639925#c4
   /** Starts the application.
-   * 
+   *
    * The default implementation of this virtual function will simply run
    * a main loop.
-   * 
+   *
    * It is an error to call this function if @a application is a proxy for
    * a remote application.
    *
    * @param window The window to show. This method will return when the window is hidden.
-   * 
+   *
    * @newin{3,4}
    */
   int run(Window& window);
@@ -153,13 +153,13 @@ public:
   //TODO: If argc and argv are necessary at all, document the need to call that constructor first.
   //See https://bugzilla.gnome.org/show_bug.cgi?id=639925#c4
   /** Starts the application.
-   * 
+   *
    * The default implementation of this virtual function will simply run
    * a main loop.
-   * 
+   *
    * It is an error to call this function if @a application is a proxy for
    * a remote application.
-   * 
+   *
    * @newin{3,4}
    */
   int run();
diff --git a/gtk/src/arrow.ccg b/gtk/src/arrow.ccg
index 524fb4c..f1159dd 100644
--- a/gtk/src/arrow.ccg
+++ b/gtk/src/arrow.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: arrow.ccg,v 1.1 2003/01/21 13:38:42 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -42,5 +38,5 @@ Arrow::Arrow(ArrowType arrow_type, ShadowType shadow_type)
 
 */
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/arrow.hg b/gtk/src/arrow.hg
index ec8f5b1..3145fd1 100644
--- a/gtk/src/arrow.hg
+++ b/gtk/src/arrow.hg
@@ -1,7 +1,4 @@
-/* $Id: arrow.hg,v 1.1 2003/01/21 13:38:42 murrayc Exp $ */
-
-/* arrow.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -54,7 +51,7 @@ public:
    * the arrow.
    */
   _WRAP_CTOR(Arrow(ArrowType arrow_type, ShadowType shadow_type), gtk_arrow_new)
-  
+
 
   // Changes the direction and shadow of an arrow.
   _WRAP_METHOD(void set(ArrowType arrow_type, ShadowType shadow_type),gtk_arrow_set)
@@ -65,5 +62,5 @@ public:
 };
 
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/aspectframe.ccg b/gtk/src/aspectframe.ccg
index 5e3e723..e6c59e3 100644
--- a/gtk/src/aspectframe.ccg
+++ b/gtk/src/aspectframe.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: aspectframe.ccg,v 1.1 2003/01/21 13:38:42 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/aspectframe.hg b/gtk/src/aspectframe.hg
index 962cc1c..e2a009b 100644
--- a/gtk/src/aspectframe.hg
+++ b/gtk/src/aspectframe.hg
@@ -1,7 +1,4 @@
-/* $Id: aspectframe.hg,v 1.2 2003/03/03 07:49:05 murrayc Exp $ */
-
-/* aspectframe.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -47,7 +44,7 @@ public:
    * @param label Label text.
    * @param xalign Horizontal alignment of the child within the allocation of this
    * AspectFrame.  For possible values, see Gtk::Align.
-   * @param yalign Vertical alignment of the child within the allocation of this 
+   * @param yalign Vertical alignment of the child within the allocation of this
    * AspectFrame. For possible values, see Gtk::Align.
    * @param ratio The desired aspect ratio.
    * @param obey_child If <tt>true</tt>, @a ratio  is ignored and the aspect ratio
@@ -59,12 +56,12 @@ public:
 
   /** Constructor to create a new AspectFrame object.
    * @param label Label text.
-   * @param xalign Horizontal alignment of the child within the allocation of this 
+   * @param xalign Horizontal alignment of the child within the allocation of this
    * AspectFrame.  This ranges from 0.0 (left aligned) to 1.0 (right aligned).
-   * @param yalign Vertical alignment of the child within the allocation of this 
+   * @param yalign Vertical alignment of the child within the allocation of this
    * AspectFrame. This ranges from 0.0 (top aligned) to 1.0 (bottom aligned).
    * @param ratio The desired aspect ratio.
-   * @param obey_child If <tt>true</tt>, @a ratio  is ignored and the aspect ratio 
+   * @param obey_child If <tt>true</tt>, @a ratio  is ignored and the aspect ratio
    * is taken from the requisition of the child.
    */
   _WRAP_CTOR(AspectFrame(const Glib::ustring& label,
@@ -73,20 +70,20 @@ public:
 
   //TODO: Is "obey_child = true" a good default?
   /** Set the properties of this AspectFrame.
-   * @param xalign Horizontal alignment of the child within the allocation of this 
+   * @param xalign Horizontal alignment of the child within the allocation of this
    * AspectFrame.  This ranges from 0.0 (left aligned) to 1.0 (right aligned).
-   * @param yalign Vertical alignment of the child within the allocation of this 
+   * @param yalign Vertical alignment of the child within the allocation of this
    * AspectFrame.  This ranges from 0.0 (top aligned) to 1.0 (bottom aligned).
    * @param ratio The desired aspect ratio.
-   * @param obey_child If <tt>true</tt>, @a ratio  is ignored and the aspect ratio 
+   * @param obey_child If <tt>true</tt>, @a ratio  is ignored and the aspect ratio
    * is taken from the requisition of the child.
    */
   _WRAP_METHOD(void set(float xalign, float yalign, float ratio, bool obey_child = true), gtk_aspect_frame_set)
 
   /** Set the properties of this AspectFrame.
-   * @param xalign Horizontal alignment of the child within the allocation of this 
+   * @param xalign Horizontal alignment of the child within the allocation of this
    * AspectFrame.  For possible values, see Gtk::Align.
-   * @param yalign Vertical alignment of the child within the allocation of this 
+   * @param yalign Vertical alignment of the child within the allocation of this
    * AspectFrame.  For possible values, see Gtk::Align.
    * @param ratio The desired aspect ratio.
    * @param obey_child If <tt>true</tt>, @a ratio  is ignored and the aspect ratio
@@ -100,5 +97,5 @@ public:
   _WRAP_PROPERTY("obey-child", bool)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/assistant.ccg b/gtk/src/assistant.ccg
index c2e1c50..d7811fa 100644
--- a/gtk/src/assistant.ccg
+++ b/gtk/src/assistant.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: assistant.ccg,v 1.3 2006/05/11 11:40:24 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2006 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -55,11 +51,11 @@ void Assistant::set_forward_page_func(const SlotForwardPage& slot)
   // when SignalProxy_SlotForwardPage_gtk_callback_destroy() is called.
   SlotForwardPage* slot_copy = new SlotForwardPage(slot);
 
-  gtk_assistant_set_forward_page_func(gobj(), 
+  gtk_assistant_set_forward_page_func(gobj(),
       &SignalProxy_SlotForwardPage_gtk_callback, slot_copy,
       &SignalProxy_SlotForwardPage_gtk_callback_destroy);
 }
-  
+
 
 } // namespace Gtk
 
diff --git a/gtk/src/assistant.hg b/gtk/src/assistant.hg
index f9a6a21..fe8bfec 100644
--- a/gtk/src/assistant.hg
+++ b/gtk/src/assistant.hg
@@ -1,7 +1,4 @@
-/* $Id: assistant.hg,v 1.4 2006/06/13 17:16:26 murrayc Exp $ */
-
-/* assistant.h
- *
+/*
  * Copyright (C) 2004 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/bin.ccg b/gtk/src/bin.ccg
index 2114926..e93366f 100644
--- a/gtk/src/bin.ccg
+++ b/gtk/src/bin.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: bin.ccg,v 1.2 2004/03/15 00:26:00 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -95,4 +91,4 @@ Bin::add_pixlabel(const std::string& pixfile,
 }
 
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/bin.hg b/gtk/src/bin.hg
index f90a80e..a372fa2 100644
--- a/gtk/src/bin.hg
+++ b/gtk/src/bin.hg
@@ -1,7 +1,4 @@
-/* $Id: bin.hg,v 1.2 2003/03/03 07:49:05 murrayc Exp $ */
-
-/* bin.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -124,4 +121,4 @@ public:
 		                double x_align = 0.5, double y_align = 0.5);
 };
 
-}  /* namespace Gtk */
+}  //namespace Gtk
diff --git a/gtk/src/border.ccg b/gtk/src/border.ccg
index e159feb..e20f05f 100644
--- a/gtk/src/border.ccg
+++ b/gtk/src/border.ccg
@@ -1,5 +1,4 @@
-/* border.cc
- *
+/*
  * Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/border.hg b/gtk/src/border.hg
index b8f47ff..1940cb6 100644
--- a/gtk/src/border.hg
+++ b/gtk/src/border.hg
@@ -1,5 +1,4 @@
-/* border.h
- *
+/*
  * Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -24,7 +23,7 @@ _DEFS(gtkmm,gtk)
 namespace Gtk
 {
 
-/** This specifies a border around a rectangular area that can be of a different width on each side. 
+/** This specifies a border around a rectangular area that can be of a different width on each side.
  */
 class Border
 {
@@ -64,6 +63,6 @@ public:
   _MEMBER_SET(bottom, bottom, int, gint)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
 
diff --git a/gtk/src/box.ccg b/gtk/src/box.ccg
index a88e83d..8ee435d 100644
--- a/gtk/src/box.ccg
+++ b/gtk/src/box.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: box.ccg,v 1.1 2003/01/21 13:38:42 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -44,4 +40,4 @@ void Box::pack_end(Widget& child, PackOptions options, guint padding)
 }
 
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/box.hg b/gtk/src/box.hg
index ee1f250..40c2d30 100644
--- a/gtk/src/box.hg
+++ b/gtk/src/box.hg
@@ -1,5 +1,3 @@
-/* $Id: box.hg,v 1.10 2006/01/28 18:49:13 jjongsma Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -124,7 +122,7 @@ public:
 
 } // namespace Gtk
 
-//Include the deprecated header, 
+//Include the deprecated header,
 //whose classes were previously in this header,
 //to preserve the "API" of the includes.
 #include <gtkmm/hvbox.h>
diff --git a/gtk/src/buildable.ccg b/gtk/src/buildable.ccg
index b2dd09b..f10e0ef 100644
--- a/gtk/src/buildable.ccg
+++ b/gtk/src/buildable.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: buildable.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
-
 /* Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/buildable.hg b/gtk/src/buildable.hg
index 396773c..aa99e2a 100644
--- a/gtk/src/buildable.hg
+++ b/gtk/src/buildable.hg
@@ -1,5 +1,3 @@
-/* $Id: buildable.hg,v 1.3 2006/05/18 17:53:15 murrayc Exp $ */
-
 /* Copyright (C) 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -34,12 +32,12 @@ namespace Gtk
 
 /** A base class for objects that can be built by Gtk::Builder.
  *
- * Buildable allows objects to extend and customize thier deserialization from Gtk::Builder UI descriptions. 
+ * Buildable allows objects to extend and customize thier deserialization from Gtk::Builder UI descriptions.
  * The interface includes methods for setting names and properties of objects, parsing custom tags and constructing child objects.
  *
- * All gtkmm widgets, and many non-widget objects, derive from this base class. 
+ * All gtkmm widgets, and many non-widget objects, derive from this base class.
  * The main user of this interface is Gtk::Builder. There should be very little need for applications to call any of Buildable's methods.
- * 
+ *
  * @newin{3,0}
  */
 class Buildable : public Glib::Interface
@@ -49,11 +47,11 @@ class Buildable : public Glib::Interface
 public:
   _WRAP_METHOD(void set_name(const Glib::ustring& name), gtk_buildable_set_name)
   _WRAP_METHOD(Glib::ustring get_name() const, gtk_buildable_get_name)
-  
-//TODO: #m4 _CONVERSION(`(const Glib::RefPtr<Builder>&',`GtkBuilder*',`($3).gobj()') 
+
+//TODO: #m4 _CONVERSION(`(const Glib::RefPtr<Builder>&',`GtkBuilder*',`($3).gobj()')
 //TODO:  _WRAP_METHOD(void add_child(const Glib::RefPtr<Builder>& builder, const Glib::RefPtr<Glib::Object>& child, const Glib::ustring& type), gtk_buildable_add_child)
-  
-/* TODO: 
+
+/* TODO:
   _WRAP_METHOD(void      gtk_buildable_set_buildable_property (
 						GtkBuilder          *builder,
 						const Glib::ustring& name,
@@ -83,7 +81,7 @@ public:
 						GtkBuilder          *builder,
 						const Glib::ustring& childname);
 */
-						
+
   //TODO: Properties, signals, vfuncs.
 };
 
diff --git a/gtk/src/builder.ccg b/gtk/src/builder.ccg
index 1d1a402..45a7512 100644
--- a/gtk/src/builder.ccg
+++ b/gtk/src/builder.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: builder.ccg,v 1.11 2006/05/10 20:59:27 murrayc Exp $ */
-
 /* Copyright 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -22,7 +19,7 @@
 
 #include <gtk/gtk.h>
 
-// Allow GtkBuilder to instantiate a gtkmm derived GType instead of the regular 
+// Allow GtkBuilder to instantiate a gtkmm derived GType instead of the regular
 // GTK+ GType, so we can, for instance, use our vfuncs and default signal handlers.
 static GType
 get_type_from_name_vfunc_callback(GtkBuilder*, const char* type_name)
@@ -212,7 +209,7 @@ Gtk::Widget* Builder::get_widget_checked(const Glib::ustring& name, GType type)
   GtkWidget *cobject = get_cwidget(name);
   if(!cobject)
   {
-    g_critical("gtkmm: Gtk::Buidler: widget `%s' was not found in the GtkBuilder file, or the specified part of it.", 
+    g_critical("gtkmm: Gtk::Buidler: widget `%s' was not found in the GtkBuilder file, or the specified part of it.",
       name.c_str());
     return 0;
   }
diff --git a/gtk/src/builder.hg b/gtk/src/builder.hg
index 8b771ab..de68b90 100644
--- a/gtk/src/builder.hg
+++ b/gtk/src/builder.hg
@@ -1,5 +1,3 @@
-/* $Id: builder.hg,v 1.19 2006/05/10 20:59:27 murrayc Exp $ */
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -35,8 +33,8 @@ _WRAP_GERROR(BuilderError,GtkBuilderError,GTK_BUILDER_ERROR)
 /** Build an interface from a UI definition description.
  *
  * This object represents an `instantiation' of an UI definition description.
- * When one of these objects is created, the XML file is read, and the interface 
- * is created. The Gtk::Builder object then provides an interface for accessing the 
+ * When one of these objects is created, the XML file is read, and the interface
+ * is created. The Gtk::Builder object then provides an interface for accessing the
  * widgets in the interface by the names assigned to them inside the UI description.
  *
  * @newin{2,12}
@@ -44,13 +42,13 @@ _WRAP_GERROR(BuilderError,GtkBuilderError,GTK_BUILDER_ERROR)
 class Builder : public Glib::Object
 {
   _CLASS_GOBJECT(Builder, GtkBuilder, GTK_BUILDER, Glib::Object, GObject)
- 
+
 protected:
  _CTOR_DEFAULT
  _IGNORE(gtk_builder_new)
 
 public:
-  /** Creates a new builder object. 
+  /** Creates a new builder object.
    */
   _WRAP_CREATE()
 
@@ -78,7 +76,7 @@ public:
    * @newin{2,14}
    */
   static Glib::RefPtr<Builder> create_from_file(const std::string& filename, const Glib::ustring& object_id);
-  //This is just to avoid the ambiguous call when using a string literal, 
+  //This is just to avoid the ambiguous call when using a string literal,
   //caused by the overload that takes a std::vector<Glib::ustring>.
   /** Parses a file containing a GtkBuilder UI definition, building only the requested object.
    *
@@ -118,7 +116,7 @@ public:
    * @newin{2,12}
    */
   static Glib::RefPtr<Builder> create_from_string(const Glib::ustring& buffer);
-  //This is just to avoid the ambiguous call when using a string literal, 
+  //This is just to avoid the ambiguous call when using a string literal,
   //caused by the overload that takes a std::vector<Glib::ustring>.
   /** Parses a string containing a GtkBuilder UI definition building only the requested object.
    *
@@ -158,7 +156,7 @@ public:
   static Glib::RefPtr<Builder> create_from_string(const Glib::ustring& buffer, const std::vector<Glib::ustring>& object_ids);
   _IGNORE(gtk_builder_add_objects_from_file)
 
-  /** Parses a file containing a GtkBuilder UI definition, 
+  /** Parses a file containing a GtkBuilder UI definition,
    * and merges it with the current contents of the builder.
    *
    * @param buffer The file to parse.
@@ -169,10 +167,10 @@ public:
    */
   _WRAP_METHOD(bool add_from_file(const std::string& filename), gtk_builder_add_from_file, errthrow)
 
-  //This is just to avoid the ambiguous call when using a string literal, 
+  //This is just to avoid the ambiguous call when using a string literal,
   //caused by the overload that takes a std::vector<Glib::ustring>.
-  /** Parses a file containing a GtkBuilder UI definition, 
-   * building only the requested object, 
+  /** Parses a file containing a GtkBuilder UI definition,
+   * building only the requested object,
    * and merges it with the current contents of the builder.
    *
    * If you are adding an object that depends on an object that is not
@@ -188,8 +186,8 @@ public:
    */
   bool add_from_file(const std::string& filename, const char* object_id);
 
-  /** Parses a file containing a GtkBuilder UI definition, 
-   * building only the requested object, 
+  /** Parses a file containing a GtkBuilder UI definition,
+   * building only the requested object,
    * and merges it with the current contents of the builder.
    *
    * If you are adding an object that depends on an object that is not
@@ -208,9 +206,9 @@ public:
 #m4 _CONVERSION(`const std::vector<Glib::ustring>&',`gchar**',`const_cast<char**>(Glib::ArrayHandler<Glib::ustring>::vector_to_array($3).data())')
   _WRAP_METHOD(bool add_from_file(const std::string& filename, const std::vector<Glib::ustring>& object_ids),  gtk_builder_add_objects_from_file, errthrow)
 
-  //This is just to avoid the ambiguous call when using a string literal, 
+  //This is just to avoid the ambiguous call when using a string literal,
   //caused by the overload that takes a std::vector<Glib::ustring>.
-  /** Parses a string containing a GtkBuilder UI definition 
+  /** Parses a string containing a GtkBuilder UI definition
    * and merges it with the current contents of the builder.
    *
    * @param buffer The string to parse.
@@ -221,8 +219,8 @@ public:
    */
   bool add_from_string(const Glib::ustring& buffer);
 
-  /** Parses a string containing a GtkBuilder UI definition, 
-   * building only the requested object, 
+  /** Parses a string containing a GtkBuilder UI definition,
+   * building only the requested object,
    * and merges it with the current contents of the builder.
    *
    * @param buffer The string to parse.
@@ -234,8 +232,8 @@ public:
    */
   bool add_from_string(const Glib::ustring& buffer, const char* object_id);
 
-  /** Parses a string containing a GtkBuilder UI definition, 
-   * building only the requested object, 
+  /** Parses a string containing a GtkBuilder UI definition,
+   * building only the requested object,
    * and merges it with the current contents of the builder.
    *
    * @param buffer The string to parse.
@@ -247,8 +245,8 @@ public:
    */
   bool add_from_string(const Glib::ustring& buffer, const Glib::ustring& object_id);
 
-  /** Parses a string containing a GtkBuilder UI definition, 
-   * building only the requested objects, 
+  /** Parses a string containing a GtkBuilder UI definition,
+   * building only the requested objects,
    * and merges it with the current contents of the builder.
    *
    * @param buffer The string to parse.
@@ -261,7 +259,7 @@ public:
   bool add_from_string(const Glib::ustring& buffer, const std::vector<Glib::ustring>& object_ids);
   _IGNORE(gtk_builder_add_objects_from_string)
 
-  /** Parses a string containing a GtkBuilder UI definition 
+  /** Parses a string containing a GtkBuilder UI definition
    * and merges it with the current contents of the builder.
    *
    * @param buffer The string to parse.
@@ -329,7 +327,7 @@ public:
   {
      // Initialize output parameter:
      widget = 0;
-     
+
      // Get the widget from the GtkBuilder file.
      typedef typename T_Widget::BaseObjectType cwidget_type;
      cwidget_type* pCWidget = (cwidget_type*)get_cwidget(name);
@@ -351,12 +349,12 @@ public:
        //Somebody might be trying to call get_widget_derived() after already calling get_widget(),
        //or after already calling get_widget_derived() with a different derived C++ type.
        if(!widget)
-        g_critical("Gtk::Builder::get_widget_derived(): dynamic_cast<> failed. An existing C++ instance, of a different type, seems to exist.");      
+        g_critical("Gtk::Builder::get_widget_derived(): dynamic_cast<> failed. An existing C++ instance, of a different type, seems to exist.");
      }
      else
      {
        //Create a new C++ instance to wrap the existing C instance:
-       
+
        //Set the output variable. We needed to do this because we can not template the return type.
        Glib::RefPtr<Gtk::Builder> refThis(this);
        refThis->reference(); //take a copy.
@@ -371,10 +369,10 @@ public:
   //_WRAP_METHOD(void connect_signals_full(GtkBuilderConnectFunc func, gpointer       user_data), gtk_builder_connect_signals_full)
   _WRAP_METHOD(void set_translation_domain(const Glib::ustring& domain), gtk_builder_set_translation_domain)
   _WRAP_METHOD(Glib::ustring get_translation_domain() const, gtk_builder_get_translation_domain)
-  
+
   //We ignore gtk_builder_get_type_from_name() because it only seems useful when implementing GtkBuildable for widgets.
   _IGNORE(gtk_builder_get_type_from_name)
-  
+
   _WRAP_PROPERTY("translation-domain", Glib::ustring)
 
 protected:
diff --git a/gtk/src/button.ccg b/gtk/src/button.ccg
index 93d8fee..5019b6e 100644
--- a/gtk/src/button.ccg
+++ b/gtk/src/button.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: button.ccg,v 1.1 2003/01/21 13:38:43 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/button.hg b/gtk/src/button.hg
index b091c25..5e5ebdb 100644
--- a/gtk/src/button.hg
+++ b/gtk/src/button.hg
@@ -1,7 +1,4 @@
-/* $Id: button.hg,v 1.10 2006/08/21 19:07:14 jjongsma Exp $ */
-
-/* box.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/buttonbox.ccg b/gtk/src/buttonbox.ccg
index cde8287..6b8a5f6 100644
--- a/gtk/src/buttonbox.ccg
+++ b/gtk/src/buttonbox.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: buttonbox.ccg,v 1.1 2003/01/21 13:38:43 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/buttonbox.hg b/gtk/src/buttonbox.hg
index 7023de2..22181ab 100644
--- a/gtk/src/buttonbox.hg
+++ b/gtk/src/buttonbox.hg
@@ -1,7 +1,4 @@
-/* $Id: buttonbox.hg,v 1.3 2003/10/12 09:38:11 murrayc Exp $ */
-
-/* buttonbox.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -69,17 +66,17 @@ public:
 
   _WRAP_METHOD(void set_child_secondary(Widget& child, bool is_secondary = true), gtk_button_box_set_child_secondary)
   _WRAP_METHOD(bool get_child_secondary(const Gtk::Widget& child) const, gtk_button_box_get_child_secondary)
-  
+
   _WRAP_METHOD(bool get_child_non_homogeneous(const Gtk::Widget& child) const, gtk_button_box_get_child_non_homogeneous )
 
   _WRAP_METHOD(void set_child_non_homogeneous(Gtk::Widget& child, bool non_homogeneous = true), gtk_button_box_set_child_non_homogeneous)
-  
+
   _WRAP_PROPERTY("layout-style", ButtonBoxStyle)
 };
 
 } // namespace Gtk
 
-//Include the deprecated header, 
+//Include the deprecated header,
 //whose classes were previously in this header,
 //to preserve the "API" of the includes.
 #include <gtkmm/hvbuttonbox.h>
diff --git a/gtk/src/calendar.ccg b/gtk/src/calendar.ccg
index b4052e4..2091e8e 100644
--- a/gtk/src/calendar.ccg
+++ b/gtk/src/calendar.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: calendar.ccg,v 1.1 2003/01/21 13:38:43 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -59,12 +55,12 @@ void Calendar::get_date(Glib::Date& date) const
   guint year = 0;
   guint month = 0;
   guint day = 0;
-  
+
   get_date(year, month, day);
-  
+
   date.set_year(year);
   date.set_month(static_cast<Glib::Date::Month>(Glib::Date::JANUARY + month)); // Month from 1 to 12 instead from 0 to 11
-  date.set_day(day);  
+  date.set_day(day);
 }
 
 void Calendar::set_detail_func(const SlotDetails& slot)
diff --git a/gtk/src/cellarea.ccg b/gtk/src/cellarea.ccg
index ec8662b..21fdcd8 100644
--- a/gtk/src/cellarea.ccg
+++ b/gtk/src/cellarea.ccg
@@ -115,7 +115,7 @@ void CellArea_Class::get_preferred_width_vfunc_callback(GtkCellArea* self, GtkCe
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
@@ -161,7 +161,7 @@ void CellArea_Class::get_preferred_height_for_width_vfunc_callback(GtkCellArea*
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
@@ -207,7 +207,7 @@ void CellArea_Class::get_preferred_height_vfunc_callback(GtkCellArea* self, GtkC
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
@@ -253,7 +253,7 @@ void CellArea_Class::get_preferred_width_for_height_vfunc_callback(GtkCellArea*
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
diff --git a/gtk/src/cellarea.hg b/gtk/src/cellarea.hg
index aaecd85..19ca090 100644
--- a/gtk/src/cellarea.hg
+++ b/gtk/src/cellarea.hg
@@ -199,12 +199,12 @@ public:
   _WRAP_METHOD(void add_focus_sibling(CellRenderer& renderer, CellRenderer& sibling), gtk_cell_area_add_focus_sibling)
   _WRAP_METHOD(void remove_focus_sibling( CellRenderer& renderer, CellRenderer& sibling), gtk_cell_area_remove_focus_sibling)
   _WRAP_METHOD(bool is_focus_sibling(CellRenderer& renderer,  CellRenderer& sibling), gtk_cell_area_is_focus_sibling)
-  
 
-#m4 _CONVERSION(`const GList*',`std::vector<CellRenderer*>',`Glib::ListHandler<CellRenderer*>::list_to_vector(const_cast<GList*>($3), Glib::OWNERSHIP_NONE)')  
+
+#m4 _CONVERSION(`const GList*',`std::vector<CellRenderer*>',`Glib::ListHandler<CellRenderer*>::list_to_vector(const_cast<GList*>($3), Glib::OWNERSHIP_NONE)')
   _WRAP_METHOD(std::vector<CellRenderer*> get_focus_siblings(CellRenderer& renderer), gtk_cell_area_get_focus_siblings)
-  
-#m4 _CONVERSION(`const GList*',`std::vector<const CellRenderer*>',`Glib::ListHandler<const CellRenderer*>::list_to_vector(const_cast<GList*>($3), Glib::OWNERSHIP_NONE)')  
+
+#m4 _CONVERSION(`const GList*',`std::vector<const CellRenderer*>',`Glib::ListHandler<const CellRenderer*>::list_to_vector(const_cast<GList*>($3), Glib::OWNERSHIP_NONE)')
   _WRAP_METHOD(std::vector<const CellRenderer*> get_focus_siblings(const CellRenderer& renderer) const, gtk_cell_area_get_focus_siblings)
 
   _WRAP_METHOD(CellRenderer* get_focus_from_sibling(CellRenderer& renderer), gtk_cell_area_get_focus_from_sibling)
@@ -243,7 +243,7 @@ protected:
   _WRAP_VFUNC(void get_preferred_height_for_width(const Glib::RefPtr<CellAreaContext>& context, Widget& widget, int width, int& minimum_height, int& natural_height), get_preferred_height_for_width, custom_vfunc_callback)
   _WRAP_VFUNC(void get_preferred_height(const Glib::RefPtr<CellAreaContext>& context, Widget& widget, int& minimum_height, int& natural_height), get_preferred_height, custom_vfunc_callback)
   _WRAP_VFUNC(void get_preferred_width_for_height(const Glib::RefPtr<CellAreaContext>& context, Widget& widget, int height, int& minimum_width, int& natural_width), get_preferred_width_for_height, custom_vfunc_callback)
-  
+
   _WRAP_PROPERTY("focus-cell", CellRenderer*)
   _WRAP_PROPERTY("edited-cell", CellRenderer*)
   _WRAP_PROPERTY("edit-widget", CellEditable*)
diff --git a/gtk/src/cellareabox.hg b/gtk/src/cellareabox.hg
index 9d1e5ea..09146f9 100644
--- a/gtk/src/cellareabox.hg
+++ b/gtk/src/cellareabox.hg
@@ -49,7 +49,7 @@ class CellAreaBox
 {
   _CLASS_GOBJECT(CellAreaBox, GtkCellAreaBox, GTK_CELL_AREA_BOX, CellArea, GtkCellArea)
   _IMPLEMENTS_INTERFACE(Orientable)
-  
+
 protected:
   _CTOR_DEFAULT
 public:
@@ -61,7 +61,7 @@ public:
   _WRAP_METHOD(void pack_end(CellRenderer& renderer, bool expand = false, bool align = true, bool fixed = false), gtk_cell_area_box_pack_end)
   _WRAP_METHOD(int get_spacing() const, gtk_cell_area_box_get_spacing)
   _WRAP_METHOD(void set_spacing(int spacing), gtk_cell_area_box_set_spacing)
-  
+
   _WRAP_PROPERTY("spacing", int)
 };
 
diff --git a/gtk/src/cellareacontext.ccg b/gtk/src/cellareacontext.ccg
index f8f62c6..9b54cb4 100644
--- a/gtk/src/cellareacontext.ccg
+++ b/gtk/src/cellareacontext.ccg
@@ -21,4 +21,4 @@
 namespace Gtk
 {
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/cellareacontext.hg b/gtk/src/cellareacontext.hg
index e6d5b29..b44b6d7 100644
--- a/gtk/src/cellareacontext.hg
+++ b/gtk/src/cellareacontext.hg
@@ -73,4 +73,4 @@ public:
   _WRAP_PROPERTY("natural-height", int)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/celleditable.ccg b/gtk/src/celleditable.ccg
index 9111eb1..6c671bd 100644
--- a/gtk/src/celleditable.ccg
+++ b/gtk/src/celleditable.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: celleditable.ccg,v 1.1 2003/01/21 13:38:44 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/celleditable.hg b/gtk/src/celleditable.hg
index 051260c..4fdedca 100644
--- a/gtk/src/celleditable.hg
+++ b/gtk/src/celleditable.hg
@@ -1,5 +1,3 @@
-/* $Id: celleditable.hg,v 1.2 2005/01/10 10:49:23 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -34,7 +32,7 @@ namespace Gtk
 {
 
 /** Interface for widgets which are used for editing cells.
- * The CellEditable interface must be implemented for widgets to be usable when editing the contents of a TreeView cell. 
+ * The CellEditable interface must be implemented for widgets to be usable when editing the contents of a TreeView cell.
  */
 class CellEditable : public Glib::Interface
 {
@@ -47,7 +45,7 @@ public:
 
   _WRAP_SIGNAL(void editing_done(), "editing_done")
   _WRAP_SIGNAL(void remove_widget(), "remove_widget")
-  
+
   _WRAP_PROPERTY("editing-canceled", bool)
 
 protected:
diff --git a/gtk/src/celllayout.ccg b/gtk/src/celllayout.ccg
index b109758..5f029ca 100644
--- a/gtk/src/celllayout.ccg
+++ b/gtk/src/celllayout.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: celllayout.ccg,v 1.8 2006/05/11 11:40:24 murrayc Exp $ */
-
 /* Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/celllayout.hg b/gtk/src/celllayout.hg
index 9713f6a..8aa5260 100644
--- a/gtk/src/celllayout.hg
+++ b/gtk/src/celllayout.hg
@@ -1,5 +1,3 @@
-/* $Id: celllayout.hg,v 1.12 2006/05/10 20:59:27 murrayc Exp $ */
-
 /* Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/cellrenderer.ccg b/gtk/src/cellrenderer.ccg
index de656c9..3d300f9 100644
--- a/gtk/src/cellrenderer.ccg
+++ b/gtk/src/cellrenderer.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: cellrenderer.ccg,v 1.2 2006/05/10 20:59:27 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -67,7 +64,7 @@ void CellRenderer_Class::get_preferred_width_vfunc_callback(GtkCellRenderer* sel
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
@@ -112,7 +109,7 @@ void CellRenderer_Class::get_preferred_height_for_width_vfunc_callback(GtkCellRe
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
@@ -157,7 +154,7 @@ void CellRenderer_Class::get_preferred_height_vfunc_callback(GtkCellRenderer* se
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
@@ -202,7 +199,7 @@ void CellRenderer_Class::get_preferred_width_for_height_vfunc_callback(GtkCellRe
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
diff --git a/gtk/src/cellrenderer.hg b/gtk/src/cellrenderer.hg
index 678736a..37fa12e 100644
--- a/gtk/src/cellrenderer.hg
+++ b/gtk/src/cellrenderer.hg
@@ -51,7 +51,7 @@ public:
   _WRAP_METHOD(void get_preferred_height(Widget& widget, int& minimum_height, int& natural_height) const, gtk_cell_renderer_get_preferred_height)
   _WRAP_METHOD(void get_preferred_width_for_height(Widget& widget, int height, int& minimum_width, int& natural_width) const, gtk_cell_renderer_get_preferred_width_for_height)
   _WRAP_METHOD(void get_preferred_size(Widget& widget, Requisition& minimum_size, Requisition& natural_size) const, gtk_cell_renderer_get_preferred_size)
-  
+
   //TODO: Use a return value intead?
   _WRAP_METHOD(void get_aligned_area(Widget& widget, CellRendererState flags,  const Gdk::Rectangle& cell_area, Gdk::Rectangle& aligned_area), gtk_cell_renderer_get_aligned_area)
 
@@ -95,10 +95,10 @@ public:
   _WRAP_METHOD(bool is_activatable() const, gtk_cell_renderer_is_activatable)
 
   _WRAP_METHOD(void stop_editing(bool canceled = false), gtk_cell_renderer_stop_editing)
-  
+
   _WRAP_METHOD(StateFlags get_state(Widget& widget, CellRendererState cell_state) const, gtk_cell_renderer_get_state)
-  
-  
+
+
   /** Translates the cell renderer state to StateFlags,
    * based on the cell renderer and
    * the given CellRendererState.
diff --git a/gtk/src/cellrendereraccel.ccg b/gtk/src/cellrendereraccel.ccg
index 61dd820..44a6f09 100644
--- a/gtk/src/cellrendereraccel.ccg
+++ b/gtk/src/cellrendereraccel.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: cellrendereraccel.ccg,v 1.2 2006/05/11 11:40:24 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2005 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -19,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
- 
+
 #include <gtk/gtk.h>
 
 namespace Gtk
diff --git a/gtk/src/cellrendereraccel.hg b/gtk/src/cellrendereraccel.hg
index 6c99f0b..3f41591 100644
--- a/gtk/src/cellrendereraccel.hg
+++ b/gtk/src/cellrendereraccel.hg
@@ -1,7 +1,4 @@
-/* $Id: cellrendereraccel.hg,v 1.2 2006/05/11 11:40:24 murrayc Exp $ */
-
-/* cellrendereraccel.h
- * 
+/*
  * Copyright (C) 2005 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -34,9 +31,9 @@ _WRAP_ENUM(CellRendererAccelMode, GtkCellRendererAccelMode)
 /**  .
  * Renders a keyboard accelerator in a cell
  *
- * Gtk::CellRendererAccel displays a keyboard accelerator 
+ * Gtk::CellRendererAccel displays a keyboard accelerator
  * (i.e. a key combination like <Control>-a).
- * If the cell renderer is editable, the accelerator can be changed by 
+ * If the cell renderer is editable, the accelerator can be changed by
  * simply typing the new combination.
  *
  * @ingroup TreeView
@@ -63,5 +60,5 @@ public:
   virtual Glib::PropertyProxy_Base _property_renderable(); //override
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/cellrenderercombo.ccg b/gtk/src/cellrenderercombo.ccg
index cbc7521..7776530 100644
--- a/gtk/src/cellrenderercombo.ccg
+++ b/gtk/src/cellrenderercombo.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: cellrenderercombo.ccg,v 1.3 2006/05/10 20:59:27 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2004 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -19,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
- 
+
 #include <gtk/gtk.h>
 
 ///This is used only by signal_changed's generated implementation.
diff --git a/gtk/src/cellrenderercombo.hg b/gtk/src/cellrenderercombo.hg
index 919a5fe..df668c9 100644
--- a/gtk/src/cellrenderercombo.hg
+++ b/gtk/src/cellrenderercombo.hg
@@ -1,7 +1,4 @@
-/* $Id: cellrenderercombo.hg,v 1.5 2006/05/10 20:59:27 murrayc Exp $ */
-
-/* cellrenderercombo.h
- * 
+/*
  * Copyright (C) 2004 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -29,14 +26,14 @@ namespace Gtk
 {
 
 /**  Renders a combobox in a cell.
- * CellRendererCombo renders text in a cell like CellRendererText, from which it is derived. But while 
- * CellRendererText offers a simple entry to edit the text, CellRendererCombo offers a ComboBox or 
- * ComboBoxEntry widget to edit the text. The values to display in the combo box are taken from the 
+ * CellRendererCombo renders text in a cell like CellRendererText, from which it is derived. But while
+ * CellRendererText offers a simple entry to edit the text, CellRendererCombo offers a ComboBox or
+ * ComboBoxEntry widget to edit the text. The values to display in the combo box are taken from the
  * tree model specified in the model property.
  *
- * The combo cell renderer takes care of adding a text cell renderer to the combo box and sets it to 
- * display the column specified by its text_column property. Further cell renderers can be added in a 
- * handler for the editing_started signal. 
+ * The combo cell renderer takes care of adding a text cell renderer to the combo box and sets it to
+ * display the column specified by its text_column property. Further cell renderers can be added in a
+ * handler for the editing_started signal.
  *
  * @ingroup TreeView
  */
@@ -56,7 +53,7 @@ dnl // not.
 
 #m4 _CONVERSION(`const gchar*',`const Glib::ustring&',__GCHARP_TO_USTRING)
   _WRAP_SIGNAL(void changed(const Glib::ustring& path, const TreeModel::iterator& iter), "changed", no_default_handler)
- 
+
   _WRAP_PROPERTY("model", Glib::RefPtr<Gtk::TreeModel>)
   _WRAP_PROPERTY("text_column", int)
   _WRAP_PROPERTY("has_entry", bool)
@@ -64,5 +61,5 @@ dnl // not.
   virtual Glib::PropertyProxy_Base _property_renderable();
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/cellrendererpixbuf.ccg b/gtk/src/cellrendererpixbuf.ccg
index ddf53e3..ac50cff 100644
--- a/gtk/src/cellrendererpixbuf.ccg
+++ b/gtk/src/cellrendererpixbuf.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: cellrendererpixbuf.ccg,v 1.2 2006/05/10 20:59:27 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/cellrendererpixbuf.hg b/gtk/src/cellrendererpixbuf.hg
index 8533920..f29ed72 100644
--- a/gtk/src/cellrendererpixbuf.hg
+++ b/gtk/src/cellrendererpixbuf.hg
@@ -1,7 +1,4 @@
-/* $Id: cellrendererpixbuf.hg,v 1.4 2006/05/10 20:59:27 murrayc Exp $ */
-
-/* cellrenderertext.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -29,11 +26,11 @@ namespace Gtk
 {
 
 /** Renders a pixbuf in a cell.
- * A CellRendererPixbuf can be used to render an image in a cell. It allows you to render either a 
+ * A CellRendererPixbuf can be used to render an image in a cell. It allows you to render either a
  * given Pixbuf (set via the pixbuf property) or a stock icon (set via the stock_id property).
  *
- * To support the tree view, CellRendererPixbuf also supports rendering two alternative pixbufs, when 
- * the is_expanded property is true. If the is_expanded property is true and the pixbuf_expander_open 
+ * To support the tree view, CellRendererPixbuf also supports rendering two alternative pixbufs, when
+ * the is_expanded property is true. If the is_expanded property is true and the pixbuf_expander_open
  * property is set to a pixbuf, it renders that pixbuf. If the is_expanded property is false and the *
  * pixbuf_expander_closed property is set to a pixbuf, it renders that one.
  *
@@ -59,5 +56,5 @@ public:
   virtual Glib::PropertyProxy_Base _property_renderable();
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/cellrendererprogress.ccg b/gtk/src/cellrendererprogress.ccg
index 2b190fb..800700c 100644
--- a/gtk/src/cellrendererprogress.ccg
+++ b/gtk/src/cellrendererprogress.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: cellrendererprogress.ccg,v 1.2 2006/05/10 20:59:27 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2004 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -19,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
- 
+
 #include <gtk/gtk.h>
 
 namespace Gtk
diff --git a/gtk/src/cellrendererprogress.hg b/gtk/src/cellrendererprogress.hg
index ac19bd9..63c502a 100644
--- a/gtk/src/cellrendererprogress.hg
+++ b/gtk/src/cellrendererprogress.hg
@@ -1,5 +1,3 @@
-/* $Id: cellrendererprogress.hg,v 1.3 2006/05/10 20:59:27 murrayc Exp $ */
-
 /* Copyright (C) 2004 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -46,7 +44,7 @@ public:
   _WRAP_PROPERTY("text-xalign", float)
   _WRAP_PROPERTY("text-yalign", float)
   _WRAP_PROPERTY("inverted", bool)
-  
+
   virtual Glib::PropertyProxy_Base _property_renderable();
 };
 
diff --git a/gtk/src/cellrendererspin.hg b/gtk/src/cellrendererspin.hg
index 3026955..9b58e99 100644
--- a/gtk/src/cellrendererspin.hg
+++ b/gtk/src/cellrendererspin.hg
@@ -26,18 +26,18 @@ namespace Gtk
 
 /**  Renders a spin button in a cell.
  *
- * Gtk::CellRendererSpin renders text in a cell like Gtk::CellRendererText, 
- * from which it is derived. But while Gtk::CellRendererText offers a simple 
- * entry to edit the text, Gtk::CellRendererSpin offers a Gtk::SpinButton widget. 
- * Of course, that means that the text must be parseable as a floating point 
+ * Gtk::CellRendererSpin renders text in a cell like Gtk::CellRendererText,
+ * from which it is derived. But while Gtk::CellRendererText offers a simple
+ * entry to edit the text, Gtk::CellRendererSpin offers a Gtk::SpinButton widget.
+ * Of course, that means that the text must be parseable as a floating point
  * number.
  *
- * The range of the spinbutton is taken from the adjustment property of the 
- * cell renderer, which can be set explicitly or mapped to a column in 
- * the tree model, like all properties of cell renders. Gtk::CellRendererSpin 
- * also has properties for the climb rate and the number of digits to display. 
+ * The range of the spinbutton is taken from the adjustment property of the
+ * cell renderer, which can be set explicitly or mapped to a column in
+ * the tree model, like all properties of cell renders. Gtk::CellRendererSpin
+ * also has properties for the climb rate and the number of digits to display.
  * Other Gtk::SpinButton properties can be set in a handler for the start-editing
- * signal. 
+ * signal.
  *
  * @ingroup TreeView
  * @newin{2,12}
@@ -48,7 +48,7 @@ class CellRendererSpin : public CellRendererText
 public:
 
   _CTOR_DEFAULT
-  
+
   _WRAP_PROPERTY("adjustment", Glib::RefPtr<Adjustment>)
   _WRAP_PROPERTY("climb_rate", double)
   _WRAP_PROPERTY("digits", guint)
diff --git a/gtk/src/cellrendererspinner.ccg b/gtk/src/cellrendererspinner.ccg
index 18d0656..448f9a8 100644
--- a/gtk/src/cellrendererspinner.ccg
+++ b/gtk/src/cellrendererspinner.ccg
@@ -1,7 +1,4 @@
-// -*- c++ -*-
-
 /*
- *
  * Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/cellrendererspinner.hg b/gtk/src/cellrendererspinner.hg
index 60e8298..80f5b80 100644
--- a/gtk/src/cellrendererspinner.hg
+++ b/gtk/src/cellrendererspinner.hg
@@ -1,5 +1,4 @@
-/* cellrendererspinner.h
- *
+/*
  * Copyright (C) 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -49,5 +48,5 @@ public:
   _WRAP_PROPERTY("size", Gtk::IconSize)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/cellrenderertext.ccg b/gtk/src/cellrenderertext.ccg
index c2f44b3..430b11b 100644
--- a/gtk/src/cellrenderertext.ccg
+++ b/gtk/src/cellrenderertext.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: cellrenderertext.ccg,v 1.2 2006/05/10 20:59:27 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/cellrenderertext.hg b/gtk/src/cellrenderertext.hg
index b4de5e7..0fb2eb7 100644
--- a/gtk/src/cellrenderertext.hg
+++ b/gtk/src/cellrenderertext.hg
@@ -1,5 +1,3 @@
-/* $Id: cellrenderertext.hg,v 1.7 2006/05/10 20:59:27 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/cellrenderertoggle.ccg b/gtk/src/cellrenderertoggle.ccg
index 7362400..92ce900 100644
--- a/gtk/src/cellrenderertoggle.ccg
+++ b/gtk/src/cellrenderertoggle.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: cellrenderertoggle.ccg,v 1.2 2006/05/10 20:59:27 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/cellrenderertoggle.hg b/gtk/src/cellrenderertoggle.hg
index 85b21d5..cf130c5 100644
--- a/gtk/src/cellrenderertoggle.hg
+++ b/gtk/src/cellrenderertoggle.hg
@@ -1,7 +1,4 @@
-/* $Id: cellrenderertoggle.hg,v 1.5 2006/05/10 20:59:27 murrayc Exp $ */
-
-/* cellrenderertoggle.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -28,7 +25,7 @@ namespace Gtk
 {
 
 /** Renders a toggle button in a cell.
- * The button is drawn as a radio- or checkbutton, depending on the radio property. When activated, it 
+ * The button is drawn as a radio- or checkbutton, depending on the radio property. When activated, it
  * emits the toggled signal.
  *
  * @ingroup TreeView
@@ -39,7 +36,7 @@ class CellRendererToggle : public CellRenderer
 public:
 
   _CTOR_DEFAULT
-  
+
 
   _WRAP_METHOD(bool get_radio() const, gtk_cell_renderer_toggle_get_radio)
   _WRAP_METHOD(void set_radio(bool radio = true), gtk_cell_renderer_toggle_set_radio)
@@ -62,5 +59,5 @@ public:
   virtual Glib::PropertyProxy_Base _property_renderable();
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/cellview.ccg b/gtk/src/cellview.ccg
index 15b950e..c0788a3 100644
--- a/gtk/src/cellview.ccg
+++ b/gtk/src/cellview.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: cellview.ccg,v 1.3 2006/05/10 20:59:27 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/cellview.hg b/gtk/src/cellview.hg
index b41c489..eb670fa 100644
--- a/gtk/src/cellview.hg
+++ b/gtk/src/cellview.hg
@@ -97,7 +97,7 @@ public:
 
   _WRAP_METHOD(void set_background_color(const Gdk::Color& color), gtk_cell_view_set_background_color, deprecated "Use set_background_rgba instead.")
   _WRAP_METHOD(void set_background_rgba(const Gdk::RGBA& rgba), gtk_cell_view_set_background_rgba)
-  
+
   _WRAP_METHOD(bool get_draw_sensitive() const, gtk_cell_view_get_draw_sensitive)
   _WRAP_METHOD(void set_draw_sensitive(bool draw_sensitive = true), gtk_cell_view_set_draw_sensitive)
   _WRAP_METHOD(bool get_fit_model() const, gtk_cell_view_get_fit_model)
@@ -113,7 +113,7 @@ public:
   _WRAP_PROPERTY("cell-area", Glib::RefPtr<CellArea>)
   _WRAP_PROPERTY("cell-area-context", Glib::RefPtr<CellAreaContext>)
   _WRAP_PROPERTY("draw-sensitive", bool)
-  _WRAP_PROPERTY("fit-model", bool) 
+  _WRAP_PROPERTY("fit-model", bool)
 };
 
 } // namespace Gtk
diff --git a/gtk/src/checkbutton.ccg b/gtk/src/checkbutton.ccg
index aa5ee21..341ebd4 100644
--- a/gtk/src/checkbutton.ccg
+++ b/gtk/src/checkbutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: checkbutton.ccg,v 1.1 2003/01/21 13:38:44 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/checkbutton.hg b/gtk/src/checkbutton.hg
index 33ff9ce..3c9e17f 100644
--- a/gtk/src/checkbutton.hg
+++ b/gtk/src/checkbutton.hg
@@ -1,7 +1,4 @@
-/* $Id: checkbutton.hg,v 1.2 2004/01/19 19:48:44 murrayc Exp $ */
-
-/* checkbutton.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -79,4 +76,4 @@ _CONVERSION(`cairo_t*',`const ::Cairo::RefPtr< ::Cairo::Context>&',`::Cairo::Ref
 };
 
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/checkmenuitem.ccg b/gtk/src/checkmenuitem.ccg
index 021bcc0..d838f81 100644
--- a/gtk/src/checkmenuitem.ccg
+++ b/gtk/src/checkmenuitem.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: checkmenuitem.ccg,v 1.1 2003/01/21 13:38:45 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/checkmenuitem.hg b/gtk/src/checkmenuitem.hg
index 14094ff..3de8fd1 100644
--- a/gtk/src/checkmenuitem.hg
+++ b/gtk/src/checkmenuitem.hg
@@ -1,7 +1,4 @@
-/* $Id: checkmenuitem.hg,v 1.3 2004/01/19 19:48:44 murrayc Exp $ */
-
-/* checkmenuitem.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -76,4 +73,4 @@ _CONVERSION(`cairo_t*',`const ::Cairo::RefPtr< ::Cairo::Context>&',`::Cairo::Ref
   _WRAP_VFUNC(void draw_indicator(const ::Cairo::RefPtr< ::Cairo::Context>& cr), draw_indicator)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/clipboard.ccg b/gtk/src/clipboard.ccg
index 73a1498..baebc22 100644
--- a/gtk/src/clipboard.ccg
+++ b/gtk/src/clipboard.ccg
@@ -1,5 +1,4 @@
-/* 
- *
+/*
  * Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -242,7 +241,7 @@ void Clipboard::request_rich_text(const Glib::RefPtr<TextBuffer>& buffer, const
   // Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
   SlotRichTextReceived* slot_copy = new SlotRichTextReceived(slot);
 
-  gtk_clipboard_request_rich_text(gobj(), buffer->gobj(), 
+  gtk_clipboard_request_rich_text(gobj(), buffer->gobj(),
       &SignalProxy_RichTextReceived_gtk_callback, slot_copy);
 }
 
@@ -321,6 +320,6 @@ std::string Clipboard::wait_for_rich_text(const Glib::RefPtr<TextBuffer>& buffer
   return result;
 }
 
-    
+
 } //namespace Gtk
 
diff --git a/gtk/src/clipboard.hg b/gtk/src/clipboard.hg
index cec4195..ca813f6 100644
--- a/gtk/src/clipboard.hg
+++ b/gtk/src/clipboard.hg
@@ -1,7 +1,4 @@
-/* $Id: clipboard.hg,v 1.17 2006/06/13 17:16:26 murrayc Exp $ */
-
-/* clipboard.h
- * 
+/*
  * Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -21,7 +18,7 @@
 
 #include <vector>
 
-#include <gdkmm/display.h> 
+#include <gdkmm/display.h>
 #include <gdkmm/pixbuf.h>
 #include <gtkmm/targetentry.h>
 #include <gtkmm/selectiondata.h>
@@ -38,30 +35,30 @@ namespace Gtk
 class TextBuffer;
 #endif //DOXYGEN_SHOULD_SKIP_THIS
 
-/** The Clipboard object represents a clipboard of data shared between different processes or between 
+/** The Clipboard object represents a clipboard of data shared between different processes or between
  * different widgets in the same process. Each clipboard is identified by a name encoded as a GdkAtom. *
- * (Conversion to and from strings can be done with gdk_atom_intern() and gdk_atom_name().) The default 
- * clipboard corresponds to the "CLIPBOARD" atom; another commonly used clipboard is the "PRIMARY" clipboard, 
+ * (Conversion to and from strings can be done with gdk_atom_intern() and gdk_atom_name().) The default
+ * clipboard corresponds to the "CLIPBOARD" atom; another commonly used clipboard is the "PRIMARY" clipboard,
  * which, in X, traditionally contains the currently selected text.
  *
- * To support having a number of different formats on the clipboard at the same time, the clipboard mechanism 
- * allows providing callbacks instead of the actual data. When you set the contents of the clipboard, you can 
- * either supply the data directly (via functions like set_text()), or you can supply a callback 
- * to be called at a later time when the data is needed (via set().) Providing a callback also avoids having to 
+ * To support having a number of different formats on the clipboard at the same time, the clipboard mechanism
+ * allows providing callbacks instead of the actual data. When you set the contents of the clipboard, you can
+ * either supply the data directly (via functions like set_text()), or you can supply a callback
+ * to be called at a later time when the data is needed (via set().) Providing a callback also avoids having to
  * make copies of the data when it is not needed.
  *
- * Requesting the data from the clipboard is essentially asynchronous. If the contents of the clipboard are 
- * provided within the same process, then a direct function call will be made to retrieve the data, but if they 
- * are provided by another process, then the data needs to be retrieved from the other process, which may take 
- * some time. To avoid blocking the user interface, the call to request the selection, request_contents() takes 
- * a callback that will be called when the contents are received (or when the request fails.) If you don't want 
- * to deal with providing a separate callback, you can also use wait_for_contents(). This runs the 
- * GLib main loop recursively waiting for the contents. This can simplify the code flow, but you still have to 
+ * Requesting the data from the clipboard is essentially asynchronous. If the contents of the clipboard are
+ * provided within the same process, then a direct function call will be made to retrieve the data, but if they
+ * are provided by another process, then the data needs to be retrieved from the other process, which may take
+ * some time. To avoid blocking the user interface, the call to request the selection, request_contents() takes
+ * a callback that will be called when the contents are received (or when the request fails.) If you don't want
+ * to deal with providing a separate callback, you can also use wait_for_contents(). This runs the
+ * GLib main loop recursively waiting for the contents. This can simplify the code flow, but you still have to
  * be aware that other callbacks in your program can be called while this recursive mainloop is running.
  *
- * Along with the functions to get the clipboard contents as an arbitrary data chunk, there are also functions 
- * to retrieve it as text, request_text() and wait_for_text(). These functions take 
- * care of determining which formats are advertised by the clipboard provider, asking for the clipboard in the 
+ * Along with the functions to get the clipboard contents as an arbitrary data chunk, there are also functions
+ * to retrieve it as text, request_text() and wait_for_text(). These functions take
+ * care of determining which formats are advertised by the clipboard provider, asking for the clipboard in the
  * best available format and converting the results into the UTF-8 encoding.
  */
 class Clipboard : public Glib::Object
@@ -96,7 +93,7 @@ public:
   */
   bool set(const std::vector<TargetEntry>& targets, const SlotGet& slot_get, const SlotClear& slot_clear);
   _IGNORE(gtk_clipboard_set_with_owner, gtk_clipboard_set_with_data)
-  
+
   _WRAP_METHOD(Glib::RefPtr<Glib::Object> get_owner(), gtk_clipboard_get_owner, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Glib::Object> get_owner() const, gtk_clipboard_get_owner, refreturn, constversion)
 
@@ -119,7 +116,7 @@ public:
    */
   void set_text(const Glib::ustring& text);
   _IGNORE(gtk_clipboard_set_text)
-  
+
   _WRAP_METHOD(void set_image(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_clipboard_set_image)
 
   /// For instance: void on_received(const SelectionData& selection_data);
@@ -138,7 +135,7 @@ public:
    **/
   void request_contents(const Glib::ustring& target, const SlotReceived& slot);
   _IGNORE(gtk_clipboard_request_contents)
-  
+
   /// For instance: void on_text_received(const Glib::ustring& text);
   typedef sigc::slot<void, const Glib::ustring&> SlotTextReceived;
 
@@ -161,11 +158,11 @@ public:
   /// For instance: void on_rich_text_received(const Glib::ustring& format, const std::string& text);
   typedef sigc::slot<void, const Glib::ustring&, const std::string&> SlotRichTextReceived;
 
-  /** Requests the contents of the clipboard as rich text. When the rich text is later received, 
+  /** Requests the contents of the clipboard as rich text. When the rich text is later received,
    * callback will be called.
    *
-   * The text parameter to the callback will contain the resulting rich text if the request succeeded, or 
-   * an empty string if it failed. This function can fail for various reasons, in particular if the 
+   * The text parameter to the callback will contain the resulting rich text if the request succeeded, or
+   * an empty string if it failed. This function can fail for various reasons, in particular if the
    * clipboard was empty or if the contents of the clipboard could not be converted into rich text form.
    *
    *
@@ -194,13 +191,13 @@ public:
   */
   void request_uris(const SlotUrisReceived& slot);
   _IGNORE(gtk_clipboard_request_uris)
-  
-  
+
+
   /// For instance: void on_image_received(const Glib::RefPtr<Gdk::Pixbuf>& text);
   typedef sigc::slot<void, const Glib::RefPtr<Gdk::Pixbuf>&> SlotImageReceived;
-  
+
   /** Requests the contents of the clipboard as image. When the image is
-   * later received, it will be converted to a Gdk::Pixbuf. 
+   * later received, it will be converted to a Gdk::Pixbuf.
    * This function waits for
    * the data to be received using the main loop, so events,
    * timeouts, etc, may be dispatched during the wait.
@@ -234,7 +231,7 @@ public:
    */
   void request_targets(const SlotTargetsReceived& slot);
   _IGNORE(gtk_clipboard_request_targets)
-               
+
   /**
    * Requests the contents of the clipboard using the given target.
    * This function waits for the data to be received using the main
@@ -242,7 +239,7 @@ public:
    *
    * @param target The form into which the clipboard owner should convert the selection.
    *
-   * @return A SelectionData object, which will be invalid if retrieving the given target failed. 
+   * @return A SelectionData object, which will be invalid if retrieving the given target failed.
    */
   SelectionData wait_for_contents(const Glib::ustring& target) const;
   _IGNORE(gtk_clipboard_wait_for_contents)
@@ -251,10 +248,10 @@ public:
 
   std::string wait_for_rich_text(const Glib::RefPtr<TextBuffer>& buffer, std::string& format);
   _IGNORE(gtk_clipboard_wait_for_rich_text)
-  
+
   //Maybe the result should be const, but constness is not so clear-cut here. murrayc
   _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> wait_for_image() const, gtk_clipboard_wait_for_image)
-  
+
   _WRAP_METHOD(bool wait_is_text_available() const, gtk_clipboard_wait_is_text_available)
   _WRAP_METHOD(bool wait_is_rich_text_available(const Glib::RefPtr<TextBuffer>& buffer) const, gtk_clipboard_wait_is_rich_text_available)
   _WRAP_METHOD(bool wait_is_image_available() const, gtk_clipboard_wait_is_image_available)
@@ -275,20 +272,20 @@ public:
 #m4 _CONVERSION(`gchar**',`std::vector<Glib::ustring>',`Glib::ArrayHandler<Glib::ustring>::array_to_vector($3, Glib::OWNERSHIP_DEEP)')
   _WRAP_METHOD(std::vector<Glib::ustring> wait_for_uris() const, gtk_clipboard_wait_for_uris)
 
-  /** Hints that the clipboard data should be stored somewhere when the application exits or when store() 
+  /** Hints that the clipboard data should be stored somewhere when the application exits or when store()
    * is called.
-   * 
-   * This value is reset when the clipboard owner changes. Where the clipboard data is stored is platform 
+   *
+   * This value is reset when the clipboard owner changes. Where the clipboard data is stored is platform
    * dependent, see Gdk::Display::store_clipboard() for more information.
    *
    * @param targets Array containing information about which forms should be stored.
    */
   void set_can_store(const std::vector<TargetEntry>& targets);
-  
-  /** Hints that all forms of clipboard data should be stored somewhere when the application exits or when store() 
+
+  /** Hints that all forms of clipboard data should be stored somewhere when the application exits or when store()
    * is called.
-   * 
-   * This value is reset when the clipboard owner changes. Where the clipboard data is stored is platform 
+   *
+   * This value is reset when the clipboard owner changes. Where the clipboard data is stored is platform
    * dependent, see Gdk::Display::store_clipboard() for more information.
    */
   void set_can_store();
@@ -297,8 +294,8 @@ public:
   _WRAP_METHOD(void store(), gtk_clipboard_store)
 
   _WRAP_SIGNAL(void owner_change(GdkEventOwnerChange* event), "owner_change", no_default_handler)
-           
+
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/colorbutton.ccg b/gtk/src/colorbutton.ccg
index 23bc6f9..8ab58b7 100644
--- a/gtk/src/colorbutton.ccg
+++ b/gtk/src/colorbutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: colorbutton.ccg,v 1.2 2003/10/18 15:35:31 murrayc Exp $ */
-
 /*
- *
  * Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/colorbutton.hg b/gtk/src/colorbutton.hg
index 892874c..1b6899e 100644
--- a/gtk/src/colorbutton.hg
+++ b/gtk/src/colorbutton.hg
@@ -1,7 +1,4 @@
-/* $Id: colorbutton.hg,v 1.5 2005/11/30 14:10:49 murrayc Exp $ */
-
-/* colorbutton.h
- *
+/*
  * Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/colorchooser.ccg b/gtk/src/colorchooser.ccg
index 78e945a..fd97bae 100644
--- a/gtk/src/colorchooser.ccg
+++ b/gtk/src/colorchooser.ccg
@@ -30,7 +30,7 @@ Gdk::RGBA ColorChooser::get_rgba() const
 void ColorChooser::add_palette(Orientation orientation, int colors_per_line, const std::vector<Gdk::RGBA>& colors)
 {
   gtk_color_chooser_add_palette(gobj(), (GtkOrientation)orientation, colors_per_line, colors.size(),
-    Glib::ArrayHandler<Gdk::RGBA, Gdk::RGBATraits>::vector_to_array(colors).data() );                    
+    Glib::ArrayHandler<Gdk::RGBA, Gdk::RGBATraits>::vector_to_array(colors).data() );
 }
 
 } //namespace Gtk
diff --git a/gtk/src/colorselection.ccg b/gtk/src/colorselection.ccg
index 8a44685..c688ed4 100644
--- a/gtk/src/colorselection.ccg
+++ b/gtk/src/colorselection.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: colorselection.ccg,v 1.7 2006/05/11 11:40:24 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/colorselection.hg b/gtk/src/colorselection.hg
index 9859ba3..c78443c 100644
--- a/gtk/src/colorselection.hg
+++ b/gtk/src/colorselection.hg
@@ -1,5 +1,3 @@
-/* $Id: colorselection.hg,v 1.2 2004/02/10 14:50:11 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -68,13 +66,13 @@ public:
   _WRAP_METHOD(void set_previous_alpha(guint16 alpha), gtk_color_selection_set_previous_alpha)
   Gdk::Color get_previous_color() const;
   _WRAP_METHOD(guint16 get_previous_alpha() const, gtk_color_selection_get_previous_alpha)
-  
-  
+
+
   Gdk::RGBA get_current_rgba() const;
   Gdk::RGBA get_previous_rgba() const;
 
-  _WRAP_METHOD(void set_current_rgba(const Gdk::RGBA& color), gtk_color_selection_set_current_rgba)  
-  _WRAP_METHOD(void set_previous_rgba(const Gdk::RGBA& color), gtk_color_selection_set_previous_rgba)    
+  _WRAP_METHOD(void set_current_rgba(const Gdk::RGBA& color), gtk_color_selection_set_current_rgba)
+  _WRAP_METHOD(void set_previous_rgba(const Gdk::RGBA& color), gtk_color_selection_set_previous_rgba)
 
   _WRAP_METHOD(bool is_adjusting() const, gtk_color_selection_is_adjusting)
 
diff --git a/gtk/src/combobox.ccg b/gtk/src/combobox.ccg
index 1ce7cfd..857eeae 100644
--- a/gtk/src/combobox.ccg
+++ b/gtk/src/combobox.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: combobox.ccg,v 1.9 2006/05/10 20:59:27 murrayc Exp $ */
-
 /*
- *
  * Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index 100148f..4d70e5a 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -1,7 +1,4 @@
-/* $Id: combobox.hg,v 1.17 2006/09/19 20:08:42 murrayc Exp $ */
-
-/* combobox.h
- *
+/*
  * Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -50,7 +47,7 @@ namespace Gtk
  *
  * To allow the user to enter values not in the model, the 'has-entry'
  * property allows the ComboBox to contain a Gtk::Entry. This entry
- * can be accessed by calling get_entry(), or you can just call get_entry_text() 
+ * can be accessed by calling get_entry(), or you can just call get_entry_text()
  * to get the text from the Entry.
  *
  * For a simple list of textual choices, the model-view API of ComboBox
@@ -85,7 +82,7 @@ public:
    */
   explicit ComboBox(const Glib::RefPtr<TreeModel>& model, bool has_entry = false);
   _IGNORE(gtk_combo_box_new_with_model, gtk_combo_box_new_with_model_and_entry)
-  
+
   /** Creates a new empty #GtkComboBox, optionally with an entry.
    * @param has_entry If this is true then this will have an Entry widget.
    */
@@ -187,7 +184,7 @@ public:
 
   _WRAP_METHOD(Glib::RefPtr<Atk::Object> get_popup_accessible(), gtk_combo_box_get_popup_accessible, ifdef GTKMM_ATKMM_ENABLED)
   _WRAP_METHOD(Glib::RefPtr<const Atk::Object> get_popup_accessible() const, gtk_combo_box_get_popup_accessible, constversion, ifdef GTKMM_ATKMM_ENABLED)
-  
+
   _WRAP_METHOD(int get_id_column() const, gtk_combo_box_get_id_column)
   _WRAP_METHOD(void set_id_column(int id_column), gtk_combo_box_set_id_column)
   _WRAP_METHOD(Glib::ustring get_active_id() const, gtk_combo_box_get_active_id)
diff --git a/gtk/src/comboboxtext.ccg b/gtk/src/comboboxtext.ccg
index 111c16a..f0a64a5 100644
--- a/gtk/src/comboboxtext.ccg
+++ b/gtk/src/comboboxtext.ccg
@@ -1,5 +1,4 @@
 /*
- *
  * Copyright 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/comboboxtext.hg b/gtk/src/comboboxtext.hg
index c173186..259c7d7 100644
--- a/gtk/src/comboboxtext.hg
+++ b/gtk/src/comboboxtext.hg
@@ -1,5 +1,4 @@
-/* comboboxtext.h
- *
+/*
  * Copyright (C) 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -29,7 +28,7 @@ namespace Gtk
 /** This is a simple variant of ComboBox that hides the model-view complexity for simple text-only use cases.
  * You can add items to a ComboBoxText with append(), insert() or prepend() and remove items with remove_text().
  *
- * If the ComboBoxText contains an entry (via the 'has_entry' property), its contents can be retrieved using 
+ * If the ComboBoxText contains an entry (via the 'has_entry' property), its contents can be retrieved using
  * get_active_text(). The entry itself can be accessed by calling ComboBox::get_entry() or ComboBox::get_entry_text().
  *
  * You should not call set_model() or attempt to pack more cells into this combo box via its CellLayout base class.
diff --git a/gtk/src/container.ccg b/gtk/src/container.ccg
index cfb1f40..4502861 100644
--- a/gtk/src/container.ccg
+++ b/gtk/src/container.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: container.ccg,v 1.12 2006/07/19 16:58:50 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/container.hg b/gtk/src/container.hg
index e215155..fb4b793 100644
--- a/gtk/src/container.hg
+++ b/gtk/src/container.hg
@@ -1,5 +1,3 @@
-/* $Id: container.hg,v 1.11 2006/04/12 11:11:25 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -186,9 +184,9 @@ protected:
 
   /** Invokes a callback on all children of the container.
    *
-   * The callback may optionally be invoked also on children that are considered 
-   * "internal" (implementation details of the container). "Internal" children 
-   * generally  weren't added by the user of the container, but were added by the 
+   * The callback may optionally be invoked also on children that are considered
+   * "internal" (implementation details of the container). "Internal" children
+   * generally  weren't added by the user of the container, but were added by the
    * container implementation itself.
    *
    * Most applications should use foreach(), rather than forall().
@@ -202,9 +200,9 @@ protected:
   //TODO: Return a ustring instead when we can break ABI.
   /** Returns the composite name of a child widget.
    *
-   * Composite widgets are  children of the container that are considered 
-   * "internal" (implementation details of the container). "Internal" children 
-   * generally weren't added by the user of the container, but were added by 
+   * Composite widgets are  children of the container that are considered
+   * "internal" (implementation details of the container). "Internal" children
+   * generally weren't added by the user of the container, but were added by
    * the container implementation itself.
    *
    * The caller is responsible for freeing the returned string.
@@ -216,9 +214,9 @@ protected:
 
   /** Sets a child property for this container and its child.
    *
-   * Child properties are object properties that are not specific to either the 
-   * container or the contained widget, but rather to their relation. Typical 
-   * examples of child properties are the position or pack-type of a widget 
+   * Child properties are object properties that are not specific to either the
+   * container or the contained widget, but rather to their relation. Typical
+   * examples of child properties are the position or pack-type of a widget
    * which is contained in a Gtk::Box.
    *
    * @param child The child property.
diff --git a/gtk/src/cssprovider.ccg b/gtk/src/cssprovider.ccg
index 8768960..c2bbf59 100644
--- a/gtk/src/cssprovider.ccg
+++ b/gtk/src/cssprovider.ccg
@@ -14,7 +14,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
- 
+
 #include <gtk/gtk.h>
 
 namespace Gtk
@@ -30,4 +30,4 @@ bool CssProvider::load_from_data(const std::string& data)
   return retvalue;
 }
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/cssprovider.hg b/gtk/src/cssprovider.hg
index 6056d1b..8846201 100644
--- a/gtk/src/cssprovider.hg
+++ b/gtk/src/cssprovider.hg
@@ -51,17 +51,17 @@ protected:
 
 public:
   _WRAP_CREATE()
-  
+
   _WRAP_METHOD(Glib::ustring to_string() const, gtk_css_provider_to_string)
-  
+
   /** Loads @a data into this css provider, making it clear any previously loaded information.
    *
    * @param data CSS data loaded in memory.
    * @result True if the data could be loaded.
-   */ 
+   */
   bool load_from_data(const std::string& data);
   _IGNORE(gtk_css_provider_load_from_data)
-  
+
   _WRAP_METHOD(bool load_from_file(const Glib::RefPtr<const Gio::File>& file), gtk_css_provider_load_from_file, errthrow)
   _WRAP_METHOD(bool load_from_path(const std::string& path), gtk_css_provider_load_from_path, errthrow)
 
diff --git a/gtk/src/dialog.ccg b/gtk/src/dialog.ccg
index a3070b3..87aed3a 100644
--- a/gtk/src/dialog.ccg
+++ b/gtk/src/dialog.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: dialog.ccg,v 1.3 2004/11/21 20:54:20 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/dialog.hg b/gtk/src/dialog.hg
index 0ca8e7c..435a403 100644
--- a/gtk/src/dialog.hg
+++ b/gtk/src/dialog.hg
@@ -1,7 +1,4 @@
-/* $Id: dialog.hg,v 1.8 2006/03/22 16:53:22 murrayc Exp $ */
-
-/* dialog.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -129,4 +126,4 @@ public:
   _IGNORE_SIGNAL("close")
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/drawingarea.ccg b/gtk/src/drawingarea.ccg
index b14778d..031daaa 100644
--- a/gtk/src/drawingarea.ccg
+++ b/gtk/src/drawingarea.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: drawingarea.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/drawingarea.hg b/gtk/src/drawingarea.hg
index c892241..3a78347 100644
--- a/gtk/src/drawingarea.hg
+++ b/gtk/src/drawingarea.hg
@@ -1,7 +1,4 @@
-/* $Id: drawingarea.hg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
-
-/* drawingarea.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -37,8 +34,8 @@ class DrawingArea : public Widget
 public:
 
   _CTOR_DEFAULT
-  
+
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/editable.ccg b/gtk/src/editable.ccg
index 67e2e91..6c671bd 100644
--- a/gtk/src/editable.ccg
+++ b/gtk/src/editable.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: editable.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/editable.hg b/gtk/src/editable.hg
index d06ea37..f032c59 100644
--- a/gtk/src/editable.hg
+++ b/gtk/src/editable.hg
@@ -1,5 +1,3 @@
-/* $Id: editable.hg,v 1.3 2006/05/18 17:53:15 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/entry.ccg b/gtk/src/entry.ccg
index 56962f1..a199ea1 100644
--- a/gtk/src/entry.ccg
+++ b/gtk/src/entry.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: entry.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -28,48 +24,48 @@ namespace Gtk
 
 void Entry::set_icon_from_pixbuf(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, EntryIconPosition icon_pos)
 {
-  gtk_entry_set_icon_from_pixbuf(gobj(), ((GtkEntryIconPosition)(icon_pos)), Glib::unwrap(pixbuf)); 
+  gtk_entry_set_icon_from_pixbuf(gobj(), ((GtkEntryIconPosition)(icon_pos)), Glib::unwrap(pixbuf));
 }
 
 void Entry::set_icon_from_stock(const StockID& stock_id, EntryIconPosition icon_pos)
 {
-  gtk_entry_set_icon_from_stock(gobj(), ((GtkEntryIconPosition)(icon_pos)), (stock_id).get_c_str()); 
+  gtk_entry_set_icon_from_stock(gobj(), ((GtkEntryIconPosition)(icon_pos)), (stock_id).get_c_str());
 }
 
 void Entry::set_icon_from_icon_name(const Glib::ustring& icon_name, EntryIconPosition icon_pos)
 {
-  gtk_entry_set_icon_from_icon_name(gobj(), ((GtkEntryIconPosition)(icon_pos)), icon_name.c_str()); 
+  gtk_entry_set_icon_from_icon_name(gobj(), ((GtkEntryIconPosition)(icon_pos)), icon_name.c_str());
 }
 
 void Entry::set_icon_from_gicon(const Glib::RefPtr<Gio::Icon>& icon, EntryIconPosition icon_pos)
 {
-  gtk_entry_set_icon_from_gicon(gobj(), ((GtkEntryIconPosition)(icon_pos)), const_cast<GIcon*>(Glib::unwrap<Gio::Icon>(icon))); 
+  gtk_entry_set_icon_from_gicon(gobj(), ((GtkEntryIconPosition)(icon_pos)), const_cast<GIcon*>(Glib::unwrap<Gio::Icon>(icon)));
 }
 
 void Entry::unset_icon(EntryIconPosition icon_pos)
 {
   //We could use any one of these set_icon_from_* functions:
-  gtk_entry_set_icon_from_pixbuf(gobj(), ((GtkEntryIconPosition)(icon_pos)), 0); 
+  gtk_entry_set_icon_from_pixbuf(gobj(), ((GtkEntryIconPosition)(icon_pos)), 0);
 }
 
 void Entry::set_icon_activatable(bool activatable, EntryIconPosition icon_pos)
 {
-  gtk_entry_set_icon_activatable(gobj(), ((GtkEntryIconPosition)(icon_pos)), static_cast<int>(activatable)); 
+  gtk_entry_set_icon_activatable(gobj(), ((GtkEntryIconPosition)(icon_pos)), static_cast<int>(activatable));
 }
 
 void Entry::set_icon_tooltip_text(const Glib::ustring& tooltip, EntryIconPosition icon_pos)
 {
-  gtk_entry_set_icon_tooltip_text(gobj(), ((GtkEntryIconPosition)(icon_pos)), tooltip.c_str()); 
+  gtk_entry_set_icon_tooltip_text(gobj(), ((GtkEntryIconPosition)(icon_pos)), tooltip.c_str());
 }
 
 void Entry::set_icon_tooltip_markup(const Glib::ustring& tooltip, EntryIconPosition icon_pos)
 {
-  gtk_entry_set_icon_tooltip_markup(gobj(), ((GtkEntryIconPosition)(icon_pos)), tooltip.c_str()); 
+  gtk_entry_set_icon_tooltip_markup(gobj(), ((GtkEntryIconPosition)(icon_pos)), tooltip.c_str());
 }
 
 void Entry::set_icon_drag_source(const Glib::RefPtr<TargetList>& target_list, Gdk::DragAction actions, EntryIconPosition icon_pos)
 {
-  gtk_entry_set_icon_drag_source(gobj(), ((GtkEntryIconPosition)(icon_pos)), const_cast<GtkTargetList*>(Glib::unwrap(target_list)), ((GdkDragAction)(actions))); 
+  gtk_entry_set_icon_drag_source(gobj(), ((GtkEntryIconPosition)(icon_pos)), const_cast<GtkTargetList*>(Glib::unwrap(target_list)), ((GdkDragAction)(actions)));
 }
 
 Gdk::Rectangle Entry::get_text_area() const
@@ -85,5 +81,5 @@ Gdk::Rectangle Entry::get_icon_area(EntryIconPosition icon_pos) const
   gtk_entry_get_icon_area(const_cast<GtkEntry*>(gobj()), (GtkEntryIconPosition)icon_pos, result.gobj());
   return result;
 }
-  
+
 } //namespace Gtk
diff --git a/gtk/src/entry.hg b/gtk/src/entry.hg
index 1c389e8..dc264e5 100644
--- a/gtk/src/entry.hg
+++ b/gtk/src/entry.hg
@@ -1,7 +1,4 @@
-/* $Id: entry.hg,v 1.12 2006/06/13 17:16:26 murrayc Exp $ */
-
-/* entry.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -75,7 +72,7 @@ public:
   _WRAP_METHOD(Glib::RefPtr<const EntryBuffer> get_buffer() const, gtk_entry_get_buffer, refreturn, constversion)
 
 
-  /** Returns the area where the entry's text is drawn. 
+  /** Returns the area where the entry's text is drawn.
    * This function is useful when drawing something to the entry in a draw callback.
    *
    * See also get_icon_area().
@@ -86,7 +83,7 @@ public:
    **/
   Gdk::Rectangle get_text_area() const;
   _IGNORE(gtk_entry_get_text_area)
-                                                 
+
   _WRAP_METHOD(void set_buffer(const Glib::RefPtr<EntryBuffer>& buffer), gtk_entry_set_buffer)
   _WRAP_METHOD(void set_visibility(bool visible = true), gtk_entry_set_visibility)
   _WRAP_METHOD(bool get_visibility() const, gtk_entry_get_visibility)
@@ -134,7 +131,7 @@ public:
   _WRAP_METHOD(void set_progress_pulse_step(double fraction), gtk_entry_set_progress_pulse_step)
   _WRAP_METHOD(double get_progress_pulse_step(), gtk_entry_get_progress_pulse_step)
   _WRAP_METHOD(void progress_pulse(), gtk_entry_progress_pulse)
-  
+
   _WRAP_METHOD(Glib::ustring get_placeholder_text() const, gtk_entry_get_placeholder_text)
   _WRAP_METHOD(void set_placeholder_text(const Glib::ustring& text), gtk_entry_set_placeholder_text)
 
@@ -154,9 +151,9 @@ public:
   _WRAP_METHOD_DOCS_ONLY(gtk_entry_set_icon_from_gicon)
   void set_icon_from_gicon(const Glib::RefPtr<Gio::Icon>& icon, EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY);
   _IGNORE(gtk_entry_set_icon_from_gicon)
-  
+
   /** Do not show any icon in the specified position.
-   * See set_icon_from_pixbuf(), set_icon_from_stock(), set_icon_from_icon_name(), 
+   * See set_icon_from_pixbuf(), set_icon_from_stock(), set_icon_from_icon_name(),
    * and set_icon_from_gicon().
    *
    * @param icon_pos The icon position.
@@ -211,7 +208,7 @@ public:
    */
   Gdk::Rectangle get_icon_area(EntryIconPosition icon_pos = ENTRY_ICON_PRIMARY) const;
   _IGNORE(gtk_entry_get_icon_area)
-                                                          
+
   _WRAP_METHOD(int get_current_icon_drag_source(), gtk_entry_get_current_icon_drag_source)
   _WRAP_METHOD(bool im_context_filter_keypress(GdkEventKey* event), gtk_entry_im_context_filter_keypress)
   _WRAP_METHOD(void reset_im_context(), gtk_entry_reset_im_context)
@@ -280,4 +277,4 @@ public:
   _WRAP_PROPERTY("completion", Glib::RefPtr<EntryCompletion>)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/entrybuffer.ccg b/gtk/src/entrybuffer.ccg
index 3551e18..8d21a08 100644
--- a/gtk/src/entrybuffer.ccg
+++ b/gtk/src/entrybuffer.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: entrybuffer.ccg,v 1.8 2006/11/20 09:19:49 murrayc Exp $ */
-
 /* Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -34,7 +31,7 @@ EntryBuffer::EntryBuffer(const Glib::ustring& text)
 
 void EntryBuffer::set_text(const Glib::ustring& text)
 {
-  gtk_entry_buffer_set_text(gobj(), text.c_str(), -1 /* see docs */); 
+  gtk_entry_buffer_set_text(gobj(), text.c_str(), -1 /* see docs */);
 }
 
 guint EntryBuffer::insert_text(guint position, const Glib::ustring& text)
@@ -44,7 +41,7 @@ guint EntryBuffer::insert_text(guint position, const Glib::ustring& text)
 
 void EntryBuffer::emit_inserted_text(guint position, const Glib::ustring& text)
 {
-  gtk_entry_buffer_emit_inserted_text(gobj(), position, text.c_str(), -1 /* see docs */); 
+  gtk_entry_buffer_emit_inserted_text(gobj(), position, text.c_str(), -1 /* see docs */);
 }
 
 } // namespace Gtk
diff --git a/gtk/src/entrybuffer.hg b/gtk/src/entrybuffer.hg
index 6b43519..b8b546d 100644
--- a/gtk/src/entrybuffer.hg
+++ b/gtk/src/entrybuffer.hg
@@ -1,5 +1,3 @@
-/* $Id: entrybuffer.hg,v 1.20 2006/11/20 09:19:49 murrayc Exp $ */
-
 /* Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -41,7 +39,7 @@ namespace Gtk
  *
  * EntryBuffer may be derived from. Such a derived class might allow
  * text to be stored in an alternate location, such as non-pageable memory,
- * useful in the case of important passwords. Or a derived class could 
+ * useful in the case of important passwords. Or a derived class could
  * integrate with an application's concept of undo/redo.
  *
  * @@newin{2,20}
diff --git a/gtk/src/entrycompletion.ccg b/gtk/src/entrycompletion.ccg
index d28057a..2f1583c 100644
--- a/gtk/src/entrycompletion.ccg
+++ b/gtk/src/entrycompletion.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: entrycompletion.ccg,v 1.13 2006/07/19 16:58:50 murrayc Exp $ */
-
 /* Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/entrycompletion.hg b/gtk/src/entrycompletion.hg
index 6722ffc..87f529c 100644
--- a/gtk/src/entrycompletion.hg
+++ b/gtk/src/entrycompletion.hg
@@ -1,5 +1,3 @@
-/* $Id: entrycompletion.hg,v 1.24 2006/07/19 16:58:50 murrayc Exp $ */
-
 /* Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -20,7 +18,7 @@
 #include <gtkmm/widget.h>
 #include <gtkmm/celllayout.h>
 #include <gtkmm/treemodel.h>
- 
+
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/object_p.h)
 
@@ -34,29 +32,29 @@ class Entry;
 
 /** Completion functionality for Gtk::Entry.
  *
- * Gtk::EntryCompletion is an auxiliary object to be used in conjunction with 
- * Gtk::Entry to provide the completion functionality. 
- * 
- * "Completion functionality" means that when the user modifies the text in the 
- * entry, Gtk::EntryCompletion checks which rows in the model match the current 
+ * Gtk::EntryCompletion is an auxiliary object to be used in conjunction with
+ * Gtk::Entry to provide the completion functionality.
+ *
+ * "Completion functionality" means that when the user modifies the text in the
+ * entry, Gtk::EntryCompletion checks which rows in the model match the current
  * content of the entry, and displays a list of matches. By default, the
- * matching is done by comparing the entry text case-insensitively against 
- * the text column of the model (see set_text_column()), 
+ * matching is done by comparing the entry text case-insensitively against
+ * the text column of the model (see set_text_column()),
  * but this can be overridden with a custom match function (see set_match_func()).
  *
- * When the user selects a completion, the content of the entry is updated. 
- * By default, the content of the entry is replaced by the text column of the 
- * model, but this can be overridden by connecting to the match_selected signal 
- * and updating the entry in the signal handler. Note that you should return true 
+ * When the user selects a completion, the content of the entry is updated.
+ * By default, the content of the entry is replaced by the text column of the
+ * model, but this can be overridden by connecting to the match_selected signal
+ * and updating the entry in the signal handler. Note that you should return true
  * from the signal handler to suppress the default behaviour.
- * 
+ *
  * To add completion functionality to an entry, use Gtk::Entry::set_completion().
- * 
- * In addition to regular completion matches, which will be inserted into 
- * the entry when they are selected, Gtk::EntryCompletion also allows the display of  
- * "actions" in the popup window. Their appearance is similar to menu items, 
- * to differentiate them clearly from completion strings. When an action is 
- * selected, the action_activated signal is emitted. 
+ *
+ * In addition to regular completion matches, which will be inserted into
+ * the entry when they are selected, Gtk::EntryCompletion also allows the display of
+ * "actions" in the popup window. Their appearance is similar to menu items,
+ * to differentiate them clearly from completion strings. When an action is
+ * selected, the action_activated signal is emitted.
  */
 class EntryCompletion
  : public Glib::Object,
@@ -91,10 +89,10 @@ public:
 
   /// For example, bool on_match(const Glib::ustring& key, const TreeModel::const_iterator& iter);
   typedef sigc::slot<bool, const Glib::ustring&, const TreeModel::const_iterator&> SlotMatch;
-  
+
   void set_match_func(const SlotMatch& slot);
   _IGNORE(gtk_entry_completion_set_match_func)
-  
+
   _WRAP_METHOD(void set_minimum_key_length(int length), gtk_entry_completion_set_minimum_key_length)
   _WRAP_METHOD(int get_minimum_key_length() const, gtk_entry_completion_get_minimum_key_length)
   _WRAP_METHOD(Glib::ustring compute_prefix(const Glib::ustring& key), gtk_entry_completion_compute_prefix)
@@ -143,9 +141,9 @@ public:
   _IGNORE_SIGNAL(match_selected)
   _IGNORE_SIGNAL(cursor_on_match)
 
-  /** Emitted when a match from the list is selected. 
-   * The default behaviour is to replace the contents of the 
-   * entry with the contents of the text column in the row 
+  /** Emitted when a match from the list is selected.
+   * The default behaviour is to replace the contents of the
+   * entry with the contents of the text column in the row
    * pointed to by @a iter.
    *
    * It is necessary to connect your signal handler <i>before</i>
@@ -160,7 +158,7 @@ public:
    * @param model The TreeModel containing the matches
    * @param iter A TreeModel::iterator positioned at the selected match
    * @result true if the signal has been handled
-   * 
+   *
    * @par Prototype:
    * <tt>bool %on_match_selected(const TreeModel::iterator& iter)</tt>
    */
@@ -168,13 +166,13 @@ public:
 
   /** Emitted when a match from the cursor is on a match
    * of the list. The default behaviour is to replace the contents
-   * of the entry with the contents of the text column in the row 
+   * of the entry with the contents of the text column in the row
    * pointed to by @a iter.
    *
    * @param model The TreeModel containing the matches
    * @param iter A TreeModel::iterator positioned at the selected match
    * @result true if the signal has been handled
-   * 
+   *
    * @par Prototype:
    * <tt>bool %on_cursor_on_match(const TreeModel::iterator& iter)</tt>
    *
@@ -212,8 +210,8 @@ dnl
 protected:
 
   //Default Signal Handler:
-  virtual bool on_match_selected(const TreeModel::iterator& iter);  
-  //No default handler for on_cursor_on_match(), to preserver ABI. TODO: Add this when we can break ABI.      
+  virtual bool on_match_selected(const TreeModel::iterator& iter);
+  //No default handler for on_cursor_on_match(), to preserver ABI. TODO: Add this when we can break ABI.
 };
 
 } // namespace Gtk
diff --git a/gtk/src/enums.ccg b/gtk/src/enums.ccg
index f652395..bde9d4e 100644
--- a/gtk/src/enums.ccg
+++ b/gtk/src/enums.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: enums.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/enums.hg b/gtk/src/enums.hg
index 8df1ac4..ef0def8 100644
--- a/gtk/src/enums.hg
+++ b/gtk/src/enums.hg
@@ -1,7 +1,4 @@
-/* $Id: enums.hg,v 1.5 2006/05/09 16:51:34 murrayc Exp $ */
-
-/* enums.h
- *
+/*
  * Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/eventbox.ccg b/gtk/src/eventbox.ccg
index 6cdd151..e6c59e3 100644
--- a/gtk/src/eventbox.ccg
+++ b/gtk/src/eventbox.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: eventbox.ccg,v 1.1 2003/01/21 13:38:49 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/eventbox.hg b/gtk/src/eventbox.hg
index 2cc791c..c653f70 100644
--- a/gtk/src/eventbox.hg
+++ b/gtk/src/eventbox.hg
@@ -1,7 +1,4 @@
-/* $Id: eventbox.hg,v 1.2 2003/10/12 09:38:11 murrayc Exp $ */
-
-/* eventbox.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -49,9 +46,9 @@ public:
   _WRAP_METHOD(bool get_above_child() const, gtk_event_box_get_above_child)
   _WRAP_METHOD(void set_above_child(bool above_child = true), gtk_event_box_set_above_child)
 
-  _WRAP_PROPERTY("visible-window", bool) 
-  _WRAP_PROPERTY("above-child", bool) 
+  _WRAP_PROPERTY("visible-window", bool)
+  _WRAP_PROPERTY("above-child", bool)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/expander.ccg b/gtk/src/expander.ccg
index 1a2e4c6..3bc1c2a 100644
--- a/gtk/src/expander.ccg
+++ b/gtk/src/expander.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: expander.ccg,v 1.2 2003/11/01 17:02:37 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/expander.hg b/gtk/src/expander.hg
index 4f1fc46..80d9bb9 100644
--- a/gtk/src/expander.hg
+++ b/gtk/src/expander.hg
@@ -1,7 +1,4 @@
-/* $Id: expander.hg,v 1.9 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* expander.h
- *
+/*
  * Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -103,7 +100,7 @@ public:
 
   _WRAP_METHOD(void set_label_fill(bool label_fill = true), gtk_expander_set_label_fill)
   _WRAP_METHOD(bool get_label_fill() const, gtk_expander_get_label_fill)
-  
+
   _WRAP_METHOD(void set_resize_toplevel(bool resize_toplevel = true), gtk_expander_set_resize_toplevel)
   _WRAP_METHOD(bool get_resize_toplevel() const, gtk_expander_get_resize_toplevel)
 
diff --git a/gtk/src/filechooser.ccg b/gtk/src/filechooser.ccg
index df83718..8bfbab9 100644
--- a/gtk/src/filechooser.ccg
+++ b/gtk/src/filechooser.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: filechooser.ccg,v 1.2 2004/11/12 11:51:42 murrayc Exp $ */
-
 /* Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/filechooser.hg b/gtk/src/filechooser.hg
index 10adc4a..a0eca64 100644
--- a/gtk/src/filechooser.hg
+++ b/gtk/src/filechooser.hg
@@ -1,5 +1,3 @@
-/* $Id: filechooser.hg,v 1.23 2006/04/18 13:28:56 murrayc Exp $ */
-
 /* Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/filechooserbutton.ccg b/gtk/src/filechooserbutton.ccg
index 1b70abb..0c132e8 100644
--- a/gtk/src/filechooserbutton.ccg
+++ b/gtk/src/filechooserbutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: filechooserbutton.ccg,v 1.2 2005/01/09 12:42:07 murrayc Exp $ */
-
 /*
- *
  * Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -30,7 +26,7 @@ FileChooserButton::FileChooserButton(FileChooserAction action)
   _CONSTRUCT("action", action)
 {
 }
-  
+
 
 } // namespace Gtk
 
diff --git a/gtk/src/filechooserbutton.hg b/gtk/src/filechooserbutton.hg
index af4ec74..134b23b 100644
--- a/gtk/src/filechooserbutton.hg
+++ b/gtk/src/filechooserbutton.hg
@@ -1,7 +1,4 @@
-/* $Id: filechooserbutton.hg,v 1.7 2005/12/12 08:14:21 murrayc Exp $ */
-
-/* filechooserbutton.h
- *
+/*
  * Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/filechooserdialog.ccg b/gtk/src/filechooserdialog.ccg
index f533905..1d92e14 100644
--- a/gtk/src/filechooserdialog.ccg
+++ b/gtk/src/filechooserdialog.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: filechooserdialog.ccg,v 1.2 2005/01/06 22:51:46 mxpxpod Exp $ */
-
 /*
- *
  * Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/filechooserdialog.hg b/gtk/src/filechooserdialog.hg
index e1a1d04..b37d520 100644
--- a/gtk/src/filechooserdialog.hg
+++ b/gtk/src/filechooserdialog.hg
@@ -1,7 +1,4 @@
-/* $Id: filechooserdialog.hg,v 1.4 2005/01/09 12:42:07 murrayc Exp $ */
-
-/* filechooserdialog.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/filechooserwidget.ccg b/gtk/src/filechooserwidget.ccg
index 4d426fb..006ca05 100644
--- a/gtk/src/filechooserwidget.ccg
+++ b/gtk/src/filechooserwidget.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: filechooserwidget.ccg,v 1.1 2003/11/01 17:02:37 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/filechooserwidget.hg b/gtk/src/filechooserwidget.hg
index 345f56a..0f08197 100644
--- a/gtk/src/filechooserwidget.hg
+++ b/gtk/src/filechooserwidget.hg
@@ -1,7 +1,4 @@
-/* $Id: filechooserwidget.hg,v 1.4 2005/11/30 14:10:49 murrayc Exp $ */
-
-/* box.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -46,14 +43,14 @@ class FileChooserWidget
   _IMPLEMENTS_INTERFACE(FileChooser)
 public:
   _CTOR_DEFAULT;
-  
+
   /** Creates a file chooser widget that can be embedded in other widgets.
    *
    * Creates a new FileChooserWidget. This is a file chooser widget that can be embedded in
    * custom windows, and it is the same widget that is used by Gtk::FileChooserDialog.
    *
    * @param action Open or save mode for the widget
-   * 
+   *
    * @newin{2,4}
    */
   _WRAP_CTOR(FileChooserWidget(FileChooserAction action), gtk_file_chooser_widget_new)
diff --git a/gtk/src/filefilter.ccg b/gtk/src/filefilter.ccg
index cc044f9..0f1e9c3 100644
--- a/gtk/src/filefilter.ccg
+++ b/gtk/src/filefilter.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: filefilter.ccg,v 1.8 2006/05/11 11:40:24 murrayc Exp $ */
-
 /* Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -33,7 +30,7 @@ static gboolean SignalProxy_Custom_gtk_callback(const GtkFileFilterInfo* filter_
     cppInfo.uri = Glib::convert_const_gchar_ptr_to_ustring(filter_info->uri);
     cppInfo.display_name = Glib::convert_const_gchar_ptr_to_ustring(filter_info->display_name);
     cppInfo.mime_type = Glib::convert_const_gchar_ptr_to_ustring(filter_info->mime_type);
-  
+
     return (*the_slot)(cppInfo);
   }
   catch(...)
@@ -57,12 +54,12 @@ void FileFilter::add_custom(FileFilterFlags needed, const SlotCustom& slot)
   //Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
   //It will be deleted when SignalProxy_Custom::gtk_callback_destroy() is called.
   SlotCustom* slot_copy = new SlotCustom(slot);
-      
+
   gtk_file_filter_add_custom(gobj(), (GtkFileFilterFlags)needed,
                              &SignalProxy_Custom_gtk_callback,
                              slot_copy,
-                             &SignalProxy_Custom_gtk_callback_destroy);     
+                             &SignalProxy_Custom_gtk_callback_destroy);
 }
- 
+
 } // namespace Gtk
 
diff --git a/gtk/src/filefilter.hg b/gtk/src/filefilter.hg
index d67a999..4115c17 100644
--- a/gtk/src/filefilter.hg
+++ b/gtk/src/filefilter.hg
@@ -1,5 +1,3 @@
-/* $Id: filefilter.hg,v 1.8 2004/11/12 11:51:42 murrayc Exp $ */
-
 /* Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/fixed.ccg b/gtk/src/fixed.ccg
index 5ac9dda..102aed8 100644
--- a/gtk/src/fixed.ccg
+++ b/gtk/src/fixed.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: fixed.ccg,v 1.1 2003/01/21 13:38:49 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/fixed.hg b/gtk/src/fixed.hg
index 1a90165..97cc558 100644
--- a/gtk/src/fixed.hg
+++ b/gtk/src/fixed.hg
@@ -1,7 +1,4 @@
-/* $Id: fixed.hg,v 1.1 2003/01/21 13:38:49 murrayc Exp $ */
-
-/* fixed.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -51,5 +48,5 @@ public:
   _IGNORE(gtk_fixed_set_has_window, gtk_fixed_get_has_window) // deprecated
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/fontbutton.ccg b/gtk/src/fontbutton.ccg
index 9350727..1ffbc16 100644
--- a/gtk/src/fontbutton.ccg
+++ b/gtk/src/fontbutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: fontbutton.ccg,v 1.1 2003/10/12 09:38:11 murrayc Exp $ */
-
 /*
- *
  * Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/fontbutton.hg b/gtk/src/fontbutton.hg
index 79a1fe7..249aae1 100644
--- a/gtk/src/fontbutton.hg
+++ b/gtk/src/fontbutton.hg
@@ -1,7 +1,4 @@
-/* $Id: fontbutton.hg,v 1.5 2006/08/02 14:42:41 jjongsma Exp $ */
-
-/* fontbutton.h
- * 
+/*
  * Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -30,7 +27,7 @@ namespace Gtk
 {
 
 /** A button to launch a font selection dialog.
- * 
+ *
  * The Gtk::FontButton is a button which displays the currently selected font and
  * allows to open a font selection dialog to change the font. It is suitable widget
  * for selecting a font in a preference dialog.
@@ -49,7 +46,7 @@ class FontButton
 public:
   _CTOR_DEFAULT()
   _WRAP_CTOR(FontButton(const Glib::ustring& font_name), gtk_font_button_new_with_font)
-  
+
   _WRAP_METHOD(Glib::ustring get_title() const, gtk_font_button_get_title)
   _WRAP_METHOD(void set_title(const Glib::ustring& title), gtk_font_button_set_title)
   _WRAP_METHOD(bool get_use_font() const, gtk_font_button_get_use_font)
diff --git a/gtk/src/fontchooser.ccg b/gtk/src/fontchooser.ccg
index 633cbc0..be833e9 100644
--- a/gtk/src/fontchooser.ccg
+++ b/gtk/src/fontchooser.ccg
@@ -29,8 +29,8 @@ static gboolean SignalProxy_Filter_gtk_callback(const PangoFontFamily* family, c
   try
   {
     // Create suitable C++ instances to pass to the C++ method:
-    const Glib::RefPtr<const Pango::FontFamily> cppFamily = Glib::wrap(const_cast<PangoFontFamily*>(family), true); 
-    const Glib::RefPtr<const Pango::FontFace> cppFace = Glib::wrap(const_cast<PangoFontFace*>(face), true); 
+    const Glib::RefPtr<const Pango::FontFamily> cppFamily = Glib::wrap(const_cast<PangoFontFamily*>(family), true);
+    const Glib::RefPtr<const Pango::FontFace> cppFace = Glib::wrap(const_cast<PangoFontFace*>(face), true);
     return (*the_slot)(cppFamily, cppFace);
   }
   catch(...)
diff --git a/gtk/src/fontchooser.hg b/gtk/src/fontchooser.hg
index 6b02162..a5f236e 100644
--- a/gtk/src/fontchooser.hg
+++ b/gtk/src/fontchooser.hg
@@ -43,7 +43,7 @@ namespace Gtk
  * To get the selected font use get_font_name().
  *
  * To change the text which is shown in the preview area, use set_preview_text().
- * 
+ *
  * @ingroup FontChooser
  * @newin{3,2}
  */
@@ -63,12 +63,12 @@ public:
 #m4 _CONVERSION(`PangoFontDescription*',`Pango::FontDescription',`Glib::wrap(const_cast<PangoFontDescription*>($3), false)')
   _WRAP_METHOD(Pango::FontDescription get_font_desc() const, gtk_font_chooser_get_font_desc)
   _WRAP_METHOD(void set_font_desc(const Pango::FontDescription& font_desc), gtk_font_chooser_set_font_desc)
-                                                            
+
   _WRAP_METHOD(Glib::ustring get_font() const, gtk_font_chooser_get_font)
   _WRAP_METHOD(void set_font(const Glib::ustring& font), gtk_font_chooser_set_font)
   _WRAP_METHOD(Glib::ustring get_preview_text() const, gtk_font_chooser_get_preview_text)
   _WRAP_METHOD(void set_preview_text(const Glib::ustring& fontname),gtk_font_chooser_set_preview_text)
-  
+
   _WRAP_METHOD(bool get_show_preview_entry() const, gtk_font_chooser_get_show_preview_entry)
   _WRAP_METHOD(void set_show_preview_entry(bool show_preview_entry = true), gtk_font_chooser_set_show_preview_entry)
 
diff --git a/gtk/src/fontchooserdialog.hg b/gtk/src/fontchooserdialog.hg
index 3d19278..2e57df1 100644
--- a/gtk/src/fontchooserdialog.hg
+++ b/gtk/src/fontchooserdialog.hg
@@ -47,7 +47,7 @@ class FontChooserDialog
 public:
   _CTOR_DEFAULT()
   explicit FontChooserDialog(const Glib::ustring& title);
-  
+
   //Note: We renamed the parent parameter to transient_for because that is the property name.
   _WRAP_CTOR(FontChooserDialog(const Glib::ustring& title, Window& transient_for), gtk_font_chooser_dialog_new)
 };
diff --git a/gtk/src/fontselection.ccg b/gtk/src/fontselection.ccg
index b64a8e1..3f2fb8c 100644
--- a/gtk/src/fontselection.ccg
+++ b/gtk/src/fontselection.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: fontselection.ccg,v 1.1 2003/01/21 13:38:49 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/fontselection.hg b/gtk/src/fontselection.hg
index 8ee0f10..21fb820 100644
--- a/gtk/src/fontselection.hg
+++ b/gtk/src/fontselection.hg
@@ -1,5 +1,3 @@
-/* $Id: fontselection.hg,v 1.2 2003/01/22 23:04:19 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/frame.ccg b/gtk/src/frame.ccg
index 364d08d..b9daa6f 100644
--- a/gtk/src/frame.ccg
+++ b/gtk/src/frame.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: frame.ccg,v 1.1 2003/01/21 13:38:49 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/frame.hg b/gtk/src/frame.hg
index 1f7023d..cf33e7e 100644
--- a/gtk/src/frame.hg
+++ b/gtk/src/frame.hg
@@ -1,7 +1,4 @@
-/* $Id: frame.hg,v 1.6 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* frame.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/grid.ccg b/gtk/src/grid.ccg
index 02fe423..b3e0586 100644
--- a/gtk/src/grid.ccg
+++ b/gtk/src/grid.ccg
@@ -1,5 +1,4 @@
 /*
- *
  * Copyright 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -22,4 +21,4 @@
 namespace Gtk
 {
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/grid.hg b/gtk/src/grid.hg
index f83c198..d4917f2 100644
--- a/gtk/src/grid.hg
+++ b/gtk/src/grid.hg
@@ -1,5 +1,3 @@
-/* $Id: table.hg,v 1.3 2006/05/16 14:16:08 jjongsma Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -54,7 +52,7 @@ class Grid
   _IMPLEMENTS_INTERFACE(Orientable)
 public:
   _CTOR_DEFAULT
-  
+
   //TODO: Add a Grid(Orientation orientation = ORIENTATION_HORIZONTAL) constructor to match the Paned and Box ones?
 
   _WRAP_METHOD(void attach(Widget& child, int left, int top, int width, int height), gtk_grid_attach)
@@ -65,7 +63,7 @@ public:
   _WRAP_METHOD(void insert_row(int position), gtk_grid_insert_row)
   _WRAP_METHOD(void insert_column(int position), gtk_grid_insert_column)
   _WRAP_METHOD(void insert_next_to(Widget& sibling, PositionType side), gtk_grid_insert_next_to)
-                                                         
+
   _WRAP_METHOD(void set_row_homogeneous(bool homogeneous = true), gtk_grid_set_row_homogeneous)
   _WRAP_METHOD(bool get_row_homogeneous() const, gtk_grid_get_row_homogeneous)
   _WRAP_METHOD(void set_row_spacing(guint spacing), gtk_grid_set_row_spacing)
diff --git a/gtk/src/handlebox.ccg b/gtk/src/handlebox.ccg
index 60d3780..d0bf412 100644
--- a/gtk/src/handlebox.ccg
+++ b/gtk/src/handlebox.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: handlebox.ccg,v 1.1 2003/01/21 13:40:26 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -26,4 +22,4 @@
 namespace Gtk
 {
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/handlebox.hg b/gtk/src/handlebox.hg
index d493437..b2fc2ff 100644
--- a/gtk/src/handlebox.hg
+++ b/gtk/src/handlebox.hg
@@ -1,7 +1,4 @@
- /* $Id: handlebox.hg,v 1.1 2003/01/21 13:40:26 murrayc Exp $ */
-
-/* handlebox.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -76,4 +73,4 @@ public:
   _WRAP_PROPERTY("child-detached", bool)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/hvbox.ccg b/gtk/src/hvbox.ccg
index b9811e3..48060f1 100644
--- a/gtk/src/hvbox.ccg
+++ b/gtk/src/hvbox.ccg
@@ -23,4 +23,4 @@ namespace Gtk
 {
 
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/hvscale.ccg b/gtk/src/hvscale.ccg
index 2f5242e..09fedb7 100644
--- a/gtk/src/hvscale.ccg
+++ b/gtk/src/hvscale.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: scale.ccg,v 1.2 2004/01/19 19:48:44 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/hvscale.hg b/gtk/src/hvscale.hg
index e603a1b..8aef8f3 100644
--- a/gtk/src/hvscale.hg
+++ b/gtk/src/hvscale.hg
@@ -1,7 +1,4 @@
-/* $Id: scale.hg,v 1.7 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* scale.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -91,4 +88,4 @@ public:
 
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/hvscrollbar.ccg b/gtk/src/hvscrollbar.ccg
index adf88ae..01d4453 100644
--- a/gtk/src/hvscrollbar.ccg
+++ b/gtk/src/hvscrollbar.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: scrollbar.ccg,v 1.1 2003/01/21 13:40:36 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/hvscrollbar.hg b/gtk/src/hvscrollbar.hg
index b1723a9..dc6f043 100644
--- a/gtk/src/hvscrollbar.hg
+++ b/gtk/src/hvscrollbar.hg
@@ -1,7 +1,4 @@
-/* $Id: scrollbar.hg,v 1.1 2003/01/21 13:40:36 murrayc Exp $ */
-
-/* scrollbar.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -55,7 +52,7 @@ class VScrollbar : public Scrollbar
 public:
   VScrollbar();
   explicit VScrollbar(const Glib::RefPtr<Adjustment>& gtkadjustment);
-  
+
 };
 
 /** A horizontal scrollbar.
@@ -81,9 +78,9 @@ class HScrollbar : public Scrollbar
 public:
   HScrollbar();
   explicit HScrollbar(const Glib::RefPtr<Adjustment>& gtkadjustment);
-  
+
 };
 
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/hvseparator.hg b/gtk/src/hvseparator.hg
index eb303e6..fbbe69c 100644
--- a/gtk/src/hvseparator.hg
+++ b/gtk/src/hvseparator.hg
@@ -45,7 +45,7 @@ class VSeparator : public Separator
   _IS_DEPRECATED
 public:
   _CTOR_DEFAULT
-  
+
 };
 
 
@@ -65,8 +65,8 @@ class HSeparator : public Separator
   _IS_DEPRECATED
 public:
   _CTOR_DEFAULT
-  
+
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/iconfactory.ccg b/gtk/src/iconfactory.ccg
index c92dd76..574fbe1 100644
--- a/gtk/src/iconfactory.ccg
+++ b/gtk/src/iconfactory.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: iconfactory.ccg,v 1.1 2003/01/21 13:40:26 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/iconfactory.hg b/gtk/src/iconfactory.hg
index ff120c2..b78c3e8 100644
--- a/gtk/src/iconfactory.hg
+++ b/gtk/src/iconfactory.hg
@@ -1,5 +1,3 @@
-/* $Id: iconfactory.hg,v 1.1 2003/01/21 13:40:26 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/iconinfo.hg b/gtk/src/iconinfo.hg
index 60110f6..d80cd25 100644
--- a/gtk/src/iconinfo.hg
+++ b/gtk/src/iconinfo.hg
@@ -41,9 +41,9 @@ public:
   IconInfo(const Glib::RefPtr<IconTheme>& icon_theme, const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
   _IGNORE(gtk_icon_info_new_for_pixbuf)
 
-  /** This typedef is just to make it more obvious that 
+  /** This typedef is just to make it more obvious that
    * our operator const void* should be used like operator bool().
-   */ 
+   */
   typedef const void* BoolExpr;
 
   /** Tests whether the IconInfo is valid.
@@ -69,11 +69,11 @@ public:
 
   //TODO: Documentation:
   Glib::RefPtr<Gdk::Pixbuf> load_symbolic(const Glib::RefPtr<StyleContext>& style, bool& was_symbolic);
-  _IGNORE(gtk_icon_info_load_symbolic_for_context)             
+  _IGNORE(gtk_icon_info_load_symbolic_for_context)
 
   _WRAP_METHOD(void set_raw_coordinates(bool raw_coordinates = true), gtk_icon_info_set_raw_coordinates)
   _WRAP_METHOD(bool get_embedded_rect(Gdk::Rectangle& rectangle) const, gtk_icon_info_get_embedded_rect)
-  
+
   //TODO: Documentation.
   std::vector<Gdk::Point> get_attach_points() const;
 
diff --git a/gtk/src/iconset.ccg b/gtk/src/iconset.ccg
index 6447a0d..5c474fb 100644
--- a/gtk/src/iconset.ccg
+++ b/gtk/src/iconset.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: iconset.ccg,v 1.1 2003/01/21 13:40:26 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -41,6 +37,6 @@ std::vector<IconSize> IconSet::get_sizes() const
   return Glib::ArrayHandler<IconSize, IconSizeTraits>::array_to_vector(pSizes, n_sizes, Glib::OWNERSHIP_SHALLOW);
 }
 
-} /* namespace Gtk */
+} //namespace Gtk
 
 
diff --git a/gtk/src/iconset.hg b/gtk/src/iconset.hg
index 0048377..990259f 100644
--- a/gtk/src/iconset.hg
+++ b/gtk/src/iconset.hg
@@ -1,8 +1,5 @@
-/* $Id: iconset.hg,v 1.3 2006/07/30 20:49:50 murrayc Exp $ */
-
-/* iconset.h
- *
- * Copyright(C) 1998-2002 The gtkmm Development Team
+/*
+ * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software, ) you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -35,9 +32,9 @@ class Widget;
 
 
 
-/** This manages a set of variants of a particular icon 
- * An IconSet contains variants for different sizes and widget states. 
- * Icons in an icon factory are named by a stock ID, which is a simple string identifying the icon. Each GtkStyle has a list of GtkIconFactory derived from the current theme; those icon factories are consulted first when searching for an icon. If the theme doesn't set a particular icon, GTK+ looks for the icon in a list of default icon factories, maintained by gtk_icon_factory_add_default() and gtk_icon_factory_remove_default(). Applications with icons should add a default icon factory with their icons, which will allow themes to override the icons for the application. 
+/** This manages a set of variants of a particular icon
+ * An IconSet contains variants for different sizes and widget states.
+ * Icons in an icon factory are named by a stock ID, which is a simple string identifying the icon. Each GtkStyle has a list of GtkIconFactory derived from the current theme; those icon factories are consulted first when searching for an icon. If the theme doesn't set a particular icon, GTK+ looks for the icon in a list of default icon factories, maintained by gtk_icon_factory_add_default() and gtk_icon_factory_remove_default(). Applications with icons should add a default icon factory with their icons, which will allow themes to override the icons for the application.
  */
 class IconSet
 {
@@ -54,7 +51,7 @@ public:
 
   _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> render_icon_pixbuf(const Glib::RefPtr<StyleContext>& context, IconSize size), gtk_icon_set_render_icon_pixbuf)
   _IGNORE(gtk_icon_set_render_icon) //deprecated.
-  
+
   _WRAP_METHOD(void add_source(const IconSource& source), gtk_icon_set_add_source)
 
   std::vector<IconSize> get_sizes() const;
@@ -62,6 +59,6 @@ public:
   _WRAP_METHOD(static Glib::RefPtr<IconSet> lookup_default(const Gtk::StockID& stock_id), gtk_icon_factory_lookup_default, refreturn)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
 
diff --git a/gtk/src/iconsource.ccg b/gtk/src/iconsource.ccg
index 9bc88ac..e6c59e3 100644
--- a/gtk/src/iconsource.ccg
+++ b/gtk/src/iconsource.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: iconsource.ccg,v 1.1 2003/01/21 13:40:26 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/iconsource.hg b/gtk/src/iconsource.hg
index 62d4045..e8c0c6f 100644
--- a/gtk/src/iconsource.hg
+++ b/gtk/src/iconsource.hg
@@ -1,8 +1,5 @@
-/* $Id: iconsource.hg,v 1.5 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* iconsource.h
- *
- * Copyright(C) 1998-2002 The gtkmm Development Team
+/*
+ * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software, ) you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -39,7 +36,7 @@ public:
   _WRAP_METHOD(Glib::ustring get_filename() const, gtk_icon_source_get_filename)
   _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_pixbuf(), gtk_icon_source_get_pixbuf, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_pixbuf() const, gtk_icon_source_get_pixbuf, refreturn, constversion)
-  
+
   _WRAP_METHOD(void set_direction_wildcarded(bool setting = true), gtk_icon_source_set_direction_wildcarded)
   _WRAP_METHOD(void set_state_wildcarded(bool setting = true), gtk_icon_source_set_state_wildcarded)
   _WRAP_METHOD(void set_size_wildcarded (bool setting = true), gtk_icon_source_set_size_wildcarded)
@@ -57,6 +54,6 @@ public:
   _WRAP_METHOD(Glib::ustring get_icon_name() const, gtk_icon_source_get_icon_name)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
 
diff --git a/gtk/src/icontheme.ccg b/gtk/src/icontheme.ccg
index 4a68d33..8feeb93 100644
--- a/gtk/src/icontheme.ccg
+++ b/gtk/src/icontheme.ccg
@@ -39,11 +39,11 @@ std::vector<Glib::ustring> IconTheme::get_search_path() const
 std::vector<int> IconTheme::get_icon_sizes(const Glib::ustring& icon_name) const
 {
   int* pArrayInts = gtk_icon_theme_get_icon_sizes(const_cast<GtkIconTheme*>(gobj()), icon_name.c_str());
-  
+
   //pArrayInts is null-terminated.
   return Glib::ArrayHandler<int>::array_to_vector(pArrayInts, Glib::OWNERSHIP_SHALLOW);
 }
-  
+
 std::vector<Glib::ustring> IconTheme::list_icons() const
 {
   return Glib::ListHandler<Glib::ustring>::list_to_vector(gtk_icon_theme_list_icons(const_cast<GtkIconTheme*>(gobj()), 0 /* means all icons according to the C documentation. */ ), Glib::OWNERSHIP_SHALLOW);
diff --git a/gtk/src/icontheme.hg b/gtk/src/icontheme.hg
index 38fbef2..200dc6e 100644
--- a/gtk/src/icontheme.hg
+++ b/gtk/src/icontheme.hg
@@ -22,7 +22,7 @@
 
 #include <gtkmm/iconinfo.h>
 #include <giomm/icon.h>
- 
+
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/object_p.h)
 
@@ -35,7 +35,7 @@ _WRAP_ENUM(IconLookupFlags, GtkIconLookupFlags, NO_GTYPE)
 /** Exception class for Gdk::IconTheme errors.
  */
 _WRAP_GERROR(IconThemeError,GtkIconThemeError,GTK_ICON_THEME_ERROR)
-  
+
 class IconTheme : public Glib::Object
 {
   _CLASS_GOBJECT(IconTheme, GtkIconTheme, GTK_ICON_THEME, Glib::Object, GObject)
@@ -45,7 +45,7 @@ protected:
   _CTOR_DEFAULT()
 public:
   _WRAP_CREATE()
-  
+
   _WRAP_METHOD(static Glib::RefPtr<IconTheme> get_default(), gtk_icon_theme_get_default, refreturn)
   _WRAP_METHOD(static Glib::RefPtr<IconTheme> get_for_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_icon_theme_get_for_screen, refreturn)
   _WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_icon_theme_set_screen)
@@ -76,7 +76,7 @@ public:
    *
    * @return A list holding the names of all the
    * icons in the theme.
-   * 
+   *
    * @newin{2,10}.
    */
    std::vector<Glib::ustring> list_icons() const;
diff --git a/gtk/src/iconview.ccg b/gtk/src/iconview.ccg
index 1287281..d0d3961 100644
--- a/gtk/src/iconview.ccg
+++ b/gtk/src/iconview.ccg
@@ -1,6 +1,3 @@
-// -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-/* $Id: iconview.ccg,v 1.7 2006/05/11 11:40:24 murrayc Exp $ */
-
 /* Copyright 1998-2004 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -20,7 +17,7 @@
 
 #include <glibmm/vectorutils.h>
 
-#include <gtkmm/adjustment.h> 
+#include <gtkmm/adjustment.h>
 #include <gtk/gtk.h>
 
 namespace //anonymous namespace
diff --git a/gtk/src/iconview.hg b/gtk/src/iconview.hg
index c33a724..76e9c5b 100644
--- a/gtk/src/iconview.hg
+++ b/gtk/src/iconview.hg
@@ -1,7 +1,4 @@
-/* $Id: iconview.hg,v 1.11 2006/07/08 16:31:38 murrayc Exp $ */
-
-/* iconview.h
- *
+/*
  * Copyright (C) 1998-2004 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/image.ccg b/gtk/src/image.ccg
index b3dd528..8a45aa9 100644
--- a/gtk/src/image.ccg
+++ b/gtk/src/image.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: image.ccg,v 1.3 2005/07/10 19:24:22 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/image.hg b/gtk/src/image.hg
index f597f10..dfbd81b 100644
--- a/gtk/src/image.hg
+++ b/gtk/src/image.hg
@@ -1,7 +1,4 @@
-/* $Id: image.hg,v 1.9 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* image.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -161,4 +158,4 @@ public:
   _WRAP_PROPERTY("use-fallback", bool)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/imagemenuitem.ccg b/gtk/src/imagemenuitem.ccg
index 5518e2d..2ee2737 100644
--- a/gtk/src/imagemenuitem.ccg
+++ b/gtk/src/imagemenuitem.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: imagemenuitem.ccg,v 1.2 2003/10/28 17:12:27 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -29,7 +25,7 @@
 namespace Gtk
 {
 
-ImageMenuItem::ImageMenuItem(Widget& image, 
+ImageMenuItem::ImageMenuItem(Widget& image,
                              const Glib::ustring& label, bool mnemonic)
 :
   _CONSTRUCT()
diff --git a/gtk/src/imagemenuitem.hg b/gtk/src/imagemenuitem.hg
index fe02ef8..1c075ad 100644
--- a/gtk/src/imagemenuitem.hg
+++ b/gtk/src/imagemenuitem.hg
@@ -1,7 +1,4 @@
-/* $Id: imagemenuitem.hg,v 1.3 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* checkmenuitem.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -30,7 +27,7 @@ namespace Gtk
 {
 
 /** A menu item with an icon.
- * 
+ *
  * A GtkImageMenuItem is a menu item which has an icon next to the text label. Note that the
  * user can disable display of menu icons, so make sure to still fill in the text label.
  *
@@ -43,11 +40,11 @@ class ImageMenuItem : public MenuItem
 public:
 
   _CTOR_DEFAULT
-  explicit ImageMenuItem(Widget& image, 
+  explicit ImageMenuItem(Widget& image,
                          const Glib::ustring& label, bool mnemonic = false);
   explicit ImageMenuItem(const Glib::ustring& label, bool mnemonic = false);
-  explicit ImageMenuItem(const StockID& id);  
-  
+  explicit ImageMenuItem(const StockID& id);
+
   _WRAP_METHOD(void set_always_show_image(bool always_show = true), gtk_image_menu_item_set_always_show_image)
   _WRAP_METHOD(bool get_always_show_image() const, gtk_image_menu_item_get_always_show_image)
 
@@ -66,5 +63,5 @@ public:
 
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/infobar.ccg b/gtk/src/infobar.ccg
index 1793d47..d941333 100644
--- a/gtk/src/infobar.ccg
+++ b/gtk/src/infobar.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: infobar.ccg,v 1.1 2003/01/21 13:38:43 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/infobar.hg b/gtk/src/infobar.hg
index cce4299..ea12150 100644
--- a/gtk/src/infobar.hg
+++ b/gtk/src/infobar.hg
@@ -1,5 +1,3 @@
-/* $Id: infobar.hg,v 1.10 2006/08/21 19:07:14 jjongsma Exp $ */
-
 /* Copyright (C) 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/invisible.ccg b/gtk/src/invisible.ccg
index 50a1702..dbba317 100644
--- a/gtk/src/invisible.ccg
+++ b/gtk/src/invisible.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: invisible.ccg,v 1.1 2003/01/21 13:40:27 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/invisible.hg b/gtk/src/invisible.hg
index dcd4415..afdfd72 100644
--- a/gtk/src/invisible.hg
+++ b/gtk/src/invisible.hg
@@ -1,7 +1,4 @@
-/* $Id: invisible.hg,v 1.2 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* invisible.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -37,13 +34,13 @@ class Invisible : public Widget
 public:
   _CTOR_DEFAULT
   _WRAP_CTOR(Invisible(const Glib::RefPtr<Gdk::Screen>& screen), gtk_invisible_new_for_screen)
- 
+
   _WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_invisible_get_screen, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Screen> get_screen() const, gtk_invisible_get_screen, refreturn, constversion)
   _WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_invisible_set_screen)
-  
+
   _WRAP_PROPERTY("screen", Glib::RefPtr<Gdk::Screen>)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/label.ccg b/gtk/src/label.ccg
index 6dd9ddb..1b383a0 100644
--- a/gtk/src/label.ccg
+++ b/gtk/src/label.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: label.ccg,v 1.2 2004/02/03 11:06:49 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/label.hg b/gtk/src/label.hg
index 104e9f8..9533dc8 100644
--- a/gtk/src/label.hg
+++ b/gtk/src/label.hg
@@ -1,6 +1,4 @@
-/* $Id: label.hg,v 1.11 2006/06/21 20:04:25 murrayc Exp $ */
-
-/* Copyright(C) 1998-2002 The gtkmm Development Team
+/* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/gtk/src/layout.ccg b/gtk/src/layout.ccg
index 6974f2a..a938f77 100644
--- a/gtk/src/layout.ccg
+++ b/gtk/src/layout.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: layout.ccg,v 1.1 2003/01/21 13:40:28 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -25,25 +21,4 @@
 namespace Gtk
 {
 
-/* layout.cc
- *
- * Copyright (C) 1998 EMC Capital Management Inc.
- * Developed by Havoc Pennington <hp pobox com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-
 } // namespace Gtk
diff --git a/gtk/src/layout.hg b/gtk/src/layout.hg
index fdb18bc..0e77dac 100644
--- a/gtk/src/layout.hg
+++ b/gtk/src/layout.hg
@@ -1,7 +1,4 @@
-/* $Id: layout.hg,v 1.4 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* layout.h
- *
+/*
  * Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -52,7 +49,7 @@ class Layout
 public:
   _CTOR_DEFAULT
   _WRAP_CTOR(Layout(const Glib::RefPtr<Adjustment>& hadjustment, const Glib::RefPtr<Adjustment>& vadjustment), gtk_layout_new)
-  
+
   _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_bin_window(), gtk_layout_get_bin_window, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_bin_window() const, gtk_layout_get_bin_window, refreturn, constversion)
 
@@ -60,7 +57,7 @@ public:
   _WRAP_METHOD(void move(Widget& child_widget, int x, int y), gtk_layout_move)
   _WRAP_METHOD(void set_size(guint width, guint height), gtk_layout_set_size)
   _WRAP_METHOD(void get_size(guint& width, guint& height) const, gtk_layout_get_size)
-  
+
   _IGNORE(gtk_layout_get_hadjustment, gtk_layout_set_hadjustment,
     gtk_layout_get_vadjustment, gtk_layout_set_vadjustment) //deprecated
 
@@ -68,4 +65,4 @@ public:
   _WRAP_PROPERTY("height", guint)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/linkbutton.ccg b/gtk/src/linkbutton.ccg
index 119f37c..f96c9bb 100644
--- a/gtk/src/linkbutton.ccg
+++ b/gtk/src/linkbutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: linkbutton.ccg,v 1.1 2006/01/29 12:21:43 murrayc Exp $ */
-
 /*
- *
  * Copyright 2006 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/linkbutton.hg b/gtk/src/linkbutton.hg
index 46782fa..085cf28 100644
--- a/gtk/src/linkbutton.hg
+++ b/gtk/src/linkbutton.hg
@@ -1,7 +1,4 @@
-/* $Id: linkbutton.hg,v 1.2 2006/03/22 16:53:22 murrayc Exp $ */
-
-/* linkbutton.h
- *
+/*
  * Copyright (C) 2006 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/liststore.ccg b/gtk/src/liststore.ccg
index 40b53f6..32db2ff 100644
--- a/gtk/src/liststore.ccg
+++ b/gtk/src/liststore.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: liststore.ccg,v 1.5 2004/04/03 12:53:49 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -37,7 +34,7 @@ void ListStore::set_column_types(const TreeModelColumnRecord& columns)
 {
    gtk_list_store_set_column_types(gobj(), columns.size(), const_cast<GType*>(columns.types()));
 }
-  
+
 
 TreeModel::iterator ListStore::erase(const iterator& iter)
 {
diff --git a/gtk/src/liststore.hg b/gtk/src/liststore.hg
index 89e215f..10c6c58 100644
--- a/gtk/src/liststore.hg
+++ b/gtk/src/liststore.hg
@@ -1,5 +1,3 @@
-/* $Id: liststore.hg,v 1.4 2004/04/03 12:53:49 murrayc Exp $ */
-
 /* Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -68,7 +66,7 @@ protected:
    * constructor should only be used by derived classes.
    */
   _CTOR_DEFAULT
-  
+
   explicit ListStore(const TreeModelColumnRecord& columns);
 
 public:
@@ -81,7 +79,7 @@ public:
 
   void set_column_types(const TreeModelColumnRecord& columns);
   _IGNORE(gtk_list_store_set_column_types)
-  
+
   /** Removes the given row from the list store.
    * @param iter The iterator to the row to be removed.
    * @result An iterator to the next row, or end() if there is none.
@@ -96,7 +94,7 @@ public:
    * See also prepend() and append().
    *
    * @param iter An iterator to the row before which the new row will be inserted.
-   * @result An iterator to the new row. 
+   * @result An iterator to the new row.
    */
   iterator insert(const iterator& iter);
   _IGNORE(gtk_list_store_insert_before)
@@ -112,7 +110,7 @@ public:
    */
   iterator insert_after(const iterator& iter);
   _IGNORE(gtk_list_store_insert_after)
-  
+
   /** Creates a new row at the start.
    * The row will be empty - to fill in values, you need to dereference the returned iterator and use Row::operator[] or Row::set_value().
    * See also insert() and append().
diff --git a/gtk/src/main.ccg b/gtk/src/main.ccg
index 6579db2..35764c0 100644
--- a/gtk/src/main.ccg
+++ b/gtk/src/main.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: main.ccg,v 1.13 2006/09/19 20:08:42 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -453,6 +449,6 @@ void Main::on_window_hide()
 
 _DEPRECATE_IFDEF_END
 
-} /* namespace Gtk */
+} //namespace Gtk
 
 
diff --git a/gtk/src/main.hg b/gtk/src/main.hg
index a8e1c26..c0e1dc7 100644
--- a/gtk/src/main.hg
+++ b/gtk/src/main.hg
@@ -1,7 +1,4 @@
-/* $Id: main.hg,v 1.9 2005/02/13 20:48:35 murrayc Exp $ */
-
-/* main.h
- * 
+/*
  * Copyright (C) 1998-2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -72,10 +69,10 @@ _DEPRECATE_IFDEF_END
  * It is a singleton so declaring more than one will simply access the first
  * created.
  *
- * You would normally use this class in your main() function to initialize gtkmm 
- * and optionally to give argc and argv to the GTK+ initialization. 
- * After calling Gtk::Main::run(), you may use Gtk::Main::quit() to exit from 
- * the application, or just pass your main window to run(), to make run() 
+ * You would normally use this class in your main() function to initialize gtkmm
+ * and optionally to give argc and argv to the GTK+ initialization.
+ * After calling Gtk::Main::run(), you may use Gtk::Main::quit() to exit from
+ * the application, or just pass your main window to run(), to make run()
  * return when that window closes.
  *
  * A minimal gtkmm application would be something like this:
@@ -97,22 +94,22 @@ public:
 _DEPRECATE_IFDEF_START
   //This offers the same functionality as gtk_init_with_args():
   /** Scans the argument vector, and strips off all parameters parsed by GTK+ or your @a option_context.
-   * Add a Glib::OptionGroup to the Glib::OptionContext to parse your own command-line arguments.  
+   * Add a Glib::OptionGroup to the Glib::OptionContext to parse your own command-line arguments.
    *
    * Note:  The argument strings themself won't be modified, although the
    * pointers to them might change.  This makes it possible to create your
    * own argv of string literals, which have the type 'const char[]' in
    * standard C++.  (You might need to use const_cast<>, though.)
    *
-   * This function automatically generates nicely formatted 
+   * This function automatically generates nicely formatted
    * <option>--help</option> output. Note that your program will
    * be terminated after writing out the help output.
    *
    * @param argc a reference to the number of command line arguments.
    * @param argv a reference to the array of command line arguments.
-   * @parameter_string a string which is displayed in the first line of <option>--help</option> output, 
+   * @parameter_string a string which is displayed in the first line of <option>--help</option> output,
    * after <literal><replaceable>programname</replaceable> [OPTION...]</literal>
-   * @param option_context A Glib::OptionContext containing Glib::OptionGroups which described the command-line arguments taken by your program. 
+   * @param option_context A Glib::OptionContext containing Glib::OptionGroups which described the command-line arguments taken by your program.
    *
    * @throw Glib::OptionError
    *
@@ -130,9 +127,9 @@ _DEPRECATE_IFDEF_START
    *
    * @param argc a pointer to the number of command line arguments.
    * @param argv a pointer to the array of command line arguments.
-   * @param set_locale Passing false prevents GTK+ from automatically calling 
-   * setlocale(LC_ALL, ""). You would want to pass false if you wanted to set 
-   * the locale for your program to something other than the user's locale, or 
+   * @param set_locale Passing false prevents GTK+ from automatically calling
+   * setlocale(LC_ALL, ""). You would want to pass false if you wanted to set
+   * the locale for your program to something other than the user's locale, or
    * if you wanted to set different values for different locale categories.
    *
    * @deprecated Use Gtk::Application instead.
@@ -144,20 +141,20 @@ _DEPRECATE_IFDEF_START
    *
    * @param argc a reference to the number of command line arguments.
    * @param argv a reference to the array of command line arguments.
-   * @param set_locale Passing false prevents GTK+ from automatically calling 
-   * setlocale(LC_ALL, ""). You would want to pass false if you wanted to set 
-   * the locale for your program to something other than the user's locale, or 
+   * @param set_locale Passing false prevents GTK+ from automatically calling
+   * setlocale(LC_ALL, ""). You would want to pass false if you wanted to set
+   * the locale for your program to something other than the user's locale, or
    * if you wanted to set different values for different locale categories.
    *
    * @deprecated Use Gtk::Application instead.
    */
   Main(int& argc, char**& argv, bool set_locale = true);
-  
+
   /** Initialization without command-line arguments.
    *
-   * @param set_locale Passing false prevents GTK+ from automatically calling 
-   * setlocale(LC_ALL, ""). You would want to pass false if you wanted to set 
-   * the locale for your program to something other than the user's locale, or 
+   * @param set_locale Passing false prevents GTK+ from automatically calling
+   * setlocale(LC_ALL, ""). You would want to pass false if you wanted to set
+   * the locale for your program to something other than the user's locale, or
    * if you wanted to set different values for different locale categories.
    *
    * @deprecated Use Gtk::Application instead.
@@ -165,7 +162,7 @@ _DEPRECATE_IFDEF_START
   explicit Main(bool set_locale = true);
 
   /**
-   * @deprecated Use Gtk::Application instead. 
+   * @deprecated Use Gtk::Application instead.
    */
   virtual ~Main();
 
@@ -207,10 +204,10 @@ _DEPRECATE_IFDEF_START
 
   //This attempts to provide the same functionality as gtk_get_option_group():
   /** Add a Glib::OptionGroup, for the commandline arguments recognized
-   * by GTK+ and GDK, to a Glib::OptionContext, so that these commandline arguments will 
+   * by GTK+ and GDK, to a Glib::OptionContext, so that these commandline arguments will
    * be processed in addition to the existing commandline arguments specified by the Glib::OptionContext.
    *
-   * You do not need to use this method if you pass your Glib::OptionContext to the Main constructor, because 
+   * You do not need to use this method if you pass your Glib::OptionContext to the Main constructor, because
    * it adds the gtk option group automatically.
    *
    * @param option_context Option Context to which the group will be added.
diff --git a/gtk/src/menu.ccg b/gtk/src/menu.ccg
index d4d397f..77c1f47 100644
--- a/gtk/src/menu.ccg
+++ b/gtk/src/menu.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: menu.ccg,v 1.7 2006/05/11 11:40:24 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -78,7 +75,7 @@ void Menu::popup(MenuShell& parent_menu_shell, MenuItem& parent_menu_item, const
   else
   {
     SlotPositionCalc* slot_copy = new SlotPositionCalc(position_calc_slot); //Deleted in the destroy callback.
-  
+
     gtk_menu_popup_for_device(gobj(), device->gobj(), parent_menu_shell.Gtk::Widget::gobj(), parent_menu_item.Gtk::Widget::gobj(), &SignalProxy_PopupPosition_gtk_callback, slot_copy, &SignalProxy_PopupPosition_gtk_callback_destroy, button, activate_time);
   }
 }
diff --git a/gtk/src/menu.hg b/gtk/src/menu.hg
index edc4b9a..cec0f38 100644
--- a/gtk/src/menu.hg
+++ b/gtk/src/menu.hg
@@ -1,5 +1,3 @@
-/* $Id: menu.hg,v 1.11 2006/04/12 11:11:25 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -42,7 +40,7 @@ class AccelGroup;
 class Menu : public MenuShell
 {
   _CLASS_GTKOBJECT(Menu,GtkMenu,GTK_MENU,Gtk::MenuShell,GtkMenuShell)
-  
+
   _IGNORE(gtk_menu_append, gtk_menu_prepend, gtk_menu_insert) //deprecated.
 public:
   _CTOR_DEFAULT
@@ -53,7 +51,7 @@ public:
    * void on_popup_menu_position(int& x, int& y, bool& push_in);
    */
   typedef sigc::slot<void, int&, int&, bool&> SlotPositionCalc;
-  
+
   void popup(MenuShell& parent_menu_shell, MenuItem& parent_menu_item, const SlotPositionCalc& slot, guint button, guint32 activate_time, const Glib::RefPtr<Gdk::Device>& device = Glib::RefPtr<Gdk::Device>());
   _IGNORE(gtk_menu_popup, gtk_menu_popup_for_device)
 
@@ -93,7 +91,7 @@ public:
   void unset_accel_group();
   _WRAP_METHOD(Glib::RefPtr<AccelGroup> get_accel_group(), gtk_menu_get_accel_group, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const AccelGroup> get_accel_group() const, gtk_menu_get_accel_group, refreturn, constversion)
-  
+
   _WRAP_METHOD(void set_accel_path(const Glib::ustring& accel_path), gtk_menu_set_accel_path)
   _WRAP_METHOD(Glib::ustring get_accel_path() const, gtk_menu_get_accel_path)
 
@@ -113,7 +111,7 @@ public:
 
   _WRAP_METHOD(void set_monitor(int monitor_num), gtk_menu_set_monitor)
   _WRAP_METHOD(int get_monitor() const, gtk_menu_get_monitor)
-  
+
   void reorder_child(const MenuItem& child, int position);
   _IGNORE(gtk_menu_reorder_child)
 
@@ -140,7 +138,7 @@ protected:
 
   //TODO: What does "attach" actually mean here? murrayc
   /** Attaches the menu to the widget.
-   * 
+   *
    * param @attach_widget: the Widget that the menu will be attached to.
    *
    * @newin{2,10}
diff --git a/gtk/src/menubar.ccg b/gtk/src/menubar.ccg
index dda45eb..34d6eae 100644
--- a/gtk/src/menubar.ccg
+++ b/gtk/src/menubar.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: menubar.ccg,v 1.5 2004/04/07 12:49:39 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/menubar.hg b/gtk/src/menubar.hg
index fd7dd9a..78424fe 100644
--- a/gtk/src/menubar.hg
+++ b/gtk/src/menubar.hg
@@ -1,8 +1,4 @@
-/* $Id: menubar.hg,v 1.2 2003/11/17 18:19:00 murrayc Exp $ */
-
-
-/* menubar.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -19,7 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
- 
+
 #include <gtkmm/menushell.h>
 #include <gtkmm/menuitem.h>
 _DEFS(gtkmm,gtk)
@@ -51,9 +47,9 @@ public:
   _WRAP_METHOD(void set_pack_direction(PackDirection pack_dir), gtk_menu_bar_set_pack_direction)
   _WRAP_METHOD(PackDirection get_child_pack_direction() const, gtk_menu_bar_get_child_pack_direction)
   _WRAP_METHOD(void set_child_pack_direction(PackDirection child_pack_dir), gtk_menu_bar_set_child_pack_direction)
-							
+
   // append, prepend and insert are defined in menushell
-  
+
   _WRAP_PROPERTY("pack-direction", PackDirection)
   _WRAP_PROPERTY("child-pack-direction", PackDirection)
 
diff --git a/gtk/src/menuitem.ccg b/gtk/src/menuitem.ccg
index 732f09b..62b7156 100644
--- a/gtk/src/menuitem.ccg
+++ b/gtk/src/menuitem.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: menuitem.ccg,v 1.5 2006/05/11 11:40:24 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/menushell.ccg b/gtk/src/menushell.ccg
index 0499d1d..57927a9 100644
--- a/gtk/src/menushell.ccg
+++ b/gtk/src/menushell.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: menushell.ccg,v 1.5 2006/05/11 11:40:24 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -70,7 +67,7 @@ void MenuShell::accelerate(Window& window)
 
 void MenuShell::accelerate(Widget& parent)
 {
-  Gtk::Window* toplevel_window 
+  Gtk::Window* toplevel_window
       = dynamic_cast<Gtk::Window*>(parent.get_toplevel());
   if(toplevel_window)
     accelerate(*toplevel_window);
diff --git a/gtk/src/menushell.hg b/gtk/src/menushell.hg
index 928162c..2327f12 100644
--- a/gtk/src/menushell.hg
+++ b/gtk/src/menushell.hg
@@ -1,5 +1,3 @@
-/* $Id: menushell.hg,v 1.9 2006/06/21 20:04:25 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -114,13 +112,13 @@ public:
 
   _WRAP_METHOD(bool get_take_focus() const, gtk_menu_shell_get_take_focus)
   _WRAP_METHOD(void set_take_focus(bool take_focus = true), gtk_menu_shell_set_take_focus)
-  
+
   _WRAP_METHOD(Widget* get_selected_item(), gtk_menu_shell_get_selected_item)
   _WRAP_METHOD(const Widget* get_selected_item() const, gtk_menu_shell_get_selected_item)
-  
+
   _WRAP_METHOD(Widget* get_parent_shell(), gtk_menu_shell_get_parent_shell)
   _WRAP_METHOD(const Widget* get_parent_shell() const, gtk_menu_shell_get_parent_shell)
-  
+
   _WRAP_PROPERTY("take-focus", bool)
 
 protected:
diff --git a/gtk/src/menutoolbutton.ccg b/gtk/src/menutoolbutton.ccg
index 4e1c84c..e82c377 100644
--- a/gtk/src/menutoolbutton.ccg
+++ b/gtk/src/menutoolbutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: menutoolbutton.ccg,v 1.1 2004/10/10 20:41:20 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/messagedialog.ccg b/gtk/src/messagedialog.ccg
index 19cc7ea..4e4f735 100644
--- a/gtk/src/messagedialog.ccg
+++ b/gtk/src/messagedialog.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: messagedialog.ccg,v 1.7 2005/02/15 10:52:44 murrayc Exp $ */
-
 /*
- *
  * Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/messagedialog.hg b/gtk/src/messagedialog.hg
index d12c762..dbc3e1b 100644
--- a/gtk/src/messagedialog.hg
+++ b/gtk/src/messagedialog.hg
@@ -1,7 +1,4 @@
-/* $Id: messagedialog.hg,v 1.15 2006/06/20 18:46:59 murrayc Exp $ */
-
-/* messagedialog.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/misc.ccg b/gtk/src/misc.ccg
index de31852..e3060b7 100644
--- a/gtk/src/misc.ccg
+++ b/gtk/src/misc.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: misc.ccg,v 1.1 2003/01/21 13:40:31 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/misc.hg b/gtk/src/misc.hg
index 9b0e6f7..8633589 100644
--- a/gtk/src/misc.hg
+++ b/gtk/src/misc.hg
@@ -1,7 +1,4 @@
-/* $Id: misc.hg,v 1.1 2003/01/21 13:40:31 murrayc Exp $ */
-
-/* misc.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -57,5 +54,5 @@ public:
   _WRAP_PROPERTY("ypad", int)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/notebook.ccg b/gtk/src/notebook.ccg
index a63a201..45c44d9 100644
--- a/gtk/src/notebook.ccg
+++ b/gtk/src/notebook.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: notebook.ccg,v 1.6 2006/06/16 21:40:01 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/offscreenwindow.ccg b/gtk/src/offscreenwindow.ccg
index cda2d81..80cd177 100644
--- a/gtk/src/offscreenwindow.ccg
+++ b/gtk/src/offscreenwindow.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: offscreenwindow.ccg,v 1.5 2006/06/13 17:24:35 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/orientable.ccg b/gtk/src/orientable.ccg
index 67e9a09..938f98b 100644
--- a/gtk/src/orientable.ccg
+++ b/gtk/src/orientable.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: orientable.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
-
 /* Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/orientable.hg b/gtk/src/orientable.hg
index d64d64d..841d4ed 100644
--- a/gtk/src/orientable.hg
+++ b/gtk/src/orientable.hg
@@ -1,5 +1,3 @@
-/* $Id: orientable.hg,v 1.3 2006/05/18 17:53:15 murrayc Exp $ */
-
 /* Copyright (C) 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/pagesetup.ccg b/gtk/src/pagesetup.ccg
index f64fe82..37caffa 100644
--- a/gtk/src/pagesetup.ccg
+++ b/gtk/src/pagesetup.ccg
@@ -49,7 +49,7 @@ Glib::RefPtr<PageSetup> PageSetup::create_from_file(const std::string& file_name
 
 void PageSetup::save_to_key_file(Glib::KeyFile& key_file) const
 {
-  gtk_page_setup_to_key_file(const_cast<GtkPageSetup*>(gobj()), (key_file).gobj(), 0); 
+  gtk_page_setup_to_key_file(const_cast<GtkPageSetup*>(gobj()), (key_file).gobj(), 0);
 }
 
 bool PageSetup::load_from_key_file(const Glib::KeyFile& key_file)
diff --git a/gtk/src/pagesetup.hg b/gtk/src/pagesetup.hg
index a37738a..28ee413 100644
--- a/gtk/src/pagesetup.hg
+++ b/gtk/src/pagesetup.hg
@@ -25,16 +25,16 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gtk
 {
 
-/** A PageSetup object stores the page size, orientation and margins. You can get one of these from the page setup dialog 
- * and then pass it to the PrintOperation when printing. The benefit of splitting this out of the PrintSettings is that 
+/** A PageSetup object stores the page size, orientation and margins. You can get one of these from the page setup dialog
+ * and then pass it to the PrintOperation when printing. The benefit of splitting this out of the PrintSettings is that
  * these affect the actual layout of the page, and thus need to be set long before the user prints.
  *
- * The margins specified in this object are the "print margins", i.e. the parts of the page that the printer cannot print  
- * on. These are different from the layout margins that a word processor uses; they are typically used to determine the 
+ * The margins specified in this object are the "print margins", i.e. the parts of the page that the printer cannot print
+ * on. These are different from the layout margins that a word processor uses; they are typically used to determine the
  * minimal size for the layout margins.
  *
- * To obtain a PageSetup use PageSetup::create() to get the defaults, or use run_page_setup_dialog() to show the page 
- * setup dialog and receive the resulting page setup. 
+ * To obtain a PageSetup use PageSetup::create() to get the defaults, or use run_page_setup_dialog() to show the page
+ * setup dialog and receive the resulting page setup.
  *
  * @newin{2,10}
  *
@@ -55,7 +55,7 @@ public:
   *
   * @param key_file The KeyFile to retrieve the page setup from.
   * @result The restored PageSetup
-  * 
+  *
   * @throws KeyFileError
   *
   * @newin{2,14}
@@ -69,7 +69,7 @@ public:
   * @param key_file The KeyFile to retrieve the page setup from.
   * @param group_name The name of the group in the key_file to read.
   * @result The restored PageSetup
-  * 
+  *
   * @throws KeyFileError
   *
   * @newin{2,14}
@@ -77,13 +77,13 @@ public:
   static Glib::RefPtr<PageSetup> create_from_key_file(const Glib::KeyFile& key_file, const Glib::ustring& group_name);
   _IGNORE(gtk_page_setup_new_from_key_file)
 
- /** Reads the page setup from the file @file_name. Returns a 
-  * new PageSetup object with the restored page setup, 
+ /** Reads the page setup from the file @file_name. Returns a
+  * new PageSetup object with the restored page setup,
   * or an empty RefPtr if an error occurred. See save_to_file().
   *
   * @param file_name The filename to read the page setup from.
   * @result The restored PageSetup
-  * 
+  *
   * @newin{2,14}
   */
   static Glib::RefPtr<PageSetup> create_from_file(const std::string& file_name);
@@ -101,7 +101,7 @@ public:
   *
   * @param key_file The KeyFile to retrieve the page setup from.
   * @result true on success
-  * 
+  *
   * @throws KeyFileError
   *
   * @newin{2,14}
@@ -144,7 +144,7 @@ public:
 
   /** This function adds the page setup from @a setup to @a key_file,
    * in the group "Page Setup"
-   * 
+   *
    * @newin{2,12}
    * @param key_file The G::KeyFile to save the page setup to.
    */
diff --git a/gtk/src/pagesetupunixdialog.ccg b/gtk/src/pagesetupunixdialog.ccg
index 5d4e166..c72b340 100644
--- a/gtk/src/pagesetupunixdialog.ccg
+++ b/gtk/src/pagesetupunixdialog.ccg
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 /* Copyright (C) 2006 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/paned.ccg b/gtk/src/paned.ccg
index b613b8a..37e0524 100644
--- a/gtk/src/paned.ccg
+++ b/gtk/src/paned.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: paned.ccg,v 1.1 2003/01/21 13:40:33 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/paned.hg b/gtk/src/paned.hg
index 861fe45..c87fd2f 100644
--- a/gtk/src/paned.hg
+++ b/gtk/src/paned.hg
@@ -1,8 +1,4 @@
-/* $Id: paned.hg,v 1.6 2006/04/12 11:11:25 murrayc Exp $ */
-
-
-/* paned.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -113,7 +109,7 @@ public:
 
 } // namespace Gtk
 
-//Include the deprecated header, 
+//Include the deprecated header,
 //whose classes were previously in this header,
 //to preserve the "API" of the includes.
 #include <gtkmm/hvpaned.h>
diff --git a/gtk/src/papersize.hg b/gtk/src/papersize.hg
index 6629639..c8e5e52 100644
--- a/gtk/src/papersize.hg
+++ b/gtk/src/papersize.hg
@@ -69,9 +69,9 @@ public:
   _IGNORE(gtk_paper_size_copy, gtk_paper_size_free, gtk_paper_size_is_equal)
   bool equal(const PaperSize& other) const;
 
-  /** This typedef is just to make it more obvious that 
+  /** This typedef is just to make it more obvious that
    * our operator const void* should be used like operator bool().
-   */ 
+   */
   typedef const void* BoolExpr;
 
   /** Returns true if the PaperSize is a valid object.
diff --git a/gtk/src/plug.ccg b/gtk/src/plug.ccg
index d0ffbd4..e839415 100644
--- a/gtk/src/plug.ccg
+++ b/gtk/src/plug.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: plug.ccg,v 1.2 2005/01/25 16:16:33 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/plug.hg b/gtk/src/plug.hg
index 7130d34..647f07b 100644
--- a/gtk/src/plug.hg
+++ b/gtk/src/plug.hg
@@ -1,5 +1,3 @@
-/* $Id: plug.hg,v 1.2 2005/01/25 16:16:33 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -28,7 +26,7 @@ namespace Gtk
 //Note that Window (not Gtk::Window) is the (awfully named) type from the X11 header.
 //gtkx.h (needed to get GtkPlug and GtkSocket) pulls this in,
 //assuming that you will be careful when doing so.
-  
+
 //TODO: Documentation
 class Plug : public Window
 {
@@ -38,7 +36,7 @@ class Plug : public Window
   _GTKMMPROC_WIN32_NO_WRAP
 public:
   Plug();
-  
+
 #m4 _CONVERSION(`Window', `::Window', `($3)')
 #m4 _CONVERSION(`::Window', `Window', `($3)')
   explicit Plug(::Window socket_id);
@@ -57,5 +55,5 @@ public:
   _WRAP_SIGNAL(void embedded(), "embedded")
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/printcontext.hg b/gtk/src/printcontext.hg
index e394571..d910f6f 100644
--- a/gtk/src/printcontext.hg
+++ b/gtk/src/printcontext.hg
@@ -32,12 +32,12 @@ namespace Gtk
 {
 
 /** A PrintContext encapsulates context information that is required when
- * drawing pages for printing, such as the cairo context and important 
+ * drawing pages for printing, such as the cairo context and important
  * parameters like page size and resolution. It also lets you easily
- * create Pango::Layout and Pango::Context objects that match the font metrics 
+ * create Pango::Layout and Pango::Context objects that match the font metrics
  * of the cairo surface.
- * 
- * PrintContext objects gets passed to the begin-print, end-print, 
+ *
+ * PrintContext objects gets passed to the begin-print, end-print,
  * request-page-setup and draw-page signals on the PrintOperation.
  *
  * @newin{2,10}
diff --git a/gtk/src/printer.ccg b/gtk/src/printer.ccg
index ba986b5..a1c27cd 100644
--- a/gtk/src/printer.ccg
+++ b/gtk/src/printer.ccg
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 /* Copyright (C) 2006 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -59,7 +58,7 @@ void enumerate_printers(const SlotPrinterEnumerator& slot, bool wait)
   // Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
   // It will be deleted when SignalProxy_Custom_gtk_callback_destroy() is called.
   SlotPrinterEnumerator* slot_copy = new SlotPrinterEnumerator(slot);
-      
+
   gtk_enumerate_printers(&SignalProxy_Custom_gtk_callback,
                          slot_copy,
                          &SignalProxy_Custom_gtk_callback_destroy,
diff --git a/gtk/src/printjob.ccg b/gtk/src/printjob.ccg
index 822706e..74f6671 100644
--- a/gtk/src/printjob.ccg
+++ b/gtk/src/printjob.ccg
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 /* Copyright (C) 2006 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -53,7 +52,7 @@ void PrintJob::send(const SlotPrintJobComplete& slot)
   // Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
   // It will be deleted when SignalProxy_Custom_gtk_callback_destroy() is called.
   SlotPrintJobComplete* slot_copy = new SlotPrintJobComplete(slot);
-      
+
   gtk_print_job_send(gobj(), &SignalProxy_Custom_gtk_callback, slot_copy, &SignalProxy_Custom_gtk_callback_destroy);
 }
 
diff --git a/gtk/src/printjob.hg b/gtk/src/printjob.hg
index 315e5b2..085c1fe 100644
--- a/gtk/src/printjob.hg
+++ b/gtk/src/printjob.hg
@@ -28,13 +28,13 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gtk
 {
 
-/** A PrintJob object represents a job that is sent to a printer. You only need to deal 
+/** A PrintJob object represents a job that is sent to a printer. You only need to deal
  * directly with print jobs if you  use the non-portable PrintUnixDialog API.
- * 
- * Use get_surface() to obtain the cairo surface onto which the pages must be drawn. 
- * Use send() to send the finished job to the printer.If you don't use cairo then 
+ *
+ * Use get_surface() to obtain the cairo surface onto which the pages must be drawn.
+ * Use send() to send the finished job to the printer.If you don't use cairo then
  * PrintJob also supports printing of manually generated postscript, via set_source_file().
- * 
+ *
  * @newin{2,10}
  *
  * @ingroup Printing
@@ -70,7 +70,7 @@ public:
   _WRAP_METHOD(void set_track_print_status(bool track_status = true), gtk_print_job_set_track_print_status)
   _WRAP_METHOD(bool get_track_print_status() const, gtk_print_job_get_track_print_status)
 
-  /** For example, 
+  /** For example,
    * void on_print_job_complete(const Glib::RefPtr<PrintJob>& job);
    *
    * @throws exception
@@ -82,8 +82,8 @@ public:
    */
   void send(const SlotPrintJobComplete& slot);
   _IGNORE(gtk_print_job_send)
-  
-  
+
+
   _WRAP_METHOD(PrintPages get_pages() const, gtk_print_job_get_pages)
   _WRAP_METHOD(void set_pages(PrintPages pages), gtk_print_job_set_pages)
 //TODO:  _WRAP_METHOD(PageRange* get_page_ranges(int *n_ranges), gtk_print_job_get_page_ranges)
diff --git a/gtk/src/printoperation.ccg b/gtk/src/printoperation.ccg
index f77c518..b93e789 100644
--- a/gtk/src/printoperation.ccg
+++ b/gtk/src/printoperation.ccg
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 /* Copyright (C) 2006 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/printoperationpreview.ccg b/gtk/src/printoperationpreview.ccg
index f870edb..eb6b609 100644
--- a/gtk/src/printoperationpreview.ccg
+++ b/gtk/src/printoperationpreview.ccg
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 /* Copyright (C) 2006 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/printoperationpreview.hg b/gtk/src/printoperationpreview.hg
index 26fd9bb..89635a7 100644
--- a/gtk/src/printoperationpreview.hg
+++ b/gtk/src/printoperationpreview.hg
@@ -35,7 +35,7 @@ namespace Gtk
 
 //TODO: There is no GtkPrintOperationPreview documentation either.
 // See http://bugzilla.gnome.org/show_bug.cgi?id=575538
-/** 
+/**
  * @newin{2,10}
  *
  * @ingroup Printing
diff --git a/gtk/src/printsettings.ccg b/gtk/src/printsettings.ccg
index 9656bb9..7ac1254 100644
--- a/gtk/src/printsettings.ccg
+++ b/gtk/src/printsettings.ccg
@@ -149,7 +149,7 @@ bool PrintSettings::load_from_key_file(const Glib::KeyFile& key_file)
 
 void PrintSettings::save_to_key_file(Glib::KeyFile& key_file) const
 {
-  gtk_print_settings_to_key_file(const_cast<GtkPrintSettings*>(gobj()), (key_file).gobj(), 0); 
+  gtk_print_settings_to_key_file(const_cast<GtkPrintSettings*>(gobj()), (key_file).gobj(), 0);
 }
 
 } // namespace Gtk
diff --git a/gtk/src/printsettings.hg b/gtk/src/printsettings.hg
index ff4d37c..8374d94 100644
--- a/gtk/src/printsettings.hg
+++ b/gtk/src/printsettings.hg
@@ -33,14 +33,14 @@ _WRAP_ENUM(PrintPages, GtkPrintPages)
 _WRAP_ENUM(PageSet, GtkPageSet)
 _WRAP_ENUM(NumberUpLayout, GtkNumberUpLayout)
 
-/** A PrintSettings object represents the settings of a print dialog in a system-independent way. 
- * The main use for this object is that once you've printed you can get a settings object that 
- * represents the settings the user chose, and the next time you print you can pass that object 
+/** A PrintSettings object represents the settings of a print dialog in a system-independent way.
+ * The main use for this object is that once you've printed you can get a settings object that
+ * represents the settings the user chose, and the next time you print you can pass that object
  * in so that the user doesn't have to re-set all his settings.
- * 
- * It's also possible to enumerate the settings so that you can easily save the settings for the 
- * next time your app runs, or even store them in a document. The predefined keys try to use shared 
- * values as much as possible so that moving such a document between systems still works. 
+ *
+ * It's also possible to enumerate the settings so that you can easily save the settings for the
+ * next time your app runs, or even store them in a document. The predefined keys try to use shared
+ * values as much as possible so that moving such a document between systems still works.
  *
  * @newin{2,10}
  *
@@ -164,7 +164,7 @@ public:
 
   /** This function adds the print settings from @a settings to @a key_file,
    * in the "Print Settings" group.
-   * 
+   *
    * @newin{2,12}
    * @param key_file The Glib::KeyFile to save the print settings to.
    */
@@ -178,7 +178,7 @@ public:
   _WRAP_METHOD(void set(const Glib::ustring& key, const Glib::ustring& value), gtk_print_settings_set)
   _WRAP_METHOD(void unset(const Glib::ustring& key), gtk_print_settings_unset)
 
-  /** For example, 
+  /** For example,
    * void on_foreach_setting(const Glib::ustring& key, const Glib::ustring& value);
    */
   typedef sigc::slot<void, const Glib::ustring&, const Glib::ustring&> SlotForeach;
diff --git a/gtk/src/printunixdialog.ccg b/gtk/src/printunixdialog.ccg
index 52ed1d3..e67b7a1 100644
--- a/gtk/src/printunixdialog.ccg
+++ b/gtk/src/printunixdialog.ccg
@@ -1,4 +1,3 @@
-// -*- c++ -*-
 /* Copyright (C) 2006 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -38,7 +37,7 @@ PrintUnixDialog::PrintUnixDialog(const Glib::ustring& title)
 void PrintUnixDialog::add_custom_tab(const Widget& child, const Glib::ustring& tab_label)
 {
   Gtk::Label* label = Gtk::manage(new Gtk::Label(tab_label));
-  add_custom_tab(child, *label); 
+  add_custom_tab(child, *label);
 }
 
 } // namespace Gtk
diff --git a/gtk/src/progressbar.ccg b/gtk/src/progressbar.ccg
index d34a486..1947fea 100644
--- a/gtk/src/progressbar.ccg
+++ b/gtk/src/progressbar.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: progressbar.ccg,v 1.1 2003/01/21 13:40:34 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/progressbar.hg b/gtk/src/progressbar.hg
index c67ad84..95b2dfa 100644
--- a/gtk/src/progressbar.hg
+++ b/gtk/src/progressbar.hg
@@ -1,7 +1,4 @@
-/* $Id: progressbar.hg,v 1.2 2004/11/10 22:05:57 murrayc Exp $ */
-
-/* progressbar.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -83,13 +80,13 @@ public:
 
   _WRAP_METHOD(double get_pulse_step() const, gtk_progress_bar_get_pulse_step)
   _WRAP_METHOD(void set_pulse_step(double fraction), gtk_progress_bar_set_pulse_step)
-  
+
   _WRAP_METHOD(void set_inverted(bool inverted = true), gtk_progress_bar_set_inverted)
   _WRAP_METHOD(bool get_inverted() const, gtk_progress_bar_get_inverted )
 
   _WRAP_METHOD(void set_ellipsize(Pango::EllipsizeMode mode), gtk_progress_bar_set_ellipsize)
   _WRAP_METHOD(Pango::EllipsizeMode get_ellipsize() const, gtk_progress_bar_get_ellipsize)
-  
+
   _WRAP_METHOD(void set_show_text(bool show_text = true), gtk_progress_bar_set_show_text)
   _WRAP_METHOD(bool get_show_text() const, gtk_progress_bar_get_show_text)
 
diff --git a/gtk/src/radioaction.ccg b/gtk/src/radioaction.ccg
index dbec316..9c1f4f6 100644
--- a/gtk/src/radioaction.ccg
+++ b/gtk/src/radioaction.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: radioaction.ccg,v 1.5 2004/03/27 00:30:38 murrayc Exp $ */
-
 /* Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/radioaction.hg b/gtk/src/radioaction.hg
index fad22a1..082d3d3 100644
--- a/gtk/src/radioaction.hg
+++ b/gtk/src/radioaction.hg
@@ -1,5 +1,3 @@
-/* $Id: radioaction.hg,v 1.8 2006/01/29 12:21:43 murrayc Exp $ */
-
 /* Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/radiobutton.ccg b/gtk/src/radiobutton.ccg
index 4502e22..c545f21 100644
--- a/gtk/src/radiobutton.ccg
+++ b/gtk/src/radiobutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: radiobutton.ccg,v 1.2 2003/10/28 17:12:27 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/radiobutton.hg b/gtk/src/radiobutton.hg
index a7a093e..aef52e3 100644
--- a/gtk/src/radiobutton.hg
+++ b/gtk/src/radiobutton.hg
@@ -1,7 +1,4 @@
-/* $Id: radiobutton.hg,v 1.8 2006/01/24 14:55:50 murrayc Exp $ */
-
-/* radiobutton.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -91,4 +88,4 @@ public:
   //Probably wouldn't work: _WRAP_PROPERTY("group", Group)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/radiomenuitem.ccg b/gtk/src/radiomenuitem.ccg
index 0307e76..c49b050 100644
--- a/gtk/src/radiomenuitem.ccg
+++ b/gtk/src/radiomenuitem.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: radiomenuitem.ccg,v 1.2 2003/10/28 17:12:27 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/radiomenuitem.hg b/gtk/src/radiomenuitem.hg
index b8b21b3..e2ef604 100644
--- a/gtk/src/radiomenuitem.hg
+++ b/gtk/src/radiomenuitem.hg
@@ -1,7 +1,4 @@
-/* $Id: radiomenuitem.hg,v 1.7 2005/04/07 08:46:44 murrayc Exp $ */
-
-/* radiomenuitem.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -38,7 +35,7 @@ class RadioMenuItem : public CheckMenuItem
 {
   _CLASS_GTKOBJECT(RadioMenuItem, GtkRadioMenuItem, GTK_RADIO_MENU_ITEM, Gtk::CheckMenuItem, GtkCheckMenuItem)
 public:
-  
+
   typedef RadioButtonGroup Group;
 
   RadioMenuItem(Group& groupx);
@@ -48,7 +45,7 @@ public:
 
   //We ignore the _new_*_from_widget() functions because they are just the same as calling get_group() and set_group() ourselves.
   _IGNORE(gtk_radio_menu_item_new_from_widget, gtk_radio_menu_item_new_with_mnemonic_from_widget, gtk_radio_menu_item_new_with_label_from_widget)
-                    
+
   _WRAP_METHOD(Group get_group(), gtk_radio_menu_item_get_group)
   _IGNORE(gtk_radio_menu_item_set_group)
   void set_group(Group& group);
diff --git a/gtk/src/radiotoolbutton.ccg b/gtk/src/radiotoolbutton.ccg
index 49afc4c..cd61954 100644
--- a/gtk/src/radiotoolbutton.ccg
+++ b/gtk/src/radiotoolbutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: radiotoolbutton.ccg,v 1.4 2003/12/06 14:06:18 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/radiotoolbutton.hg b/gtk/src/radiotoolbutton.hg
index 92b623d..e3d8623 100644
--- a/gtk/src/radiotoolbutton.hg
+++ b/gtk/src/radiotoolbutton.hg
@@ -1,7 +1,4 @@
-/* $Id: radiotoolbutton.hg,v 1.10 2005/11/30 14:10:49 murrayc Exp $ */
-
-/* box.h
- *
+/*
  * Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -51,7 +48,7 @@ public:
    * @newin{2,4}
    */
   _CTOR_DEFAULT()
-  
+
   /** Creates a new Gtk::RadioToolButton in an existing group.
    *
    * The RadioToolButton will have the label @a label and will be put into the Group
@@ -64,12 +61,12 @@ public:
    */
   explicit RadioToolButton(Group& group, const Glib::ustring& label = Glib::ustring());
   _IGNORE(gtk_radio_tool_button_new)
-  
+
   /** Creates a new Gtk::RadioToolButton in an existing group.
    *
    * The RadioToolButton will be created according to the StockID properties and put into
    * the Group @a group.
-   * 
+   *
    * @param group The existing group which will be used for this RadioButton.
    * @param stock_id The StockID which determines the look of the RadioToolButton.
    *
@@ -86,7 +83,7 @@ public:
   //This does not correspond to any gtk_radio_tool_button_*_new() function,
   //but it should work (it just sets properties), and it makes this class consistent with the
   //other ToolButton classes.
-  
+
   /** Creates a new Gtk::RadioToolButton with an image and a new group.
    *
    * The RadioToolButton will have the label @a label and an image widget @a icon_widget.
@@ -98,10 +95,10 @@ public:
    */
   explicit RadioToolButton(Widget& icon_widget, const Glib::ustring& label = Glib::ustring());
 
-  
+
   _WRAP_METHOD(Group get_group(), gtk_radio_tool_button_get_group)
   _WRAP_METHOD(void set_group(Group& group), gtk_radio_tool_button_set_group)
-  
+
   //Probably wouldn't work: _WRAP_PROPERTY("group", Group)
 };
 
diff --git a/gtk/src/range.ccg b/gtk/src/range.ccg
index 67522e5..1ec7fbb 100644
--- a/gtk/src/range.ccg
+++ b/gtk/src/range.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: range.ccg,v 1.1 2003/01/21 13:40:35 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/range.hg b/gtk/src/range.hg
index ef1483c..bb4e0db 100644
--- a/gtk/src/range.hg
+++ b/gtk/src/range.hg
@@ -1,5 +1,3 @@
-/* $Id: range.hg,v 1.8 2006/04/12 11:11:25 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -102,7 +100,7 @@ public:
   _WRAP_PROPERTY("restrict-to-fill-level", bool)
   _WRAP_PROPERTY("fill-level", double)
   _WRAP_PROPERTY("round-digits", int)
-  
+
 protected:
   virtual void get_range_border_vfunc(Gtk::Border& border) const;
 
diff --git a/gtk/src/recentaction.ccg b/gtk/src/recentaction.ccg
index dcf44c0..8045bee 100644
--- a/gtk/src/recentaction.ccg
+++ b/gtk/src/recentaction.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: recentaction.ccg,v 1.5 2004/03/27 00:30:38 murrayc Exp $ */
-
 /* Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/recentaction.hg b/gtk/src/recentaction.hg
index ac95dbf..6430873 100644
--- a/gtk/src/recentaction.hg
+++ b/gtk/src/recentaction.hg
@@ -1,5 +1,3 @@
-/* $Id: recentaction.hg,v 1.5 2004/07/01 08:55:45 murrayc Exp $ */
-
 /* Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -31,12 +29,12 @@ namespace Gtk
 
 /** An action of which represents a list of recently used files.
  *
- * A Gtk::RecentAction represents a list of recently used files, 
- * which can be shown by widgets such as Gtk::RecentChooserDialog or 
+ * A Gtk::RecentAction represents a list of recently used files,
+ * which can be shown by widgets such as Gtk::RecentChooserDialog or
  * Gtk::RecentChooserMenu.
- * To construct a submenu showing recently used files, use a 
- * Gtk::RecentAction as the action for a <menuitem>. To construct a menu 
- * toolbutton showing the recently used files in the popup menu, use a 
+ * To construct a submenu showing recently used files, use a
+ * Gtk::RecentAction as the action for a <menuitem>. To construct a menu
+ * toolbutton showing the recently used files in the popup menu, use a
  * Gtk::RecentAction as the action for a <toolitem> element.
  *
  * See also the methods in the RecentChooser base class.
@@ -58,7 +56,7 @@ protected:
 //Make sure that we use NULL instead of empty strings for the constructors:
 #m4 _CONVERSION(`const Glib::ustring&',`const char*',`$3.empty() ? 0 : $3.c_str()')
 
-  //Note that the order of the parameters is not the same as gtk_recent_action_new(), because 
+  //Note that the order of the parameters is not the same as gtk_recent_action_new(), because
   //a) we want to be consistent with Action, ToggleAction, etc.
   //b) this allows us to use the StockID parameter to distinguish the create() overloads.
   _WRAP_CTOR(RecentAction(const Glib::ustring& name, const StockID& stock_id = StockID(), const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()), gtk_recent_action_new)
@@ -77,7 +75,7 @@ public:
   _WRAP_METHOD(bool get_show_numbers(), gtk_recent_action_get_show_numbers)
   _WRAP_METHOD(void set_show_numbers(bool show_numbers = true), gtk_recent_action_set_show_numbers)
 
-  _WRAP_PROPERTY("show-numbers", bool)          
+  _WRAP_PROPERTY("show-numbers", bool)
 };
 
 } // namespace Gtk
diff --git a/gtk/src/recentchooserdialog.hg b/gtk/src/recentchooserdialog.hg
index d490c04..b14c868 100644
--- a/gtk/src/recentchooserdialog.hg
+++ b/gtk/src/recentchooserdialog.hg
@@ -1,5 +1,4 @@
-/* recentchooserdialog.h
- *
+/*
  * Copyright (C) 2006 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/recentchoosermenu.hg b/gtk/src/recentchoosermenu.hg
index 6c10f14..67c2dec 100644
--- a/gtk/src/recentchoosermenu.hg
+++ b/gtk/src/recentchoosermenu.hg
@@ -1,5 +1,4 @@
-/* recentchoosermenu.h
- *
+/*
  * Copyright (C) 2006 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -53,7 +52,7 @@ public:
 
   _WRAP_METHOD(void set_show_numbers(bool show_numbers = true), gtk_recent_chooser_menu_set_show_numbers)
   _WRAP_METHOD(bool get_show_numbers() const, gtk_recent_chooser_menu_get_show_numbers)
-  
+
   _WRAP_PROPERTY("show-numbers", bool)
 };
 
diff --git a/gtk/src/recentchooserwidget.hg b/gtk/src/recentchooserwidget.hg
index 29f4599..e13b2ae 100644
--- a/gtk/src/recentchooserwidget.hg
+++ b/gtk/src/recentchooserwidget.hg
@@ -44,7 +44,7 @@ class RecentChooserWidget
   _IMPLEMENTS_INTERFACE(RecentChooser)
 public:
   _CTOR_DEFAULT;
-  
+
   _WRAP_CTOR(RecentChooserWidget(const Glib::RefPtr<RecentManager>& recent_manager), gtk_recent_chooser_widget_new_for_manager)
 };
 
diff --git a/gtk/src/recentfilter.ccg b/gtk/src/recentfilter.ccg
index 108fcdd..8beb2af 100644
--- a/gtk/src/recentfilter.ccg
+++ b/gtk/src/recentfilter.ccg
@@ -33,9 +33,9 @@ static gboolean SignalProxy_Custom_gtk_callback(const GtkRecentFilterInfo* filte
     cppInfo.uri = Glib::convert_const_gchar_ptr_to_ustring(filter_info->uri);
     cppInfo.display_name = Glib::convert_const_gchar_ptr_to_ustring(filter_info->display_name);
     cppInfo.mime_type = Glib::convert_const_gchar_ptr_to_ustring(filter_info->mime_type);
-    
+
     // Create string lists from char**s.
-    
+
     for(int i = 0; filter_info->groups[i] != 0; ++i)
     {
       cppInfo.groups.push_back( Glib::convert_const_gchar_ptr_to_ustring(filter_info->groups[i]) );
@@ -44,9 +44,9 @@ static gboolean SignalProxy_Custom_gtk_callback(const GtkRecentFilterInfo* filte
     {
       cppInfo.applications.push_back( Glib::convert_const_gchar_ptr_to_ustring(filter_info->applications[i]) );
     }
-    
+
     cppInfo.age = filter_info->age;
-  
+
     return (*the_slot)(cppInfo);
   }
   catch(...)
@@ -75,7 +75,7 @@ void RecentFilter::add_custom(RecentFilterFlags needed, const SlotCustom& slot)
   // Create a copy of the slot. A pointer to this will be passed through the callback's data parameter.
   // It will be deleted when SignalProxy_Custom_gtk_callback_destroy() is called.
   SlotCustom* slot_copy = new SlotCustom(slot);
-      
+
   gtk_recent_filter_add_custom(gobj(), (GtkRecentFilterFlags)needed,
                                &SignalProxy_Custom_gtk_callback,
                                slot_copy,
diff --git a/gtk/src/recentmanager.ccg b/gtk/src/recentmanager.ccg
index 7d3b868..d1c8dc3 100644
--- a/gtk/src/recentmanager.ccg
+++ b/gtk/src/recentmanager.ccg
@@ -33,12 +33,12 @@ bool RecentManager::add_item(const Glib::ustring& uri, const Data& data)
   c_data.mime_type = const_cast<gchar*>(data.mime_type.c_str());
   c_data.app_name = const_cast<gchar*>(data.app_name.c_str());
   c_data.app_exec = const_cast<gchar*>(data.app_exec.c_str());
-  
+
   c_data.groups = static_cast<gchar**>(g_malloc((data.groups.size() + 1) * sizeof(gchar*)));
   for(unsigned int i = 0; i < data.groups.size(); ++ i)
     c_data.groups[i] = const_cast<gchar*>(data.groups[i].c_str());
   c_data.groups[data.groups.size()] = NULL;
-  
+
   c_data.is_private = data.is_private;
 
   result = gtk_recent_manager_add_full(gobj(), uri.c_str(), &c_data);
diff --git a/gtk/src/requisition.ccg b/gtk/src/requisition.ccg
index 21cce6f..fc44649 100644
--- a/gtk/src/requisition.ccg
+++ b/gtk/src/requisition.ccg
@@ -1,5 +1,3 @@
-/* $Id: requisition.hg,v 1.3 2006/05/18 17:53:15 murrayc Exp $ */
-
 /* Copyright (C) 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/requisition.hg b/gtk/src/requisition.hg
index 4822354..94486cd 100644
--- a/gtk/src/requisition.hg
+++ b/gtk/src/requisition.hg
@@ -1,5 +1,3 @@
-/* $Id: requisition.hg,v 1.3 2006/05/18 17:53:15 murrayc Exp $ */
-
 /* Copyright (C) 2010 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/scale.ccg b/gtk/src/scale.ccg
index d3a4629..d7e2d83 100644
--- a/gtk/src/scale.ccg
+++ b/gtk/src/scale.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: scale.ccg,v 1.2 2004/01/19 19:48:44 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/scale.hg b/gtk/src/scale.hg
index 72e2925..7b2caef 100644
--- a/gtk/src/scale.hg
+++ b/gtk/src/scale.hg
@@ -1,7 +1,4 @@
-/* $Id: scale.hg,v 1.7 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* scale.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -54,7 +51,7 @@ public:
    * @newin{3,2}
    */
   explicit Scale(Orientation orientation = ORIENTATION_HORIZONTAL);
-  
+
   //Note that we try to use the same default parameter value as the default property value.
   explicit Scale(const Glib::RefPtr<Adjustment>& adjustment, Orientation orientation = ORIENTATION_HORIZONTAL);
   _IGNORE(gtk_scale_new)
@@ -132,10 +129,10 @@ protected:
   virtual int calc_digits_(double step) const;
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
 
-//Include the deprecated header, 
+//Include the deprecated header,
 //whose classes were previously in this header,
 //to preserve the "API" of the includes.
 #include <gtkmm/hvscale.h>
diff --git a/gtk/src/scalebutton.ccg b/gtk/src/scalebutton.ccg
index 822e2ad..51c0aaa 100644
--- a/gtk/src/scalebutton.ccg
+++ b/gtk/src/scalebutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: scalebutton.ccg,v 1.2 2003/10/18 15:35:31 murrayc Exp $ */
-
 /*
- *
  * Copyright 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/scrollbar.ccg b/gtk/src/scrollbar.ccg
index 39658f0..884f687 100644
--- a/gtk/src/scrollbar.ccg
+++ b/gtk/src/scrollbar.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: scrollbar.ccg,v 1.1 2003/01/21 13:40:36 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/scrollbar.hg b/gtk/src/scrollbar.hg
index b90d869..a2b11d9 100644
--- a/gtk/src/scrollbar.hg
+++ b/gtk/src/scrollbar.hg
@@ -1,7 +1,4 @@
-/* $Id: scrollbar.hg,v 1.1 2003/01/21 13:40:36 murrayc Exp $ */
-
-/* scrollbar.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -57,17 +54,17 @@ class Scrollbar
   _IMPLEMENTS_INTERFACE(Orientable)
 public:
   _CTOR_DEFAULT()
-  
+
   //Note that we try to use the same defaul parameter value as the default property value.
   explicit Scrollbar(const Glib::RefPtr<Adjustment>& adjustment, Orientation orientation = ORIENTATION_HORIZONTAL);
   _IGNORE(gtk_scrollbar_new)
-  
+
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
 
-//Include the deprecated header, 
+//Include the deprecated header,
 //whose classes were previously in this header,
 //to preserve the "API" of the includes.
 #include <gtkmm/hvscrollbar.h>
diff --git a/gtk/src/scrolledwindow.ccg b/gtk/src/scrolledwindow.ccg
index a27953c..d9b560a 100644
--- a/gtk/src/scrolledwindow.ccg
+++ b/gtk/src/scrolledwindow.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: scrolledwindow.ccg,v 1.1 2003/01/21 13:40:36 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/scrolledwindow.hg b/gtk/src/scrolledwindow.hg
index b37f9d9..75a56c7 100644
--- a/gtk/src/scrolledwindow.hg
+++ b/gtk/src/scrolledwindow.hg
@@ -1,7 +1,4 @@
-/* $Id: scrolledwindow.hg,v 1.7 2006/08/17 18:03:34 murrayc Exp $ */
-
-/* scrolledwindow.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -112,4 +109,4 @@ public:
   _WRAP_PROPERTY("kinetic-scrolling", bool)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/selectiondata.ccg b/gtk/src/selectiondata.ccg
index 0290eab..a23b2fc 100644
--- a/gtk/src/selectiondata.ccg
+++ b/gtk/src/selectiondata.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: selectiondata.ccg,v 1.5 2006/07/05 16:59:28 murrayc Exp $ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/selectiondata.hg b/gtk/src/selectiondata.hg
index 9bf5a30..d089361 100644
--- a/gtk/src/selectiondata.hg
+++ b/gtk/src/selectiondata.hg
@@ -1,5 +1,3 @@
-/* $Id: selectiondata.hg,v 1.9 2006/07/05 16:59:28 murrayc Exp $ */
-
 /* Copyright(C) 2002 The gtkmm Development Team
  *
  * This library is free software, ) you can redistribute it and/or
@@ -40,7 +38,7 @@ public:
   //TODO : document this. It's like the other set(), but it uses this SelectionData's target type.
   //Why would you ever want to use any other type?
   void set(int format, const guint8* data, int length);
-  
+
   /** Assign a memory block of raw data.
    * Store new data into the Gtk::SelectionData object. Should _only_ by called
    * from a selection handler callback.  A 0-byte terminates the stored data.
@@ -53,7 +51,7 @@ public:
 
   /** Assign a string of raw data.
    * Store new data into the Gtk::SelectionData object. Should _only_ by called
-   * from a selection handler callback. 
+   * from a selection handler callback.
    * @param type The type of the selection.
    * @param data A string that contains the data (does not have to be text).
    */
diff --git a/gtk/src/separator.ccg b/gtk/src/separator.ccg
index 39fde23..e6c59e3 100644
--- a/gtk/src/separator.ccg
+++ b/gtk/src/separator.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: separator.ccg,v 1.1 2003/01/21 13:40:37 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/separator.hg b/gtk/src/separator.hg
index 4010425..422cc93 100644
--- a/gtk/src/separator.hg
+++ b/gtk/src/separator.hg
@@ -1,7 +1,4 @@
-/* $Id: separator.hg,v 1.1 2003/01/21 13:40:37 murrayc Exp $ */
-
-/* separator.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -31,9 +28,9 @@ namespace Gtk
 
 /** A separator widget.
  *
- * Gtk::Separator is a horizontal or vertical separator widget, depending on the 
+ * Gtk::Separator is a horizontal or vertical separator widget, depending on the
  * value of the orientation property, used to group the widgets within a
- * window. It displays a line with a shadow to make it appear sunken into the 
+ * window. It displays a line with a shadow to make it appear sunken into the
  * interface.
  */
 class Separator
@@ -43,14 +40,14 @@ class Separator
   _CLASS_GTKOBJECT(Separator,GtkSeparator,GTK_SEPARATOR,Gtk::Widget,GtkWidget)
   _IMPLEMENTS_INTERFACE(Orientable)
 public:
-  
+
   //Note that we try to use the same default parameter value as the default property value.
   _WRAP_CTOR(Separator(Orientation orientation = ORIENTATION_HORIZONTAL), gtk_separator_new)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
-//Include the deprecated header, 
+//Include the deprecated header,
 //whose classes were previously in this header,
 //to preserve the "API" of the includes.
 #include <gtkmm/hvseparator.h>
diff --git a/gtk/src/separatormenuitem.ccg b/gtk/src/separatormenuitem.ccg
index fc5cfa5..f8fb272 100644
--- a/gtk/src/separatormenuitem.ccg
+++ b/gtk/src/separatormenuitem.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: separatormenuitem.ccg,v 1.1 2003/01/21 13:40:37 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/separatormenuitem.hg b/gtk/src/separatormenuitem.hg
index 1123168..0da0d74 100644
--- a/gtk/src/separatormenuitem.hg
+++ b/gtk/src/separatormenuitem.hg
@@ -1,8 +1,5 @@
-/* $Id: separatormenuitem.hg,v 1.1 2003/01/21 13:40:37 murrayc Exp $ */
 
-
-/* separator.h
- * 
+/*
  * Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -40,5 +37,5 @@ public:
   _CTOR_DEFAULT
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/separatortoolitem.ccg b/gtk/src/separatortoolitem.ccg
index f5b41ff..330aefd 100644
--- a/gtk/src/separatortoolitem.ccg
+++ b/gtk/src/separatortoolitem.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: separatortoolitem.ccg,v 1.1 2003/10/28 17:12:27 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/separatortoolitem.hg b/gtk/src/separatortoolitem.hg
index bc4d0ff..b4f2b2e 100644
--- a/gtk/src/separatortoolitem.hg
+++ b/gtk/src/separatortoolitem.hg
@@ -1,7 +1,4 @@
-/* $Id: separatortoolitem.hg,v 1.2 2004/03/07 14:35:47 murrayc Exp $ */
-
-/* separatortoolitem.h
- * 
+/*
  * Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -33,7 +30,7 @@ namespace Gtk
  * Depending on the theme, it will often look like a vertical line on
  * horizontally docked toolbars. If the property "expand" is <tt>true</tt> and the property "draw"
  * is <tt>false</tt>, a Gtk::SeparatorToolItem will act as a "spring" that forces other items to the
- * ends of the toolbar. 
+ * ends of the toolbar.
  *
  * @ingroup Widgets
  */
@@ -42,10 +39,10 @@ class SeparatorToolItem : public ToolItem
   _CLASS_GTKOBJECT(SeparatorToolItem, GtkSeparatorToolItem, GTK_SEPARATOR_TOOL_ITEM, Gtk::ToolItem, GtkToolItem)
 public:
   _CTOR_DEFAULT()
-  
+
   _WRAP_METHOD(bool get_draw() const, gtk_separator_tool_item_get_draw)
   _WRAP_METHOD(void set_draw(bool draw = true), gtk_separator_tool_item_set_draw)
-  
+
   _WRAP_PROPERTY("draw", bool)
 };
 
diff --git a/gtk/src/settings.ccg b/gtk/src/settings.ccg
index 7b7e7d9..76e984b 100644
--- a/gtk/src/settings.ccg
+++ b/gtk/src/settings.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: settings.ccg,v 1.4 2005/08/01 10:34:08 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/settings.hg b/gtk/src/settings.hg
index df1c626..239efda 100644
--- a/gtk/src/settings.hg
+++ b/gtk/src/settings.hg
@@ -1,7 +1,4 @@
-/* $Id: settings.hg,v 1.6 2005/08/01 11:21:33 murrayc Exp $ */
-
-/* settings.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -77,7 +74,7 @@ public:
   _WRAP_PROPERTY("gtk-timeout-initial", int)
   _WRAP_PROPERTY("gtk-timeout-repeat", int)
   _WRAP_PROPERTY("gtk-timeout-expand", int)
-  _WRAP_PROPERTY("gtk-color-scheme", Glib::ustring)  
+  _WRAP_PROPERTY("gtk-color-scheme", Glib::ustring)
   _WRAP_PROPERTY("gtk-enable-animations", bool)
   _WRAP_PROPERTY("gtk-touchscreen-mode", bool)
   _WRAP_PROPERTY("gtk-tooltip-timeout", int)
@@ -135,5 +132,5 @@ public:
 
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/sizegroup.ccg b/gtk/src/sizegroup.ccg
index a2d4047..dc2ab38 100644
--- a/gtk/src/sizegroup.ccg
+++ b/gtk/src/sizegroup.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: sizegroup.ccg,v 1.1 2003/01/21 13:40:37 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/sizegroup.hg b/gtk/src/sizegroup.hg
index 86c17fa..3b5852c 100644
--- a/gtk/src/sizegroup.hg
+++ b/gtk/src/sizegroup.hg
@@ -1,7 +1,4 @@
-/* $Id: sizegroup.hg,v 1.5 2006/12/11 18:57:50 murrayc Exp $ */
-
-/* box.h
- *
+/*
  * Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -33,21 +30,21 @@ namespace Gtk
 _CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(SizeGroupMode, GtkSizeGroupMode)
 
-/** Gtk::SizeGroup provides a mechanism for grouping a number of widgets together so they all request the same amount of space. 
+/** Gtk::SizeGroup provides a mechanism for grouping a number of widgets together so they all request the same amount of space.
  * This is typically useful when you want a column of widgets to have the same size, but you can't use a Gtk::Table widget.
- * 
- * In detail, the size requested for each widget in a Gtk::SizeGroup is the maximum of the sizes that would have been 
- * requested for each widget in the size group if they were not in the size group. The mode of the size group (see 
+ *
+ * In detail, the size requested for each widget in a Gtk::SizeGroup is the maximum of the sizes that would have been
+ * requested for each widget in the size group if they were not in the size group. The mode of the size group (see
  * set_mode()) determines whether this applies to the horizontal size, the vertical size, or both sizes.
  *
- * Note that size groups only affect the amount of space requested, not the size that the widgets finally receive. If 
- * you want the widgets in a GtkSizeGroup to actually be the same size, you need to pack them in such a way that they 
- * get the size they request and not more. For example, if you are packing your widgets into a table, you would not 
+ * Note that size groups only affect the amount of space requested, not the size that the widgets finally receive. If
+ * you want the widgets in a GtkSizeGroup to actually be the same size, you need to pack them in such a way that they
+ * get the size they request and not more. For example, if you are packing your widgets into a table, you would not
  * include the Gtk::FILL flag.
- * 
- * Widgets can be part of multiple size groups; GTK+ will compute the horizontal size of a widget from the horizontal 
- * requisition of all widgets that can be reached from the widget by a chain of size groups of type 
- * Gtk::SIZE_GROUP_HORIZONTAL or Gtk::SIZE_GROUP_BOTH, and the vertical size from the vertical requisition of all widgets  
+ *
+ * Widgets can be part of multiple size groups; GTK+ will compute the horizontal size of a widget from the horizontal
+ * requisition of all widgets that can be reached from the widget by a chain of size groups of type
+ * Gtk::SIZE_GROUP_HORIZONTAL or Gtk::SIZE_GROUP_BOTH, and the vertical size from the vertical requisition of all widgets
  * that can be reached from the widget by a chain of size groups of type Gtk::SIZE_GROUP_VERTICAL or Gtk::SIZE_GROUP_BOTH.
  */
 class SizeGroup
@@ -81,5 +78,5 @@ public:
   _WRAP_PROPERTY("ignore_hidden", bool)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/socket.ccg b/gtk/src/socket.ccg
index 66992e2..49fb6ed 100644
--- a/gtk/src/socket.ccg
+++ b/gtk/src/socket.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: socket.ccg,v 1.1 2003/01/21 13:40:37 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/socket.hg b/gtk/src/socket.hg
index 688bf9e..cb3e7d5 100644
--- a/gtk/src/socket.hg
+++ b/gtk/src/socket.hg
@@ -1,5 +1,3 @@
-/* $Id: socket.hg,v 1.2 2004/02/10 17:35:13 mxpxpod Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -29,7 +27,7 @@ namespace Gtk
 //Note that Window is the (awfully named) type from the X11 header.
 //gtkx.h (needed to get GtkPlug and GtkSocket) pulls this in,
 //assuming that you will be careful when doing so.
-  
+
 /** Container for widgets from other processes.
  * Together with Gtk::Plug, Gtk::Socket provides the ability to embed
  * widgets from one process into another process in a fashion that is
@@ -83,7 +81,7 @@ class Socket : public Container
   _GTKMMPROC_WIN32_NO_WRAP
 public:
   _CTOR_DEFAULT
-  
+
 #m4 _CONVERSION(`Window', `::Window', `($3)')
 #m4 _CONVERSION(`::Window', `Window', `($3)')
   _WRAP_METHOD(void add_id(::Window window_id), gtk_socket_add_id)
diff --git a/gtk/src/spinbutton.ccg b/gtk/src/spinbutton.ccg
index a7b8aa6..f24674f 100644
--- a/gtk/src/spinbutton.ccg
+++ b/gtk/src/spinbutton.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: spinbutton.ccg,v 1.1 2003/01/21 13:40:38 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/spinbutton.hg b/gtk/src/spinbutton.hg
index 9d6721f..fce5848 100644
--- a/gtk/src/spinbutton.hg
+++ b/gtk/src/spinbutton.hg
@@ -1,5 +1,3 @@
-/* $Id: spinbutton.hg,v 1.4 2006/07/19 15:35:02 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/spinner.ccg b/gtk/src/spinner.ccg
index 18d0656..448f9a8 100644
--- a/gtk/src/spinner.ccg
+++ b/gtk/src/spinner.ccg
@@ -1,7 +1,4 @@
-// -*- c++ -*-
-
 /*
- *
  * Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/spinner.hg b/gtk/src/spinner.hg
index a6aec74..e5847bd 100644
--- a/gtk/src/spinner.hg
+++ b/gtk/src/spinner.hg
@@ -1,5 +1,4 @@
-/* spinner.h
- *
+/*
  * Copyright (C) 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -45,4 +44,4 @@ public:
   _WRAP_PROPERTY("active", bool)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/statusbar.ccg b/gtk/src/statusbar.ccg
index dc2a5ca..9fa5e90 100644
--- a/gtk/src/statusbar.ccg
+++ b/gtk/src/statusbar.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: statusbar.ccg,v 1.1 2003/01/21 13:40:38 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -35,5 +31,5 @@ void Statusbar::remove_message(guint message_id, guint context_id /* = 0 */)
   return gtk_statusbar_remove(gobj(), context_id, message_id);
 }
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/statusbar.hg b/gtk/src/statusbar.hg
index 3e5178d..76ba399 100644
--- a/gtk/src/statusbar.hg
+++ b/gtk/src/statusbar.hg
@@ -1,7 +1,4 @@
-/* $Id: statusbar.hg,v 1.2 2003/10/12 09:38:11 murrayc Exp $ */
-
-/* statusbar.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -80,4 +77,4 @@ public:
   _WRAP_SIGNAL(void text_popped(guint context_id, const Glib::ustring& text), "text_popped")
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/statusicon.ccg b/gtk/src/statusicon.ccg
index b07c9b8..72e1a15 100644
--- a/gtk/src/statusicon.ccg
+++ b/gtk/src/statusicon.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: statusicon.ccg,v 1.4 2006/06/21 20:34:39 murrayc Exp $ */
-
 /* Copyright 2005 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/stockitem.ccg b/gtk/src/stockitem.ccg
index 61e0fad..0787b8d 100644
--- a/gtk/src/stockitem.ccg
+++ b/gtk/src/stockitem.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: stockitem.ccg,v 1.3 2004/06/20 22:41:14 daniel Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -19,7 +16,7 @@
  */
 
 #include <gtk/gtk.h>
- 
+
 namespace Gtk
 {
 
diff --git a/gtk/src/stockitem.hg b/gtk/src/stockitem.hg
index 2f28a42..5481964 100644
--- a/gtk/src/stockitem.hg
+++ b/gtk/src/stockitem.hg
@@ -1,5 +1,3 @@
-/* $Id: stockitem.hg,v 1.2 2004/04/11 21:00:53 murrayc Exp $ */
-
 /* Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software, ) you can redistribute it and/or
diff --git a/gtk/src/stylecontext.ccg b/gtk/src/stylecontext.ccg
index 7b5dd0d..3222d4e 100644
--- a/gtk/src/stylecontext.ccg
+++ b/gtk/src/stylecontext.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: style.ccg,v 1.5 2006/11/23 14:47:48 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -30,42 +27,42 @@ Gdk::RGBA StyleContext::get_color(StateFlags state) const
 {
   GdkRGBA crgba;
   gtk_style_context_get_color(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)), &crgba);
-  return Gdk::RGBA(&crgba, true); 
+  return Gdk::RGBA(&crgba, true);
 }
 
 Gdk::RGBA StyleContext::get_background_color(StateFlags state) const
 {
   GdkRGBA crgba;
   gtk_style_context_get_background_color(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)), &crgba);
-  return Gdk::RGBA(&crgba, true); 
+  return Gdk::RGBA(&crgba, true);
 }
 
 Gdk::RGBA StyleContext::get_border_color(StateFlags state) const
 {
   GdkRGBA crgba;
   gtk_style_context_get_border_color(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)), &crgba);
-  return Gdk::RGBA(&crgba, true); 
+  return Gdk::RGBA(&crgba, true);
 }
 
 Border StyleContext::get_border(StateFlags state) const
 {
   GtkBorder cborder;
   gtk_style_context_get_border(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)), &cborder);
-  return Border(&cborder, true); 
+  return Border(&cborder, true);
 }
 
 Border StyleContext::get_padding(StateFlags state) const
 {
   GtkBorder cborder;
   gtk_style_context_get_padding(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)), &cborder);
-  return Border(&cborder, true); 
+  return Border(&cborder, true);
 }
 
 Border StyleContext::get_margin(StateFlags state) const
 {
   GtkBorder cborder;
   gtk_style_context_get_margin(const_cast<GtkStyleContext*>(gobj()), ((GtkStateFlags)(state)), &cborder);
-  return Border(&cborder, true); 
+  return Border(&cborder, true);
 }
 
 void StyleContext::unset_parent()
diff --git a/gtk/src/stylecontext.hg b/gtk/src/stylecontext.hg
index d68fc6e..7a0b945 100644
--- a/gtk/src/stylecontext.hg
+++ b/gtk/src/stylecontext.hg
@@ -73,7 +73,7 @@ class IconSet;
  * is sufficient to trigger the transition animation. And GTK+ already
  * does that when Widget::set_state() or Widget::set_state_flags()
  * are called.
- * 
+ *
  * If a widget needs to declare several animatable regions (i.e. not
  * affecting the whole widget area), its Widget::signal_draw() signal handler
  * needs to wrap the render operations for the different regions with
@@ -89,8 +89,8 @@ class IconSet;
  * to achieve this.
  *
  * The widget also needs to notify the style context about a state change
- * for a given animatable region so the animation is triggered. 
- * notify_state_change() can take no region IDs, meaning that the whole widget 
+ * for a given animatable region so the animation is triggered.
+ * notify_state_change() can take no region IDs, meaning that the whole widget
  * area will be updated by the animation.
  *
  * @newin{3,0}
@@ -104,7 +104,7 @@ protected:
 public:
   _WRAP_CREATE()
   _IGNORE(gtk_style_context_new)
-  
+
   _WRAP_METHOD(static void add_provider_for_screen(const Glib::RefPtr<Gdk::Screen>& screen, const Glib::RefPtr<StyleProvider>& provider, guint priority), gtk_style_context_add_provider_for_screen)
   _WRAP_METHOD(static void remove_provider_for_screen(const Glib::RefPtr<Gdk::Screen>& screen, const Glib::RefPtr<StyleProvider>& provider), gtk_style_context_remove_provider_for_screen)
 
@@ -135,7 +135,7 @@ public:
   _WRAP_METHOD(bool state_is_running(StateType state, gdouble* progress), gtk_style_context_state_is_running)
 
   _WRAP_METHOD(void set_path(const WidgetPath& path), gtk_style_context_set_path)
-  
+
 #m4 _CONVERSION(`const GtkWidgetPath*',`WidgetPath',`WidgetPath(const_cast<GtkWidgetPath*>($3), true)')
   _WRAP_METHOD(WidgetPath get_path() const, gtk_style_context_get_path)
 
@@ -176,7 +176,7 @@ public:
 */
 
   _WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_style_context_set_screen)
-                                          
+
   _WRAP_METHOD(Glib::RefPtr<Gdk::Screen> get_screen(), gtk_style_context_get_screen, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Screen> get_screen() const, gtk_style_context_get_screen, refreturn, constversion)
 
@@ -212,7 +212,7 @@ public:
 
   Border get_border(StateFlags state = (StateFlags)0) const;
   _IGNORE(gtk_style_context_get_border)
-  
+
   Border get_padding(StateFlags state = (StateFlags)0) const;
   _IGNORE(gtk_style_context_get_padding)
 
@@ -223,7 +223,7 @@ public:
   //TODO: _WRAP_METHOD(void reset_widgets(const Glib::RefPtr<Gdk::Screen>& screen), gtk_style_context_reset_widgets)
 
   _WRAP_METHOD(void set_background(const Glib::RefPtr<Gdk::Window>& window), gtk_style_context_set_background)
-  
+
   _WRAP_METHOD(void render_check(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y, double width, double height), gtk_render_check)
   _WRAP_METHOD(void render_option(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double x, double y, double width, double height), gtk_render_option)
   _WRAP_METHOD(void render_arrow(const ::Cairo::RefPtr< ::Cairo::Context>& cr, double angle, double x, double y, double size), gtk_render_arrow)
diff --git a/gtk/src/styleprovider.ccg b/gtk/src/styleprovider.ccg
index 79e1f30..8093743 100644
--- a/gtk/src/styleprovider.ccg
+++ b/gtk/src/styleprovider.ccg
@@ -14,6 +14,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
- 
+
 #include <gtk/gtk.h>
 
diff --git a/gtk/src/switch.ccg b/gtk/src/switch.ccg
index 797d511..330aefd 100644
--- a/gtk/src/switch.ccg
+++ b/gtk/src/switch.ccg
@@ -1,5 +1,4 @@
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/table.ccg b/gtk/src/table.ccg
index 2becd60..8175807 100644
--- a/gtk/src/table.ccg
+++ b/gtk/src/table.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: table.ccg,v 1.1 2003/01/21 13:40:40 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -31,4 +27,4 @@ void Table::set_spacings(guint spacing)
   set_col_spacings(spacing);
 }
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/table.hg b/gtk/src/table.hg
index 9043901..d194a49 100644
--- a/gtk/src/table.hg
+++ b/gtk/src/table.hg
@@ -1,5 +1,3 @@
-/* $Id: table.hg,v 1.3 2006/05/16 14:16:08 jjongsma Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/targetlist.hg b/gtk/src/targetlist.hg
index 43802a5..e89d5ed 100644
--- a/gtk/src/targetlist.hg
+++ b/gtk/src/targetlist.hg
@@ -24,19 +24,19 @@ _DEFS(gtkmm,gtk)
 #include <gdkmm/types.h>
 
 _CC_INCLUDE(gtk/gtk.h)
-  
+
 namespace Gtk
 {
 
 class TargetList
 {
-  //GtkTargetList is actually registered as a boxed type, but it has custom 
+  //GtkTargetList is actually registered as a boxed type, but it has custom
   //reference-counting instead of copy/free functions, so we use it via RefPtr.
   _CLASS_OPAQUE_REFCOUNTED(TargetList, GtkTargetList, NONE, gtk_target_list_ref, gtk_target_list_unref)
   _IGNORE(gtk_selection_data_copy, gtk_selection_data_free)
 public:
   static Glib::RefPtr<Gtk::TargetList> create(const std::vector<TargetEntry>& targets);
-  
+
 #m4 _CONVERSION(`TargetFlags', `guint', `($2)($3)')
   _WRAP_METHOD(void add(const Glib::ustring& target, TargetFlags flags = TargetFlags(0), guint info = 0), gtk_target_list_add)
   void add(const std::vector<TargetEntry>& targets);
diff --git a/gtk/src/tearoffmenuitem.ccg b/gtk/src/tearoffmenuitem.ccg
index 8f7c667..9a2caa4 100644
--- a/gtk/src/tearoffmenuitem.ccg
+++ b/gtk/src/tearoffmenuitem.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: tearoffmenuitem.ccg,v 1.1 2003/01/21 13:40:40 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -25,4 +21,4 @@
 namespace Gtk
 {
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/tearoffmenuitem.hg b/gtk/src/tearoffmenuitem.hg
index 0d00c4f..b7257b0 100644
--- a/gtk/src/tearoffmenuitem.hg
+++ b/gtk/src/tearoffmenuitem.hg
@@ -1,8 +1,5 @@
-/* $Id: tearoffmenuitem.hg,v 1.1 2003/01/21 13:40:40 murrayc Exp $ */
 
-
-/* tearoffmenuitem.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -49,4 +46,4 @@ public:
   _CTOR_DEFAULT
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/textattributes.ccg b/gtk/src/textattributes.ccg
index 2ede831..031daaa 100644
--- a/gtk/src/textattributes.ccg
+++ b/gtk/src/textattributes.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: textattributes.ccg,v 1.1 2003/01/21 13:40:41 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/textattributes.hg b/gtk/src/textattributes.hg
index 0ea0be4..3bf4362 100644
--- a/gtk/src/textattributes.hg
+++ b/gtk/src/textattributes.hg
@@ -1,7 +1,4 @@
-/* $Id: textattributes.hg,v 1.1 2003/01/21 13:40:41 murrayc Exp $ */
-
-/* textattributes.h
- *
+/*
  * Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software, ) you can redistribute it and/or
diff --git a/gtk/src/textbuffer.ccg b/gtk/src/textbuffer.ccg
index 77e0bfc..d6827e5 100644
--- a/gtk/src/textbuffer.ccg
+++ b/gtk/src/textbuffer.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: textbuffer.ccg,v 1.8 2006/11/20 09:19:49 murrayc Exp $ */
-
 /* Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -517,7 +514,7 @@ std::vector<Glib::ustring> TextBuffer::get_deserialize_formats() const
 Glib::ustring TextBuffer::register_serialize_format(const Glib::ustring& mime_type, const SlotSerialize& slot)
 {
   SlotSerialize* slot_copy = new SlotSerialize(slot);
-  GdkAtom atom = gtk_text_buffer_register_serialize_format(gobj(), mime_type.c_str(), 
+  GdkAtom atom = gtk_text_buffer_register_serialize_format(gobj(), mime_type.c_str(),
                 &SignalProxy_Serialize, slot_copy, &SignalProxy_Serialize_gtk_callback_destroy);
 
   //Convert the atom to a string:
@@ -535,7 +532,7 @@ Glib::ustring TextBuffer::register_serialize_format(const Glib::ustring& mime_ty
 Glib::ustring TextBuffer::register_deserialize_format(const Glib::ustring& mime_type, const SlotDeserialize& slot)
 {
   SlotDeserialize* slot_copy = new SlotDeserialize(slot);
-  GdkAtom atom = gtk_text_buffer_register_deserialize_format(gobj(), mime_type.c_str(), 
+  GdkAtom atom = gtk_text_buffer_register_deserialize_format(gobj(), mime_type.c_str(),
                 &SignalProxy_Deserialize, slot_copy, &SignalProxy_Deserialize_gtk_callback_destroy);
 
   //Convert the atom to a string:
diff --git a/gtk/src/textbuffer.hg b/gtk/src/textbuffer.hg
index c003616..b782909 100644
--- a/gtk/src/textbuffer.hg
+++ b/gtk/src/textbuffer.hg
@@ -1,5 +1,3 @@
-/* $Id: textbuffer.hg,v 1.20 2006/11/20 09:19:49 murrayc Exp $ */
-
 /* Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/textchildanchor.ccg b/gtk/src/textchildanchor.ccg
index 7244188..66ca849 100644
--- a/gtk/src/textchildanchor.ccg
+++ b/gtk/src/textchildanchor.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: textchildanchor.ccg,v 1.1 2003/01/21 13:40:42 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/textchildanchor.hg b/gtk/src/textchildanchor.hg
index d804d9a..87bb60e 100644
--- a/gtk/src/textchildanchor.hg
+++ b/gtk/src/textchildanchor.hg
@@ -1,7 +1,4 @@
-/* $Id: textchildanchor.hg,v 1.3 2006/03/22 16:53:22 murrayc Exp $ */
-
-/* textchildanchor.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -29,8 +26,8 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gtk
 {
 
-/** A TextChildAnchor is a spot in the buffer where child widgets can be "anchored" 
- * (inserted inline, as if they were characters). The anchor can have multiple widgets anchored, 
+/** A TextChildAnchor is a spot in the buffer where child widgets can be "anchored"
+ * (inserted inline, as if they were characters). The anchor can have multiple widgets anchored,
  * to allow for multiple views.
  *
  * Typedefed as Gtk::TextBuffer::ChildAnchor.
@@ -59,5 +56,5 @@ public:
 
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/textiter.ccg b/gtk/src/textiter.ccg
index e9767cb..0115291 100644
--- a/gtk/src/textiter.ccg
+++ b/gtk/src/textiter.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: textiter.ccg,v 1.3 2005/01/06 20:49:07 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -71,7 +68,7 @@ bool TextIter::backward_search(const Glib::ustring& str, TextSearchFlags flags,
 {
   return gtk_text_iter_backward_search(const_cast<GtkTextIter*>(gobj()), str.c_str(), ((GtkTextSearchFlags)(flags)), (match_start).gobj(), (match_end).gobj(), 0 /* means end - see C docs */);
 }
-  
+
 
 } // namespace Gtk
 
diff --git a/gtk/src/textiter.hg b/gtk/src/textiter.hg
index becbed2..8151456 100644
--- a/gtk/src/textiter.hg
+++ b/gtk/src/textiter.hg
@@ -1,5 +1,3 @@
-/* $Id: textiter.hg,v 1.8 2006/05/11 11:40:24 murrayc Exp $ */
-
 /* Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software, ) you can redistribute it and/or
diff --git a/gtk/src/textmark.ccg b/gtk/src/textmark.ccg
index 0890b31..f1a4a47 100644
--- a/gtk/src/textmark.ccg
+++ b/gtk/src/textmark.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: textmark.ccg,v 1.1 2003/01/21 13:40:43 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/textmark.hg b/gtk/src/textmark.hg
index f73a9fc..e5dbc78 100644
--- a/gtk/src/textmark.hg
+++ b/gtk/src/textmark.hg
@@ -1,7 +1,4 @@
-/* $Id: textmark.hg,v 1.3 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* textmark.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -64,11 +61,11 @@ class TextMark : public Glib::Object
 protected:
 
   /** Creates an anoymous text mark. Add it to a buffer using Gtk::TextBuffer::add_mark().
-   * If a mark has left 
-   * gravity, and text is inserted at the mark's current location, the mark 
-   * will be moved to the left of the newly-inserted text. If the mark has 
-   * right gravity (@a left_gravity = false), the mark will end up on the 
-   * right of newly-inserted text. The standard left-to-right cursor is a 
+   * If a mark has left
+   * gravity, and text is inserted at the mark's current location, the mark
+   * will be moved to the left of the newly-inserted text. If the mark has
+   * right gravity (@a left_gravity = false), the mark will end up on the
+   * right of newly-inserted text. The standard left-to-right cursor is a
    * mark with right gravity (when you type, the cursor stays on the right
    * side of the text you're typing).
 
@@ -79,11 +76,11 @@ protected:
   explicit TextMark(bool left_gravity = true);
 
   /** Creates a text mark. Add it to a buffer using Gtk::TextBuffer::add_mark().
-   * The mark can be retrieved by name using Gtk::TextBuffer::get_mark(). If a mark has left 
-   * gravity, and text is inserted at the mark's current location, the mark 
-   * will be moved to the left of the newly-inserted text. If the mark has 
-   * right gravity (@a left_gravity = false), the mark will end up on the 
-   * right of newly-inserted text. The standard left-to-right cursor is a 
+   * The mark can be retrieved by name using Gtk::TextBuffer::get_mark(). If a mark has left
+   * gravity, and text is inserted at the mark's current location, the mark
+   * will be moved to the left of the newly-inserted text. If the mark has
+   * right gravity (@a left_gravity = false), the mark will end up on the
+   * right of newly-inserted text. The standard left-to-right cursor is a
    * mark with right gravity (when you type, the cursor stays on the right
    * side of the text you're typing).
 
@@ -96,11 +93,11 @@ protected:
 public:
 
   /** Creates an anoymous text mark. Add it to a buffer using Gtk::TextBuffer::add_mark().
-   * If a mark has left 
-   * gravity, and text is inserted at the mark's current location, the mark 
-   * will be moved to the left of the newly-inserted text. If the mark has 
-   * right gravity (@a left_gravity = false), the mark will end up on the 
-   * right of newly-inserted text. The standard left-to-right cursor is a 
+   * If a mark has left
+   * gravity, and text is inserted at the mark's current location, the mark
+   * will be moved to the left of the newly-inserted text. If the mark has
+   * right gravity (@a left_gravity = false), the mark will end up on the
+   * right of newly-inserted text. The standard left-to-right cursor is a
    * mark with right gravity (when you type, the cursor stays on the right
    * side of the text you're typing).
 
@@ -112,11 +109,11 @@ public:
   _WRAP_CREATE(bool left_gravity = true)
 
 /** Creates a text mark. Add it to a buffer using Gtk::TextBuffer::add_mark().
-   * The mark can be retrieved by name using Gtk::TextBuffer::get_mark(). If a mark has left 
-   * gravity, and text is inserted at the mark's current location, the mark 
-   * will be moved to the left of the newly-inserted text. If the mark has 
-   * right gravity (@a left_gravity = false), the mark will end up on the 
-   * right of newly-inserted text. The standard left-to-right cursor is a 
+   * The mark can be retrieved by name using Gtk::TextBuffer::get_mark(). If a mark has left
+   * gravity, and text is inserted at the mark's current location, the mark
+   * will be moved to the left of the newly-inserted text. If the mark has
+   * right gravity (@a left_gravity = false), the mark will end up on the
+   * right of newly-inserted text. The standard left-to-right cursor is a
    * mark with right gravity (when you type, the cursor stays on the right
    * side of the text you're typing).
 
@@ -135,12 +132,12 @@ public:
   _WRAP_METHOD(Glib::RefPtr<const TextBuffer> get_buffer() const, gtk_text_mark_get_buffer, refreturn, constversion)
   _WRAP_METHOD(bool get_left_gravity() const, gtk_text_mark_get_left_gravity)
 
-  //TODO: Add a const overload, if we have a ConstTextIter. 
+  //TODO: Add a const overload, if we have a ConstTextIter.
   TextIter get_iter();
-  
+
   _WRAP_PROPERTY("name", Glib::ustring)
   _WRAP_PROPERTY("left-gravity", bool)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/texttag.ccg b/gtk/src/texttag.ccg
index 7f91b3c..b5db77d 100644
--- a/gtk/src/texttag.ccg
+++ b/gtk/src/texttag.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: texttag.ccg,v 1.2 2004/04/11 21:00:53 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/texttag.hg b/gtk/src/texttag.hg
index d420b6a..0cd69bc 100644
--- a/gtk/src/texttag.hg
+++ b/gtk/src/texttag.hg
@@ -1,7 +1,4 @@
-/* $Id: texttag.hg,v 1.5 2006/05/10 20:59:28 murrayc Exp $ */
-
-/* texttag.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -49,7 +46,7 @@ class TextIter;
  * them with that buffer.
  *
  * Tags can have names, which is convenient sometimes (for example, you can name your tag that makes things bold "bold"), but
- * they can also be anonymous (which is convenient if you're creating tags on-the-fly). 
+ * they can also be anonymous (which is convenient if you're creating tags on-the-fly).
  *
  * Gtk::TextBuffer::create_tag() is the best way to create tags. See the demo for numerous examples.
  *
@@ -138,5 +135,5 @@ public:
   _WRAP_PROPERTY("paragraph-background-set", bool)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/texttagtable.ccg b/gtk/src/texttagtable.ccg
index 314db65..c208859 100644
--- a/gtk/src/texttagtable.ccg
+++ b/gtk/src/texttagtable.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: texttagtable.ccg,v 1.5 2006/04/12 10:18:43 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -44,6 +40,6 @@ void TextTagTable::foreach(const SlotForEach& slot)
 }
 
 
-} /* namespace Gtk */
+} //namespace Gtk
 
 
diff --git a/gtk/src/texttagtable.hg b/gtk/src/texttagtable.hg
index 34ba5f5..389de3c 100644
--- a/gtk/src/texttagtable.hg
+++ b/gtk/src/texttagtable.hg
@@ -1,7 +1,4 @@
-/* $Id: texttagtable.hg,v 1.4 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* texttagtable.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -65,5 +62,5 @@ public:
 
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/textview.ccg b/gtk/src/textview.ccg
index 7a2ec05..4e5307b 100644
--- a/gtk/src/textview.ccg
+++ b/gtk/src/textview.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: textview.ccg,v 1.3 2005/11/29 16:38:10 murrayc Exp $ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/textview.hg b/gtk/src/textview.hg
index 3bb59ea..5a66937 100644
--- a/gtk/src/textview.hg
+++ b/gtk/src/textview.hg
@@ -1,5 +1,3 @@
-/* $Id: textview.hg,v 1.10 2006/04/12 11:11:25 murrayc Exp $ */
-
 /* Copyright(C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -123,7 +121,7 @@ public:
   _WRAP_METHOD(void get_visible_rect(Gdk::Rectangle& visible_rect) const, gtk_text_view_get_visible_rect)
   _WRAP_METHOD(void set_cursor_visible(bool setting = true), gtk_text_view_set_cursor_visible)
   _WRAP_METHOD(bool get_cursor_visible() const, gtk_text_view_get_cursor_visible)
-  
+
   _WRAP_METHOD(void get_cursor_locations(const TextBuffer::iterator& iter,  Gdk::Rectangle& strong,  Gdk::Rectangle& weak) const, gtk_text_view_get_cursor_locations)
 
   _WRAP_METHOD(void get_iter_location(const TextBuffer::iterator&  iter, Gdk::Rectangle& location) const, gtk_text_view_get_iter_location)
@@ -233,4 +231,4 @@ public:
   _WRAP_PROPERTY("im-module", Glib::ustring)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
diff --git a/gtk/src/toggleaction.ccg b/gtk/src/toggleaction.ccg
index a185227..7eae3b8 100644
--- a/gtk/src/toggleaction.ccg
+++ b/gtk/src/toggleaction.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: toggleaction.ccg,v 1.5 2004/03/27 00:30:38 murrayc Exp $ */
-
 /* Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/toggleaction.hg b/gtk/src/toggleaction.hg
index e8c19aa..1015f4c 100644
--- a/gtk/src/toggleaction.hg
+++ b/gtk/src/toggleaction.hg
@@ -1,5 +1,3 @@
-/* $Id: toggleaction.hg,v 1.5 2004/07/01 08:55:45 murrayc Exp $ */
-
 /* Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -28,7 +26,7 @@ namespace Gtk
 
 /** An action which can be toggled between two states.
  *
- * A Gtk::ToggleAction corresponds roughly to a Gtk::CheckMenuItem. 
+ * A Gtk::ToggleAction corresponds roughly to a Gtk::CheckMenuItem.
  * It has an "active" state specifying whether the action has been checked or not.
  *
  */
@@ -119,7 +117,7 @@ public:
 
   _WRAP_SIGNAL(void toggled(), "toggled")
 
-  _WRAP_PROPERTY("draw_as_radio", bool)          
+  _WRAP_PROPERTY("draw_as_radio", bool)
   _WRAP_PROPERTY("active", bool)
 };
 
diff --git a/gtk/src/togglebutton.ccg b/gtk/src/togglebutton.ccg
index 0852801..81dd08a 100644
--- a/gtk/src/togglebutton.ccg
+++ b/gtk/src/togglebutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: togglebutton.ccg,v 1.2 2006/07/16 19:18:49 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/togglebutton.hg b/gtk/src/togglebutton.hg
index a2fba1f..3718dc0 100644
--- a/gtk/src/togglebutton.hg
+++ b/gtk/src/togglebutton.hg
@@ -1,7 +1,4 @@
-/* $Id: togglebutton.hg,v 1.3 2006/07/16 19:18:49 murrayc Exp $ */
-
-/* togglebutton.h
- * 
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -58,7 +55,7 @@ public:
    * @param stock_id The stock item.
    */
   explicit ToggleButton(const StockID& stock_id);
-  
+
   _WRAP_METHOD(void set_mode(bool draw_indicator = true),gtk_toggle_button_set_mode)
   _WRAP_METHOD(bool get_mode() const,gtk_toggle_button_get_mode)
 
@@ -77,5 +74,5 @@ public:
   _WRAP_PROPERTY("draw-indicator", bool)
 };
 
-} /* namespace Gtk */
+} //namespace Gtk
 
diff --git a/gtk/src/toggletoolbutton.ccg b/gtk/src/toggletoolbutton.ccg
index c81124b..db4a458 100644
--- a/gtk/src/toggletoolbutton.ccg
+++ b/gtk/src/toggletoolbutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: toggletoolbutton.ccg,v 1.2 2003/11/23 17:08:07 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/toggletoolbutton.hg b/gtk/src/toggletoolbutton.hg
index fab98c9..934a50c 100644
--- a/gtk/src/toggletoolbutton.hg
+++ b/gtk/src/toggletoolbutton.hg
@@ -1,7 +1,4 @@
-/* $Id: toggletoolbutton.hg,v 1.5 2004/03/07 14:35:47 murrayc Exp $ */
-
-/* box.h
- *
+/*
  * Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -44,15 +41,15 @@ public:
   /** Creates a new ToggleToolButton.
    */
   _CTOR_DEFAULT()
-  
+
   /** Creates a new ToggleToolButton from a StockID.
    *
    * The ToggleToolButton will be created according to the @a stock_id properties.
-   * 
+   *
    * @param stock_id The StockID which determines the look of the ToggleToolButton.
    */
   _WRAP_CTOR(ToggleToolButton(const Gtk::StockID& stock_id), gtk_toggle_tool_button_new_from_stock)
-  
+
   /** Creates a new ToggleToolButton with a label.
    *
    * The ToggleToolButton will have the label @a label.
@@ -60,7 +57,7 @@ public:
    * @param label The string used to display the label for this ToggleToolButton.
    */
   explicit ToggleToolButton(const Glib::ustring& label);
-  
+
   /** Creates a new ToggleToolButton with an image.
    *
    * The ToggleToolButton will have the label @a label and an image widget @a icon_widget.
@@ -74,7 +71,7 @@ public:
   _WRAP_METHOD(bool get_active() const, gtk_toggle_tool_button_get_active)
 
   _WRAP_SIGNAL(void toggled(), toggled)
-  
+
   _WRAP_PROPERTY("active", bool)
 };
 
diff --git a/gtk/src/toolbar.ccg b/gtk/src/toolbar.ccg
index d2321cc..1a3707b 100644
--- a/gtk/src/toolbar.ccg
+++ b/gtk/src/toolbar.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: toolbar.ccg,v 1.6 2004/03/03 18:48:04 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/toolbutton.ccg b/gtk/src/toolbutton.ccg
index f56aafc..09d32ee 100644
--- a/gtk/src/toolbutton.ccg
+++ b/gtk/src/toolbutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: toolbutton.ccg,v 1.2 2003/11/23 17:08:07 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/toolitem.ccg b/gtk/src/toolitem.ccg
index 1f4535c..330aefd 100644
--- a/gtk/src/toolitem.ccg
+++ b/gtk/src/toolitem.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: toolitem.ccg,v 1.1 2003/10/22 15:40:19 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/toolitemgroup.ccg b/gtk/src/toolitemgroup.ccg
index 7eb11ee..97df1b4 100644
--- a/gtk/src/toolitemgroup.ccg
+++ b/gtk/src/toolitemgroup.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: toolitemgroup.ccg,v 1.1 2003/10/22 15:40:19 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -27,7 +23,7 @@ namespace Gtk
 
 void ToolItemGroup::insert(ToolItem& item)
 {
-  gtk_tool_item_group_insert(gobj(), (item).gobj(), -1 /* see docs */); 
+  gtk_tool_item_group_insert(gobj(), (item).gobj(), -1 /* see docs */);
 }
 
 } // namespace Gtk
diff --git a/gtk/src/toolitemgroup.hg b/gtk/src/toolitemgroup.hg
index 6ebd223..39ebabb 100644
--- a/gtk/src/toolitemgroup.hg
+++ b/gtk/src/toolitemgroup.hg
@@ -26,7 +26,7 @@ _PINCLUDE(gtkmm/private/container_p.h)
 namespace Gtk
 {
 
-/** A ToolItemGroup is used together with ToolPalette to add ToolItems to a 
+/** A ToolItemGroup is used together with ToolPalette to add ToolItems to a
  * palette-like container with different categories and drag and drop support.
  *
  * @newin{2,20}
@@ -58,13 +58,13 @@ public:
   _WRAP_METHOD(ReliefStyle get_header_relief() const, gtk_tool_item_group_get_header_relief)
 
   _WRAP_METHOD(void insert(ToolItem& item, int position), gtk_tool_item_group_insert)
-  
+
   /** Inserts @a item at the end of the list of children of the group.
-   * 
+   *
    * @param item The ToolItem to insert into the group.
    */
   void insert(ToolItem& item);
-  
+
   _WRAP_METHOD(void set_item_position(ToolItem& item, int position), gtk_tool_item_group_set_item_position)
   _WRAP_METHOD(int get_item_position(const ToolItem& item) const, gtk_tool_item_group_get_item_position)
 
diff --git a/gtk/src/toolpalette.ccg b/gtk/src/toolpalette.ccg
index 044c7a6..04a5806 100644
--- a/gtk/src/toolpalette.ccg
+++ b/gtk/src/toolpalette.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: toolpalette.ccg,v 1.6 2004/03/03 18:48:04 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2009 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/toolshell.ccg b/gtk/src/toolshell.ccg
index 67e2e91..6c671bd 100644
--- a/gtk/src/toolshell.ccg
+++ b/gtk/src/toolshell.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: editable.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/toolshell.hg b/gtk/src/toolshell.hg
index d43debe..b930bc6 100644
--- a/gtk/src/toolshell.hg
+++ b/gtk/src/toolshell.hg
@@ -1,5 +1,3 @@
-/* $Id: editable.hg,v 1.3 2006/05/18 17:53:15 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -35,7 +33,7 @@ namespace Gtk
 {
 
 /** A base class for containers containing ToolItem widgets.
- * This interface allows container widgets to provide additional information when embedding ToolItem widgets. 
+ * This interface allows container widgets to provide additional information when embedding ToolItem widgets.
  *
  * @newin{2,14}
  */
@@ -55,7 +53,7 @@ public:
 
   _WRAP_METHOD(Glib::RefPtr<SizeGroup> get_text_size_group(), gtk_tool_shell_get_text_size_group, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const SizeGroup> get_text_size_group() const, gtk_tool_shell_get_text_size_group, refreturn, constversion)
- 
+
 protected:
 
   _WRAP_VFUNC(IconSize get_icon_size(), get_icon_size)
diff --git a/gtk/src/tooltip.ccg b/gtk/src/tooltip.ccg
index 6dfcc84..0394c80 100644
--- a/gtk/src/tooltip.ccg
+++ b/gtk/src/tooltip.ccg
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * Copyright (C) 2007 The gtkmm Development Team
  *
diff --git a/gtk/src/tooltip.hg b/gtk/src/tooltip.hg
index 2a09fa4..5761669 100644
--- a/gtk/src/tooltip.hg
+++ b/gtk/src/tooltip.hg
@@ -76,33 +76,33 @@ protected:
 
 public:
   _WRAP_METHOD(void set_markup(const Glib::ustring& markup), gtk_tooltip_set_markup)
-  
+
   /** Hide the label.
    * @newin{3,2}
    */
   void unset_markup();
 
   _WRAP_METHOD(void set_text(const Glib::ustring& markup), gtk_tooltip_set_text)
-  
+
   /** Hide the label.
    * @newin{3,2}
    */
   void unset_text();
-  
+
   _WRAP_METHOD(void set_icon(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf), gtk_tooltip_set_icon)
   _WRAP_METHOD(void set_icon(const Glib::RefPtr<Gio::Icon>& icon, IconSize size), gtk_tooltip_set_icon_from_gicon)
 
   //TODO: Remove the _from_*() suffixes?
   _WRAP_METHOD(void set_icon_from_stock(const StockID& stock_id, IconSize size), gtk_tooltip_set_icon_from_stock)
   _WRAP_METHOD(void set_icon_from_icon_name(const Glib::ustring& icon_name, IconSize size), gtk_tooltip_set_icon_from_icon_name)
-    
+
   /** Hide the image.
    * @newin{3,2}
    */
   void unset_icon();
 
   _WRAP_METHOD(void set_custom(Widget& custom_widget), gtk_tooltip_set_custom)
-  
+
   /** Remove the custom widget.
    * @newin{3,2}
    */
diff --git a/gtk/src/treedragdest.ccg b/gtk/src/treedragdest.ccg
index 6204b6c..1977862 100644
--- a/gtk/src/treedragdest.ccg
+++ b/gtk/src/treedragdest.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: treedragdest.ccg,v 1.2 2003/01/23 22:20:34 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/treedragdest.hg b/gtk/src/treedragdest.hg
index c2dbc58..ee11111 100644
--- a/gtk/src/treedragdest.hg
+++ b/gtk/src/treedragdest.hg
@@ -1,5 +1,3 @@
-/* $Id: treedragdest.hg,v 1.4 2004/03/09 17:36:29 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -44,10 +42,10 @@ class TreeDragDest : public Glib::Interface
 
 public:
 
-  _WRAP_METHOD(bool drag_data_received(const TreeModel::Path& dest, const SelectionData& selection_data), gtk_tree_drag_dest_drag_data_received)              
+  _WRAP_METHOD(bool drag_data_received(const TreeModel::Path& dest, const SelectionData& selection_data), gtk_tree_drag_dest_drag_data_received)
 
   _WRAP_METHOD(bool row_drop_possible(const TreeModel::Path& dest_path, const SelectionData& selection_data) const, gtk_tree_drag_dest_row_drop_possible)
-                             
+
 protected:
   _WRAP_VFUNC(bool drag_data_received(const TreeModel::Path& dest, const SelectionData& selection_data),
               drag_data_received)
diff --git a/gtk/src/treedragsource.ccg b/gtk/src/treedragsource.ccg
index 7782f61..b990ce0 100644
--- a/gtk/src/treedragsource.ccg
+++ b/gtk/src/treedragsource.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: treedragsource.ccg,v 1.4 2006/05/11 11:40:24 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/treedragsource.hg b/gtk/src/treedragsource.hg
index 6c32631..b6dca9f 100644
--- a/gtk/src/treedragsource.hg
+++ b/gtk/src/treedragsource.hg
@@ -1,5 +1,3 @@
-/* $Id: treedragsource.hg,v 1.8 2006/05/10 20:59:28 murrayc Exp $ */
-
 /* Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -46,7 +44,7 @@ public:
   _WRAP_METHOD(bool row_draggable(const TreeModel::Path& path) const, gtk_tree_drag_source_row_draggable)
 
   _WRAP_METHOD(bool drag_data_get(const TreeModel::Path& path, SelectionData& selection_data), gtk_tree_drag_source_drag_data_get)
-               
+
   _WRAP_METHOD(bool drag_data_delete(const TreeModel::Path& path), gtk_tree_drag_source_drag_data_delete)
 
 protected:
@@ -64,7 +62,7 @@ dnl// We want to hand-code these C vfunc callbacks,
 
   //We hand-code this so that we can use a temporary instance for the SelectionData& output parameter:
   virtual bool drag_data_get_vfunc(const TreeModel::Path& path, SelectionData& selection_data) const;
-   
+
   _WRAP_VFUNC(bool drag_data_delete(const TreeModel::Path& path), drag_data_delete)
 };
 
diff --git a/gtk/src/treeiter.ccg b/gtk/src/treeiter.ccg
index c3ec665..f6a081e 100644
--- a/gtk/src/treeiter.ccg
+++ b/gtk/src/treeiter.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: treeiter.ccg,v 1.10 2006/04/12 08:23:29 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -181,7 +178,7 @@ int TreeIter::get_stamp() const
 void TreeIter::set_stamp(int stamp)
 {
   gobj()->stamp = stamp;
-} 
+}
 
 
 /**** Gtk::TreeRow *********************************************************/
@@ -254,7 +251,7 @@ TreeNodeChildren::iterator TreeNodeChildren::begin()
 TreeNodeChildren::const_iterator TreeNodeChildren::begin() const
 {
   //TODO: Reduce the copy/paste from the non-const begin()?
-  
+
   const_iterator iter (model_);
 
   // If the iterator is invalid (stamp == 0), assume a 'virtual' toplevel
diff --git a/gtk/src/treeiter.hg b/gtk/src/treeiter.hg
index cdc07db..1a58a97 100644
--- a/gtk/src/treeiter.hg
+++ b/gtk/src/treeiter.hg
@@ -1,5 +1,3 @@
-/* $Id: treeiter.hg,v 1.14 2005/04/07 08:46:44 murrayc Exp $ */
-
 /* Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software, ) you can redistribute it and/or
@@ -112,15 +110,15 @@ public:
   /** Please note that this is very slow compared to operator++().
    */
   const TreeIter operator--(int);
-  
+
   inline reference operator*()  const;
   inline pointer   operator->() const;
 
   bool equal(const TreeIter& other) const;
 
-  /** This typedef is just to make it more obvious that 
+  /** This typedef is just to make it more obvious that
    * our operator const void* should be used like operator bool().
-   */ 
+   */
   typedef const void* BoolExpr;
 
   /** Discover whether the iterator is valid, and not equal to end().
@@ -296,9 +294,9 @@ public:
    */
   TreeIter parent() const;
 
-  /** This typedef is just to make it more obvious that 
+  /** This typedef is just to make it more obvious that
    * our operator const void* should be used like operator bool().
-   */ 
+   */
   typedef const void* BoolExpr;
 
   /** Discover whether this is a valid row.
@@ -310,10 +308,10 @@ public:
    */
   operator BoolExpr() const;
 
-  /// Provides access to the underlying C GObject.  
+  /// Provides access to the underlying C GObject.
   GtkTreeIter*       gobj()       { return TreeIter::gobj(); }
 
-  /// Provides access to the underlying C GObject.  
+  /// Provides access to the underlying C GObject.
   const GtkTreeIter* gobj() const { return TreeIter::gobj(); }
 
 private:
@@ -370,9 +368,9 @@ public:
   size_type size() const;
   bool empty() const;
 
-  /** This typedef is just to make it more obvious that 
+  /** This typedef is just to make it more obvious that
    * our operator const void* should be used like operator bool().
-   */ 
+   */
   typedef const void* BoolExpr;
 
   /** Discover whether this is a valid TreeNodeChildren.
diff --git a/gtk/src/treemodel.ccg b/gtk/src/treemodel.ccg
index 8cf9a79..144bc89 100644
--- a/gtk/src/treemodel.ccg
+++ b/gtk/src/treemodel.ccg
@@ -1,7 +1,5 @@
-// -*- c++ -*-
-/* $Id: treemodel.ccg,v 1.13 2006/05/11 11:40:24 murrayc Exp $ */
-
-/* Copyright 1998-2002 The gtkmm Development Team
+/*
+ * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/gtk/src/treemodel.hg b/gtk/src/treemodel.hg
index 3afd1c3..3930bb7 100644
--- a/gtk/src/treemodel.hg
+++ b/gtk/src/treemodel.hg
@@ -1,6 +1,5 @@
-/* $Id: treemodel.hg,v 1.25 2006/05/10 20:59:28 murrayc Exp $ */
-
-/* Copyright (C) 1998-2002 The gtkmm Development Team
+/*
+ * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -86,7 +85,7 @@ class TreeModel : public Glib::Interface
   _CLASS_INTERFACE(TreeModel, GtkTreeModel, GTK_TREE_MODEL, GtkTreeModelIface)
   _IGNORE(
       gtk_tree_model_iter_parent, gtk_tree_model_get_iter, gtk_tree_model_get,
-      gtk_tree_model_get_iter_from_string, gtk_tree_model_get_string_from_iter, 
+      gtk_tree_model_get_iter_from_string, gtk_tree_model_get_string_from_iter,
       gtk_tree_model_iter_nth_child,
       gtk_tree_model_ref_node, gtk_tree_model_get_valist,
       gtk_tree_model_iter_next, gtk_tree_model_iter_previous, gtk_tree_model_iter_has_child,
@@ -102,11 +101,11 @@ public:
   typedef Children::reverse_iterator reverse_iterator;
   typedef Children::const_iterator const_iterator;
   typedef Children::const_reverse_iterator const_reverse_iterator;
-  
+
   typedef TreeRow Row;
   typedef TreePath Path;
   typedef TreeRowReference RowReference;
-  
+
 
   //These are part of GtkTreeModelFilter or GtkTreeModelSort, not GtkTreeModel:
   _IGNORE(gtk_tree_model_filter_new, gtk_tree_model_sort_new_with_model, gtk_tree_model_filter_sort_new_with_model)
@@ -183,7 +182,7 @@ public:
   _WRAP_METHOD(int get_n_columns() const, gtk_tree_model_get_n_columns)
   _WRAP_METHOD(GType get_column_type(int index) const, gtk_tree_model_get_column_type)
   //TODO: A C++-type version of get_column_type()?
-  
+
   _WRAP_METHOD(TreeModel::Path get_path(const iterator& iter) const, gtk_tree_model_get_path)
 
   _WRAP_METHOD(void row_changed(const Path& path, const iterator& iter), gtk_tree_model_row_changed)
@@ -192,7 +191,7 @@ public:
   _WRAP_METHOD(void row_deleted(const Path& path), gtk_tree_model_row_deleted)
 
  /** Emits the "rows_reordered" signal on the tree model.  This should be called by
-  * custom models when their rows have been reordered. 
+  * custom models when their rows have been reordered.
   *
   * @param path A tree path pointing to the tree node whose children have been reordered.
   * @param iter A valid iterator pointing to the node whose children have been reordered. See also, rows_reordered(const Path& path, const std::vector<int>& new_order), if the path has a depth of 0.
@@ -202,7 +201,7 @@ public:
   void rows_reordered(const Path& path, const iterator& iter, const std::vector<int>& new_order);
 
  /** Emits the "rows_reordered" signal on the tree model.  This should be called by
-  * custom models when their rows have been reordered. This method overload is for nodes whose 
+  * custom models when their rows have been reordered. This method overload is for nodes whose
   * path has a depth of 0.
   * @newin{2,10}
   *
@@ -211,7 +210,7 @@ public:
   * to its old position before the re-ordering, i.e. @a new_order<literal>[newpos] = oldpos.
   */
   void rows_reordered(const Path& path, const std::vector<int>& new_order);
-  
+
   _WRAP_METHOD(void rows_reordered(const Path& path, const iterator& iter, int* new_order), gtk_tree_model_rows_reordered)
 
   _WRAP_METHOD(Glib::ustring get_string(const iterator& iter) const, gtk_tree_model_get_string_from_iter)
@@ -259,7 +258,7 @@ protected:
    * @result true if the operation was possible.
    */
   virtual bool iter_children_vfunc(const iterator& parent, iterator& iter) const;
-  
+
   /** Override and implement this in a derived TreeModel class.
    * Sets @a iter to be the parent of @a child. If @a child is at the toplevel, and
    * doesn't have a parent, then @a iter is set to an invalid iterator and false
@@ -296,8 +295,8 @@ protected:
    */
   virtual bool iter_nth_root_child_vfunc(int n, iterator& iter) const;
 
-  
-    
+
+
 #m4begin
 dnl// We want to hand-code these C vfunc callbacks,
 dnl// so that we can do forward them to C++ methods with different parameters and return types.
@@ -329,7 +328,7 @@ dnl
 
   /** Override and implement this in a derived TreeModel class.
    * Returns the number of children that @a iter has.
-   * See also iter_n_root_children_vfunc().  
+   * See also iter_n_root_children_vfunc().
    *
    * @param iter The iterator to test for children.
    * @result The number of children of @a iter.
@@ -394,7 +393,7 @@ dnl
 
   //Called by TreeRow, which is a friend class:
   //The comment about set_row_changed() in the documentation is based on my reading of the source of
-  //gtk_list_store_set_value() and gtk_tree_store_set_value().  
+  //gtk_list_store_set_value() and gtk_tree_store_set_value().
   /** Override and implement this in a derived TreeModel class, so that Row::operator() and
    * Row::set_value() work.
    * You can probably just implement this by calling set_value_vfunc().
@@ -412,4 +411,3 @@ dnl
 };
 
 } // namespace Gtk
-
diff --git a/gtk/src/treemodelfilter.ccg b/gtk/src/treemodelfilter.ccg
index 21015a7..43f3d1f 100644
--- a/gtk/src/treemodelfilter.ccg
+++ b/gtk/src/treemodelfilter.ccg
@@ -1,7 +1,5 @@
-// -*- c++ -*-
-/* $Id: treemodelfilter.ccg,v 1.9 2006/05/11 11:40:24 murrayc Exp $ */
-
-/* Copyright 1998-2002 The gtkmm Development Team
+/*
+ * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -54,7 +52,7 @@ static void SignalProxy_Modify_gtk_callback(GtkTreeModel* model, GtkTreeIter* it
     Glib::ValueBase cppValue;
     GType column_type = gtk_tree_model_get_column_type(model, column);
     cppValue.init(column_type);
-    
+
     (*the_slot)( Gtk::TreeModel::const_iterator(model, iter), cppValue, column );
 
     //GTK+ has already done this for us: g_value_init(value, column_type);
@@ -160,4 +158,3 @@ void TreeModelFilter::set_value_impl(const iterator& row, int column, const Glib
 
 
 } // namespace Gtk
-
diff --git a/gtk/src/treemodelfilter.hg b/gtk/src/treemodelfilter.hg
index 6c7e491..c918be4 100644
--- a/gtk/src/treemodelfilter.hg
+++ b/gtk/src/treemodelfilter.hg
@@ -1,6 +1,5 @@
-/* $Id: treemodelfilter.hg,v 1.16 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* Copyright(C) 1998-2002 The gtkmm Development Team
+/*
+ * Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,9 +27,9 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gtk
 {
 
-/** 
+/**
  * @ingroup TreeView
- * 
+ *
  */
 class TreeModelFilter :
   public Glib::Object,
@@ -63,7 +62,7 @@ public:
   /** For instance,
    * bool on_visible(const TreeModel::const_iterator& iter);
    * This should return true if the given row should be visible and false otherwise.
-   */                                     
+   */
   typedef sigc::slot<bool, const TreeModel::const_iterator&> SlotVisible;
 
   /** Sets the "visible" callback used when filtering the filter.
@@ -86,7 +85,7 @@ public:
    */
   typedef sigc::slot<void, const Gtk::TreeModel::iterator& /* iter */, Glib::ValueBase& /* value */, int /* column */> SlotModify;
 
-  /** Specify columns that will be provided by this model, and a callback that will provide data for these 
+  /** Specify columns that will be provided by this model, and a callback that will provide data for these
    * columns based on data in the columns of the child model.
    * The modify function will get called for each data access.
    *
@@ -95,7 +94,7 @@ public:
    */
   void set_modify_func(const TreeModelColumnRecord& columns, const SlotModify& slot);
   _IGNORE(gtk_tree_model_filter_set_modify_func)
- 
+
   _WRAP_METHOD(void set_visible_column(const TreeModelColumnBase& column), gtk_tree_model_filter_set_visible_column)
   _WRAP_METHOD(void set_visible_column(int column), gtk_tree_model_filter_set_visible_column)
 
@@ -121,7 +120,7 @@ public:
 
   _WRAP_METHOD(void refilter(), gtk_tree_model_filter_refilter)
   _WRAP_METHOD(void clear_cache(), gtk_tree_model_filter_clear_cache)
-  
+
   _WRAP_PROPERTY("child-model", Glib::RefPtr<TreeModel>)
   _WRAP_PROPERTY("virtual-root", TreeModel::Path)
 
@@ -130,4 +129,3 @@ protected:
 };
 
 } // namespace Gtk
-
diff --git a/gtk/src/treemodelsort.ccg b/gtk/src/treemodelsort.ccg
index 18a7162..74534c6 100644
--- a/gtk/src/treemodelsort.ccg
+++ b/gtk/src/treemodelsort.ccg
@@ -1,7 +1,5 @@
-// -*- c++ -*-
-/* $Id: treemodelsort.ccg,v 1.2 2003/11/04 18:11:36 murrayc Exp $ */
-
-/* Copyright 1998-2002 The gtkmm Development Team
+/*
+ * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +18,6 @@
 
 #include <gtk/gtk.h>
 
-
 typedef Gtk::TreeModel::Path Path; //So that the generated method implemenations can use this a return type.
 
 namespace Gtk
@@ -67,4 +64,3 @@ void TreeModelSort::set_value_impl(const iterator& row, int column, const Glib::
 }
 
 } // namespace Gtk
-
diff --git a/gtk/src/treemodelsort.hg b/gtk/src/treemodelsort.hg
index e7e6602..fb9f30f 100644
--- a/gtk/src/treemodelsort.hg
+++ b/gtk/src/treemodelsort.hg
@@ -1,6 +1,5 @@
-/* $Id: treemodelsort.hg,v 1.5 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* Copyright(C) 1998-2002 The gtkmm Development Team
+/*
+ * Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -32,13 +31,13 @@ namespace Gtk
 
 /** A wrapper which makes an underlying Gtk::TreeModel sortable.
  *
- * The TreeModelSort is a model which implements the TreeSortable interface. 
+ * The TreeModelSort is a model which implements the TreeSortable interface.
  * It does not hold any data itself, but rather is created with
  * a child model and proxies its data.  It has identical column types to
  * this child model, and the changes in the child are propagated.  The
  * primary purpose of this model is to provide a way to sort a different
  * model without modifying it. Note that the sort function used by
- * TreeModelSort is not guaranteed to be stable. 
+ * TreeModelSort is not guaranteed to be stable.
  *
  * For instance, you might create two TreeView widgets each with a
  * view of the same data.  If the model is wrapped by a
@@ -86,7 +85,7 @@ public:
   _WRAP_METHOD(void clear_cache(), gtk_tree_model_sort_clear_cache)
 
   _WRAP_METHOD(bool iter_is_valid(const iterator& iter) const, gtk_tree_model_sort_iter_is_valid)
-  
+
   _WRAP_PROPERTY("model", Glib::RefPtr<TreeModel>)
 
 protected:
@@ -94,4 +93,3 @@ protected:
 };
 
 } // namespace Gtk
-
diff --git a/gtk/src/treepath.ccg b/gtk/src/treepath.ccg
index cfd03b8..53abe0c 100644
--- a/gtk/src/treepath.ccg
+++ b/gtk/src/treepath.ccg
@@ -1,7 +1,5 @@
-// -*- c++ -*-
-/* $Id: treepath.ccg,v 1.5 2005/11/29 16:38:10 murrayc Exp $ */
-
-/* Copyright 1998-2002 The gtkmm Development Team
+/*
+ * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/gtk/src/treepath.hg b/gtk/src/treepath.hg
index 0687810..677701e 100644
--- a/gtk/src/treepath.hg
+++ b/gtk/src/treepath.hg
@@ -1,6 +1,5 @@
-/* $Id: treepath.hg,v 1.15 2006/02/25 12:38:11 murrayc Exp $ */
-
-/* Copyright(C) 1998-2002 The gtkmm Development Team
+/*
+ * Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software, ) you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -85,9 +84,9 @@ public:
   // I think it's OK for this assignment to be implicit.  It's very useful.
   TreePath& operator=(const TreeModel::iterator& iter);
 
-  /** This typedef is just to make it more obvious that 
+  /** This typedef is just to make it more obvious that
    * our operator const void* should be used like operator bool().
-   */ 
+   */
   typedef const void* BoolExpr;
 
   /** Checks that the path is not empty, by calling empty().
@@ -230,5 +229,4 @@ struct TreePathTraits
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
-
 } // namespace Gtk
diff --git a/gtk/src/treerowreference.ccg b/gtk/src/treerowreference.ccg
index b1cf5f6..d63eb12 100644
--- a/gtk/src/treerowreference.ccg
+++ b/gtk/src/treerowreference.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: treerowreference.ccg,v 1.2 2003/01/22 23:04:19 murrayc Exp $ */
-
 /* Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/treerowreference.hg b/gtk/src/treerowreference.hg
index f270950..0333b4c 100644
--- a/gtk/src/treerowreference.hg
+++ b/gtk/src/treerowreference.hg
@@ -1,6 +1,5 @@
-/* $Id: treerowreference.hg,v 1.7 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* Copyright (C) 2002 The gtkmm Development Team
+/*
+ * Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -39,9 +38,9 @@ class TreeRowReference
 public:
   TreeRowReference(const Glib::RefPtr<TreeModel>& model, const TreeModel::Path& path);
 
-  /** This typedef is just to make it more obvious that 
+  /** This typedef is just to make it more obvious that
    * our operator const void* should be used like operator bool().
-   */ 
+   */
   typedef const void* BoolExpr;
 
   /** The same as is_valid().
diff --git a/gtk/src/treeselection.ccg b/gtk/src/treeselection.ccg
index c31c77e..23b7917 100644
--- a/gtk/src/treeselection.ccg
+++ b/gtk/src/treeselection.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: treeselection.ccg,v 1.10 2006/05/11 11:40:24 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -183,4 +180,3 @@ std::vector<TreeModel::Path> TreeSelection::get_selected_rows(Glib::RefPtr<TreeM
 }
 
 } // namespace Gtk
-
diff --git a/gtk/src/treeselection.hg b/gtk/src/treeselection.hg
index d910621..32aa45f 100644
--- a/gtk/src/treeselection.hg
+++ b/gtk/src/treeselection.hg
@@ -1,5 +1,3 @@
-/* $Id: treeselection.hg,v 1.6 2006/04/12 11:11:25 murrayc Exp $ */
-
 /* Copyright(C) 1998-1999 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -61,10 +59,10 @@ class TreePath;
 class TreeSelection : public Glib::Object
 {
    _CLASS_GOBJECT(TreeSelection, GtkTreeSelection, GTK_TREE_SELECTION, Glib::Object, GObject)
-   _IGNORE(gtk_tree_selection_get_selected, 
+   _IGNORE(gtk_tree_selection_get_selected,
            gtk_tree_selection_get_selected_rows, gtk_tree_selection_count_selected_rows)
 protected:
-  
+
 
 public:
   _WRAP_METHOD(void set_mode(SelectionMode type), gtk_tree_selection_set_mode)
@@ -99,7 +97,7 @@ public:
   Glib::RefPtr<const TreeModel> get_model() const; // convenience function, not in GTK+
 
   //TODO: Add TreeModel::const_iterator get_selected() const, when we have a real const_iterator.
-  
+
   /** Get the currently selected row.
    * @return The currently selected row.
    * @note
@@ -199,10 +197,10 @@ public:
 
   _WRAP_METHOD(bool is_selected(const TreeModel::Path& path) const, gtk_tree_selection_path_is_selected)
   _WRAP_METHOD(bool is_selected(const TreeModel::iterator& iter) const, gtk_tree_selection_iter_is_selected)
-  
+
   _WRAP_METHOD(void select_all(), gtk_tree_selection_select_all)
   _WRAP_METHOD(void unselect_all(), gtk_tree_selection_unselect_all)
-  
+
   _WRAP_PROPERTY("mode", SelectionMode)
 
   _WRAP_SIGNAL(void changed(), "changed")
diff --git a/gtk/src/treesortable.ccg b/gtk/src/treesortable.ccg
index c929bae..a42cfc4 100644
--- a/gtk/src/treesortable.ccg
+++ b/gtk/src/treesortable.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: treesortable.ccg,v 1.7 2006/05/11 11:40:24 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -75,4 +72,3 @@ void TreeSortable::unset_default_sort_func()
 }
 
 } // namespace Gtk
-
diff --git a/gtk/src/treesortable.hg b/gtk/src/treesortable.hg
index 06664fe..bbca930 100644
--- a/gtk/src/treesortable.hg
+++ b/gtk/src/treesortable.hg
@@ -1,7 +1,5 @@
-/* $Id: treesortable.hg,v 1.8 2006/04/21 07:41:28 murrayc Exp $ */
-
-
-/* Copyright (C) 1998-2002 The gtkmm Development Team
+/*
+ * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -67,7 +65,7 @@ public:
   _WRAP_METHOD(void set_sort_column(int sort_column_id, SortType order),
                gtk_tree_sortable_set_sort_column_id)
 
-  /** This callback should return -1 if a compares before b, 0 if they compare equal, 1 if a compares after b. 
+  /** This callback should return -1 if a compares before b, 0 if they compare equal, 1 if a compares after b.
    * For instance, int on_sort_compare(const Gtk::TreeModel::iterator& a, const Gtk::TreeModel::iterator& b);
    */
   typedef sigc::slot<int, const Gtk::TreeModel::iterator&, const Gtk::TreeModel::iterator&> SlotCompare;
diff --git a/gtk/src/treestore.ccg b/gtk/src/treestore.ccg
index 1c5a576..6e0374c 100644
--- a/gtk/src/treestore.ccg
+++ b/gtk/src/treestore.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: treestore.ccg,v 1.3 2004/04/03 12:53:49 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -37,7 +34,7 @@ void TreeStore::set_column_types(const TreeModelColumnRecord& columns)
 {
    gtk_tree_store_set_column_types(gobj(), columns.size(), const_cast<GType*>(columns.types()));
 }
-  
+
 TreeModel::iterator TreeStore::erase(const iterator& iter)
 {
   g_assert(iter.get_gobject_if_not_end() != 0);
@@ -139,4 +136,3 @@ void TreeStore::set_value_impl(const iterator& row, int column, const Glib::Valu
 }
 
 } // namespace Gtk
-
diff --git a/gtk/src/treestore.hg b/gtk/src/treestore.hg
index 0ce84c9..488901d 100644
--- a/gtk/src/treestore.hg
+++ b/gtk/src/treestore.hg
@@ -1,5 +1,3 @@
-/* $Id: treestore.hg,v 1.5 2004/04/03 12:53:49 murrayc Exp $ */
-
 /* Copyright(C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -63,7 +61,7 @@ protected:
    * constructor should only be used by derived classes.
    */
   _CTOR_DEFAULT
-  
+
   explicit TreeStore(const TreeModelColumnRecord& columns);
 
 public:
@@ -138,7 +136,7 @@ public:
    *
    * @param node The list of the parent row's children, as returned by Gtk::TreeModel::iterator::children().
    * @result An iterator to the new row.
-   */  
+   */
   iterator append(const TreeNodeChildren& node);
 
   _WRAP_METHOD(void iter_swap(const iterator& a, const iterator& b), gtk_tree_store_swap)
diff --git a/gtk/src/treeview.ccg b/gtk/src/treeview.ccg
index 4c2fa9a..19f634d 100644
--- a/gtk/src/treeview.ccg
+++ b/gtk/src/treeview.ccg
@@ -1,6 +1,3 @@
-// -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-/* $Id: treeview.ccg,v 1.24 2006/06/19 17:28:12 murrayc Exp $ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -481,5 +478,4 @@ void TreeView::unset_row_separator_func()
   gtk_tree_view_set_row_separator_func(gobj(), 0, 0, 0);
 }
 
-
 } // namespace Gtk
diff --git a/gtk/src/treeview.hg b/gtk/src/treeview.hg
index fad4e61..3d02711 100644
--- a/gtk/src/treeview.hg
+++ b/gtk/src/treeview.hg
@@ -696,8 +696,8 @@ public:
   _WRAP_METHOD(bool is_rubber_banding_active() const, gtk_tree_view_is_rubber_banding_active)
 
   /** The slot type for determining whether the row pointed to by the iterator should be rendered as a separator.
-   * Return true if the row is a separator. 
-   * A common way to implement this is to have a boolean column in the model, whose values the slot returns. 
+   * Return true if the row is a separator.
+   * A common way to implement this is to have a boolean column in the model, whose values the slot returns.
    *
    * For instance,
    * bool on_row_separator(const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator& iter);
@@ -708,7 +708,7 @@ public:
    */
   void set_row_separator_func(const SlotRowSeparator& slot);
   _IGNORE(gtk_tree_view_set_row_separator_func, gtk_tree_view_get_row_separator_func)
-  
+
   /** Removes the row separator function, so no separators are drawn.
    * See set_row_separator_func().
    *
diff --git a/gtk/src/treeviewcolumn.ccg b/gtk/src/treeviewcolumn.ccg
index e0b281a..a2f5bfa 100644
--- a/gtk/src/treeviewcolumn.ccg
+++ b/gtk/src/treeviewcolumn.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: treeviewcolumn.ccg,v 1.6 2006/05/10 20:59:28 murrayc Exp $ */
-
 /* Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -82,5 +79,4 @@ void TreeViewColumn::unset_cell_data_func(CellRenderer& cell_renderer)
   gtk_tree_view_column_set_cell_data_func(gobj(), cell_renderer.gobj(), 0, 0, 0);
 }
 
-
 } // namespace Gtk
diff --git a/gtk/src/treeviewcolumn.hg b/gtk/src/treeviewcolumn.hg
index d0f348b..8e932a6 100644
--- a/gtk/src/treeviewcolumn.hg
+++ b/gtk/src/treeviewcolumn.hg
@@ -204,7 +204,7 @@ public:
 
   _WRAP_METHOD(Button* get_button(), gtk_tree_view_column_get_button, refreturn)
   _WRAP_METHOD(const Button* get_button() const, gtk_tree_view_column_get_button, refreturn, constversion)
-  
+
   _WRAP_SIGNAL(void clicked(), "clicked")
 
   _WRAP_PROPERTY("visible", bool)
diff --git a/gtk/src/uimanager.ccg b/gtk/src/uimanager.ccg
index a391155..0c4b6be 100644
--- a/gtk/src/uimanager.ccg
+++ b/gtk/src/uimanager.ccg
@@ -1,7 +1,5 @@
-// -*- c++ -*-
-/* $Id: uimanager.ccg,v 1.9 2006/11/24 19:09:39 jhs Exp $ */
-
-/* Copyright 2003 The gtkmm Development Team
+/*
+ * Copyright 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -34,7 +32,7 @@ UIManager::ui_merge_id UIManager::add_ui_from_string(const Glib::ustring& buffer
   guint retvalue = gtk_ui_manager_add_ui_from_string(gobj(), buffer.c_str(), buffer.size(), &(gerror));
 
   if (gerror)
-  { 
+  {
   ::Glib::Error::throw_exception(gerror);
   }
   return retvalue;
@@ -45,6 +43,5 @@ void UIManager::add_ui_separator(ui_merge_id merge_id, const Glib::ustring& path
   gtk_ui_manager_add_ui(gobj(), merge_id, path.c_str(), name.c_str(), 0 /* See C docs */, ((GtkUIManagerItemType)(type)), static_cast<int>(top));
 }
 
-
 } // namespace Gtk
 
diff --git a/gtk/src/uimanager.hg b/gtk/src/uimanager.hg
index 3006a5d..e47d39f 100644
--- a/gtk/src/uimanager.hg
+++ b/gtk/src/uimanager.hg
@@ -1,6 +1,5 @@
-/* $Id: uimanager.hg,v 1.17 2006/05/11 11:40:24 murrayc Exp $ */
-
-/* Copyright (C) 2003 The gtkmm Development Team
+/*
+ * Copyright (C) 2003 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,7 +21,7 @@
 #include <gtkmm/widget.h>
 #include <gtkmm/action.h>
 #include <gtkmm/actiongroup.h>
- 
+
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/object_p.h)
 
@@ -33,7 +32,7 @@ _PINCLUDE(glibmm/private/object_p.h)
 
 namespace Gtk
 {
-	
+
 _WRAP_ENUM(UIManagerItemType, GtkUIManagerItemType)
 
 /** Constructing menus and toolbars from an XML description.
@@ -55,11 +54,11 @@ _WRAP_ENUM(UIManagerItemType, GtkUIManagerItemType)
  * <!ELEMENT toolitem     (menu?) >
  * <!ELEMENT separator    EMPTY >
  * <!ELEMENT accelerator  EMPTY >
- * <!ATTLIST menubar      name                  #IMPLIED 
+ * <!ATTLIST menubar      name                  #IMPLIED
  *                      action                #IMPLIED >
- * <!ATTLIST toolbar      name                  #IMPLIED 
+ * <!ATTLIST toolbar      name                  #IMPLIED
  *                      action                #IMPLIED >
- * <!ATTLIST popup        name                  #IMPLIED 
+ * <!ATTLIST popup        name                  #IMPLIED
  *                      action                #IMPLIED >
  * <!ATTLIST placeholder  name                  #IMPLIED
  *                       action                #IMPLIED >
@@ -79,14 +78,14 @@ _WRAP_ENUM(UIManagerItemType, GtkUIManagerItemType)
  *                       action                #REQUIRED >
  * \endcode
  *
- * There are some additional restrictions beyond those specified in the DTD, e.g. 
+ * There are some additional restrictions beyond those specified in the DTD, e.g.
  * every toolitem must have a toolbar in its anchestry and every menuitem must have a +
- * menubar or popup in its anchestry. Since a GMarkup parser is used to parse the UI description, 
+ * menubar or popup in its anchestry. Since a GMarkup parser is used to parse the UI description,
  * it must not only be valid XML, but valid GMarkup.
  *
  * If a name is not specified, it defaults to the action. If an action is not specified either,
- * the element name is used. The name and action attributes must not contain '/' characters after 
- * parsing (since that would mess up path lookup) and must be usable as XML attributes when 
+ * the element name is used. The name and action attributes must not contain '/' characters after
+ * parsing (since that would mess up path lookup) and must be usable as XML attributes when
  * enclosed in doublequotes, thus they must not '"' characters or references to the &quot; entity.
  *
  * \par Example: UI Definition
@@ -116,7 +115,7 @@ _WRAP_ENUM(UIManagerItemType, GtkUIManagerItemType)
  * </toolbar>
  * </ui>
  * \endcode
- * 
+ *
  * The constructed widget hierarchy is very similar to the element tree of the XML,
  * with the exception that placeholders are merged into their parents. The correspondence
  * of XML elements to widgets should be almost obvious:
@@ -125,50 +124,50 @@ _WRAP_ENUM(UIManagerItemType, GtkUIManagerItemType)
  * - popup  a toplevel Gtk::Menu
  * - menu  a Gtk::Menu attached to a menuitem
  * - menuitem  a Gtk::MenuItem subclass, the exact type depends on the action
- * - toolitem  a Gtk::ToolItem subclass, the exact type depends on the action. 
- * Note that toolitem elements may contain a menu element, but only if their 
+ * - toolitem  a Gtk::ToolItem subclass, the exact type depends on the action.
+ * Note that toolitem elements may contain a menu element, but only if their
  * associated action specifies a Gtk::MenuToolButton as proxy.
  * - separator  a Gtk::SeparatorMenuItem or Gtk::SeparatorToolItem
  * - accelerator 	a keyboard accelerator
- * 
- * The "position" attribute determines where a constructed widget is positioned wrt. 
- * to its siblings in the partially constructed tree. If it is "top", the widget is 
- * prepended, otherwise it is appended. 
+ *
+ * The "position" attribute determines where a constructed widget is positioned wrt.
+ * to its siblings in the partially constructed tree. If it is "top", the widget is
+ * prepended, otherwise it is appended.
  *
  * \par UI Merging
  *
- * The most remarkable feature of Gtk::UIManager is that it can overlay a set of menuitems 
+ * The most remarkable feature of Gtk::UIManager is that it can overlay a set of menuitems
  * and toolitems over another one, and demerge them later.
  *
  * Merging is done based on the names of the XML elements. Each element is identified by
- * a path which consists of the names of its anchestors, separated by slashes. For example, 
- * the menuitem named "Left" in the example above has the path /ui/menubar/JustifyMenu/Left 
+ * a path which consists of the names of its anchestors, separated by slashes. For example,
+ * the menuitem named "Left" in the example above has the path /ui/menubar/JustifyMenu/Left
  * and the toolitem with the same name has path /ui/toolbar1/JustifyToolItems/Left.
  *
  * \par Accelerators
  *
- * Every action has an accelerator path. Accelerators are installed together with menuitem 
- * proxies, but they can also be explicitly added with <accelerator> elements in the 
- * UI definition. This makes it possible to have accelerators for actions even 
+ * Every action has an accelerator path. Accelerators are installed together with menuitem
+ * proxies, but they can also be explicitly added with <accelerator> elements in the
+ * UI definition. This makes it possible to have accelerators for actions even
  * if they have no visible proxies.
- * 
+ *
  * \par Smart Separators
  *
- * The separators created by Gtk::UIManager are "smart", i.e. they do not show up in 
- * the UI unless they end up between two visible menu or tool items. Separators which are 
- * located at the very beginning or end of the menu or toolbar containing them, or multiple 
- * separators next to each other, are hidden. This is a useful feature, since the merging 
- * of UI elements from multiple sources can make it hard or impossible to determine in 
+ * The separators created by Gtk::UIManager are "smart", i.e. they do not show up in
+ * the UI unless they end up between two visible menu or tool items. Separators which are
+ * located at the very beginning or end of the menu or toolbar containing them, or multiple
+ * separators next to each other, are hidden. This is a useful feature, since the merging
+ * of UI elements from multiple sources can make it hard or impossible to determine in
  * advance whether a separator will end up in such an unfortunate position.
  *
  * For separators in toolbars, you can set expand="true" to turn them from a small,
- * visible separator to an expanding, invisible one. Toolitems following an expanding 
+ * visible separator to an expanding, invisible one. Toolitems following an expanding
  * separator are effectively right-aligned.
  *
  * \par Empty Menus
  *
- * Submenus pose similar problems to separators inconnection with merging. It is impossible 
- * to know in advance whether they will end up empty after merging. Gtk::UIManager offers 
+ * Submenus pose similar problems to separators inconnection with merging. It is impossible
+ * to know in advance whether they will end up empty after merging. Gtk::UIManager offers
  * two ways to treat empty submenus:
  *
  * - make them disappear by hiding the menu item they're attached to
@@ -197,7 +196,7 @@ public:
   _WRAP_METHOD(std::vector< Glib::RefPtr<ActionGroup> > get_action_groups(), gtk_ui_manager_get_action_groups)
 #m4 _CONVERSION(`GList*', `std::vector< Glib::RefPtr<const ActionGroup> >', `Glib::ListHandler<Glib::RefPtr<const ActionGroup> >::list_to_vector($3, Glib::OWNERSHIP_NONE)')
   _WRAP_METHOD(std::vector< Glib::RefPtr<const ActionGroup> > get_action_groups() const, gtk_ui_manager_get_action_groups)
-  
+
   _WRAP_METHOD(Glib::RefPtr<AccelGroup> get_accel_group(), gtk_ui_manager_get_accel_group, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const AccelGroup> get_accel_group() const, gtk_ui_manager_get_accel_group, refreturn, constversion)
   _WRAP_METHOD(Widget* get_widget(const Glib::ustring& path), gtk_ui_manager_get_widget)
@@ -207,12 +206,12 @@ public:
   _WRAP_METHOD(std::vector<Widget*> get_toplevels(UIManagerItemType types), gtk_ui_manager_get_toplevels)
 #m4 _CONVERSION(`GSList*',`std::vector<const Widget*>',`Glib::SListHandler<const Widget*>::slist_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
   _WRAP_METHOD(std::vector<const Widget*> get_toplevels(UIManagerItemType types) const, gtk_ui_manager_get_toplevels)
-                 
+
   _WRAP_METHOD(Glib::RefPtr<Action> get_action(const Glib::ustring& path), gtk_ui_manager_get_action, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Action> get_action(const Glib::ustring& path) const, gtk_ui_manager_get_action, refreturn, constversion)
 
   typedef guint ui_merge_id;
-    
+
   /** Parses a string containing a UI definition and
    * merges it with the current contents. An enclosing &lt;ui&gt;
    * element is added if it is missing.
@@ -221,7 +220,7 @@ public:
    * @result  The merge id for the merged UI. The merge id can be used to unmerge the UI with remove_ui(). If an error occurred, the return value is 0.
    * @throws exception
    * @newin{2,4}
-   */ 
+   */
   ui_merge_id add_ui_from_string(const Glib::ustring& buffer);
   _IGNORE(gtk_ui_manager_add_ui_from_string)
   _WRAP_METHOD(ui_merge_id add_ui_from_file(const Glib::ustring& filename), gtk_ui_manager_add_ui_from_file, errthrow)
@@ -248,7 +247,7 @@ public:
    * is added after its siblings.
    */
   void add_ui_separator(ui_merge_id merge_id, const Glib::ustring& path, const Glib::ustring& name = "", UIManagerItemType type = Gtk::UI_MANAGER_AUTO, bool top = true);
-  
+
   _WRAP_METHOD(void remove_ui(ui_merge_id merge_id), gtk_ui_manager_remove_ui)
   _WRAP_METHOD(Glib::ustring get_ui() const, gtk_ui_manager_get_ui)
   _WRAP_METHOD(void ensure_update(), gtk_ui_manager_ensure_update)
@@ -263,7 +262,7 @@ public:
 
   _WRAP_PROPERTY("add_tearoffs", bool)
   _WRAP_PROPERTY("ui", Glib::ustring)
-             
+
 };
 
 } // namespace Gtk
diff --git a/gtk/src/viewport.ccg b/gtk/src/viewport.ccg
index fc6a5d1..f743a9c 100644
--- a/gtk/src/viewport.ccg
+++ b/gtk/src/viewport.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: viewport.ccg,v 1.1 2003/01/21 13:40:53 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/viewport.hg b/gtk/src/viewport.hg
index 3a038eb..22feca8 100644
--- a/gtk/src/viewport.hg
+++ b/gtk/src/viewport.hg
@@ -1,7 +1,4 @@
-/* $Id: viewport.hg,v 1.3 2006/04/12 11:11:25 murrayc Exp $ */
-
-/* viewport.h
- *
+/*
  * Copyright (C) 2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -62,4 +59,4 @@ public:
   _WRAP_PROPERTY("shadow_type", ShadowType)
 };
 
-}  /* namespace Gtk */
+}  //namespace Gtk
diff --git a/gtk/src/volumebutton.ccg b/gtk/src/volumebutton.ccg
index 4d7907f..a03ca70 100644
--- a/gtk/src/volumebutton.ccg
+++ b/gtk/src/volumebutton.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: volumebutton.ccg,v 1.2 2003/10/18 15:35:31 murrayc Exp $ */
-
 /*
- *
  * Copyright 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/volumebutton.hg b/gtk/src/volumebutton.hg
index 62dae3e..6b45543 100644
--- a/gtk/src/volumebutton.hg
+++ b/gtk/src/volumebutton.hg
@@ -1,7 +1,4 @@
-/* $Id: volumebutton.hg,v 1.5 2005/11/30 14:10:49 murrayc Exp $ */
-
-/* volumebutton.h
- *
+/*
  * Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -29,8 +26,8 @@ namespace Gtk
 
 /** A button which pops up a volume control.
  *
- * Gtk::VolumeButton is a subclass of Gtk::ScaleButton that has been tailored 
- * for use as a volume control widget with suitable icons, tooltips and 
+ * Gtk::VolumeButton is a subclass of Gtk::ScaleButton that has been tailored
+ * for use as a volume control widget with suitable icons, tooltips and
  * accessible labels.
  *
  * @ingroup Widgets
diff --git a/gtk/src/widget.ccg b/gtk/src/widget.ccg
index a6f205d..6ce576d 100644
--- a/gtk/src/widget.ccg
+++ b/gtk/src/widget.ccg
@@ -1,6 +1,3 @@
-// -*- c++ -*-
-/* $Id: widget.ccg,v 1.23 2006/07/19 16:58:50 murrayc Exp $ */
-
 /* Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -198,7 +195,7 @@ void Widget_Class::get_preferred_width_vfunc_callback(GtkWidget* self, gint* min
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
@@ -243,7 +240,7 @@ void Widget_Class::get_preferred_height_for_width_vfunc_callback(GtkWidget* self
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
@@ -288,7 +285,7 @@ void Widget_Class::get_preferred_height_vfunc_callback(GtkWidget* self, gint* mi
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
@@ -333,7 +330,7 @@ void Widget_Class::get_preferred_width_for_height_vfunc_callback(GtkWidget* self
       #endif //GLIBMM_EXCEPTIONS_ENABLED
     }
   }
-  
+
   BaseClassType *const base = static_cast<BaseClassType*>(
       g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
   );
@@ -381,7 +378,7 @@ void Widget::remove_modal_grab()
 Widget* Widget::get_current_modal_grab()
 {
   return Glib::wrap(gtk_grab_get_current());
-} 
+}
 
 void Widget::set_window(const Glib::RefPtr<Gdk::Window>& window)
 {
@@ -613,37 +610,37 @@ Requisition Widget::get_requisition() const
 //Implemented manually so we can reorder the parameters, to have a default value:
 void Widget::override_color(const Gdk::RGBA& color, StateFlags state)
 {
-  gtk_widget_override_color(gobj(), ((GtkStateFlags)(state)), (color).gobj()); 
+  gtk_widget_override_color(gobj(), ((GtkStateFlags)(state)), (color).gobj());
 }
 
 void Widget::override_background_color(const Gdk::RGBA& color, StateFlags state)
 {
-  gtk_widget_override_background_color(gobj(), ((GtkStateFlags)(state)), (color).gobj()); 
+  gtk_widget_override_background_color(gobj(), ((GtkStateFlags)(state)), (color).gobj());
 }
 
 void Widget::unset_color(StateFlags state)
 {
-   gtk_widget_override_color(gobj(), ((GtkStateFlags)(state)), 0); 
+   gtk_widget_override_color(gobj(), ((GtkStateFlags)(state)), 0);
 }
 
 void Widget::unset_background_color(StateFlags state)
 {
-  gtk_widget_override_background_color(gobj(), ((GtkStateFlags)(state)), 0); 
+  gtk_widget_override_background_color(gobj(), ((GtkStateFlags)(state)), 0);
 }
-  
+
 void Widget::unset_font()
 {
-  gtk_widget_override_font(gobj(), 0); 
+  gtk_widget_override_font(gobj(), 0);
 }
-  
+
 void Widget::unset_symbolic_color(const Glib::ustring& name)
 {
-  gtk_widget_override_symbolic_color(gobj(), name.c_str(), 0); 
+  gtk_widget_override_symbolic_color(gobj(), name.c_str(), 0);
 }
-  
+
 void Widget::unset_cursor()
 {
-  gtk_widget_override_cursor(gobj(), 0, 0); 
+  gtk_widget_override_cursor(gobj(), 0, 0);
 }
 
 
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 986b736..f7c3246 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -258,16 +258,16 @@ public:
   _WRAP_METHOD(int get_allocated_height() const, gtk_widget_get_allocated_height)
 
   /** Retrieves the widget's location.
-   * Note, when implementing a Container: a widget's allocation will be its "adjusted" allocation, 
-   * that is, the widget's parent container typically calls size_allocate() with an allocation, 
-   * and that allocation is then adjusted (to handle margin and alignment for example) before 
-   * assignment to the widget. get_allocation() returns the adjusted allocation that was actually 
-   * assigned to the widget. The adjusted allocation is guaranteed to be completely contained 
-   * within the size_allocate() allocation, however. So a Container is guaranteed that its 
-   * children stay inside the assigned bounds, but not that they have exactly the bounds the 
-   * container assigned. There is no way to get the original allocation assigned by 
-   * size_allocate(), since it isn't stored. If a container implementation needs that information 
-   * it will have to track it itself. 
+   * Note, when implementing a Container: a widget's allocation will be its "adjusted" allocation,
+   * that is, the widget's parent container typically calls size_allocate() with an allocation,
+   * and that allocation is then adjusted (to handle margin and alignment for example) before
+   * assignment to the widget. get_allocation() returns the adjusted allocation that was actually
+   * assigned to the widget. The adjusted allocation is guaranteed to be completely contained
+   * within the size_allocate() allocation, however. So a Container is guaranteed that its
+   * children stay inside the assigned bounds, but not that they have exactly the bounds the
+   * container assigned. There is no way to get the original allocation assigned by
+   * size_allocate(), since it isn't stored. If a container implementation needs that information
+   * it will have to track it itself.
    *
    * @return The widget's allocated area.
    */
@@ -821,8 +821,8 @@ protected:
   //The parameter name is "the_property_name" to avoid a warning because there is a method with the "property_name" name.
 
   /** Gets the value of a style property of @a widget.
-   * 
-   * It is usually easier to use get_style_property(), to avoid the use of 
+   *
+   * It is usually easier to use get_style_property(), to avoid the use of
    * Glib::Value.
    *
    * @param the_property_name The name of a style property.
diff --git a/gtk/src/widgetpath.ccg b/gtk/src/widgetpath.ccg
index d1a392b..e5bde59 100644
--- a/gtk/src/widgetpath.ccg
+++ b/gtk/src/widgetpath.ccg
@@ -20,6 +20,6 @@
 namespace Gtk
 {
 
-} /* namespace Gtk */
+}//namespace Gtk
 
 
diff --git a/gtk/src/widgetpath.hg b/gtk/src/widgetpath.hg
index be9f220..d486fcf 100644
--- a/gtk/src/widgetpath.hg
+++ b/gtk/src/widgetpath.hg
@@ -23,7 +23,7 @@ namespace Gtk
 {
 
 //TODO: Add all of the C documentation, including translating the code examples to C++.
-/** This represents a widget hierarchy from the topmost widget, typically a toplevel, to any child. 
+/** This represents a widget hierarchy from the topmost widget, typically a toplevel, to any child.
  * This widget path abstraction is used in StyleContext on behalf of the real
  * widget in order to query style information.
  *
@@ -76,6 +76,4 @@ public:
 
 };
 
-} /* namespace Gtk */
-
-
+} //namespace Gtk
diff --git a/gtk/src/window.ccg b/gtk/src/window.ccg
index 5334de3..9a60f5b 100644
--- a/gtk/src/window.ccg
+++ b/gtk/src/window.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: window.ccg,v 1.5 2006/05/10 20:59:28 murrayc Exp $ */
-
 /*
- *
  * Copyright 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index 1b64897..97a2be9 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -1,7 +1,4 @@
-/* $Id: window.hg,v 1.20 2006/05/10 20:59:28 murrayc Exp $ */
-
-/* window.h
- *
+/*
  * Copyright (C) 1998-2002 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -342,14 +339,14 @@ dnl
 
   _WRAP_METHOD(Glib::RefPtr<Application> get_application(), gtk_window_get_application, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Application> get_application() const, gtk_window_get_application, refreturn)
-  
+
   _WRAP_METHOD(void set_application(const Glib::RefPtr<Application>& application), gtk_window_set_application)
-  
+
   /** Unsets the Application associated with the window.
    * This could cause the application to exit if it is the application's last window.
    */
   void unset_application();
-                                                 
+
   _WRAP_METHOD(void set_has_resize_grip(bool setting = true), gtk_window_set_has_resize_grip)
   _WRAP_METHOD(bool get_has_resize_grip() const, gtk_window_get_has_resize_grip)
 
@@ -388,5 +385,4 @@ private:
 };
 
 
-
 } // namespace Gtk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]