Rm remaining Gtk::Stock usage

(bzr r15368)

14 files changed, 162 insertions, 181 deletions

diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index b7a48e859..8f0545e96 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -27,7 +27,6 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/aspectframe.h>
 #include <gtkmm/textview.h>
-#include <gtkmm/stock.h>
 
 #include "path-prefix.h"
 #include "document.h"
@@ -39,8 +38,6 @@
 #include "inkscape-version.h"
 
 
-
-
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/calligraphic-profile-rename.cpp b/src/ui/dialog/calligraphic-profile-rename.cpp
index 0835043ab..36570e769 100644
--- a/src/ui/dialog/calligraphic-profile-rename.cpp
+++ b/src/ui/dialog/calligraphic-profile-rename.cpp
@@ -15,7 +15,6 @@
 
 #include "calligraphic-profile-rename.h"
 #include <glibmm/i18n.h>
-#include <gtkmm/stock.h>
 #include <gtkmm/grid.h>
 
 #include "desktop.h"
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index d0b618c65..27a6e55d9 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -19,7 +19,6 @@
 
 #include "dialog-manager.h"
 #include <gtkmm/dialog.h>
-#include <gtkmm/stock.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "inkscape.h"
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp
index ec630c08f..02955b9a8 100644
--- a/src/ui/dialog/dock-behavior.cpp
+++ b/src/ui/dialog/dock-behavior.cpp
@@ -25,9 +25,6 @@
 #include "dialog.h"
 #include "ui/dialog-events.h"
 
-#include <gtkmm/invisible.h>
-#include <gtkmm/stock.h>
-
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index fa8e11dfd..9abad3e7b 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -15,7 +15,6 @@
 #endif
 
 #include <gtkmm/dialog.h>
-#include <gtkmm/stock.h>
 #include <glibmm/main.h>
 
 #include "floating-behavior.h"
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 5872393ae..9ec8d3148 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -1,25 +1,24 @@
-/*
- * A simple dialog for creating grid type arrangements of selected objects
- *
- * Authors:
- *   Bob Jamison ( based off trace dialog)
- *   John Cliff
- *   Other dudes from The Inkscape Organization
- *   Abhishek Sharma
- *   Declara Denis
- *
- * Copyright (C) 2004 Bob Jamison
- * Copyright (C) 2004 John Cliff
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-//#define DEBUG_GRID_ARRANGE 1
+    /*
+     * A simple dialog for creating grid type arrangements of selected objects
+     *
+     * Authors:
+     *   Bob Jamison ( based off trace dialog)
+     *   John Cliff
+     *   Other dudes from The Inkscape Organization
+     *   Abhishek Sharma
+     *   Declara Denis
+     *
+     * Copyright (C) 2004 Bob Jamison
+     * Copyright (C) 2004 John Cliff
+     *
+     * Released under GNU GPL, read the file 'COPYING' for more information
+     */
+    //#define DEBUG_GRID_ARRANGE 1
 
 #include "ui/dialog/grid-arrange-tab.h"
 #include <glibmm/i18n.h>
 
 #include <gtkmm/grid.h>
-#include <gtkmm/stock.h>
 
 #include <2geom/transforms.h>
 
@@ -31,193 +30,193 @@
 #include "document-undo.h"
 #include "widgets/icon.h"
 #include "desktop.h"
-//#include "sp-item-transform.h" FIXME
+    //#include "sp-item-transform.h" FIXME
 #include "ui/dialog/tile.h" // for Inkscape::UI::Dialog::ArrangeDialog
 
