GNOME.org
 

[monkey-bubble: 209/753] Use the GTK+ API to access our stock icons.

commit 9eec6ecbc5b8c5d12bededb44a06b687cae0541f
Author: Martin Baulig <baulig suse de>
Date:   Sun Apr 29 00:54:34 2001 +0000

    Use the GTK+ API to access our stock icons.
    
    2001-04-29  Martin Baulig  <baulig suse de>
    
    	* gnome-app-helper.c, gnome-druid.c, gnome-font-picker.c,
    	gnome-helpsys.c: Use the GTK+ API to access our stock icons.
    
    	* gnome-stock-icons.h: New file; provide #defines for all
    	our stock ids.
    
    	* gnome-init.c (libgnomeui_post_args_parse): Call
    	init_gnome_stock_icons().
    
    	* gnome-stock.[ch], gnome-stock-ids.[ch]: Removed.

 libgnomeui/ChangeLog           |   13 ++
 libgnomeui/Makefile.am         |    5 +-
 libgnomeui/gnome-app-helper.c  |    2 +
 libgnomeui/gnome-druid.c       |   12 +-
 libgnomeui/gnome-font-picker.c |    6 +-
 libgnomeui/gnome-helpsys.c     |   28 ++--
 libgnomeui/gnome-stock-icons.c |    3 +-
 libgnomeui/gnome-stock-icons.h |  222 +++++++++++++++++++++++
 libgnomeui/gnome-stock-ids.c   |  185 -------------------
 libgnomeui/gnome-stock-ids.h   |  384 ----------------------------------------
 libgnomeui/gnome-ui-init.c     |    3 +
 libgnomeui/libgnomeui.h        |    2 +-
 12 files changed, 266 insertions(+), 599 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index dd3f745..d0ee836 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,5 +1,18 @@
 2001-04-29  Martin Baulig  <baulig suse de>
 
+	* gnome-app-helper.c, gnome-druid.c, gnome-font-picker.c,
+	gnome-helpsys.c: Use the GTK+ API to access our stock icons.
+
+	* gnome-stock-icons.h: New file; provide #defines for all
+	our stock ids.
+
+	* gnome-init.c (libgnomeui_post_args_parse): Call
+	init_gnome_stock_icons().
+
+	* gnome-stock.[ch], gnome-stock-ids.[ch]: Removed.
+
+2001-04-29  Martin Baulig  <baulig suse de>
+
 	* gnome-textfu.c (gnome_textfu_parse): Use stat(), not fstat();
 	[FIXME: for some strange reason, fstat() is an undefined symbol
 	on my system.]
diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
index a9b8c06..f355b71 100644
--- a/libgnomeui/Makefile.am
+++ b/libgnomeui/Makefile.am
@@ -84,8 +84,6 @@ libgnomeui_2_la_SOURCES = \
 	gnome-pouchP.h			\
 	gnome-preferences.c		\
 	gnome-roo.c			\
-	gnome-stock.c			\
-	gnome-stock-ids.c		\
         gnome-winhints.c		\
         gnome-paper-selector.c		\
 	gnome-unit-spinner.c		\
@@ -151,8 +149,7 @@ gnome_headers = \
 	gnome-pixmap.h			\
 	gnome-roo.h			\
 	gnome-selector.h		\
-	gnome-stock.h			\
-	gnome-stock-ids.h		\
+	gnome-stock-icons.h		\
 	gnome-types.h			\
 	gnome-uidefs.h			\
 	gnome-unit-spinner.h		\
