Added "Gtk::" scope to "manage" function calls.

(bzr r13236)

22 files changed, 153 insertions, 153 deletions

diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 858312f5b..312a8d655 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -141,7 +141,7 @@ attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int
                               Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
 #endif
             } else {
-                Gtk::HBox *space = manage (new Gtk::HBox);
+                Gtk::HBox *space = Gtk::manage (new Gtk::HBox);
                 space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
 #if WITH_GTKMM_3_0
                 space->set_halign(Gtk::ALIGN_CENTER);
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 3c4ad9b00..4b1dbd1ed 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -469,7 +469,7 @@ static inline void attach_all(Gtk::Table &table, Gtk::Widget const *const arr[],
                               Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
 #endif
             } else {
-                Gtk::HBox *space = manage (new Gtk::HBox);
+                Gtk::HBox *space = Gtk::manage (new Gtk::HBox);
                 space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
 #if WITH_GTKMM_3_0
                 space->set_halign(Gtk::ALIGN_CENTER);
diff --git a/src/interface.cpp b/src/interface.cpp
index 6eb1b6a5a..1cbeb44a3 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -1524,7 +1524,7 @@ ContextMenu::~ContextMenu(void)
 
 Gtk::SeparatorMenuItem* ContextMenu::AddSeparator(void)
 {
-    Gtk::SeparatorMenuItem* sep = manage(new Gtk::SeparatorMenuItem());
+    Gtk::SeparatorMenuItem* sep = Gtk::manage(new Gtk::SeparatorMenuItem());
     sep->show();
     append(*sep);
     return sep;
@@ -1556,7 +1556,7 @@ void ContextMenu::AppendItemFromVerb(Inkscape::Verb *verb)//, SPDesktop *view)//
             return;
         }
         
-        Gtk::ImageMenuItem *item = manage(new Gtk::ImageMenuItem(action->name, true));
+        Gtk::ImageMenuItem *item = Gtk::manage(new Gtk::ImageMenuItem(action->name, true));
 
         sp_shortcut_add_accelerator(GTK_WIDGET(item->gobj()), sp_shortcut_get_primary(verb));
 
@@ -1638,7 +1638,7 @@ void ContextMenu::MakeItemMenu (void)
     Gtk::MenuItem* mi;
 
     /* Item dialog */
-    mi = manage(new Gtk::MenuItem(_("_Object Properties..."),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("_Object Properties..."),1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ItemProperties));
     mi->show();
     append(*mi);//insert(*mi,positionOfLastDialog++);
@@ -1647,7 +1647,7 @@ void ContextMenu::MakeItemMenu (void)
     
     /* Select item */
     if (Inkscape::Verb::getbyid( "org.inkscape.followlink" )) {
-        mi = manage(new Gtk::MenuItem(_("_Select This"),1));
+        mi = Gtk::manage(new Gtk::MenuItem(_("_Select This"), 1));
         if (_desktop->selection->includes(_item)) {
             mi->set_sensitive(FALSE);
         } else {
@@ -1658,9 +1658,9 @@ void ContextMenu::MakeItemMenu (void)
     }
 
 
-    mi = manage(new Gtk::MenuItem(_("Select Same")));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Select Same")));
     mi->show();
-    Gtk::Menu *select_same_submenu = manage(new Gtk::Menu());
+    Gtk::Menu *select_same_submenu = Gtk::manage(new Gtk::Menu());
     if (_desktop->selection->isEmpty()) {
         mi->set_sensitive(FALSE);
     }
@@ -1668,42 +1668,42 @@ void ContextMenu::MakeItemMenu (void)
     append(*mi);
 
     /* Select same fill and stroke */
-    mi = manage(new Gtk::MenuItem(_("Fill and Stroke"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Fill and Stroke"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::SelectSameFillStroke));
     mi->set_sensitive(!SP_IS_ANCHOR(_item));
     mi->show();
     select_same_submenu->append(*mi);
 
     /* Select same fill color */
-    mi = manage(new Gtk::MenuItem(_("Fill Color"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Fill Color"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::SelectSameFillColor));
     mi->set_sensitive(!SP_IS_ANCHOR(_item));
     mi->show();
     select_same_submenu->append(*mi);
 
     /* Select same stroke color */
-    mi = manage(new Gtk::MenuItem(_("Stroke Color"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Stroke Color"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::SelectSameStrokeColor));
     mi->set_sensitive(!SP_IS_ANCHOR(_item));
     mi->show();
     select_same_submenu->append(*mi);
 
     /* Select same stroke style */
-    mi = manage(new Gtk::MenuItem(_("Stroke Style"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Stroke Style"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::SelectSameStrokeStyle));
     mi->set_sensitive(!SP_IS_ANCHOR(_item));
     mi->show();
     select_same_submenu->append(*mi);
 
     /* Select same stroke style */
-    mi = manage(new Gtk::MenuItem(_("Object type"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Object type"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::SelectSameObjectType));
     mi->set_sensitive(!SP_IS_ANCHOR(_item));
     mi->show();
     select_same_submenu->append(*mi);
 
     /* Move to layer */
-    mi = manage(new Gtk::MenuItem(_("_Move to layer ..."),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("_Move to layer ..."), 1));
     if (_desktop->selection->isEmpty()) {
         mi->set_sensitive(FALSE);
     } else {
@@ -1713,7 +1713,7 @@ void ContextMenu::MakeItemMenu (void)
     append(*mi);
 
     /* Create link */
-    mi = manage(new Gtk::MenuItem(_("Create _Link"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Create _Link"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ItemCreateLink));
     mi->set_sensitive(!SP_IS_ANCHOR(_item));
     mi->show();
@@ -1736,7 +1736,7 @@ void ContextMenu::MakeItemMenu (void)
         }
     }    
     /* Set mask */
-    mi = manage(new Gtk::MenuItem(_("Set Mask"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Set Mask"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::SetMask));
     if (ClipRefOK || MaskRefOK) {
         mi->set_sensitive(FALSE);
@@ -1747,7 +1747,7 @@ void ContextMenu::MakeItemMenu (void)
     append(*mi);
     
     /* Release mask */
-    mi = manage(new Gtk::MenuItem(_("Release Mask"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Release Mask"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ReleaseMask));
     if (MaskRefOK) {
         mi->set_sensitive(TRUE);
@@ -1758,7 +1758,7 @@ void ContextMenu::MakeItemMenu (void)
     append(*mi);
     
     /* Set Clip */
-    mi = manage(new Gtk::MenuItem(_("Set Cl_ip"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Set Cl_ip"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::SetClip));
     if (ClipRefOK || MaskRefOK) {
         mi->set_sensitive(FALSE);
@@ -1769,7 +1769,7 @@ void ContextMenu::MakeItemMenu (void)
     append(*mi);
     
     /* Release Clip */
-    mi = manage(new Gtk::MenuItem(_("Release C_lip"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Release C_lip"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ReleaseClip));
     if (ClipRefOK) {
         mi->set_sensitive(TRUE);
@@ -1780,7 +1780,7 @@ void ContextMenu::MakeItemMenu (void)
     append(*mi);
 
     /* Group */
-    mi = manage(new Gtk::MenuItem(_("_Group"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("_Group"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ActivateGroup));
     if (_desktop->selection->isEmpty() || _desktop->selection->single()) {
         mi->set_sensitive(FALSE);
@@ -1882,7 +1882,7 @@ void ContextMenu::ReleaseClip(void)
 void ContextMenu::MakeGroupMenu(void)
 {
     /* Ungroup */
-    Gtk::MenuItem* mi = manage(new Gtk::MenuItem(_("_Ungroup"),1));
+    Gtk::MenuItem* mi = Gtk::manage(new Gtk::MenuItem(_("_Ungroup"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ActivateUngroup));
     mi->show();
     append(*mi);
@@ -1907,19 +1907,19 @@ void ContextMenu::MakeAnchorMenu(void)
     Gtk::MenuItem* mi;
     
     /* Link dialog */
-    mi = manage(new Gtk::MenuItem(_("Link _Properties..."),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Link _Properties..."), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::AnchorLinkProperties));
     mi->show();
     insert(*mi,positionOfLastDialog++);
     
     /* Select item */
-    mi = manage(new Gtk::MenuItem(_("_Follow Link"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("_Follow Link"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::AnchorLinkFollow));
     mi->show();
     append(*mi);
     
     /* Reset transformations */
-    mi = manage(new Gtk::MenuItem(_("_Remove Link"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("_Remove Link"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::AnchorLinkRemove));
     mi->show();
     append(*mi);
@@ -1961,13 +1961,13 @@ void ContextMenu::MakeImageMenu (void)
     const gchar *href = ir->attribute("xlink:href");
 
     /* Image properties */
-    mi = manage(new Gtk::MenuItem(_("Image _Properties..."),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Image _Properties..."), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ImageProperties));
     mi->show();
     insert(*mi,positionOfLastDialog++);
 
     /* Edit externally */
-    mi = manage(new Gtk::MenuItem(_("Edit Externally..."),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Edit Externally..."), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ImageEdit));
     mi->show();
     insert(*mi,positionOfLastDialog++);
@@ -1976,7 +1976,7 @@ void ContextMenu::MakeImageMenu (void)
     }
 
     /* Trace Bitmap */
-    mi = manage(new Gtk::MenuItem(_("_Trace Bitmap..."),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("_Trace Bitmap..."), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ImageTraceBitmap));
     mi->show();
     insert(*mi,positionOfLastDialog++);
@@ -1985,7 +1985,7 @@ void ContextMenu::MakeImageMenu (void)
     }
 
     /* Trace Pixel Art */
-    mi = manage(new Gtk::MenuItem(_("Trace Pixel Art"),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Trace Pixel Art"), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ImageTracePixelArt));
     mi->show();
     insert(*mi,positionOfLastDialog++);
@@ -1995,7 +1995,7 @@ void ContextMenu::MakeImageMenu (void)
 
     /* Embed image */
     if (Inkscape::Verb::getbyid( "org.ekips.filter.embedselectedimages" )) {
-        mi = manage(new Gtk::MenuItem(C_("Context menu", "Embed Image")));
+        mi = Gtk::manage(new Gtk::MenuItem(C_("Context menu", "Embed Image")));
         mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ImageEmbed));
         mi->show();
         insert(*mi,positionOfLastDialog++);
@@ -2006,7 +2006,7 @@ void ContextMenu::MakeImageMenu (void)
 
     /* Extract image */
     if (Inkscape::Verb::getbyid( "org.ekips.filter.extractimage" )) {
-        mi = manage(new Gtk::MenuItem(C_("Context menu", "Extract Image...")));
+        mi = Gtk::manage(new Gtk::MenuItem(C_("Context menu", "Extract Image...")));
         mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ImageExtract));
         mi->show();
         insert(*mi,positionOfLastDialog++);
@@ -2151,7 +2151,7 @@ void ContextMenu::MakeShapeMenu (void)
     Gtk::MenuItem* mi;
     
     /* Item dialog */
-    mi = manage(new Gtk::MenuItem(_("_Fill and Stroke..."),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("_Fill and Stroke..."), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::FillSettings));
     mi->show();
     insert(*mi,positionOfLastDialog++);
@@ -2171,19 +2171,19 @@ void ContextMenu::MakeTextMenu (void)
     Gtk::MenuItem* mi;
 
     /* Fill and Stroke dialog */
-    mi = manage(new Gtk::MenuItem(_("_Fill and Stroke..."),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("_Fill and Stroke..."), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::FillSettings));
     mi->show();
     insert(*mi,positionOfLastDialog++);
     
     /* Edit Text dialog */
-    mi = manage(new Gtk::MenuItem(_("_Text and Font..."),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("_Text and Font..."), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::TextSettings));
     mi->show();
     insert(*mi,positionOfLastDialog++);
 
     /* Spellcheck dialog */
-    mi = manage(new Gtk::MenuItem(_("Check Spellin_g..."),1));
+    mi = Gtk::manage(new Gtk::MenuItem(_("Check Spellin_g..."), 1));
     mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::SpellcheckSettings));
     mi->show();
     insert(*mi,positionOfLastDialog++);
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index efe25d843..09c505860 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -122,7 +122,7 @@ DocumentMetadata::build_metadata()
 
     _page_metadata1.show();
 
-    Gtk::Label *label = manage (new Gtk::Label);
+    Gtk::Label *label = Gtk::manage (new Gtk::Label);
     label->set_markup (_("<b>Dublin Core Entities</b>"));
     label->set_alignment (0.0);
 
@@ -140,7 +140,7 @@ DocumentMetadata::build_metadata()
         if ( entity->editable == RDF_EDIT_GENERIC ) {
             EntityEntry *w = EntityEntry::create (entity, _wr);
             _rdflist.push_back (w);
-            Gtk::HBox *space = manage (new Gtk::HBox);
+            Gtk::HBox *space = Gtk::manage (new Gtk::HBox);
             space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
 
 #if WITH_GTKMM_3_0
@@ -164,7 +164,7 @@ DocumentMetadata::build_metadata()
     _page_metadata2.show();
 
     row = 0;
-    Gtk::Label *llabel = manage (new Gtk::Label);
+    Gtk::Label *llabel = Gtk::manage (new Gtk::Label);
     llabel->set_markup (_("<b>License</b>"));
     llabel->set_alignment (0.0);
 
@@ -178,7 +178,7 @@ DocumentMetadata::build_metadata()
     /* add license selector pull-down and URI */
     ++row;
     _licensor.init (_wr);
-    Gtk::HBox *space = manage (new Gtk::HBox);
+    Gtk::HBox *space = Gtk::manage (new Gtk::HBox);
     space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
 
 #if WITH_GTKMM_3_0
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index a31ab1a09..508fc52b1 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -297,7 +297,7 @@ inline void attach_all(Gtk::Table &table, Gtk::Widget *const arr[], unsigned con
                 table.attach (label, 0, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
 #endif
             } else {
-                Gtk::HBox *space = manage (new Gtk::HBox);
+                Gtk::HBox *space = Gtk::manage (new Gtk::HBox);
                 space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
 
 #if WITH_GTKMM_3_0
@@ -317,11 +317,11 @@ void DocumentProperties::build_page()
 {
     _page_page->show();
 
-    Gtk::Label* label_gen = manage (new Gtk::Label);
+    Gtk::Label* label_gen = Gtk::manage (new Gtk::Label);
     label_gen->set_markup (_("<b>General</b>"));
-    Gtk::Label *label_for = manage (new Gtk::Label);
+    Gtk::Label *label_for = Gtk::manage (new Gtk::Label);
     label_for->set_markup (_("<b>Page Size</b>"));
-    Gtk::Label* label_dsp = manage (new Gtk::Label);
+    Gtk::Label* label_dsp = Gtk::manage (new Gtk::Label);
     label_dsp->set_markup (_("<b>Display</b>"));
     _page_sizer.init();
 
@@ -356,7 +356,7 @@ void DocumentProperties::build_guides()
 {
     _page_guides->show();
 
-    Gtk::Label *label_gui = manage (new Gtk::Label);
+    Gtk::Label *label_gui = Gtk::manage (new Gtk::Label);
     label_gui->set_markup (_("<b>Guides</b>"));
 
     Gtk::Widget *const widget_array[] =
@@ -374,13 +374,13 @@ void DocumentProperties::build_snap()
 {
     _page_snap->show();
 
-    Gtk::Label *label_o = manage (new Gtk::Label);
+    Gtk::Label *label_o = Gtk::manage (new Gtk::Label);
     label_o->set_markup (_("<b>Snap to objects</b>"));
-    Gtk::Label *label_gr = manage (new Gtk::Label);
+    Gtk::Label *label_gr = Gtk::manage (new Gtk::Label);
     label_gr->set_markup (_("<b>Snap to grids</b>"));
-    Gtk::Label *label_gu = manage (new Gtk::Label);
+    Gtk::Label *label_gu = Gtk::manage (new Gtk::Label);
     label_gu->set_markup (_("<b>Snap to guides</b>"));
-    Gtk::Label *label_m = manage (new Gtk::Label);
+    Gtk::Label *label_m = Gtk::manage (new Gtk::Label);
     label_m->set_markup (_("<b>Miscellaneous</b>"));
 
     Gtk::Widget *const array[] =
@@ -607,9 +607,9 @@ void DocumentProperties::removeSelectedProfile(){
 void DocumentProperties::build_cms()
 {
     _page_cms->show();
-    Gtk::Label *label_link= manage (new Gtk::Label("", Gtk::ALIGN_START));
+    Gtk::Label *label_link= Gtk::manage (new Gtk::Label("", Gtk::ALIGN_START));
     label_link->set_markup (_("<b>Linked Color Profiles:</b>"));
-    Gtk::Label *label_avail = manage (new Gtk::Label("", Gtk::ALIGN_START));
+    Gtk::Label *label_avail = Gtk::manage (new Gtk::Label("", Gtk::ALIGN_START));
     label_avail->set_markup (_("<b>Available Color Profiles:</b>"));
 
     _link_btn.set_tooltip_text(_("Link Profile"));
@@ -746,7 +746,7 @@ void DocumentProperties::build_scripting()
 
     //# External scripts tab
     _page_external_scripts->show();
-    Gtk::Label *label_external= manage (new Gtk::Label("", Gtk::ALIGN_START));
+    Gtk::Label *label_external= Gtk::manage (new Gtk::Label("", Gtk::ALIGN_START));
     label_external->set_markup (_("<b>External script files:</b>"));
 
     _external_add_btn.set_tooltip_text(_("Add the current file name or browse for a file"));
@@ -835,7 +835,7 @@ void DocumentProperties::build_scripting()
 
     //# Embedded scripts tab
     _page_embedded_scripts->show();
-    Gtk::Label *label_embedded= manage (new Gtk::Label("", Gtk::ALIGN_START));
+    Gtk::Label *label_embedded= Gtk::manage (new Gtk::Label("", Gtk::ALIGN_START));
     label_embedded->set_markup (_("<b>Embedded script files:</b>"));
 
     _embed_new_btn.set_tooltip_text(_("New"));
@@ -922,7 +922,7 @@ void DocumentProperties::build_scripting()
 // TODO restore?    _EmbeddedScriptsList.set_fixed_height_mode(true);
 
     //# Set up the Embedded Scripts content box
-    Gtk::Label *label_embedded_content= manage (new Gtk::Label("", Gtk::ALIGN_START));
+    Gtk::Label *label_embedded_content= Gtk::manage (new Gtk::Label("", Gtk::ALIGN_START));
     label_embedded_content->set_markup (_("<b>Content:</b>"));
 
     label_embedded_content->set_alignment(0.0);
@@ -1001,7 +1001,7 @@ void DocumentProperties::build_metadata()
 
     _page_metadata1->show();
 
-    Gtk::Label *label = manage (new Gtk::Label);
+    Gtk::Label *label = Gtk::manage (new Gtk::Label);
     label->set_markup (_("<b>Dublin Core Entities</b>"));
     label->set_alignment (0.0);
 
@@ -1019,7 +1019,7 @@ void DocumentProperties::build_metadata()
         if ( entity->editable == RDF_EDIT_GENERIC ) {
             EntityEntry *w = EntityEntry::create (entity, _wr);
             _rdflist.push_back (w);
-            Gtk::HBox *space = manage (new Gtk::HBox);
+            Gtk::HBox *space = Gtk::manage (new Gtk::HBox);
             space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
 
 #if WITH_GTKMM_3_0
@@ -1040,15 +1040,15 @@ void DocumentProperties::build_metadata()
         }
     }
 
-    Gtk::Button *button_save = manage (new Gtk::Button(_("_Save as default"),1));
+    Gtk::Button *button_save = Gtk::manage (new Gtk::Button(_("_Save as default"),1));
     button_save->set_tooltip_text(_("Save this metadata as the default metadata"));
-    Gtk::Button *button_load = manage (new Gtk::Button(_("Use _default"),1));
+    Gtk::Button *button_load = Gtk::manage (new Gtk::Button(_("Use _default"),1));
     button_load->set_tooltip_text(_("Use the previously saved default metadata here"));
 
 #if WITH_GTKMM_3_0
-    Gtk::ButtonBox *box_buttons = manage (new Gtk::ButtonBox);
+    Gtk::ButtonBox *box_buttons = Gtk::manage (new Gtk::ButtonBox);
 #else
-    Gtk::HButtonBox *box_buttons = manage (new Gtk::HButtonBox);
+    Gtk::HButtonBox *box_buttons = Gtk::manage (new Gtk::HButtonBox);
 #endif
 
     box_buttons->set_layout(Gtk::BUTTONBOX_END);
@@ -1063,7 +1063,7 @@ void DocumentProperties::build_metadata()
     _page_metadata2->show();
 
     row = 0;
-    Gtk::Label *llabel = manage (new Gtk::Label);
+    Gtk::Label *llabel = Gtk::manage (new Gtk::Label);
     llabel->set_markup (_("<b>License</b>"));
     llabel->set_alignment (0.0);
 
@@ -1077,7 +1077,7 @@ void DocumentProperties::build_metadata()
     /* add license selector pull-down and URI */
     ++row;
     _licensor.init (_wr);
-    Gtk::HBox *space = manage (new Gtk::HBox);
+    Gtk::HBox *space = Gtk::manage (new Gtk::HBox);
     space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
 
 #if WITH_GTKMM_3_0
@@ -1545,12 +1545,12 @@ void DocumentProperties::update()
 Gtk::HBox&
 DocumentProperties::_createPageTabLabel(const Glib::ustring& label, const char *label_image)
 {
-    Gtk::HBox *_tab_label_box = manage(new Gtk::HBox(false, 0));
+    Gtk::HBox *_tab_label_box = Gtk::manage(new Gtk::HBox(false, 0));
     _tab_label_box->set_spacing(4);
     _tab_label_box->pack_start(*Glib::wrap(sp_icon_new(Inkscape::ICON_SIZE_DECORATION,
                                                        label_image)));
 
-    Gtk::Label *_tab_label = manage(new Gtk::Label(label, true));
+    Gtk::Label *_tab_label = Gtk::manage(new Gtk::Label(label, true));
     _tab_label_box->pack_start(*_tab_label);
     _tab_label_box->show_all();
 
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index 19b873d54..c55d55cda 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -131,7 +131,7 @@ FillAndStroke::_savePagePref(guint page_num)
 void
 FillAndStroke::_layoutPageFill()
 {
-    fillWdgt = manage(sp_fill_style_widget_new());
+    fillWdgt = Gtk::manage(sp_fill_style_widget_new());
 
 #if WITH_GTKMM_3_0
     _page_fill->table().attach(*fillWdgt, 0, 0, 1, 1);
@@ -143,7 +143,7 @@ FillAndStroke::_layoutPageFill()
 void
 FillAndStroke::_layoutPageStrokePaint()
 {
-    strokeWdgt = manage(sp_stroke_style_paint_widget_new());
+    strokeWdgt = Gtk::manage(sp_stroke_style_paint_widget_new());
 
 #if WITH_GTKMM_3_0
     _page_stroke_paint->table().attach(*strokeWdgt, 0, 0, 1, 1);
@@ -195,11 +195,11 @@ FillAndStroke::showPageStrokeStyle()
 Gtk::HBox&
 FillAndStroke::_createPageTabLabel(const Glib::ustring& label, const char *label_image)
 {
-    Gtk::HBox *_tab_label_box = manage(new Gtk::HBox(false, 4));
+    Gtk::HBox *_tab_label_box = Gtk::manage(new Gtk::HBox(false, 4));
     _tab_label_box->pack_start(*Glib::wrap(sp_icon_new(Inkscape::ICON_SIZE_DECORATION,
                                                        label_image)));
 
-    Gtk::Label *_tab_label = manage(new Gtk::Label(label, true));
+    Gtk::Label *_tab_label = Gtk::manage(new Gtk::Label(label, true));
     _tab_label_box->pack_start(*_tab_label);
     _tab_label_box->show_all();
 
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 03108b403..d826ece09 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1534,9 +1534,9 @@ void InkscapePreferences::initKeyboardShortcuts(Gtk::TreeModel::iterator iter_ui
     row++;
 
 #if WITH_GTKMM_3_0
-    Gtk::ButtonBox *box_buttons = manage(new Gtk::ButtonBox);
+    Gtk::ButtonBox *box_buttons = Gtk::manage(new Gtk::ButtonBox);
 #else
-    Gtk::HButtonBox *box_buttons = manage (new Gtk::HButtonBox);
+    Gtk::HButtonBox *box_buttons = Gtk::manage (new Gtk::HButtonBox);
 #endif
 
     box_buttons->set_layout(Gtk::BUTTONBOX_END);
@@ -1549,14 +1549,14 @@ void InkscapePreferences::initKeyboardShortcuts(Gtk::TreeModel::iterator iter_ui
     _page_keyshortcuts.attach(*box_buttons, 0, 3, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
 #endif
 
-    UI::Widget::Button *kb_reset = manage(new UI::Widget::Button(_("Reset"), _("Remove all your customized keyboard shortcuts, and revert to the shortcuts in the shortcut file listed above")));
+    UI::Widget::Button *kb_reset = Gtk::manage(new UI::Widget::Button(_("Reset"), _("Remove all your customized keyboard shortcuts, and revert to the shortcuts in the shortcut file listed above")));
     box_buttons->pack_start(*kb_reset, true, true, 6);
     box_buttons->set_child_secondary(*kb_reset);
 
-    UI::Widget::Button *kb_import = manage(new UI::Widget::Button(_("Import ..."), _("Import custom keyboard shortcuts from a file")));
+    UI::Widget::Button *kb_import = Gtk::manage(new UI::Widget::Button(_("Import ..."), _("Import custom keyboard shortcuts from a file")));
     box_buttons->pack_end(*kb_import, true, true, 6);
 
-    UI::Widget::Button *kb_export = manage(new UI::Widget::Button(_("Export ..."), _("Export custom keyboard shortcuts to a file")));
+    UI::Widget::Button *kb_export = Gtk::manage(new UI::Widget::Button(_("Export ..."), _("Export custom keyboard shortcuts to a file")));
     box_buttons->pack_end(*kb_export, true, true, 6);
 
     kb_reset->signal_clicked().connect( sigc::mem_fun(*this, &InkscapePreferences::onKBReset) );
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index 2d4755fd2..4be6716a5 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -1151,9 +1151,9 @@ InputDialogImpl::ConfPanel::ConfPanel() :
     useExt.signal_toggled().connect(sigc::mem_fun(*this, &InputDialogImpl::ConfPanel::useExtToggled));
 
 #if WITH_GTKMM_3_0
-    Gtk::ButtonBox *buttonBox = manage(new Gtk::ButtonBox);
+    Gtk::ButtonBox *buttonBox = Gtk::manage(new Gtk::ButtonBox);
 #else
-    Gtk::HButtonBox *buttonBox = manage (new Gtk::HButtonBox);
+    Gtk::HButtonBox *buttonBox = Gtk::manage (new Gtk::HButtonBox);
 #endif
 
     buttonBox->set_layout (Gtk::BUTTONBOX_END);
diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp
index f19828b1f..d5540b88a 100644
--- a/src/ui/dialog/layer-properties.cpp
+++ b/src/ui/dialog/layer-properties.cpp
@@ -213,7 +213,7 @@ LayerPropertiesDialog::_setup_layers_controls() {
     _tree.set_model( _store );
     _tree.set_headers_visible(false);
 
-    Inkscape::UI::Widget::ImageToggler *eyeRenderer = manage( new Inkscape::UI::Widget::ImageToggler(
+    Inkscape::UI::Widget::ImageToggler *eyeRenderer = Gtk::manage( new Inkscape::UI::Widget::ImageToggler(
         INKSCAPE_ICON("object-visible"), INKSCAPE_ICON("object-hidden")) );
     int visibleColNum = _tree.append_column("vis", *eyeRenderer) - 1;
     Gtk::TreeViewColumn* col = _tree.get_column(visibleColNum);
@@ -221,7 +221,7 @@ LayerPropertiesDialog::_setup_layers_controls() {
         col->add_attribute( eyeRenderer->property_active(), _model->_colVisible );
     }
 
-    Inkscape::UI::Widget::ImageToggler * renderer = manage( new Inkscape::UI::Widget::ImageToggler(
+    Inkscape::UI::Widget::ImageToggler * renderer = Gtk::manage( new Inkscape::UI::Widget::ImageToggler(
         INKSCAPE_ICON("object-locked"), INKSCAPE_ICON("object-unlocked")) );
     int lockedColNum = _tree.append_column("lock", *renderer) - 1;
     col = _tree.get_column(lockedColNum);
@@ -229,7 +229,7 @@ LayerPropertiesDialog::_setup_layers_controls() {
         col->add_attribute( renderer->property_active(), _model->_colLocked );
     }
 
-    Gtk::CellRendererText *_text_renderer = manage(new Gtk::CellRendererText());
+    Gtk::CellRendererText *_text_renderer = Gtk::manage(new Gtk::CellRendererText());
     int nameColNum = _tree.append_column("Name", *_text_renderer) - 1;
     Gtk::TreeView::Column *_name_column = _tree.get_column(nameColNum);
     _name_column->add_attribute(_text_renderer->property_text(), _model->_colLabel);
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 381810f1e..b5dac0595 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -92,7 +92,7 @@ void LayersPanel::_styleButton( Gtk::Button& btn, SPDesktop *desktop, unsigned i
     if ( iconName ) {
         GtkWidget *child = sp_icon_new( Inkscape::ICON_SIZE_SMALL_TOOLBAR, iconName );
         gtk_widget_show( child );
-        btn.add( *manage(Glib::wrap(child)) );
+        btn.add( *Gtk::manage(Glib::wrap(child)) );
         btn.set_relief(Gtk::RELIEF_NONE);
         set = true;
     }
@@ -104,7 +104,7 @@ void LayersPanel::_styleButton( Gtk::Button& btn, SPDesktop *desktop, unsigned i
             if ( !set && action && action->image ) {
                 GtkWidget *child = sp_icon_new( Inkscape::ICON_SIZE_SMALL_TOOLBAR, action->image );
                 gtk_widget_show( child );
-                btn.add( *manage(Glib::wrap(child)) );
+                btn.add( *Gtk::manage(Glib::wrap(child)) );
                 set = true;
             }
 
@@ -149,7 +149,7 @@ Gtk::MenuItem& LayersPanel::_addPopupItem( SPDesktop *desktop, unsigned int code
 
     Gtk::Widget* wrapped = 0;
     if ( iconWidget ) {
-        wrapped = manage(Glib::wrap(iconWidget));
+        wrapped = Gtk::manage(Glib::wrap(iconWidget));
         wrapped->show();
     }
 
@@ -809,7 +809,7 @@ LayersPanel::LayersPanel() :
     _tree.set_reorderable(true);
     _tree.enable_model_drag_dest (Gdk::ACTION_MOVE);
 
-    Inkscape::UI::Widget::ImageToggler *eyeRenderer = manage( new Inkscape::UI::Widget::ImageToggler(
+    Inkscape::UI::Widget::ImageToggler *eyeRenderer = Gtk::manage( new Inkscape::UI::Widget::ImageToggler(
         INKSCAPE_ICON("object-visible"), INKSCAPE_ICON("object-hidden")) );
     int visibleColNum = _tree.append_column("vis", *eyeRenderer) - 1;
     eyeRenderer->signal_pre_toggle().connect( sigc::mem_fun(*this, &LayersPanel::_preToggle) );
@@ -821,7 +821,7 @@ LayersPanel::LayersPanel() :
     }
 
 
-    Inkscape::UI::Widget::ImageToggler * renderer = manage( new Inkscape::UI::Widget::ImageToggler(
+    Inkscape::UI::Widget::ImageToggler * renderer = Gtk::manage( new Inkscape::UI::Widget::ImageToggler(
         INKSCAPE_ICON("object-locked"), INKSCAPE_ICON("object-unlocked")) );
     int lockedColNum = _tree.append_column("lock", *renderer) - 1;
     renderer->signal_pre_toggle().connect( sigc::mem_fun(*this, &LayersPanel::_preToggle) );
@@ -832,7 +832,7 @@ LayersPanel::LayersPanel() :
         col->add_attribute( renderer->property_active(), _model->_colLocked );
     }
 
-    _text_renderer = manage(new Gtk::CellRendererText());
+    _text_renderer = Gtk::manage(new Gtk::CellRendererText());
     int nameColNum = _tree.append_column("Name", *_text_renderer) - 1;
     _name_column = _tree.get_column(nameColNum);
     _name_column->add_attribute(_text_renderer->property_text(), _model->_colLabel);
@@ -880,40 +880,40 @@ LayersPanel::LayersPanel() :
 
     SPDesktop* targetDesktop = getDesktop();
 
-    Gtk::Button* btn = manage( new Gtk::Button() );
+    Gtk::Button* btn = Gtk::manage( new Gtk::Button() );
     _styleButton( *btn, targetDesktop, SP_VERB_LAYER_NEW, INKSCAPE_ICON("list-add"), C_("Layers", "New") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_NEW) );
     _buttonsSecondary.pack_start(*btn, Gtk::PACK_SHRINK);
 
-    btn = manage( new Gtk::Button() );
+    btn = Gtk::manage( new Gtk::Button() );
     _styleButton( *btn, targetDesktop, SP_VERB_LAYER_TO_BOTTOM, INKSCAPE_ICON("go-bottom"), C_("Layers", "Bot") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_BOTTOM) );
     _watchingNonBottom.push_back( btn );
     _buttonsPrimary.pack_end(*btn, Gtk::PACK_SHRINK);
     
-    btn = manage( new Gtk::Button() );
+    btn = Gtk::manage( new Gtk::Button() );
     _styleButton( *btn, targetDesktop, SP_VERB_LAYER_LOWER, INKSCAPE_ICON("go-down"), C_("Layers", "Dn") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_DOWN) );
     _watchingNonBottom.push_back( btn );
     _buttonsPrimary.pack_end(*btn, Gtk::PACK_SHRINK);
     
-    btn = manage( new Gtk::Button() );
+    btn = Gtk::manage( new Gtk::Button() );
     _styleButton( *btn, targetDesktop, SP_VERB_LAYER_RAISE, INKSCAPE_ICON("go-up"), C_("Layers", "Up") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_UP) );
     _watchingNonTop.push_back( btn );
     _buttonsPrimary.pack_end(*btn, Gtk::PACK_SHRINK);
     
-    btn = manage( new Gtk::Button() );
+    btn = Gtk::manage( new Gtk::Button() );
     _styleButton( *btn, targetDesktop, SP_VERB_LAYER_TO_TOP, INKSCAPE_ICON("go-top"), C_("Layers", "Top") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_TOP) );
     _watchingNonTop.push_back( btn );
     _buttonsPrimary.pack_end(*btn, Gtk::PACK_SHRINK);
 
-//     btn = manage( new Gtk::Button("Dup") );
+//     btn = Gtk::manage( new Gtk::Button("Dup") );
 //     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_DUPLICATE) );
 //     _buttonsRow.add( *btn );
 
-    btn = manage( new Gtk::Button() );
+    btn = Gtk::manage( new Gtk::Button() );
     _styleButton( *btn, targetDesktop, SP_VERB_LAYER_DELETE, INKSCAPE_ICON("list-remove"), _("X") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_DELETE) );
     _watching.push_back( btn );
@@ -930,19 +930,19 @@ LayersPanel::LayersPanel() :
         _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_DUPLICATE, 0, "Duplicate", (int)BUTTON_DUPLICATE ) );
         _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_NEW, 0, "New", (int)BUTTON_NEW ) );
 
-        _popupMenu.append(*manage(new Gtk::SeparatorMenuItem()));
+        _popupMenu.append(*Gtk::manage(new Gtk::SeparatorMenuItem()));
 
         _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_SOLO, 0, "Solo", (int)BUTTON_SOLO ) );
         _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_SHOW_ALL, 0, "Show All", (int)BUTTON_SHOW_ALL ) );
         _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_HIDE_ALL, 0, "Hide All", (int)BUTTON_HIDE_ALL ) );
 
-        _popupMenu.append(*manage(new Gtk::SeparatorMenuItem()));
+        _popupMenu.append(*Gtk::manage(new Gtk::SeparatorMenuItem()));
 
         _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_LOCK_OTHERS, 0, "Lock Others", (int)BUTTON_LOCK_OTHERS ) );
         _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_LOCK_ALL, 0, "Lock All", (int)BUTTON_LOCK_ALL ) );
         _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_UNLOCK_ALL, 0, "Unlock All", (int)BUTTON_UNLOCK_ALL ) );
 
-        _popupMenu.append(*manage(new Gtk::SeparatorMenuItem()));
+        _popupMenu.append(*Gtk::manage(new Gtk::SeparatorMenuItem()));
 
         _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_RAISE, INKSCAPE_ICON("go-up"), "Up", (int)BUTTON_UP ) );
         _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_LOWER, INKSCAPE_ICON("go-down"), "Down", (int)BUTTON_DOWN ) );
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index b81b300e2..0ab2fc9f7 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -172,7 +172,7 @@ LivePathEffectEditor::LivePathEffectEditor()
     effectlist_selection->signal_changed().connect( sigc::mem_fun(*this, &LivePathEffectEditor::on_effect_selection_changed) );
 
     //Add the visibility icon column:
-    Inkscape::UI::Widget::ImageToggler *eyeRenderer = manage( new Inkscape::UI::Widget::ImageToggler(
+    Inkscape::UI::Widget::ImageToggler *eyeRenderer = Gtk::manage( new Inkscape::UI::Widget::ImageToggler(
         INKSCAPE_ICON("object-visible"), INKSCAPE_ICON("object-hidden")) );
     int visibleColNum = effectlist_view.append_column("is_visible", *eyeRenderer) - 1;
     eyeRenderer->signal_toggled().connect( sigc::mem_fun(*this, &LivePathEffectEditor::on_visibility_toggled) );
diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp
index 71d1c22d0..f326bb3ee 100644
--- a/src/ui/dialog/new-from-template.cpp
+++ b/src/ui/dialog/new-from-template.cpp
@@ -29,7 +29,7 @@ NewFromTemplate::NewFromTemplate()
     get_vbox()->pack_start(_main_widget);
    
     Gtk::Alignment *align;
-    align = manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0));
+    align = Gtk::manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0));
     get_vbox()->pack_end(*align, Gtk::PACK_SHRINK);
     align->set_padding(0, 0, 0, 15);
     align->add(_create_template_button);
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 5e77a28ab..4f0cb211a 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -645,7 +645,7 @@ SwatchesPanel::SwatchesPanel(gchar const* prefsPath) :
         std::vector<SwatchPage*> swatchSets = _getSwatchSets();
         for ( std::vector<SwatchPage*>::iterator it = swatchSets.begin(); it != swatchSets.end(); ++it) {
             SwatchPage* curr = *it;
-            Gtk::RadioMenuItem* single = manage(new Gtk::RadioMenuItem(groupOne, curr->_name));
+            Gtk::RadioMenuItem* single = Gtk::manage(new Gtk::RadioMenuItem(groupOne, curr->_name));
             if ( curr == first ) {
                 hotItem = single;
             }
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index 6b1f4542f..d75f81456 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -42,10 +42,10 @@ TemplateLoadTab::TemplateLoadTab()
 {
     set_border_width(10);
 
-    _info_widget = manage(new TemplateWidget());
+    _info_widget = Gtk::manage(new TemplateWidget());
     
     Gtk::Label *title;
-    title = manage(new Gtk::Label(_("Search:")));
+    title = Gtk::manage(new Gtk::Label(_("Search:")));
     _search_box.pack_start(*title, Gtk::PACK_SHRINK);
     _search_box.pack_start(_keywords_combo, Gtk::PACK_SHRINK, 5);
     
@@ -55,7 +55,7 @@ TemplateLoadTab::TemplateLoadTab()
     pack_start(*_info_widget, Gtk::PACK_EXPAND_WIDGET, 5);
     
     Gtk::ScrolledWindow *scrolled;
-    scrolled = manage(new Gtk::ScrolledWindow());
+    scrolled = Gtk::manage(new Gtk::ScrolledWindow());
     scrolled->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
     scrolled->add(_tlist_view);
     _tlist_box.pack_start(*scrolled, Gtk::PACK_EXPAND_WIDGET, 5);
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp
index d8e6f9b4f..ef91962d4 100644
--- a/src/ui/dialog/template-widget.cpp
+++ b/src/ui/dialog/template-widget.cpp
@@ -47,7 +47,7 @@ TemplateWidget::TemplateWidget()
     _short_description_label.set_line_wrap(true);
 
     Gtk::Alignment *align;
-    align = manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0));
+    align = Gtk::manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0));
     pack_end(*align, Gtk::PACK_SHRINK);
     align->add(_more_info_button);
     
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index bd467555e..11e75391b 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -778,7 +778,7 @@ TraceDialogImpl::TraceDialogImpl() :
     rightVBox.pack_start(sioxBox, false, false, 0);
 
     //## preview
-    Gtk::HBox *previewButtonHBox = manage(new Gtk::HBox(false, MARGIN ));
+    Gtk::HBox *previewButtonHBox = Gtk::manage(new Gtk::HBox(false, MARGIN ));
     previewLiveButton.set_label(_("Live Preview"));
     previewLiveButton.set_use_underline(true);
     previewLiveCallback();
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index 38f6f353f..21f3f38d7 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -49,25 +49,25 @@ PreviewHolder::PreviewHolder() :
     _wrap(false),
     _border(BORDER_NONE)
 {
-    _scroller = manage(new Gtk::ScrolledWindow());
+    _scroller = Gtk::manage(new Gtk::ScrolledWindow());
     ((Gtk::ScrolledWindow *)_scroller)->set_policy(Gtk::POLICY_AUTOMATIC,
                                                    Gtk::POLICY_AUTOMATIC);
 
 #if WITH_GTKMM_3_0
-    _insides = manage(new Gtk::Grid());
+    _insides = Gtk::manage(new Gtk::Grid());
     _insides->set_column_spacing(8);
     
     // Add a container with the scroller and a spacer
-    Gtk::Grid* spaceHolder = manage(new Gtk::Grid());
+    Gtk::Grid* spaceHolder = Gtk::manage(new Gtk::Grid());
 
     _scroller->set_hexpand();
     _scroller->set_vexpand();
 #else
-    _insides = manage(new Gtk::Table( 1, 2 ));
+    _insides = Gtk::manage(new Gtk::Table( 1, 2 ));
     _insides->set_col_spacings( 8 );
     
     // Add a container with the scroller and a spacer
-    Gtk::Table* spaceHolder = manage( new Gtk::Table(1, 2) );
+    Gtk::Table* spaceHolder = Gtk::manage( new Gtk::Table(1, 2) );
 #endif
 
     _scroller->add( *_insides );
@@ -134,8 +134,8 @@ void PreviewHolder::addPreview( Previewable* preview )
         switch(_view) {
             case VIEW_TYPE_LIST:
                 {
-                    Gtk::Widget* label = manage(preview->getPreview(PREVIEW_STYLE_BLURB, VIEW_TYPE_LIST, _baseSize, _ratio, _border));
-                    Gtk::Widget* thing = manage(preview->getPreview(PREVIEW_STYLE_PREVIEW, VIEW_TYPE_LIST, _baseSize, _ratio, _border));
+                    Gtk::Widget* label = Gtk::manage(preview->getPreview(PREVIEW_STYLE_BLURB, VIEW_TYPE_LIST, _baseSize, _ratio, _border));
+                    Gtk::Widget* thing = Gtk::manage(preview->getPreview(PREVIEW_STYLE_PREVIEW, VIEW_TYPE_LIST, _baseSize, _ratio, _border));
 
 #if WITH_GTKMM_3_0
                     thing->set_hexpand();
@@ -154,7 +154,7 @@ void PreviewHolder::addPreview( Previewable* preview )
                 break;
             case VIEW_TYPE_GRID:
                 {
-                    Gtk::Widget* thing = manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, VIEW_TYPE_GRID, _baseSize, _ratio, _border));
+                    Gtk::Widget* thing = Gtk::manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, VIEW_TYPE_GRID, _baseSize, _ratio, _border));
 
                     int width = 1;
                     int height = 1;
@@ -408,10 +408,10 @@ void PreviewHolder::rebuildUI()
             {
 
 #if WITH_GTKMM_3_0
-                _insides = manage(new Gtk::Grid());
+                _insides = Gtk::manage(new Gtk::Grid());
                 _insides->set_column_spacing(8);
 #else
-                _insides = manage(new Gtk::Table( 1, 2 ));
+                _insides = Gtk::manage(new Gtk::Table( 1, 2 ));
                 _insides->set_col_spacings( 8 );
 #endif
 
@@ -424,10 +424,10 @@ void PreviewHolder::rebuildUI()
                 }
 
                 for ( unsigned int i = 0; i < items.size(); i++ ) {
-                    Gtk::Widget* label = manage(items[i]->getPreview(PREVIEW_STYLE_BLURB, _view, _baseSize, _ratio, _border));
+                    Gtk::Widget* label = Gtk::manage(items[i]->getPreview(PREVIEW_STYLE_BLURB, _view, _baseSize, _ratio, _border));
                     //label->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
 
-                    Gtk::Widget* thing = manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio, _border));
+                    Gtk::Widget* thing = Gtk::manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio, _border));
 
 #if WITH_GTKMM_3_0
                     thing->set_hexpand();
@@ -458,19 +458,19 @@ void PreviewHolder::rebuildUI()
 
                     // If this is the last row, flag so the previews can draw a bottom
                     ::BorderStyle border = ((row == height -1) && (_border == BORDER_SOLID)) ? BORDER_SOLID_LAST_ROW : _border;
-                    Gtk::Widget* thing = manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio, border));
+                    Gtk::Widget* thing = Gtk::manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio, border));
 
                     if ( !_insides ) {
                         calcGridSize( thing, items.size(), width, height );
 
 #if WITH_GTKMM_3_0
-                        _insides = manage(new Gtk::Grid());
+                        _insides = Gtk::manage(new Gtk::Grid());
                         if (_border == BORDER_WIDE) {
                             _insides->set_column_spacing(1);
                             _insides->set_row_spacing(1);
                         }
 #else
-                        _insides = manage(new Gtk::Table( height, width ));
+                        _insides = Gtk::manage(new Gtk::Table( height, width ));
                         if (_border == BORDER_WIDE) {
                             _insides->set_col_spacings( 1 );
                             _insides->set_row_spacings( 1 );
@@ -493,9 +493,9 @@ void PreviewHolder::rebuildUI()
                 }
                 if ( !_insides ) {
 #if WITH_GTKMM_3_0
-                    _insides = manage(new Gtk::Grid());
+                    _insides = Gtk::manage(new Gtk::Grid());
 #else
-                    _insides = manage(new Gtk::Table( 1, 2 ));
+                    _insides = Gtk::manage(new Gtk::Table( 1, 2 ));
 #endif
                 }
 
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index c729354cb..42f352e3c 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -97,7 +97,7 @@ void Licensor::init (Registry& wr)
 
     LicenseItem *i;
     wr.setUpdating (true);
-    i = manage (new LicenseItem (&_proprietary_license, _eentry, wr, NULL));
+    i = Gtk::manage (new LicenseItem (&_proprietary_license, _eentry, wr, NULL));
     Gtk::RadioButtonGroup group = i->get_group();
     add (*i);
     LicenseItem *pd = i;
@@ -105,17 +105,17 @@ void Licensor::init (Registry& wr)
     for (struct rdf_license_t * license = rdf_licenses;
              license && license->name;
              license++) {
-        i = manage (new LicenseItem (license, _eentry, wr, &group));
+        i = Gtk::manage (new LicenseItem (license, _eentry, wr, &group));
         add(*i);
     }
     // add Other at the end before the URI field for the confused ppl.
-    LicenseItem *io = manage (new LicenseItem (&_other_license, _eentry, wr, &group));
+    LicenseItem *io = Gtk::manage (new LicenseItem (&_other_license, _eentry, wr, &group));
     add (*io);
 
     pd->set_active();
     wr.setUpdating (false);
 
-    Gtk::HBox *box = manage (new Gtk::HBox);
+    Gtk::HBox *box = Gtk::manage (new Gtk::HBox);
     pack_start (*box, true, true, 0);
 
     box->pack_start (_eentry->_label, false, false, 5);
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index d60eeefe0..b37137228 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -115,8 +115,8 @@ void Panel::_init()
         Gtk::RadioMenuItem::Group group;
         Glib::ustring one_label(_("List"));
         Glib::ustring two_label(_("Grid"));
-        Gtk::RadioMenuItem *one = manage(new Gtk::RadioMenuItem(group, one_label));
-        Gtk::RadioMenuItem *two = manage(new Gtk::RadioMenuItem(group, two_label));
+        Gtk::RadioMenuItem *one = Gtk::manage(new Gtk::RadioMenuItem(group, one_label));
+        Gtk::RadioMenuItem *two = Gtk::manage(new Gtk::RadioMenuItem(group, two_label));
 
         if (panel_mode == 0) {
             one->set_active(true);
@@ -128,7 +128,7 @@ void Panel::_init()
         _non_horizontal.push_back(one);
         _menu->append(*two);
         _non_horizontal.push_back(two);
-        Gtk::MenuItem* sep = manage(new Gtk::SeparatorMenuItem());
+        Gtk::MenuItem* sep = Gtk::manage(new Gtk::SeparatorMenuItem());
         _menu->append(*sep);
         _non_horizontal.push_back(sep);
         one->signal_activate().connect(sigc::bind<int, int>(sigc::mem_fun(*this, &Panel::_bounceCall), PANEL_SETTING_MODE, 0));
@@ -147,14 +147,14 @@ void Panel::_init()
             NC_("Swatches height", "Huge")
         };
 
-        Gtk::MenuItem *sizeItem = manage(new Gtk::MenuItem(heightItemLabel));
-        Gtk::Menu *sizeMenu = manage(new Gtk::Menu());
+        Gtk::MenuItem *sizeItem = Gtk::manage(new Gtk::MenuItem(heightItemLabel));
+        Gtk::Menu *sizeMenu = Gtk::manage(new Gtk::Menu());
         sizeItem->set_submenu(*sizeMenu);
 
         Gtk::RadioMenuItem::Group heightGroup;
         for (unsigned int i = 0; i < G_N_ELEMENTS(heightLabels); i++) {
             Glib::ustring _label(g_dpgettext2(NULL, "Swatches height", heightLabels[i]));
-            Gtk::RadioMenuItem* _item = manage(new Gtk::RadioMenuItem(heightGroup, _label));
+            Gtk::RadioMenuItem* _item = Gtk::manage(new Gtk::RadioMenuItem(heightGroup, _label));
             sizeMenu->append(*_item);
             if (i == panel_size) {
                 _item->set_active(true);
@@ -177,8 +177,8 @@ void Panel::_init()
             NC_("Swatches width", "Wider")
         };
 
-        Gtk::MenuItem *item = manage( new Gtk::MenuItem(widthItemLabel));
-        Gtk::Menu *type_menu = manage(new Gtk::Menu());
+        Gtk::MenuItem *item = Gtk::manage( new Gtk::MenuItem(widthItemLabel));
+        Gtk::Menu *type_menu = Gtk::manage(new Gtk::Menu());
         item->set_submenu(*type_menu);
         _menu->append(*item);
 
@@ -194,7 +194,7 @@ void Panel::_init()
         }
         for ( guint i = 0; i < G_N_ELEMENTS(widthLabels); ++i ) {
             Glib::ustring _label(g_dpgettext2(NULL, "Swatches width", widthLabels[i]));
-            Gtk::RadioMenuItem *_item = manage(new Gtk::RadioMenuItem(widthGroup, _label));
+            Gtk::RadioMenuItem *_item = Gtk::manage(new Gtk::RadioMenuItem(widthGroup, _label));
             type_menu->append(*_item);
             if ( i <= hot_index ) {
                 _item->set_active(true);
@@ -213,8 +213,8 @@ void Panel::_init()
             NC_("Swatches border", "Wide"),
         };
 
-        Gtk::MenuItem *item = manage( new Gtk::MenuItem(widthItemLabel));
-        Gtk::Menu *type_menu = manage(new Gtk::Menu());
+        Gtk::MenuItem *item = Gtk::manage( new Gtk::MenuItem(widthItemLabel));
+        Gtk::Menu *type_menu = Gtk::manage(new Gtk::Menu());
         item->set_submenu(*type_menu);
         _menu->append(*item);
 
@@ -230,7 +230,7 @@ void Panel::_init()
         }
         for ( guint i = 0; i < G_N_ELEMENTS(widthLabels); ++i ) {
             Glib::ustring _label(g_dpgettext2(NULL, "Swatches border", widthLabels[i]));
-            Gtk::RadioMenuItem *_item = manage(new Gtk::RadioMenuItem(widthGroup, _label));
+            Gtk::RadioMenuItem *_item = Gtk::manage(new Gtk::RadioMenuItem(widthGroup, _label));
             type_menu->append(*_item);
             if ( i <= hot_index ) {
                 _item->set_active(true);
@@ -242,7 +242,7 @@ void Panel::_init()
     {
         //TRANSLATORS: "Wrap" indicates how colour swatches are displayed
         Glib::ustring wrap_label(C_("Swatches","Wrap"));
-        Gtk::CheckMenuItem *check = manage(new Gtk::CheckMenuItem(wrap_label));
+        Gtk::CheckMenuItem *check = Gtk::manage(new Gtk::CheckMenuItem(wrap_label));
         check->set_active(panel_wrap);
         _menu->append(*check);
         _non_vertical.push_back(check);
@@ -251,7 +251,7 @@ void Panel::_init()
     }
 
     Gtk::SeparatorMenuItem *sep;
-    sep = manage(new Gtk::SeparatorMenuItem());
+    sep = Gtk::manage(new Gtk::SeparatorMenuItem());
     _menu->append(*sep);
 
     _menu->show_all_children();
@@ -284,7 +284,7 @@ void Panel::_init()
 
     pack_start(_top_bar, false, false);
 
-    Gtk::HBox* boxy = manage(new Gtk::HBox());
+    Gtk::HBox* boxy = Gtk::manage(new Gtk::HBox());
 
     boxy->pack_start(_contents, true, true);
     boxy->pack_start(_right_bar, false, true);
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 175f6471c..92cb3f03d 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -429,11 +429,11 @@ RegisteredRadioButtonPair::RegisteredRadioButtonPair (const Glib::ustring& label
 
     setProgrammatically = false;
 
-    add (*manage (new Gtk::Label (label)));
-    _rb1 = manage (new Gtk::RadioButton (label1, true));
+    add(*Gtk::manage(new Gtk::Label(label)));
+    _rb1 = Gtk::manage(new Gtk::RadioButton(label1, true));
     add (*_rb1);
     Gtk::RadioButtonGroup group = _rb1->get_group();
-    _rb2 = manage (new Gtk::RadioButton (group, label2, true));
+    _rb2 = Gtk::manage(new Gtk::RadioButton(group, label2, true));
     add (*_rb2);
     _rb2->set_active();
     _rb1->set_tooltip_text(tip1);
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index d166e3831..5fc588fdc 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -71,19 +71,19 @@ void ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& la
     //           hbox
     
     _vbox = new Gtk::VBox;
-    _hbox = manage (new Gtk::HBox);
+    _hbox = Gtk::manage(new Gtk::HBox);
     
-    Gtk::Label *theLabel1 = manage (new Gtk::Label (label1));
+    Gtk::Label *theLabel1 = Gtk::manage(new Gtk::Label(label1));
     theLabel1->set_use_underline();
     theLabel1->set_alignment(0, 0.5);
     // align the label with the checkbox text above by indenting 22 px.
     _hbox->pack_start(*theLabel1, Gtk::PACK_EXPAND_WIDGET, 22);
 
 #if WITH_GTKMM_3_0
-    _hscale = manage(new Gtk::Scale(Gtk::ORIENTATION_HORIZONTAL));
+    _hscale = Gtk::manage(new Gtk::Scale(Gtk::ORIENTATION_HORIZONTAL));
     _hscale->set_range(1.0, 51.0);
 #else 
-    _hscale = manage (new Gtk::HScale (1.0, 51, 1.0));
+    _hscale = Gtk::manage (new Gtk::HScale (1.0, 51, 1.0));
 #endif
 
     theLabel1->set_mnemonic_widget (*_hscale);
@@ -96,13 +96,13 @@ void ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& la
     _hbox->add (*_hscale);    
     
     
-    Gtk::Label *theLabel2 = manage (new Gtk::Label (label2));
+    Gtk::Label *theLabel2 = Gtk::manage(new Gtk::Label(label2));
     theLabel2->set_use_underline();
-    Gtk::Label *theLabel3 = manage (new Gtk::Label (label3));
+    Gtk::Label *theLabel3 = Gtk::manage(new Gtk::Label(label3));
     theLabel3->set_use_underline();    
-    _button1 = manage (new Gtk::RadioButton);
+    _button1 = Gtk::manage(new Gtk::RadioButton);
     _radio_button_group = _button1->get_group();
-    _button2 = manage (new Gtk::RadioButton);
+    _button2 = Gtk::manage(new Gtk::RadioButton);
     _button2->set_group(_radio_button_group);    
     _button1->set_tooltip_text (tip2);
     _button2->set_tooltip_text (tip3);    
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 9567f81ba..a4cca9472 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -114,7 +114,7 @@ StrokeStyle::StrokeStyleButton::StrokeStyleButton(Gtk::RadioButtonGroup &grp,
     show();
     set_mode(false);
         
-    Gtk::Widget *px = manage(Glib::wrap(sp_icon_new(Inkscape::ICON_SIZE_LARGE_TOOLBAR, icon)));
+    Gtk::Widget *px = Gtk::manage(Glib::wrap(sp_icon_new(Inkscape::ICON_SIZE_LARGE_TOOLBAR, icon)));
     g_assert(px != NULL);
     px->show();
     add(*px);
@@ -198,7 +198,7 @@ StrokeStyle::StrokeStyle() :
     hb->pack_start(*widthSpin, false, false, 0);
     unitSelector = new Inkscape::UI::Widget::UnitMenu();
     unitSelector->setUnitType(Inkscape::Util::UNIT_TYPE_LINEAR);
-    Gtk::Widget *us = manage(unitSelector);
+    Gtk::Widget *us = Gtk::manage(unitSelector);
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
 
     unitSelector->addUnit(*unit_table.getUnit("%"));
@@ -328,7 +328,7 @@ StrokeStyle::StrokeStyle() :
                                             //   implement a set_mnemonic_source function in the
                                             //   SPDashSelector class, so that we do not have to
                                             //   expose any of the underlying widgets?
-    dashSelector = manage(new SPDashSelector);
+    dashSelector = Gtk::manage(new SPDashSelector);
 
     dashSelector->show();
 
@@ -354,7 +354,7 @@ StrokeStyle::StrokeStyle() :
     hb = spw_hbox(table, 1, 1, i);
     i++;
 
-    startMarkerCombo = manage(new MarkerComboBox("marker-start", SP_MARKER_LOC_START));
+    startMarkerCombo = Gtk::manage(new MarkerComboBox("marker-start", SP_MARKER_LOC_START));
     startMarkerCombo->set_tooltip_text(_("Start Markers are drawn on the first node of a path or shape"));
     startMarkerConn = startMarkerCombo->signal_changed().connect(
             sigc::bind<MarkerComboBox *, StrokeStyle *, SPMarkerLoc>(
@@ -363,7 +363,7 @@ StrokeStyle::StrokeStyle() :
 
     hb->pack_start(*startMarkerCombo, true, true, 0);
 
-    midMarkerCombo =  manage(new MarkerComboBox("marker-mid", SP_MARKER_LOC_MID));
+    midMarkerCombo = Gtk::manage(new MarkerComboBox("marker-mid", SP_MARKER_LOC_MID));
     midMarkerCombo->set_tooltip_text(_("Mid Markers are drawn on every node of a path or shape except the first and last nodes"));
     midMarkerConn = midMarkerCombo->signal_changed().connect(
         sigc::bind<MarkerComboBox *, StrokeStyle *, SPMarkerLoc>(
@@ -372,7 +372,7 @@ StrokeStyle::StrokeStyle() :
 
     hb->pack_start(*midMarkerCombo, true, true, 0);
 
-    endMarkerCombo = manage(new MarkerComboBox("marker-end", SP_MARKER_LOC_END));
+    endMarkerCombo = Gtk::manage(new MarkerComboBox("marker-end", SP_MARKER_LOC_END));
     endMarkerCombo->set_tooltip_text(_("End Markers are drawn on the last node of a path or shape"));
     endMarkerConn = endMarkerCombo->signal_changed().connect(
         sigc::bind<MarkerComboBox *, StrokeStyle *, SPMarkerLoc>(