[monkey-bubble: 554/753] Change GNOME_STOCK_BUTTON_PREV to GTK_STOCK_GO_BACK,

[Sven Herzberg <herzi src gnome org>]

commit 399e8c8d6b68cac2a16a7430101f6a28cf175ddf
Author: Joe Shaw <joe ximian com>
Date:   Sun Jul 22 17:55:03 2001 +0000

    Change GNOME_STOCK_BUTTON_PREV to GTK_STOCK_GO_BACK,
    
    2001-07-22  Joe Shaw  <joe ximian com>
    
    	* gnome-druid.c (gnome_druid_init): Change GNOME_STOCK_BUTTON_PREV
    	to GTK_STOCK_GO_BACK, GNOME_STOCK_BUTTON_NEXT to GTK_STOCK_GO_FORWARD,
    	GNOME_STOCK_BUTTON_CANCEL to GTK_STOCK_CANCEL, GNOME_STOCK_BUTTON_APPLY
    	to GTK_STOCK_APPLY and GNOME_STOCK_BUTTON_HELP to GTK_STOCK_HELP.
    
    	* gnome-font-picker.c: Include gtkstock.h instead of gnome-pixmap.h.
    	(gnome_font_picker_create_inside): Change GNOME_STOCK_PIXMAP_FONT to
    	GTK_STOCK_SELECT_FONT.
    
    	* gnome-init.c: Don't include gnome-pixmap.h

 libgnomeui/ChangeLog           |   13 +++++++++++++
 libgnomeui/gnome-druid.c       |   10 +++++-----
 libgnomeui/gnome-font-picker.c |    4 ++--
 libgnomeui/gnome-ui-init.c     |    1 -
 4 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index 114e8c4..41c98c2 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,3 +1,16 @@
+2001-07-22  Joe Shaw  <joe ximian com>
+
+	* gnome-druid.c (gnome_druid_init): Change GNOME_STOCK_BUTTON_PREV
+	to GTK_STOCK_GO_BACK, GNOME_STOCK_BUTTON_NEXT to GTK_STOCK_GO_FORWARD,
+	GNOME_STOCK_BUTTON_CANCEL to GTK_STOCK_CANCEL, GNOME_STOCK_BUTTON_APPLY
+	to GTK_STOCK_APPLY and GNOME_STOCK_BUTTON_HELP to GTK_STOCK_HELP.
+
+	* gnome-font-picker.c: Include gtkstock.h instead of gnome-pixmap.h.
+	(gnome_font_picker_create_inside): Change GNOME_STOCK_PIXMAP_FONT to
+	GTK_STOCK_SELECT_FONT.
+
+	* gnome-init.c: Don't include gnome-pixmap.h
+
 2001-07-22  Martin Baulig  <baulig suse de>
 
 	* pixmaps/stock_menu_scores.png: Removed, same as stock_scores.png.
diff --git a/libgnomeui/gnome-druid.c b/libgnomeui/gnome-druid.c
index 2c7024a..959e8c8 100644
--- a/libgnomeui/gnome-druid.c
+++ b/libgnomeui/gnome-druid.c
@@ -164,16 +164,16 @@ gnome_druid_init (GnomeDruid *druid)
 
 	/* set up the buttons */
 	GTK_WIDGET_SET_FLAGS (GTK_WIDGET (druid), GTK_NO_WINDOW);
-	druid->back = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_PREV);
+	druid->back = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
 	GTK_WIDGET_SET_FLAGS (druid->back, GTK_CAN_DEFAULT);
-	druid->next = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_NEXT);
+	druid->next = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
 	GTK_WIDGET_SET_FLAGS (druid->next, GTK_CAN_DEFAULT);
 	GTK_WIDGET_SET_FLAGS (druid->next, GTK_HAS_FOCUS);
-	druid->cancel = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_CANCEL);
+	druid->cancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
 	GTK_WIDGET_SET_FLAGS (druid->cancel, GTK_CAN_DEFAULT);
-	druid->finish = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_APPLY);
+	druid->finish = gtk_button_new_from_stock (GTK_STOCK_APPLY);
 	GTK_WIDGET_SET_FLAGS (druid->finish, GTK_CAN_DEFAULT);
-	druid->help = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_HELP);
+	druid->help = gtk_button_new_from_stock (GTK_STOCK_HELP);
 	GTK_WIDGET_SET_FLAGS (druid->help, GTK_CAN_DEFAULT);
 	gtk_widget_set_parent (druid->back, GTK_WIDGET (druid));
 	gtk_widget_set_parent (druid->next, GTK_WIDGET (druid));
diff --git a/libgnomeui/gnome-font-picker.c b/libgnomeui/gnome-font-picker.c
index ea6968a..ae7ffd8 100644
--- a/libgnomeui/gnome-font-picker.c
+++ b/libgnomeui/gnome-font-picker.c
@@ -28,7 +28,7 @@
 #include <gtk/gtkvseparator.h>
 #include <gtk/gtkfontsel.h>
 #include <gtk/gtkimage.h>
-#include <libgnomeui/gnome-pixmap.h>
+#include <gtk/gtkstock.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include "gnome-font-picker.h"
 #include <libgnome/gnome-i18n.h>
@@ -849,7 +849,7 @@ GtkWidget *gnome_font_picker_create_inside(GnomeFontPicker *gfp)
     GtkWidget *widget;
     
     if (gfp->_priv->mode==GNOME_FONT_PICKER_MODE_PIXMAP) {
-        widget=gtk_image_new_from_stock(GNOME_STOCK_PIXMAP_FONT,
+        widget=gtk_image_new_from_stock(GTK_STOCK_SELECT_FONT,
 					GTK_ICON_SIZE_BUTTON);
         gtk_widget_show(widget);
     } else if (gfp->_priv->mode==GNOME_FONT_PICKER_MODE_FONT_INFO) {
diff --git a/libgnomeui/gnome-ui-init.c b/libgnomeui/gnome-ui-init.c
index 3d17374..76198ba 100644
--- a/libgnomeui/gnome-ui-init.c
+++ b/libgnomeui/gnome-ui-init.c
@@ -51,7 +51,6 @@
 #include "gnome-stock-icons.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include "gnome-pixmap.h"
 
 #include "libgnomeuiP.h"