diff --git a/libgnomeui/gnome-app-helper.c b/libgnomeui/gnome-app-helper.c
index d463fe3..5bc6dcf 100644
--- a/libgnomeui/gnome-app-helper.c
+++ b/libgnomeui/gnome-app-helper.c
@@ -341,9 +341,11 @@ create_pixmap (GnomeUIPixmapType pixmap_type, gconstpointer pixmap_info)
 	pixmap = NULL;
 
 	switch (pixmap_type) {
+#ifdef FIXME
 	case GNOME_APP_PIXMAP_STOCK:
 		pixmap = gnome_stock_new_with_icon (pixmap_info);
 		break;
+#endif
 
 	case GNOME_APP_PIXMAP_DATA:
 		if (pixmap_info)
diff --git a/libgnomeui/gnome-druid.c b/libgnomeui/gnome-druid.c
index d534065..adc16e1 100644
--- a/libgnomeui/gnome-druid.c
+++ b/libgnomeui/gnome-druid.c
@@ -112,8 +112,6 @@ gnome_druid_class_init (GnomeDruidClass *klass)
 static void
 gnome_druid_init (GnomeDruid *druid)
 {
-	GtkWidget *pixmap;
-
 	druid->_priv = g_new0(GnomeDruidPrivate, 1);
 
 	/* set the default border width */
@@ -121,16 +119,14 @@ gnome_druid_init (GnomeDruid *druid)
 
 	/* set up the buttons */
 	GTK_WIDGET_SET_FLAGS (GTK_WIDGET (druid), GTK_NO_WINDOW);
-	pixmap =  gnome_stock_new_with_icon(GNOME_STOCK_BUTTON_PREV);
-	druid->back = gnome_pixmap_button (pixmap, _("Back"));
+	druid->back = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_PREV);
 	GTK_WIDGET_SET_FLAGS (druid->back, GTK_CAN_DEFAULT);
-	druid->next = gnome_stock_or_ordinary_button (GNOME_STOCK_BUTTON_NEXT);
+	druid->next = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_NEXT);
 	GTK_WIDGET_SET_FLAGS (druid->next, GTK_CAN_DEFAULT);
 	GTK_WIDGET_SET_FLAGS (druid->next, GTK_HAS_FOCUS);
-	druid->cancel = gnome_stock_or_ordinary_button (GNOME_STOCK_BUTTON_CANCEL);
+	druid->cancel = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_CANCEL);
 	GTK_WIDGET_SET_FLAGS (druid->cancel, GTK_CAN_DEFAULT);
