Commit 2a2318ce authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

removed stock items which are already defined in Gtk+ (GTK_STOCK_NEW

2002-01-13  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/gimpstock.[ch]: removed stock items which are
	already defined in Gtk+ (GTK_STOCK_NEW etc.).

	* libgimpwidgets/gimpquerybox.[ch]: moved the icon code from the
	boolean query box constructor to create_query_box() so it can be
	used for all of them. New macro GIMP_QUERY_BOX_VBOX() to pack
	custom widgets into the dialogs. Will probably have to make a
	real widget out of it to get a sane API...

	* app/gui/menus.c
	* app/gui/select-commands.c
	* app/widgets/gimpbufferview.c
	* app/widgets/gimpdatafactoryview.c
	* app/widgets/gimpdocumentview.c
	* app/widgets/gimpdrawablelistview.c
	* libgimpwidgets/gimppatheditor.c
	* plug-ins/common/uniteditor.c: changed accordingly.

	* libgimpwidgets/gimpwidgets.c: register the WM icons in
	large -> small order.

	* themes/Default/Makefile.am: don't create inline pixbufs of the
	removed stock items' icons...

	* themes/Default/gtkrc: ...but simply override them here.

	* themes/Default/imagerc: removed them here too.
parent 957aa593
2002-01-13 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpstock.[ch]: removed stock items which are
already defined in Gtk+ (GTK_STOCK_NEW etc.).
* libgimpwidgets/gimpquerybox.[ch]: moved the icon code from the
boolean query box constructor to create_query_box() so it can be
used for all of them. New macro GIMP_QUERY_BOX_VBOX() to pack
custom widgets into the dialogs. Will probably have to make a
real widget out of it to get a sane API...
* app/gui/menus.c
* app/gui/select-commands.c
* app/widgets/gimpbufferview.c
* app/widgets/gimpdatafactoryview.c
* app/widgets/gimpdocumentview.c
* app/widgets/gimpdrawablelistview.c
* libgimpwidgets/gimppatheditor.c
* plug-ins/common/uniteditor.c: changed accordingly.
* libgimpwidgets/gimpwidgets.c: register the WM icons in
large -> small order.
* themes/Default/Makefile.am: don't create inline pixbufs of the
removed stock items' icons...
* themes/Default/gtkrc: ...but simply override them here.
* themes/Default/imagerc: removed them here too.
2002-01-12 Manish Singh <yosh@gimp.org>
* plug-ins/dbbrowser/dbbrowser_utils.c: use GtkTreeView and multiline
......
......@@ -158,9 +158,8 @@ select_shrink_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpDisplay *gdisp;
GtkWidget *edge_lock;
GtkWidget *shrink_dialog;
GList *children;
GtkWidget *edge_lock;
return_if_no_display (gdisp, data);
shrink_dialog =
......@@ -178,12 +177,8 @@ select_shrink_cmd_callback (GtkWidget *widget,
edge_lock = gtk_check_button_new_with_label (_("Shrink from image border"));
/* eeek */
children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (shrink_dialog)->vbox));
gtk_box_pack_start (GTK_BOX (children->data), edge_lock, FALSE, FALSE, 0);
g_list_free (children);
gtk_box_pack_start (GTK_BOX (GIMP_QUERY_BOX_VBOX (shrink_dialog)), edge_lock,
FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (shrink_dialog), "edge_lock_toggle", edge_lock);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (edge_lock),
......
......@@ -606,7 +606,7 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/View/New View"), NULL,
view_new_view_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"view/new_view.html", NULL },
{ { N_("/View/Shrink Wrap"), "<control>E",
......@@ -673,22 +673,22 @@ static GimpItemFactoryEntry image_entries[] =
"layers/stack/stack.html#next_layer", NULL },
{ { N_("/Layer/Stack/Raise Layer"), "<shift>Prior",
layers_raise_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"layers/stack/stack.html#raise_layer", NULL },
{ { N_("/Layer/Stack/Lower Layer"), "<shift>Next",
layers_lower_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"layers/stack/stack.html#lower_layer", NULL },
{ { N_("/Layer/Stack/Layer to Top"), "<control>Prior",
layers_raise_to_top_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GOTO_TOP },
NULL,
"layers/stack/stack.html#layer_to_top", NULL },
{ { N_("/Layer/Stack/Layer to Bottom"), "<control>Next",
layers_lower_to_bottom_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GOTO_BOTTOM },
NULL,
"layers/stack/stack.html#layer_to_bottom", NULL },
......@@ -696,7 +696,7 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/Layer/New Layer..."), NULL,
layers_new_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"layers/dialogs/new_layer.html", NULL },
{ { N_("/Layer/Duplicate Layer"), NULL,
......@@ -711,7 +711,7 @@ static GimpItemFactoryEntry image_entries[] =
"layers/anchor_layer.html", NULL },
{ { N_("/Layer/Delete Layer"), NULL,
layers_delete_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"layers/delete_layer.html", NULL },
......@@ -996,28 +996,28 @@ static GimpItemFactoryEntry layers_entries[] =
{
{ { N_("/New Layer..."), "<control>N",
layers_new_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"dialogs/new_layer.html", NULL },
{ { N_("/Raise Layer"), "<control>F",
layers_raise_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"stack/stack.html#raise_layer", NULL },
{ { N_("/Layer to Top"), "<control><shift>F",
layers_raise_to_top_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GOTO_TOP },
NULL,
"stack/stack.html#later_to_top", NULL },
{ { N_("/Lower Layer"), "<control>B",
layers_lower_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"stack/stack.html#lower_layer", NULL },
{ { N_("/Layer to Bottom"), "<control><shift>B",
layers_lower_to_bottom_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GOTO_BOTTOM },
NULL,
"stack/stack.html#layer_to_bottom", NULL },
......@@ -1033,7 +1033,7 @@ static GimpItemFactoryEntry layers_entries[] =
"anchor_layer.html", NULL },
{ { N_("/Delete Layer"), "<control>X",
layers_delete_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_layer.html", NULL },
......@@ -1114,17 +1114,17 @@ static GimpItemFactoryEntry channels_entries[] =
{
{ { N_("/New Channel..."), "<control>N",
channels_new_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"dialogs/new_channel.html", NULL },
{ { N_("/Raise Channel"), "<control>F",
channels_raise_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"raise_channel.html", NULL },
{ { N_("/Lower Channel"), "<control>B",
channels_lower_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"lower_channel.html", NULL },
{ { N_("/Duplicate Channel"), "<control>C",
......@@ -1160,7 +1160,7 @@ static GimpItemFactoryEntry channels_entries[] =
{ { N_("/Delete Channel"), "<control>X",
channels_delete_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_channel.html", NULL },
......@@ -1180,7 +1180,7 @@ static GimpItemFactoryEntry paths_entries[] =
{
{ { N_("/New Path"), "<control>N",
paths_dialog_new_path_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"new_path.html", NULL },
{ { N_("/Duplicate Path"), "<control>U",
......@@ -1205,7 +1205,7 @@ static GimpItemFactoryEntry paths_entries[] =
"stroke_path.html", NULL },
{ { N_("/Delete Path"), "<control>X",
paths_dialog_delete_path_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_path.html", NULL },
......@@ -1334,7 +1334,7 @@ static GimpItemFactoryEntry brushes_entries[] =
{
{ { N_("/New Brush"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Brush"), NULL,
......@@ -1349,7 +1349,7 @@ static GimpItemFactoryEntry brushes_entries[] =
NULL, NULL },
{ { N_("/Delete Brush..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
......@@ -1357,7 +1357,7 @@ static GimpItemFactoryEntry brushes_entries[] =
{ { N_("/Refresh Brushes"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};
......@@ -1369,7 +1369,7 @@ static GimpItemFactoryEntry patterns_entries[] =
{
{ { N_("/New Pattern"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Pattern"), NULL,
......@@ -1384,7 +1384,7 @@ static GimpItemFactoryEntry patterns_entries[] =
NULL, NULL },
{ { N_("/Delete Pattern..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
......@@ -1392,7 +1392,7 @@ static GimpItemFactoryEntry patterns_entries[] =
{ { N_("/Refresh Patterns"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};
......@@ -1620,7 +1620,7 @@ static GimpItemFactoryEntry gradients_entries[] =
{
{ { N_("/New Gradient"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Gradient"), NULL,
......@@ -1635,7 +1635,7 @@ static GimpItemFactoryEntry gradients_entries[] =
NULL, NULL },
{ { N_("/Delete Gradient..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
......@@ -1643,7 +1643,7 @@ static GimpItemFactoryEntry gradients_entries[] =
{ { N_("/Refresh Gradients"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL },
......@@ -1663,7 +1663,7 @@ static GimpItemFactoryEntry palettes_entries[] =
{
{ { N_("/New Palette"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Palette"), NULL,
......@@ -1678,7 +1678,7 @@ static GimpItemFactoryEntry palettes_entries[] =
NULL, NULL },
{ { N_("/Delete Palette..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
......@@ -1686,7 +1686,7 @@ static GimpItemFactoryEntry palettes_entries[] =
{ { N_("/Refresh Palettes"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL },
......@@ -1725,7 +1725,7 @@ static GimpItemFactoryEntry buffers_entries[] =
NULL, NULL },
{ { N_("/Delete Buffer"), NULL,
buffers_delete_buffer_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL }
};
......@@ -1752,7 +1752,7 @@ static GimpItemFactoryEntry documents_entries[] =
NULL, NULL },
{ { N_("/Remove Entry"), NULL,
documents_delete_document_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
......@@ -1760,7 +1760,7 @@ static GimpItemFactoryEntry documents_entries[] =
{ { N_("/Refresh History"), NULL,
documents_refresh_documents_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};
......
......@@ -158,9 +158,8 @@ select_shrink_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpDisplay *gdisp;
GtkWidget *edge_lock;
GtkWidget *shrink_dialog;
GList *children;
GtkWidget *edge_lock;
return_if_no_display (gdisp, data);
shrink_dialog =
......@@ -178,12 +177,8 @@ select_shrink_cmd_callback (GtkWidget *widget,
edge_lock = gtk_check_button_new_with_label (_("Shrink from image border"));
/* eeek */
children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (shrink_dialog)->vbox));
gtk_box_pack_start (GTK_BOX (children->data), edge_lock, FALSE, FALSE, 0);
g_list_free (children);
gtk_box_pack_start (GTK_BOX (GIMP_QUERY_BOX_VBOX (shrink_dialog)), edge_lock,
FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (shrink_dialog), "edge_lock_toggle", edge_lock);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (edge_lock),
......
......@@ -606,7 +606,7 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/View/New View"), NULL,
view_new_view_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"view/new_view.html", NULL },
{ { N_("/View/Shrink Wrap"), "<control>E",
......@@ -673,22 +673,22 @@ static GimpItemFactoryEntry image_entries[] =
"layers/stack/stack.html#next_layer", NULL },
{ { N_("/Layer/Stack/Raise Layer"), "<shift>Prior",
layers_raise_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"layers/stack/stack.html#raise_layer", NULL },
{ { N_("/Layer/Stack/Lower Layer"), "<shift>Next",
layers_lower_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"layers/stack/stack.html#lower_layer", NULL },
{ { N_("/Layer/Stack/Layer to Top"), "<control>Prior",
layers_raise_to_top_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GOTO_TOP },
NULL,
"layers/stack/stack.html#layer_to_top", NULL },
{ { N_("/Layer/Stack/Layer to Bottom"), "<control>Next",
layers_lower_to_bottom_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GOTO_BOTTOM },
NULL,
"layers/stack/stack.html#layer_to_bottom", NULL },
......@@ -696,7 +696,7 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/Layer/New Layer..."), NULL,
layers_new_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"layers/dialogs/new_layer.html", NULL },
{ { N_("/Layer/Duplicate Layer"), NULL,
......@@ -711,7 +711,7 @@ static GimpItemFactoryEntry image_entries[] =
"layers/anchor_layer.html", NULL },
{ { N_("/Layer/Delete Layer"), NULL,
layers_delete_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"layers/delete_layer.html", NULL },
......@@ -996,28 +996,28 @@ static GimpItemFactoryEntry layers_entries[] =
{
{ { N_("/New Layer..."), "<control>N",
layers_new_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"dialogs/new_layer.html", NULL },
{ { N_("/Raise Layer"), "<control>F",
layers_raise_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"stack/stack.html#raise_layer", NULL },
{ { N_("/Layer to Top"), "<control><shift>F",
layers_raise_to_top_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GOTO_TOP },
NULL,
"stack/stack.html#later_to_top", NULL },
{ { N_("/Lower Layer"), "<control>B",
layers_lower_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"stack/stack.html#lower_layer", NULL },
{ { N_("/Layer to Bottom"), "<control><shift>B",
layers_lower_to_bottom_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GOTO_BOTTOM },
NULL,
"stack/stack.html#layer_to_bottom", NULL },
......@@ -1033,7 +1033,7 @@ static GimpItemFactoryEntry layers_entries[] =
"anchor_layer.html", NULL },
{ { N_("/Delete Layer"), "<control>X",
layers_delete_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_layer.html", NULL },
......@@ -1114,17 +1114,17 @@ static GimpItemFactoryEntry channels_entries[] =
{
{ { N_("/New Channel..."), "<control>N",
channels_new_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"dialogs/new_channel.html", NULL },
{ { N_("/Raise Channel"), "<control>F",
channels_raise_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RAISE },
"<StockItem>", GTK_STOCK_GO_UP },
NULL,
"raise_channel.html", NULL },
{ { N_("/Lower Channel"), "<control>B",
channels_lower_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LOWER },
"<StockItem>", GTK_STOCK_GO_DOWN },
NULL,
"lower_channel.html", NULL },
{ { N_("/Duplicate Channel"), "<control>C",
......@@ -1160,7 +1160,7 @@ static GimpItemFactoryEntry channels_entries[] =
{ { N_("/Delete Channel"), "<control>X",
channels_delete_channel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_channel.html", NULL },
......@@ -1180,7 +1180,7 @@ static GimpItemFactoryEntry paths_entries[] =
{
{ { N_("/New Path"), "<control>N",
paths_dialog_new_path_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
"new_path.html", NULL },
{ { N_("/Duplicate Path"), "<control>U",
......@@ -1205,7 +1205,7 @@ static GimpItemFactoryEntry paths_entries[] =
"stroke_path.html", NULL },
{ { N_("/Delete Path"), "<control>X",
paths_dialog_delete_path_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_path.html", NULL },
......@@ -1334,7 +1334,7 @@ static GimpItemFactoryEntry brushes_entries[] =
{
{ { N_("/New Brush"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Brush"), NULL,
......@@ -1349,7 +1349,7 @@ static GimpItemFactoryEntry brushes_entries[] =
NULL, NULL },
{ { N_("/Delete Brush..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
......@@ -1357,7 +1357,7 @@ static GimpItemFactoryEntry brushes_entries[] =
{ { N_("/Refresh Brushes"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};
......@@ -1369,7 +1369,7 @@ static GimpItemFactoryEntry patterns_entries[] =
{
{ { N_("/New Pattern"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Pattern"), NULL,
......@@ -1384,7 +1384,7 @@ static GimpItemFactoryEntry patterns_entries[] =
NULL, NULL },
{ { N_("/Delete Pattern..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
......@@ -1392,7 +1392,7 @@ static GimpItemFactoryEntry patterns_entries[] =
{ { N_("/Refresh Patterns"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};
......@@ -1620,7 +1620,7 @@ static GimpItemFactoryEntry gradients_entries[] =
{
{ { N_("/New Gradient"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Gradient"), NULL,
......@@ -1635,7 +1635,7 @@ static GimpItemFactoryEntry gradients_entries[] =
NULL, NULL },
{ { N_("/Delete Gradient..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
......@@ -1643,7 +1643,7 @@ static GimpItemFactoryEntry gradients_entries[] =
{ { N_("/Refresh Gradients"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL },
......@@ -1663,7 +1663,7 @@ static GimpItemFactoryEntry palettes_entries[] =
{
{ { N_("/New Palette"), NULL,
data_new_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NEW },
"<StockItem>", GTK_STOCK_NEW },
NULL,
NULL, NULL },
{ { N_("/Duplicate Palette"), NULL,
......@@ -1678,7 +1678,7 @@ static GimpItemFactoryEntry palettes_entries[] =
NULL, NULL },
{ { N_("/Delete Palette..."), NULL,
data_delete_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
......@@ -1686,7 +1686,7 @@ static GimpItemFactoryEntry palettes_entries[] =
{ { N_("/Refresh Palettes"), NULL,
data_refresh_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL },
......@@ -1725,7 +1725,7 @@ static GimpItemFactoryEntry buffers_entries[] =
NULL, NULL },
{ { N_("/Delete Buffer"), NULL,
buffers_delete_buffer_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL }
};
......@@ -1752,7 +1752,7 @@ static GimpItemFactoryEntry documents_entries[] =
NULL, NULL },
{ { N_("/Remove Entry"), NULL,
documents_delete_document_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DELETE },
"<StockItem>", GTK_STOCK_DELETE },
NULL,
NULL, NULL },
......@@ -1760,7 +1760,7 @@ static GimpItemFactoryEntry documents_entries[] =
{ { N_("/Refresh History"), NULL,
documents_refresh_documents_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_REFRESH },
"<StockItem>", GTK_STOCK_REFRESH },
NULL,
NULL, NULL }
};
......
......@@ -169,7 +169,7 @@ gimp_buffer_view_new (GimpViewType view_type,
buffer_view->delete_button =
gimp_container_view_add_button (editor->view,
GIMP_STOCK_DELETE,
GTK_STOCK_DELETE,
_("Delete"), NULL,
G_CALLBACK (gimp_buffer_view_delete_clicked),
NULL,
......
......@@ -191,7 +191,7 @@ gimp_data_factory_view_construct (GimpDataFactoryView *factory_view,