[gnumeric] GUI: Avoid GTK_STOCK in graph window.

[Morten Welinder <mortenw src gnome org>]

commit 14fd40b93240b0d389cdf4ff12da0be5924c5bf6
Author: Morten Welinder <terra gnome org>
Date:   Thu Dec 25 17:51:19 2014 -0500

    GUI: Avoid GTK_STOCK in graph window.

 ChangeLog              |    2 ++
 src/gnm-graph-window.c |   22 +++++-----------------
 2 files changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 898228a..a2d539c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-12-25  Morten Welinder  <terra gnome org>
 
+       * src/gnm-graph-window.c: Avoid GTK_STOCK_xxx completely.
+
        * src/wbc-gtk-actions.c (SheetDirection): use proper icon.
 
        * src/wbc-gtk.c (cb_sheet_direction_change): New function to fix
diff --git a/src/gnm-graph-window.c b/src/gnm-graph-window.c
index 70a3883..2764c53 100644
--- a/src/gnm-graph-window.c
+++ b/src/gnm-graph-window.c
@@ -9,20 +9,6 @@
 
 #include <goffice/goffice.h>
 
-#define ZOOM_IN(x) *x = CLAMP(*x+1, ZOOM_LEVEL_25, ZOOM_LEVEL_200)
-#define ZOOM_OUT(x) *x = CLAMP(*x-1, ZOOM_LEVEL_25, ZOOM_LEVEL_200)
-#define ZOOM_100(x) *x = ZOOM_LEVEL_100
-#define ZOOM_FIT(x) *x = ZOOM_LEVEL_FIT
-
-/* GTK_STOCK_FULLSCREEN appeared sometime after GTK+ 2.6.  */
-#ifndef GTK_STOCK_FULLSCREEN
-#define GTK_STOCK_FULLSCREEN GTK_STOCK_ZOOM_FIT
-#endif
-#ifndef GTK_STOCK_LEAVE_FULLSCREEN
-#define GTK_STOCK_LEAVE_FULLSCREEN GTK_STOCK_ZOOM_FIT
-#endif
-
-
 struct _GnmGraphWindow {
        GtkWindow parent;
 
@@ -67,10 +53,10 @@ fullscreen_button_clicked (GtkToolButton  *button,
 {
        if (!window->is_fullscreen) {
                gtk_window_fullscreen (GTK_WINDOW (window));
-               gtk_tool_button_set_stock_id (button, GTK_STOCK_LEAVE_FULLSCREEN);
+               gtk_tool_button_set_icon_name (button, "view-restore");
        } else {
                gtk_window_unfullscreen (GTK_WINDOW (window));
-               gtk_tool_button_set_stock_id (button, GTK_STOCK_FULLSCREEN);
+               gtk_tool_button_set_icon_name (button, "view-fullscreen");
        }
 
        window->is_fullscreen = !window->is_fullscreen;
@@ -221,7 +207,9 @@ gnm_graph_window_init (GnmGraphWindow *window)
        g_signal_connect_swapped (window->size_combo, "changed",
                                  G_CALLBACK (update_graph_sizing_mode), window);
 
-       item = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN);
+       item = g_object_new (GTK_TYPE_TOOL_BUTTON,
+                            "icon-name", "view-fullscreen",
+                            NULL);
        gtk_widget_show (GTK_WIDGET (item));
 
        gtk_toolbar_insert (GTK_TOOLBAR (window->toolbar), item, -1);