-/*
- *    Sort items by their x co-ordinates, taking account of y (keeps rows intact)
- *
- *    <0 *elem1 goes before *elem2
- *    0  *elem1 == *elem2
- *    >0  *elem1 goes after *elem2
- */
-static bool sp_compare_x_position(SPItem *first, SPItem *second)
-{
-    using Geom::X;
-    using Geom::Y;
+    /*
+     *    Sort items by their x co-ordinates, taking account of y (keeps rows intact)
+     *
+     *    <0 *elem1 goes before *elem2
+     *    0  *elem1 == *elem2
+     *    >0  *elem1 goes after *elem2
+     */
+    static bool sp_compare_x_position(SPItem *first, SPItem *second)
+    {
+        using Geom::X;
+        using Geom::Y;
 
-    Geom::OptRect a = first->documentVisualBounds();
-    Geom::OptRect b = second->documentVisualBounds();
+        Geom::OptRect a = first->documentVisualBounds();
+        Geom::OptRect b = second->documentVisualBounds();
 
-    if ( !a || !b ) {
-        // FIXME?
-        return false;
-    }
+        if ( !a || !b ) {
+            // FIXME?
+            return false;
+        }
 
-    double const a_height = a->dimensions()[Y];
-    double const b_height = b->dimensions()[Y];
+        double const a_height = a->dimensions()[Y];
+        double const b_height = b->dimensions()[Y];
 
-    bool a_in_b_vert = false;
-    if ((a->min()[Y] < b->min()[Y] + 0.1) && (a->min()[Y] > b->min()[Y] - b_height)) {
-        a_in_b_vert = true;
-    } else if ((b->min()[Y] < a->min()[Y] + 0.1) && (b->min()[Y] > a->min()[Y] - a_height)) {
-        a_in_b_vert = true;
-    } else if (b->min()[Y] == a->min()[Y]) {
-        a_in_b_vert = true;
-    } else {
-        a_in_b_vert = false;
-    }
+        bool a_in_b_vert = false;
+        if ((a->min()[Y] < b->min()[Y] + 0.1) && (a->min()[Y] > b->min()[Y] - b_height)) {
+            a_in_b_vert = true;
+        } else if ((b->min()[Y] < a->min()[Y] + 0.1) && (b->min()[Y] > a->min()[Y] - a_height)) {
+            a_in_b_vert = true;
+        } else if (b->min()[Y] == a->min()[Y]) {
+            a_in_b_vert = true;
+        } else {
+            a_in_b_vert = false;
+        }
 
-    if (!a_in_b_vert) { // a and b are not in the same row
-        return (a->min()[Y] < b->min()[Y]);
+        if (!a_in_b_vert) { // a and b are not in the same row
+            return (a->min()[Y] < b->min()[Y]);
+        }
+        return (a->min()[X] < b->min()[X]);
     }
-    return (a->min()[X] < b->min()[X]);
-}
 
-/*
- *    Sort items by their y co-ordinates.
- */
-static bool sp_compare_y_position(SPItem *first, SPItem *second)
-{
-    Geom::OptRect a = first->documentVisualBounds();
-    Geom::OptRect b = second->documentVisualBounds();
+    /*
+     *    Sort items by their y co-ordinates.
+     */
+    static bool sp_compare_y_position(SPItem *first, SPItem *second)
+    {
+        Geom::OptRect a = first->documentVisualBounds();
+        Geom::OptRect b = second->documentVisualBounds();
 
-    if ( !a || !b ) {
-        // FIXME?
-        return false;
-    }
+        if ( !a || !b ) {
+            // FIXME?
+            return false;
+        }
+
+        if (a->min()[Geom::Y] > b->min()[Geom::Y]) {
+            return false;
+        }
+        if (a->min()[Geom::Y] < b->min()[Geom::Y]) {
+            return true;
+        }
 
-    if (a->min()[Geom::Y] > b->min()[Geom::Y]) {
         return false;
     }
-    if (a->min()[Geom::Y] < b->min()[Geom::Y]) {
-        return true;
-    }
-
-    return false;
-}
 
 
-namespace Inkscape {
-namespace UI {
-namespace Dialog {
+    namespace Inkscape {
+    namespace UI {
+    namespace Dialog {
 
 
-//#########################################################################
-//## E V E N T S
-//#########################################################################
-
-/*
- *
- * This arranges the selection in a grid pattern.
- *
- */
+    //#########################################################################
+    //## E V E N T S
+    //#########################################################################
 
-void GridArrangeTab::arrange()
-{
+    /*
+     *
+     * This arranges the selection in a grid pattern.
+     *
+     */
 
-    int cnt,row_cnt,col_cnt,a,row,col;
-    double grid_left,grid_top,col_width,row_height,paddingx,paddingy,width, height, new_x, new_y;
-    double total_col_width,total_row_height;
-    col_width = 0;
-    row_height = 0;
-    total_col_width=0;
-    total_row_height=0;
+    void GridArrangeTab::arrange()
+    {
 
-    // check for correct numbers in the row- and col-spinners
-    on_col_spinbutton_changed();
-    on_row_spinbutton_changed();
+        int cnt,row_cnt,col_cnt,a,row,col;
+        double grid_left,grid_top,col_width,row_height,paddingx,paddingy,width, height, new_x, new_y;
+        double total_col_width,total_row_height;
+        col_width = 0;
+        row_height = 0;
+        total_col_width=0;
+        total_row_height=0;
 
-    // set padding to manual values
-    paddingx = XPadding.getValue("px");
-    paddingy = YPadding.getValue("px");
+        // check for correct numbers in the row- and col-spinners
+        on_col_spinbutton_changed();
+        on_row_spinbutton_changed();
 
-    std::vector<double> row_heights;
-    std::vector<double> col_widths;
-    std::vector<double> row_ys;
-    std::vector<double> col_xs;
+        // set padding to manual values
+        paddingx = XPadding.getValue("px");
+        paddingy = YPadding.getValue("px");
 
-    int NoOfCols = NoOfColsSpinner.get_value_as_int();
-    int NoOfRows = NoOfRowsSpinner.get_value_as_int();
+        std::vector<double> row_heights;
+        std::vector<double> col_widths;
+        std::vector<double> row_ys;
+        std::vector<double> col_xs;
 
-    width = 0;
-    for (a=0;a<NoOfCols; a++){
-        col_widths.push_back(width);
-    }
+        int NoOfCols = NoOfColsSpinner.get_value_as_int();
+        int NoOfRows = NoOfRowsSpinner.get_value_as_int();
 
-    height = 0;
-    for (a=0;a<NoOfRows; a++){
-        row_heights.push_back(height);
-    }
-    grid_left = 99999;
-    grid_top = 99999;
+        width = 0;
+        for (a=0;a<NoOfCols; a++){
+            col_widths.push_back(width);
+        }
 
-    SPDesktop *desktop = Parent->getDesktop();
-    desktop->getDocument()->ensureUpToDate();
+        height = 0;
+        for (a=0;a<NoOfRows; a++){
+            row_heights.push_back(height);
+        }
+        grid_left = 99999;
+        grid_top = 99999;
 
-    Inkscape::Selection *selection = desktop->getSelection();
-    std::vector<SPItem*> items;
-    if (selection) {
-        items.insert(items.end(), selection->items().begin(), selection->items().end());
-    }
+        SPDesktop *desktop = Parent->getDesktop();
+        desktop->getDocument()->ensureUpToDate();
 
-    for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end(); ++i){
-        SPItem *item = *i;
-        Geom::OptRect b = item->documentVisualBounds();
-        if (!b) {
-            continue;
+        Inkscape::Selection *selection = desktop->getSelection();
+        std::vector<SPItem*> items;
+        if (selection) {
+            items.insert(items.end(), selection->items().begin(), selection->items().end());
         }
 
-        width = b->dimensions()[Geom::X];
-        height = b->dimensions()[Geom::Y];
+        for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end(); ++i){
+            SPItem *item = *i;
+            Geom::OptRect b = item->documentVisualBounds();
+            if (!b) {
+                continue;
+            }
+
+            width = b->dimensions()[Geom::X];
+            height = b->dimensions()[Geom::Y];
 
-        if (b->min()[Geom::X] < grid_left) {
-            grid_left = b->min()[Geom::X];
-        }
-        if (b->min()[Geom::Y] < grid_top) {
-            grid_top = b->min()[Geom::Y];
-        }
-        if (width > col_width) {
-            col_width = width;
-        }
-        if (height > row_height) {
-            row_height = height;
+            if (b->min()[Geom::X] < grid_left) {
+                grid_left = b->min()[Geom::X];
+            }
+            if (b->min()[Geom::Y] < grid_top) {
+                grid_top = b->min()[Geom::Y];
+            }
+            if (width > col_width) {
+                col_width = width;
+            }
+            if (height > row_height) {
+                row_height = height;
+            }
         }
-    }
 
 
-    // require the sorting done before we can calculate row heights etc.
+        // require the sorting done before we can calculate row heights etc.
 
-    g_return_if_fail(selection);
-    std::vector<SPItem*> sorted(selection->items().begin(), selection->items().end());
-    sort(sorted.begin(),sorted.end(),sp_compare_y_position);
-    sort(sorted.begin(),sorted.end(),sp_compare_x_position);
+        g_return_if_fail(selection);
+        std::vector<SPItem*> sorted(selection->items().begin(), selection->items().end());
+        sort(sorted.begin(),sorted.end(),sp_compare_y_position);
+        sort(sorted.begin(),sorted.end(),sp_compare_x_position);
 
 
-    // Calculate individual Row and Column sizes if necessary
+        // Calculate individual Row and Column sizes if necessary
 
 
-        cnt=0;
-        const std::vector<SPItem*> sizes(sorted);
-        for (std::vector<SPItem*>::const_iterator i = sizes.begin();i!=sizes.end(); ++i) {
-            SPItem *item = *i;
-            Geom::OptRect b = item->documentVisualBounds();
-            if (b) {
-                width = b->dimensions()[Geom::X];
-                height = b->dimensions()[Geom::Y];
-                if (width > col_widths[(cnt % NoOfCols)]) {
-                    col_widths[(cnt % NoOfCols)] = width;
+            cnt=0;
+            const std::vector<SPItem*> sizes(sorted);
+            for (std::vector<SPItem*>::const_iterator i = sizes.begin();i!=sizes.end(); ++i) {
+                SPItem *item = *i;
+                Geom::OptRect b = item->documentVisualBounds();
+                if (b) {
+                    width = b->dimensions()[Geom::X];
+                    height = b->dimensions()[Geom::Y];
+                    if (width > col_widths[(cnt % NoOfCols)]) {
+                        col_widths[(cnt % NoOfCols)] = width;
+                    }
+                    if (height > row_heights[(cnt / NoOfCols)]) {
+                        row_heights[(cnt / NoOfCols)] = height;
+                    }
                 }
-                if (height > row_heights[(cnt / NoOfCols)]) {
-                    row_heights[(cnt / NoOfCols)] = height;
-                }
-            }
 
-            cnt++;
-        }
+                cnt++;
+            }
 
 
-    /// Make sure the top and left of the grid dont move by compensating for align values.
+        /// Make sure the top and left of the grid dont move by compensating for align values.
     if (RowHeightButton.get_active()){
         grid_top = grid_top - (((row_height - row_heights[0]) / 2)*(VertAlign));
     }
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index a4fcc9947..19050fb1d 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -27,7 +27,6 @@
 #include <gtkmm/alignment.h>
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/frame.h>
-#include <gtkmm/stock.h>
 #include "ui/widget/frame.h"
 
 #include "desktop.h"
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 8910005aa..e5becdb5c 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -17,7 +17,6 @@
 #endif
 
 #include "livepatheffect-editor.h"
-#include <gtkmm/stock.h>
 
 #include "desktop.h"
 
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 446af4ccb..c7c696cdc 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -15,7 +15,6 @@
 
 #include "objects.h"
 #include <gtkmm/icontheme.h>
-#include <gtkmm/stock.h>
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/separatormenuitem.h>
 #include <glibmm/main.h>
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index 79747a798..3e6617cfe 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -28,7 +28,6 @@
 
 #include "pixelartdialog.h"
 #include <gtkmm/radiobutton.h>
-#include <gtkmm/stock.h>
 #include <gtkmm/messagedialog.h>
 
 #include <glibmm/i18n.h>
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index 6f31935a4..a1d4d88b8 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -21,7 +21,6 @@
 #include <gtkmm/radiobutton.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
-#include <gtkmm/stock.h>
 
 #include <glibmm/i18n.h>
 
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 475c3a9c6..d209a450c 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -16,7 +16,6 @@
 #endif
 
 #include <gtkmm/dialog.h>
-#include <gtkmm/stock.h>
 #include <2geom/transforms.h>
 
 #include "document.h"
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index d05c52531..fa35b092a 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -19,7 +19,6 @@
 #include "xml-tree.h"
 #include "widgets/icon.h"
 #include <glibmm/i18n.h>
-#include <gtkmm/stock.h>
 
 #include "desktop.h"
 
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index e0c767509..d50c56b76 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -73,8 +73,6 @@
 #include "message-stack.h"
 #include "ui/dialog/layer-properties.h"
 
-#include "widgets/image-menu-item.h"
-
 using Inkscape::DocumentUndo;
 
 /* Drag and Drop */
@@ -405,7 +403,7 @@ sp_ui_menuitem_add_icon( GtkWidget *item, gchar *icon_name )
 
     icon = sp_icon_new( Inkscape::ICON_SIZE_MENU, icon_name );
     gtk_widget_show(icon);
-    image_menu_item_set_image((ImageMenuItem *) item, icon);
+    gtk_image_menu_item_set_image((GtkImageMenuItem *) item, icon);
 } // end of sp_ui_menu_add_icon
 
 void
@@ -459,7 +457,7 @@ static GtkWidget *sp_ui_menu_append_item_from_verb(GtkMenu *menu, Inkscape::Verb
         if (radio) {
             item = gtk_radio_menu_item_new_with_mnemonic(group, action->name);
         } else {
-            item = image_menu_item_new_with_mnemonic(action->name);
+            item = gtk_image_menu_item_new_with_mnemonic(action->name);
         }
 
         gtk_label_set_markup_with_mnemonic( GTK_LABEL(gtk_bin_get_child(GTK_BIN (item))), action->name);