-	pixmap =  gnome_stock_new_with_icon(GNOME_STOCK_BUTTON_APPLY);
-	druid->finish = gnome_pixmap_button (pixmap, _("Finish"));
+	druid->finish = gtk_button_new_from_stock (GNOME_STOCK_BUTTON_APPLY);
 	GTK_WIDGET_SET_FLAGS (druid->finish, 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 5bb9e70..ea6968a 100644
--- a/libgnomeui/gnome-font-picker.c
+++ b/libgnomeui/gnome-font-picker.c
@@ -27,8 +27,9 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkvseparator.h>
 #include <gtk/gtkfontsel.h>
+#include <gtk/gtkimage.h>
 #include <libgnomeui/gnome-pixmap.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
 #include "gnome-font-picker.h"
 #include <libgnome/gnome-i18n.h>
 
@@ -848,7 +849,8 @@ GtkWidget *gnome_font_picker_create_inside(GnomeFontPicker *gfp)
     GtkWidget *widget;
     
     if (gfp->_priv->mode==GNOME_FONT_PICKER_MODE_PIXMAP) {
-        widget=gnome_stock_new_with_icon(GNOME_STOCK_PIXMAP_FONT);
+        widget=gtk_image_new_from_stock(GNOME_STOCK_PIXMAP_FONT,
+					GTK_ICON_SIZE_BUTTON);
         gtk_widget_show(widget);
     } else if (gfp->_priv->mode==GNOME_FONT_PICKER_MODE_FONT_INFO) {
         widget=gtk_hbox_new(FALSE,0);
diff --git a/libgnomeui/gnome-helpsys.c b/libgnomeui/gnome-helpsys.c
index b967a75..6c42b79 100644
--- a/libgnomeui/gnome-helpsys.c
+++ b/libgnomeui/gnome-helpsys.c
@@ -41,7 +41,7 @@
 #include <libgnome/gnome-config.h>
 #include <libgnome/gnome-i18n.h>
 #include "gnome-helpsys.h"
-#include "gnome-stock.h"
+#include "gnome-stock-icons.h"
 #include "gnome-uidefs.h"
 #include "gnome-popup-menu.h"
 #include "wap-textfu.h"
@@ -213,18 +213,20 @@ gnome_help_view_init (GnomeHelpView *help_view)
   help_view->_priv->style_priority = G_PRIORITY_LOW;
 
   help_view->_priv->toolbar = gtk_toolbar_new(GTK_ORIENTATION_VERTICAL, GTK_TOOLBAR_ICONS);
-  help_view->_priv->btn_help = gtk_toolbar_append_item(GTK_TOOLBAR(help_view->_priv->toolbar), _("Help"),
-						_("Show help for a specific region of the application"),
-						NULL,
-						gnome_stock_new_with_icon(GNOME_STOCK_PIXMAP_HELP),
-						GTK_SIGNAL_FUNC (gnome_help_view_select_help_cb),
-						(gpointer) help_view);
-  help_view->_priv->btn_style = gtk_toolbar_append_item(GTK_TOOLBAR(help_view->_priv->toolbar), _("Style"),
-						_("Change the way help is displayed"),
-						NULL,
-						gnome_stock_new_with_icon(GNOME_STOCK_PIXMAP_PREFERENCES),
-						GTK_SIGNAL_FUNC (gnome_help_view_select_style),
-						(gpointer) help_view);
+  help_view->_priv->btn_help = gtk_toolbar_insert_stock(GTK_TOOLBAR(help_view->_priv->toolbar),
+							GNOME_STOCK_PIXMAP_HELP,
+							_("Help"),
+							_("Show help for a specific region of the application"),
+							GTK_SIGNAL_FUNC (gnome_help_view_select_help_cb),
+							(gpointer) help_view,
+							-1);
+  help_view->_priv->btn_style = gtk_toolbar_insert_stock(GTK_TOOLBAR(help_view->_priv->toolbar),
+							 GNOME_STOCK_PIXMAP_PREFERENCES,
+							 _("Style"),
+							 _("Change the way help is displayed"),
+							 GTK_SIGNAL_FUNC (gnome_help_view_select_style),
+							 (gpointer) help_view,
+							 -1);
 
   help_view->_priv->evbox = gtk_event_box_new();
   gtk_widget_add_events(help_view->_priv->evbox,
diff --git a/libgnomeui/gnome-stock-icons.c b/libgnomeui/gnome-stock-icons.c
index 360e4d8..d85b6b3 100644
--- a/libgnomeui/gnome-stock-icons.c
+++ b/libgnomeui/gnome-stock-icons.c
@@ -29,7 +29,7 @@
 
 #include <libgnome/gnome-i18n.h>
 
-#include "gnome-stock-ids.h"
+#include <libgnomeui/gnome-stock-icons.h>
 #include "pixmaps/gnome-stock-pixbufs.h"
 
 #ifndef GETTEXT_PACKAGE
@@ -255,7 +255,6 @@ get_default_icons (GtkIconFactory *factory)
 
 static GtkStockItem builtin_items [] =
 {
-    { GTK_STOCK_DIALOG_INFO, N_("Information"), 0, 0, GETTEXT_PACKAGE },
     { GNOME_STOCK_PIXMAP_ADD, N_("Add"), 0, 0, GETTEXT_PACKAGE },
     { GNOME_STOCK_PIXMAP_CLEAR, N_("Clear"), 0, 0, GETTEXT_PACKAGE },
     { GNOME_STOCK_PIXMAP_COLORSELECTOR, N_("Select Color"), 0, 0, GETTEXT_PACKAGE },
diff --git a/libgnomeui/gnome-stock-icons.h b/libgnomeui/gnome-stock-icons.h
new file mode 100644
index 0000000..d33a79a
--- /dev/null
+++ b/libgnomeui/gnome-stock-icons.h
@@ -0,0 +1,222 @@
+/* Stock icons, buttons, and menu items.
+   Copyright (C) 1997, 1998 Free Software Foundation
+   All rights reserved.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Author: Eckehard Berns
+*/
+/*
+  @NOTATION@
+*/
+
+#ifndef __GNOME_STOCK_ICONS_H__
+#define __GNOME_STOCK_ICONS_H__
+
+#include <gmacros.h>
+#include <gtk/gtkiconfactory.h>
+
+G_BEGIN_DECLS
+
+#define GNOME_ICON_SIZE_TOOLBAR gnome_icon_size_toolbar
+GtkIconSize gnome_icon_size_toolbar;
+
+extern void init_gnome_stock_icons (void);
+
+#define GNOME_STOCK_PIXMAP_NEW "gnome-stock-pixmap-new"
+#define GNOME_STOCK_PIXMAP_OPEN "gnome-stock-pixmap-open"
+#define GNOME_STOCK_PIXMAP_CLOSE "gnome-stock-pixmap-close"
+#define GNOME_STOCK_PIXMAP_REVERT "gnome-stock-pixmap-revert"
+#define GNOME_STOCK_PIXMAP_SAVE "gnome-stock-pixmap-save"
+#define GNOME_STOCK_PIXMAP_SAVE_AS "gnome-stock-pixmap-save-as"
+#define GNOME_STOCK_PIXMAP_CUT "gnome-stock-pixmap-cut"
+#define GNOME_STOCK_PIXMAP_COPY "gnome-stock-pixmap-copy"
+#define GNOME_STOCK_PIXMAP_PASTE "gnome-stock-pixmap-paste"
+#define GNOME_STOCK_PIXMAP_CLEAR "gnome-stock-pixmap-clear"
+#define GNOME_STOCK_PIXMAP_PROPERTIES "gnome-stock-pixmap-properties"
+#define GNOME_STOCK_PIXMAP_PREFERENCES "gnome-stock-pixmap-preferences"
+#define GNOME_STOCK_PIXMAP_HELP "gnome-stock-pixmap-help"
+#define GNOME_STOCK_PIXMAP_SCORES "gnome-stock-pixmap-scores"
+#define GNOME_STOCK_PIXMAP_PRINT "gnome-stock-pixmap-print"
+#define GNOME_STOCK_PIXMAP_SEARCH "gnome-stock-pixmap-search"
+#define GNOME_STOCK_PIXMAP_SRCHRPL "gnome-stock-pixmap-srchrpl"
+#define GNOME_STOCK_PIXMAP_BACK "gnome-stock-pixmap-back"
+#define GNOME_STOCK_PIXMAP_FORWARD "gnome-stock-pixmap-forward"
+#define GNOME_STOCK_PIXMAP_FIRST "gnome-stock-pixmap-first"
+#define GNOME_STOCK_PIXMAP_LAST "gnome-stock-pixmap-last"
+#define GNOME_STOCK_PIXMAP_HOME "gnome-stock-pixmap-home"
+#define GNOME_STOCK_PIXMAP_STOP "gnome-stock-pixmap-stop"
+#define GNOME_STOCK_PIXMAP_REFRESH "gnome-stock-pixmap-refresh"
+#define GNOME_STOCK_PIXMAP_UNDO "gnome-stock-pixmap-undo"
+#define GNOME_STOCK_PIXMAP_REDO "gnome-stock-pixmap-redo"
+#define GNOME_STOCK_PIXMAP_TIMER "gnome-stock-pixmap-timer"
+#define GNOME_STOCK_PIXMAP_TIMER_STOP "gnome-stock-pixmap-timer-stop"
+#define GNOME_STOCK_PIXMAP_MAIL "gnome-stock-pixmap-mail"
+#define GNOME_STOCK_PIXMAP_MAIL_RCV "gnome-stock-pixmap-mail-rcv"
+#define GNOME_STOCK_PIXMAP_MAIL_SND "gnome-stock-pixmap-mail-snd"
+#define GNOME_STOCK_PIXMAP_MAIL_RPL "gnome-stock-pixmap-mail-rpl"
+#define GNOME_STOCK_PIXMAP_MAIL_FWD "gnome-stock-pixmap-mail-fwd"
+#define GNOME_STOCK_PIXMAP_MAIL_NEW "gnome-stock-pixmap-mail-new"
+#define GNOME_STOCK_PIXMAP_TRASH "gnome-stock-pixmap-trash"
+#define GNOME_STOCK_PIXMAP_TRASH_FULL "gnome-stock-pixmap-trash-full"
+#define GNOME_STOCK_PIXMAP_UNDELETE "gnome-stock-pixmap-undelete"
+#define GNOME_STOCK_PIXMAP_SPELLCHECK "gnome-stock-pixmap-spellcheck"
+#define GNOME_STOCK_PIXMAP_MIC "gnome-stock-pixmap-mic"
+#define GNOME_STOCK_PIXMAP_LINE_IN "gnome-stock-pixmap-line-in"
+#define GNOME_STOCK_PIXMAP_CDROM "gnome-stock-pixmap-cdrom"
+#define GNOME_STOCK_PIXMAP_VOLUME "gnome-stock-pixmap-volume"
+#define GNOME_STOCK_PIXMAP_MIDI "gnome-stock-pixmap-midi"
+#define GNOME_STOCK_PIXMAP_BOOK_RED "gnome-stock-pixmap-book-red"
+#define GNOME_STOCK_PIXMAP_BOOK_GREEN "gnome-stock-pixmap-book-green"
+#define GNOME_STOCK_PIXMAP_BOOK_BLUE "gnome-stock-pixmap-book-blue"
+#define GNOME_STOCK_PIXMAP_BOOK_YELLOW "gnome-stock-pixmap-book-yellow"
+#define GNOME_STOCK_PIXMAP_BOOK_OPEN "gnome-stock-pixmap-book-open"
+#define GNOME_STOCK_PIXMAP_ABOUT "gnome-stock-pixmap-about"
+#define GNOME_STOCK_PIXMAP_QUIT "gnome-stock-pixmap-quit"
+#define GNOME_STOCK_PIXMAP_MULTIPLE "gnome-stock-pixmap-multiple"
+#define GNOME_STOCK_PIXMAP_NOT "gnome-stock-pixmap-not"
+#define GNOME_STOCK_PIXMAP_CONVERT "gnome-stock-pixmap-convert"
+#define GNOME_STOCK_PIXMAP_JUMP_TO "gnome-stock-pixmap-jump-to"
+#define GNOME_STOCK_PIXMAP_UP "gnome-stock-pixmap-up"
+#define GNOME_STOCK_PIXMAP_DOWN "gnome-stock-pixmap-down"
+#define GNOME_STOCK_PIXMAP_TOP "gnome-stock-pixmap-top"
+#define GNOME_STOCK_PIXMAP_BOTTOM "gnome-stock-pixmap-bottom"
+#define GNOME_STOCK_PIXMAP_ATTACH "gnome-stock-pixmap-attach"
+#define GNOME_STOCK_PIXMAP_INDEX "gnome-stock-pixmap-index"
+#define GNOME_STOCK_PIXMAP_FONT "gnome-stock-pixmap-font"
+#define GNOME_STOCK_PIXMAP_EXEC "gnome-stock-pixmap-exec"
+
+#define GNOME_STOCK_PIXMAP_ALIGN_LEFT "gnome-stock-pixmap-align-left"
+#define GNOME_STOCK_PIXMAP_ALIGN_RIGHT "gnome-stock-pixmap-align-right"
+#define GNOME_STOCK_PIXMAP_ALIGN_CENTER "gnome-stock-pixmap-align-center"
+#define GNOME_STOCK_PIXMAP_ALIGN_JUSTIFY "gnome-stock-pixmap-align-justify"
+
+#define GNOME_STOCK_PIXMAP_TEXT_BOLD "gnome-stock-pixmap-text-bold"
+#define GNOME_STOCK_PIXMAP_TEXT_ITALIC "gnome-stock-pixmap-text-italic"
+#define GNOME_STOCK_PIXMAP_TEXT_UNDERLINE "gnome-stock-pixmap-text-underline"
+#define GNOME_STOCK_PIXMAP_TEXT_STRIKEOUT "gnome-stock-pixmap-text-strikeout"
+#define GNOME_STOCK_PIXMAP_TEXT_INDENT "gnome-stock-pixmap-text-indent"
+#define GNOME_STOCK_PIXMAP_TEXT_UNINDENT "gnome-stock-pixmap-text-unindent"
+#define GNOME_STOCK_PIXMAP_COLORSELECTOR "gnome-stock-pixmap-colorselector"
+
+#define GNOME_STOCK_PIXMAP_ADD "gnome-stock-pixmap-add"
+#define GNOME_STOCK_PIXMAP_REMOVE "gnome-stock-pixmap-remove"
+
+#define GNOME_STOCK_PIXMAP_TABLE_BORDERS "gnome-stock-pixmap-table-borders"
+#define GNOME_STOCK_PIXMAP_TABLE_FILL "gnome-stock-pixmap-table-fill"
+
+#define GNOME_STOCK_PIXMAP_TEXT_BULLETED_LIST "gnome-stock-pixmap-text-bulleted-list"
+#define GNOME_STOCK_PIXMAP_TEXT_NUMBERED_LIST "gnome-stock-pixmap-text-numbered-list"
+
+#define GNOME_STOCK_PIXMAP_EXIT GNOME_STOCK_PIXMAP_QUIT
+
+
+/*
+ * Buttons
+ */
+
+#define GNOME_STOCK_BUTTON_OK "gnome-stock-button-ok"
+#define GNOME_STOCK_BUTTON_CANCEL "gnome-stock-button-cancel"
+#define GNOME_STOCK_BUTTON_YES "gnome-stock-button-yes"
+#define GNOME_STOCK_BUTTON_NO "gnome-stock-button-no"
+#define GNOME_STOCK_BUTTON_CLOSE "gnome-stock-button-close"
+#define GNOME_STOCK_BUTTON_APPLY "gnome-stock-button-apply"
+#define GNOME_STOCK_BUTTON_HELP "gnome-stock-button-help"
+#define GNOME_STOCK_BUTTON_NEXT "gnome-stock-button-next"
+#define GNOME_STOCK_BUTTON_PREV "gnome-stock-button-prev"
+#define GNOME_STOCK_BUTTON_UP "gnome-stock-button-up"
+#define GNOME_STOCK_BUTTON_DOWN "gnome-stock-button-down"
+#define GNOME_STOCK_BUTTON_FONT "gnome-stock-button-font"
+
+/*
+ * Menus
+ */
+
+#define GNOME_STOCK_MENU_BLANK "gnome-stock-menu-blank"
+#define GNOME_STOCK_MENU_NEW "gnome-stock-menu-new"
+#define GNOME_STOCK_MENU_SAVE "gnome-stock-menu-save"
+#define GNOME_STOCK_MENU_SAVE_AS "gnome-stock-menu-save-as"
+#define GNOME_STOCK_MENU_REVERT "gnome-stock-menu-revert"
+#define GNOME_STOCK_MENU_OPEN "gnome-stock-menu-open"
+#define GNOME_STOCK_MENU_CLOSE "gnome-stock-menu-close"
+#define GNOME_STOCK_MENU_QUIT "gnome-stock-menu-quit"
+#define GNOME_STOCK_MENU_CUT "gnome-stock-menu-cut"
+#define GNOME_STOCK_MENU_COPY "gnome-stock-menu-copy"
+#define GNOME_STOCK_MENU_PASTE "gnome-stock-menu-paste"
+#define GNOME_STOCK_MENU_PROP "gnome-stock-menu-prop"
+#define GNOME_STOCK_MENU_PREF "gnome-stock-menu-pref"
+#define GNOME_STOCK_MENU_ABOUT "gnome-stock-menu-about"
+#define GNOME_STOCK_MENU_SCORES "gnome-stock-menu-scores"
+#define GNOME_STOCK_MENU_UNDO "gnome-stock-menu-undo"
+#define GNOME_STOCK_MENU_REDO "gnome-stock-menu-redo"
+#define GNOME_STOCK_MENU_PRINT "gnome-stock-menu-print"
+#define GNOME_STOCK_MENU_SEARCH "gnome-stock-menu-search"
+#define GNOME_STOCK_MENU_SRCHRPL "gnome-stock-menu-srchrpl"
+#define GNOME_STOCK_MENU_BACK "gnome-stock-menu-back"
+#define GNOME_STOCK_MENU_FORWARD "gnome-stock-menu-forward"
+#define GNOME_STOCK_MENU_FIRST "gnome-stock-menu-first"
+#define GNOME_STOCK_MENU_LAST "gnome-stock-menu-last"
+#define GNOME_STOCK_MENU_HOME "gnome-stock-menu-home"
+#define GNOME_STOCK_MENU_STOP "gnome-stock-menu-stop"
+#define GNOME_STOCK_MENU_REFRESH "gnome-stock-menu-refresh"
+#define GNOME_STOCK_MENU_MAIL "gnome-stock-menu-mail"
+#define GNOME_STOCK_MENU_MAIL_RCV "gnome-stock-menu-mail-rcv"
+#define GNOME_STOCK_MENU_MAIL_SND "gnome-stock-menu-mail-snd"
+#define GNOME_STOCK_MENU_MAIL_RPL "gnome-stock-menu-mail-rpl"
+#define GNOME_STOCK_MENU_MAIL_FWD "gnome-stock-menu-mail-fwd"
+#define GNOME_STOCK_MENU_MAIL_NEW "gnome-stock-menu-mail-new"
+#define GNOME_STOCK_MENU_TRASH "gnome-stock-menu-trash"
+#define GNOME_STOCK_MENU_TRASH_FULL "gnome-stock-menu-trash-full"
+#define GNOME_STOCK_MENU_UNDELETE "gnome-stock-menu-undelete"
+#define GNOME_STOCK_MENU_TIMER "gnome-stock-menu-timer"
+#define GNOME_STOCK_MENU_TIMER_STOP "gnome-stock-menu-timer-stop"
+#define GNOME_STOCK_MENU_SPELLCHECK "gnome-stock-menu-spellcheck"
+#define GNOME_STOCK_MENU_MIC "gnome-stock-menu-mic"
+#define GNOME_STOCK_MENU_LINE_IN "gnome-stock-menu-line-in"
+#define GNOME_STOCK_MENU_CDROM "gnome-stock-menu-cdrom"
+#define GNOME_STOCK_MENU_VOLUME "gnome-stock-menu-volume"
+#define GNOME_STOCK_MENU_MIDI "gnome-stock-menu-midi"
+#define GNOME_STOCK_MENU_BOOK_RED "gnome-stock-menu-book-red"
+#define GNOME_STOCK_MENU_BOOK_GREEN "gnome-stock-menu-book-green"
+#define GNOME_STOCK_MENU_BOOK_BLUE "gnome-stock-menu-book-blue"
+#define GNOME_STOCK_MENU_BOOK_YELLOW "gnome-stock-menu-book-yellow"
+#define GNOME_STOCK_MENU_BOOK_OPEN "gnome-stock-menu-book-open"
+#define GNOME_STOCK_MENU_CONVERT "gnome-stock-menu-convert"
+#define GNOME_STOCK_MENU_JUMP_TO "gnome-stock-menu-jump-to"
+#define GNOME_STOCK_MENU_UP "gnome-stock-menu-up"
+#define GNOME_STOCK_MENU_DOWN "gnome-stock-menu-down"
+#define GNOME_STOCK_MENU_TOP "gnome-stock-menu-top"
+#define GNOME_STOCK_MENU_BOTTOM "gnome-stock-menu-bottom"
+#define GNOME_STOCK_MENU_ATTACH "gnome-stock-menu-attach"
+#define GNOME_STOCK_MENU_INDEX "gnome-stock-menu-index"
+#define GNOME_STOCK_MENU_FONT "gnome-stock-menu-font"
+#define GNOME_STOCK_MENU_EXEC "gnome-stock-menu-exec"
+
+#define GNOME_STOCK_MENU_ALIGN_LEFT "gnome-stock-menu-align-left"
+#define GNOME_STOCK_MENU_ALIGN_RIGHT "gnome-stock-menu-align-right"
+#define GNOME_STOCK_MENU_ALIGN_CENTER "gnome-stock-menu-align-center"
+#define GNOME_STOCK_MENU_ALIGN_JUSTIFY "gnome-stock-menu-align-justify"
+
+#define GNOME_STOCK_MENU_TEXT_BOLD "gnome-stock-menu-text-bold"
+#define GNOME_STOCK_MENU_TEXT_ITALIC "gnome-stock-menu-text-italic"
+#define GNOME_STOCK_MENU_TEXT_UNDERLINE "gnome-stock-menu-text-underline"
+#define GNOME_STOCK_MENU_TEXT_STRIKEOUT "gnome-stock-menu-text-strikeout"
+
+#define GNOME_STOCK_MENU_EXIT GNOME_STOCK_MENU_QUIT
+
+G_END_DECLS
+
+#endif /* GNOME_STOCK_ICONS_H */
diff --git a/libgnomeui/gnome-ui-init.c b/libgnomeui/gnome-ui-init.c
index d12de37..397ab2e 100644
--- a/libgnomeui/gnome-ui-init.c
+++ b/libgnomeui/gnome-ui-init.c
@@ -50,6 +50,7 @@
 #include "gnome-init.h"
 #include "gnome-winhints.h"
 #include "gnome-gconf.h"
+#include "gnome-stock-icons.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "gnome-pixmap.h"
@@ -308,6 +309,8 @@ libgnomeui_post_args_parse(GnomeProgram *program, GnomeModuleInfo *mod_info)
 
         priv = g_object_get_qdata(G_OBJECT(program), quark_gnome_program_private_libgnomeui);
         priv->constructed = TRUE;
+
+        init_gnome_stock_icons ();
 }
 
 static void
diff --git a/libgnomeui/libgnomeui.h b/libgnomeui/libgnomeui.h
index 876e68c..2b0b3c0 100644
--- a/libgnomeui/libgnomeui.h
+++ b/libgnomeui/libgnomeui.h
@@ -70,7 +70,7 @@
 #include <libgnomeui/gnome-popup-help.h>
 #include <libgnomeui/gnome-pixmap.h>
 #include <libgnomeui/gnome-types.h>
-#include <libgnomeui/gnome-stock.h>
+#include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomeui/gnome-client.h>
 #include <libgnomeui/gtk-clock.h>
 #include <libgnomeui/gtkdial.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]