diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index fdb5077b12..63c764a59b 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -643,7 +643,6 @@ gtk_button_new gtk_button_new_with_label gtk_button_new_with_mnemonic gtk_button_new_from_icon_name -gtk_button_new_from_stock gtk_button_pressed gtk_button_released gtk_button_clicked @@ -653,8 +652,6 @@ gtk_button_set_relief gtk_button_get_relief gtk_button_get_label gtk_button_set_label -gtk_button_get_use_stock -gtk_button_set_use_stock gtk_button_get_use_underline gtk_button_set_use_underline gtk_button_set_focus_on_click @@ -1118,12 +1115,10 @@ gtk_entry_get_tabs gtk_entry_set_tabs GtkEntryIconPosition gtk_entry_set_icon_from_pixbuf -gtk_entry_set_icon_from_stock gtk_entry_set_icon_from_icon_name gtk_entry_set_icon_from_gicon gtk_entry_get_icon_storage_type gtk_entry_get_icon_pixbuf -gtk_entry_get_icon_stock gtk_entry_get_icon_name gtk_entry_get_icon_gicon gtk_entry_set_icon_activatable @@ -1713,14 +1708,12 @@ GtkIconViewPrivate GtkImage GtkImageType gtk_image_get_pixbuf -gtk_image_get_stock gtk_image_get_animation gtk_image_get_icon_name gtk_image_get_gicon gtk_image_get_storage_type gtk_image_new_from_file gtk_image_new_from_pixbuf -gtk_image_new_from_stock gtk_image_new_from_animation gtk_image_new_from_icon_name gtk_image_new_from_gicon @@ -1728,7 +1721,6 @@ gtk_image_new_from_resource gtk_image_new_from_surface gtk_image_set_from_file gtk_image_set_from_pixbuf -gtk_image_set_from_stock gtk_image_set_from_animation gtk_image_set_from_icon_name gtk_image_set_from_gicon @@ -1750,40 +1742,11 @@ GtkImagePrivate gtk_image_get_type GtkImageIconSetData GtkImagePixbufData -GtkImageStockData GtkImageAnimationData GtkImageIconNameData GtkImageGIconData -
-gtkimagemenuitem -GtkImageMenuItem -GtkImageMenuItem -GtkImageMenuItemClass -gtk_image_menu_item_set_image -gtk_image_menu_item_get_image -gtk_image_menu_item_new -gtk_image_menu_item_new_from_stock -gtk_image_menu_item_new_with_label -gtk_image_menu_item_new_with_mnemonic -gtk_image_menu_item_get_use_stock -gtk_image_menu_item_set_use_stock -gtk_image_menu_item_get_always_show_image -gtk_image_menu_item_set_always_show_image -gtk_image_menu_item_set_accel_group - -GTK_IMAGE_MENU_ITEM -GTK_IMAGE_MENU_ITEM_CLASS -GTK_IMAGE_MENU_ITEM_GET_CLASS -GTK_IS_IMAGE_MENU_ITEM -GTK_IS_IMAGE_MENU_ITEM_CLASS -GTK_TYPE_IMAGE_MENU_ITEM - -GtkImageMenuItemPrivate -gtk_image_menu_item_get_type -
-
gtkimcontext GtkIMContext @@ -3144,57 +3107,6 @@ GtkStatusbarPrivate gtk_statusbar_get_type
-
-gtkstatusicon -GtkStatusIcon -GtkStatusIcon -gtk_status_icon_new -gtk_status_icon_new_from_pixbuf -gtk_status_icon_new_from_file -gtk_status_icon_new_from_stock -gtk_status_icon_new_from_icon_name -gtk_status_icon_new_from_gicon -gtk_status_icon_set_from_pixbuf -gtk_status_icon_set_from_file -gtk_status_icon_set_from_stock -gtk_status_icon_set_from_icon_name -gtk_status_icon_set_from_gicon -gtk_status_icon_get_storage_type -gtk_status_icon_get_pixbuf -gtk_status_icon_get_stock -gtk_status_icon_get_icon_name -gtk_status_icon_get_gicon -gtk_status_icon_get_size -gtk_status_icon_set_screen -gtk_status_icon_get_screen -gtk_status_icon_set_tooltip_text -gtk_status_icon_get_tooltip_text -gtk_status_icon_set_tooltip_markup -gtk_status_icon_get_tooltip_markup -gtk_status_icon_set_has_tooltip -gtk_status_icon_get_has_tooltip -gtk_status_icon_set_title -gtk_status_icon_get_title -gtk_status_icon_set_name -gtk_status_icon_set_visible -gtk_status_icon_get_visible -gtk_status_icon_is_embedded -gtk_status_icon_position_menu -gtk_status_icon_get_geometry -gtk_status_icon_get_x11_window_id - - -GTK_TYPE_STATUS_ICON -GTK_STATUS_ICON -GTK_STATUS_ICON_CLASS -GTK_IS_STATUS_ICON -GTK_IS_STATUS_ICON_CLASS -GTK_STATUS_ICON_GET_CLASS - -GtkStatusIconPrivate -gtk_status_icon_get_type -
-
gtklevelbar GtkLevelBar @@ -3815,13 +3727,10 @@ GtkSeparatorToolItemPrivate GtkToolButton GtkToolButtonClass gtk_tool_button_new -gtk_tool_button_new_from_stock gtk_tool_button_set_label gtk_tool_button_get_label gtk_tool_button_set_use_underline gtk_tool_button_get_use_underline -gtk_tool_button_set_stock_id -gtk_tool_button_get_stock_id gtk_tool_button_set_icon_name gtk_tool_button_get_icon_name gtk_tool_button_set_icon_widget @@ -3848,7 +3757,6 @@ GtkToolButtonPrivate GtkMenuToolButton GtkMenuToolButtonClass gtk_menu_tool_button_new -gtk_menu_tool_button_new_from_stock gtk_menu_tool_button_set_menu gtk_menu_tool_button_get_menu gtk_menu_tool_button_set_arrow_tooltip_text @@ -3872,9 +3780,7 @@ GtkMenuToolButtonPrivate GtkRadioToolButton GtkRadioToolButton gtk_radio_tool_button_new -gtk_radio_tool_button_new_from_stock gtk_radio_tool_button_new_from_widget -gtk_radio_tool_button_new_with_stock_from_widget gtk_radio_tool_button_get_group gtk_radio_tool_button_set_group @@ -3896,7 +3802,6 @@ gtk_radio_tool_button_get_type GtkToggleToolButton GtkToggleToolButtonClass gtk_toggle_tool_button_new -gtk_toggle_tool_button_new_from_stock gtk_toggle_tool_button_set_active gtk_toggle_tool_button_get_active @@ -3997,7 +3902,6 @@ GtkTooltip gtk_tooltip_set_markup gtk_tooltip_set_text gtk_tooltip_set_icon -gtk_tooltip_set_icon_from_stock gtk_tooltip_set_icon_from_icon_name gtk_tooltip_set_icon_from_gicon gtk_tooltip_set_custom @@ -5949,7 +5853,6 @@ gtk_drag_begin_with_coordinates gtk_drag_cancel gtk_drag_set_icon_widget gtk_drag_set_icon_pixbuf -gtk_drag_set_icon_stock gtk_drag_set_icon_surface gtk_drag_set_icon_name gtk_drag_set_icon_gicon @@ -5957,7 +5860,6 @@ gtk_drag_set_icon_default gtk_drag_check_threshold gtk_drag_source_set gtk_drag_source_set_icon_pixbuf -gtk_drag_source_set_icon_stock gtk_drag_source_set_icon_name gtk_drag_source_set_icon_gicon gtk_drag_source_unset @@ -6011,127 +5913,6 @@ GtkSortType
-
-gtkstock -Stock Items -GtkStockItem -gtk_stock_add -gtk_stock_add_static -gtk_stock_item_copy -gtk_stock_item_free -gtk_stock_list_ids -gtk_stock_lookup -gtk_stock_set_translate_func - -GTK_STOCK_ABOUT -GTK_STOCK_ADD -GTK_STOCK_APPLY -GTK_STOCK_BOLD -GTK_STOCK_CANCEL -GTK_STOCK_CAPS_LOCK_WARNING -GTK_STOCK_CDROM -GTK_STOCK_CLEAR -GTK_STOCK_CLOSE -GTK_STOCK_COLOR_PICKER -GTK_STOCK_CONVERT -GTK_STOCK_CONNECT -GTK_STOCK_COPY -GTK_STOCK_CUT -GTK_STOCK_DELETE -GTK_STOCK_DIALOG_AUTHENTICATION -GTK_STOCK_DIALOG_ERROR -GTK_STOCK_DIALOG_INFO -GTK_STOCK_DIALOG_QUESTION -GTK_STOCK_DIALOG_WARNING -GTK_STOCK_DIRECTORY -GTK_STOCK_DISCARD -GTK_STOCK_DISCONNECT -GTK_STOCK_DND -GTK_STOCK_DND_MULTIPLE -GTK_STOCK_EDIT -GTK_STOCK_EXECUTE -GTK_STOCK_FILE -GTK_STOCK_FIND -GTK_STOCK_FIND_AND_REPLACE -GTK_STOCK_FLOPPY -GTK_STOCK_FULLSCREEN -GTK_STOCK_GOTO_BOTTOM -GTK_STOCK_GOTO_FIRST -GTK_STOCK_GOTO_LAST -GTK_STOCK_GOTO_TOP -GTK_STOCK_GO_BACK -GTK_STOCK_GO_DOWN -GTK_STOCK_GO_FORWARD -GTK_STOCK_GO_UP -GTK_STOCK_HARDDISK -GTK_STOCK_HELP -GTK_STOCK_HOME -GTK_STOCK_INDENT -GTK_STOCK_INDEX -GTK_STOCK_INFO -GTK_STOCK_ITALIC -GTK_STOCK_JUMP_TO -GTK_STOCK_JUSTIFY_CENTER -GTK_STOCK_JUSTIFY_FILL -GTK_STOCK_JUSTIFY_LEFT -GTK_STOCK_JUSTIFY_RIGHT -GTK_STOCK_LEAVE_FULLSCREEN -GTK_STOCK_MEDIA_FORWARD -GTK_STOCK_MEDIA_NEXT -GTK_STOCK_MEDIA_PAUSE -GTK_STOCK_MEDIA_PLAY -GTK_STOCK_MEDIA_PREVIOUS -GTK_STOCK_MEDIA_RECORD -GTK_STOCK_MEDIA_REWIND -GTK_STOCK_MEDIA_STOP -GTK_STOCK_MISSING_IMAGE -GTK_STOCK_NETWORK -GTK_STOCK_NEW -GTK_STOCK_NO -GTK_STOCK_OK -GTK_STOCK_OPEN -GTK_STOCK_ORIENTATION_LANDSCAPE -GTK_STOCK_ORIENTATION_PORTRAIT -GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE -GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT -GTK_STOCK_PAGE_SETUP -GTK_STOCK_PASTE -GTK_STOCK_PREFERENCES -GTK_STOCK_PRINT -GTK_STOCK_PRINT_ERROR -GTK_STOCK_PRINT_PAUSED -GTK_STOCK_PRINT_PREVIEW -GTK_STOCK_PRINT_REPORT -GTK_STOCK_PRINT_WARNING -GTK_STOCK_PROPERTIES -GTK_STOCK_QUIT -GTK_STOCK_REDO -GTK_STOCK_REFRESH -GTK_STOCK_REMOVE -GTK_STOCK_REVERT_TO_SAVED -GTK_STOCK_SAVE -GTK_STOCK_SAVE_AS -GTK_STOCK_SELECT_ALL -GTK_STOCK_SELECT_COLOR -GTK_STOCK_SELECT_FONT -GTK_STOCK_SORT_ASCENDING -GTK_STOCK_SORT_DESCENDING -GTK_STOCK_SPELL_CHECK -GTK_STOCK_STOP -GTK_STOCK_STRIKETHROUGH -GTK_STOCK_UNDELETE -GTK_STOCK_UNDERLINE -GTK_STOCK_UNDO -GTK_STOCK_UNINDENT -GTK_STOCK_YES -GTK_STOCK_ZOOM_100 -GTK_STOCK_ZOOM_FIT -GTK_STOCK_ZOOM_IN -GTK_STOCK_ZOOM_OUT - -GtkStock -
-
gtkicontheme GtkIconTheme diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc index fdc44f0c3c..c61a564456 100644 --- a/gtk/deprecated/Makefile.inc +++ b/gtk/deprecated/Makefile.inc @@ -5,7 +5,6 @@ deprecated_h_sources = \ deprecated/gtkgradient.h \ deprecated/gtkradioaction.h \ deprecated/gtkrecentaction.h \ - deprecated/gtkstock.h \ deprecated/gtksymboliccolor.h \ deprecated/gtktoggleaction.h \ deprecated/gtkuimanager.h @@ -21,7 +20,6 @@ deprecated_c_sources = \ deprecated/gtkgradient.c \ deprecated/gtkradioaction.c \ deprecated/gtkrecentaction.c \ - deprecated/gtkstock.c \ deprecated/gtksymboliccolor.c \ deprecated/gtktoggleaction.c \ deprecated/gtkuimanager.c diff --git a/gtk/deprecated/gtkaction.c b/gtk/deprecated/gtkaction.c index 810c448a17..036b786ea8 100644 --- a/gtk/deprecated/gtkaction.c +++ b/gtk/deprecated/gtkaction.c @@ -94,7 +94,6 @@ #include "gtklabel.h" #include "gtkmarshalers.h" #include "gtkmenuitem.h" -#include "gtkstock.h" #include "gtktoolbutton.h" #include "gtktoolbar.h" #include "gtkprivate.h" @@ -1426,13 +1425,9 @@ gtk_action_set_label (GtkAction *action, /* if label is unset, then use the label from the stock item */ if (!action->private_data->label_set && action->private_data->stock_id) { - GtkStockItem stock_item; G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - if (gtk_stock_lookup (action->private_data->stock_id, &stock_item)) - action->private_data->label = g_strdup (stock_item.label); - G_GNUC_END_IGNORE_DEPRECATIONS; } @@ -1701,14 +1696,9 @@ gtk_action_set_stock_id (GtkAction *action, /* update label and short_label if appropriate */ if (!action->private_data->label_set) { - GtkStockItem stock_item; G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - if (action->private_data->stock_id && - gtk_stock_lookup (action->private_data->stock_id, &stock_item)) - gtk_action_set_label (action, stock_item.label); - else gtk_action_set_label (action, NULL); G_GNUC_END_IGNORE_DEPRECATIONS; diff --git a/gtk/deprecated/gtkactiongroup.c b/gtk/deprecated/gtkactiongroup.c index 66b85f5035..b34e5b4849 100644 --- a/gtk/deprecated/gtkactiongroup.c +++ b/gtk/deprecated/gtkactiongroup.c @@ -91,7 +91,6 @@ #include "gtkactiongroup.h" #include "gtkbuildable.h" #include "gtkicontheme.h" -#include "gtkstock.h" #include "gtktoggleaction.h" #include "gtkradioaction.h" #include "gtkaccelmap.h" @@ -109,7 +108,6 @@ struct _GtkActionGroupPrivate GHashTable *actions; GtkAccelGroup *accel_group; - GtkTranslateFunc translate_func; gpointer translate_data; GDestroyNotify translate_notify; }; @@ -361,7 +359,6 @@ gtk_action_group_init (GtkActionGroup *action_group) action_group->priv->actions = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) remove_action); - action_group->priv->translate_func = NULL; action_group->priv->translate_data = NULL; action_group->priv->translate_notify = NULL; } @@ -1001,18 +998,11 @@ gtk_action_group_add_action_with_accel (GtkActionGroup *action_group, else { gchar *stock_id; - GtkStockItem stock_item; g_object_get (action, "stock-id", &stock_id, NULL); G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - if (stock_id && gtk_stock_lookup (stock_id, &stock_item)) - { - accel_key = stock_item.keyval; - accel_mods = stock_item.modifier; - } - G_GNUC_END_IGNORE_DEPRECATIONS; g_free (stock_id); @@ -1472,7 +1462,6 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group **/ void gtk_action_group_set_translate_func (GtkActionGroup *action_group, - GtkTranslateFunc func, gpointer data, GDestroyNotify notify) { @@ -1485,7 +1474,6 @@ gtk_action_group_set_translate_func (GtkActionGroup *action_group, if (private->translate_notify) private->translate_notify (private->translate_data); - private->translate_func = func; private->translate_data = data; private->translate_notify = notify; } @@ -1525,7 +1513,6 @@ gtk_action_group_set_translation_domain (GtkActionGroup *action_group, g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); gtk_action_group_set_translate_func (action_group, - (GtkTranslateFunc)dgettext_swapped, g_strdup (domain), g_free); } @@ -1551,7 +1538,6 @@ gtk_action_group_translate_string (GtkActionGroup *action_group, const gchar *string) { GtkActionGroupPrivate *private; - GtkTranslateFunc translate_func; gpointer translate_data; g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), string); @@ -1561,12 +1547,8 @@ gtk_action_group_translate_string (GtkActionGroup *action_group, private = action_group->priv; - translate_func = private->translate_func; translate_data = private->translate_data; - if (translate_func) - return translate_func (string, translate_data); - else return string; } diff --git a/gtk/deprecated/gtkactiongroup.h b/gtk/deprecated/gtkactiongroup.h index 3ce8f270d3..ad890f8e98 100644 --- a/gtk/deprecated/gtkactiongroup.h +++ b/gtk/deprecated/gtkactiongroup.h @@ -34,7 +34,6 @@ #endif #include -#include G_BEGIN_DECLS @@ -245,7 +244,6 @@ void gtk_action_group_add_radio_actions_full (GtkActionGroup GDestroyNotify destroy); GDK_DEPRECATED_IN_3_10 void gtk_action_group_set_translate_func (GtkActionGroup *action_group, - GtkTranslateFunc func, gpointer data, GDestroyNotify notify); GDK_DEPRECATED_IN_3_10 diff --git a/gtk/deprecated/gtkstock.c b/gtk/deprecated/gtkstock.c deleted file mode 100644 index 6d0d40ecf2..0000000000 --- a/gtk/deprecated/gtkstock.c +++ /dev/null @@ -1,575 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 2000 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#include "config.h" - -#define GDK_DISABLE_DEPRECATION_WARNINGS - -#include - -#include "gtkprivate.h" -#include "gtkstock.h" -#include "gtkintl.h" - -/** - * SECTION:gtkstock - * @Short_description: -Prebuilt common menu/toolbar items and corresponding icons - * @Title: Stock Items - * - * Stock items represent commonly-used menu or toolbar items such as - * “Open” or “Exit”. Each stock item is identified by a stock ID; - * stock IDs are just strings, but macros such as #GTK_STOCK_OPEN are - * provided to avoid typing mistakes in the strings. - * Applications can register their own stock items in addition to those - * built-in to GTK+. - * - * Each stock ID can be associated with a #GtkStockItem, which contains - * the user-visible label, keyboard accelerator, and translation domain - * of the menu or toolbar item; and/or with an icon stored in a - * #GtkIconFactory. The connection between a - * #GtkStockItem and stock icons is purely conventional (by virtue of - * using the same stock ID); it’s possible to register a stock item but - * no icon, and vice versa. Stock icons may have a RTL variant which gets - * used for right-to-left locales. - */ - -static GHashTable *translate_hash = NULL; -static GHashTable *stock_hash = NULL; -static void init_stock_hash (void); - -/* We use an unused modifier bit to mark stock items which - * must be freed when they are removed from the hash table. - */ -#define NON_STATIC_MASK (1 << 29) - -/* Magic value which is automatically replaced by the primary accel modifier */ -#define PRIMARY_MODIFIER 0xffffffff - -typedef struct _GtkStockTranslateFunc GtkStockTranslateFunc; -struct _GtkStockTranslateFunc -{ - GtkTranslateFunc func; - gpointer data; - GDestroyNotify notify; -}; - -static void -real_add (const GtkStockItem *items, - guint n_items, - gboolean copy, - gboolean replace_primary) -{ - int i; - - init_stock_hash (); - - if (n_items == 0) - return; - - i = 0; - while (i < n_items) - { - gpointer old_key, old_value; - const GtkStockItem *item = &items[i]; - - if (replace_primary && (guint)item->modifier == PRIMARY_MODIFIER) - { - item = gtk_stock_item_copy (item); - ((GtkStockItem *)item)->modifier = (NON_STATIC_MASK | - _gtk_get_primary_accel_mod ()); - } - else - { - if (item->modifier & NON_STATIC_MASK) - { - g_warning ("Bit 29 set in stock accelerator."); - copy = TRUE; - } - - if (copy) - { - item = gtk_stock_item_copy (item); - ((GtkStockItem *)item)->modifier |= NON_STATIC_MASK; - } - } - - if (g_hash_table_lookup_extended (stock_hash, item->stock_id, - &old_key, &old_value)) - { - g_hash_table_remove (stock_hash, old_key); - if (((GtkStockItem *)old_value)->modifier & NON_STATIC_MASK) - gtk_stock_item_free (old_value); - } - - g_hash_table_insert (stock_hash, - (gchar*)item->stock_id, (GtkStockItem*)item); - - ++i; - } -} - -/** - * gtk_stock_add: - * @items: (array length=n_items): a #GtkStockItem or array of items - * @n_items: number of #GtkStockItem in @items - * - * Registers each of the stock items in @items. If an item already - * exists with the same stock ID as one of the @items, the old item - * gets replaced. The stock items are copied, so GTK+ does not hold - * any pointer into @items and @items can be freed. Use - * gtk_stock_add_static() if @items is persistent and GTK+ need not - * copy the array. - * - * Deprecated: 3.10 - **/ -void -gtk_stock_add (const GtkStockItem *items, - guint n_items) -{ - g_return_if_fail (items != NULL); - - real_add (items, n_items, TRUE, FALSE); -} - -/** - * gtk_stock_add_static: - * @items: (array length=n_items): a #GtkStockItem or array of #GtkStockItem - * @n_items: number of items - * - * Same as gtk_stock_add(), but doesn’t copy @items, so - * @items must persist until application exit. - * - * Deprecated: 3.10 - **/ -void -gtk_stock_add_static (const GtkStockItem *items, - guint n_items) -{ - g_return_if_fail (items != NULL); - - real_add (items, n_items, FALSE, FALSE); -} - -/** - * gtk_stock_lookup: - * @stock_id: a stock item name - * @item: (out): stock item to initialize with values - * - * Fills @item with the registered values for @stock_id, returning %TRUE - * if @stock_id was known. - * - * Returns: %TRUE if @item was initialized - * - * Deprecated: 3.10 - **/ -gboolean -gtk_stock_lookup (const gchar *stock_id, - GtkStockItem *item) -{ - const GtkStockItem *found; - - g_return_val_if_fail (stock_id != NULL, FALSE); - g_return_val_if_fail (item != NULL, FALSE); - - init_stock_hash (); - - found = g_hash_table_lookup (stock_hash, stock_id); - - if (found) - { - *item = *found; - item->modifier &= ~NON_STATIC_MASK; - if (item->label) - { - GtkStockTranslateFunc *translate; - - if (item->translation_domain) - translate = (GtkStockTranslateFunc *) - g_hash_table_lookup (translate_hash, item->translation_domain); - else - translate = NULL; - - if (translate != NULL && translate->func != NULL) - item->label = (* translate->func) (item->label, translate->data); - else - item->label = (gchar *) g_dgettext (item->translation_domain, item->label); - } - } - - return found != NULL; -} - -/** - * gtk_stock_list_ids: - * - * Retrieves a list of all known stock IDs added to a #GtkIconFactory - * or registered with gtk_stock_add(). The list must be freed with g_slist_free(), - * and each string in the list must be freed with g_free(). - * - * Returns: (element-type utf8) (transfer full): a list of known stock IDs - * - * Deprecated: 3.10 - **/ -GSList* -gtk_stock_list_ids (void) -{ - GList *ids; - GList *icon_ids; - GSList *retval; - const gchar *last_id; - - init_stock_hash (); - - ids = g_hash_table_get_keys (stock_hash); - icon_ids = NULL; - ids = g_list_concat (ids, icon_ids); - - ids = g_list_sort (ids, (GCompareFunc)strcmp); - - last_id = NULL; - retval = NULL; - while (ids != NULL) - { - GList *next; - - next = ids->next; - - if (last_id && strcmp (ids->data, last_id) == 0) - { - /* duplicate, ignore */ - } - else - { - retval = g_slist_prepend (retval, g_strdup (ids->data)); - last_id = ids->data; - } - - g_list_free_1 (ids); - - ids = next; - } - - return retval; -} - -/** - * gtk_stock_item_copy: (skip) - * @item: a #GtkStockItem - * - * Copies a stock item, mostly useful for language bindings and not in applications. - * - * Returns: a new #GtkStockItem - * - * Deprecated: 3.10 - **/ -GtkStockItem * -gtk_stock_item_copy (const GtkStockItem *item) -{ - GtkStockItem *copy; - - g_return_val_if_fail (item != NULL, NULL); - - copy = g_new (GtkStockItem, 1); - - *copy = *item; - - copy->stock_id = g_strdup (item->stock_id); - copy->label = g_strdup (item->label); - copy->translation_domain = g_strdup (item->translation_domain); - - return copy; -} - -/** - * gtk_stock_item_free: - * @item: a #GtkStockItem - * - * Frees a stock item allocated on the heap, such as one returned by - * gtk_stock_item_copy(). Also frees the fields inside the stock item, - * if they are not %NULL. - * - * Deprecated: 3.10 - **/ -void -gtk_stock_item_free (GtkStockItem *item) -{ - g_return_if_fail (item != NULL); - - g_free ((gchar*)item->stock_id); - g_free ((gchar*)item->label); - g_free ((gchar*)item->translation_domain); - - g_free (item); -} - -static const GtkStockItem builtin_items [] = -{ - /* KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate */ - - { GTK_STOCK_DIALOG_INFO, NC_("Stock label", "Information"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_DIALOG_WARNING, NC_("Stock label", "Warning"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_DIALOG_ERROR, NC_("Stock label", "Error"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_DIALOG_QUESTION, NC_("Stock label", "Question"), 0, 0, GETTEXT_PACKAGE }, - - /* FIXME these need accelerators when appropriate, and - * need the mnemonics to be rationalized - */ - { GTK_STOCK_ABOUT, NC_("Stock label", "_About"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_ADD, NC_("Stock label", "_Add"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_APPLY, NC_("Stock label", "_Apply"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_BOLD, NC_("Stock label", "_Bold"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_CANCEL, NC_("Stock label", "_Cancel"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_CDROM, NC_("Stock label", "_CD-ROM"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_CLEAR, NC_("Stock label", "_Clear"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_CLOSE, NC_("Stock label", "_Close"), PRIMARY_MODIFIER, 'w', GETTEXT_PACKAGE }, - { GTK_STOCK_CONNECT, NC_("Stock label", "C_onnect"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_CONVERT, NC_("Stock label", "_Convert"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_COPY, NC_("Stock label", "_Copy"), PRIMARY_MODIFIER, 'c', GETTEXT_PACKAGE }, - { GTK_STOCK_CUT, NC_("Stock label", "Cu_t"), PRIMARY_MODIFIER, 'x', GETTEXT_PACKAGE }, - { GTK_STOCK_DELETE, NC_("Stock label", "_Delete"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_DISCARD, NC_("Stock label", "_Discard"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_DISCONNECT, NC_("Stock label", "_Disconnect"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_EXECUTE, NC_("Stock label", "_Execute"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_EDIT, NC_("Stock label", "_Edit"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_FILE, NC_("Stock label", "_File"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_FIND, NC_("Stock label", "_Find"), PRIMARY_MODIFIER, 'f', GETTEXT_PACKAGE }, - { GTK_STOCK_FIND_AND_REPLACE, NC_("Stock label", "Find and _Replace"), PRIMARY_MODIFIER, 'r', GETTEXT_PACKAGE }, - { GTK_STOCK_FLOPPY, NC_("Stock label", "_Floppy"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_FULLSCREEN, NC_("Stock label", "_Fullscreen"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_LEAVE_FULLSCREEN, NC_("Stock label", "_Leave Fullscreen"), 0, 0, GETTEXT_PACKAGE }, - /* This is a navigation label as in "go to the bottom of the page" */ - { GTK_STOCK_GOTO_BOTTOM, NC_("Stock label, navigation", "_Bottom"), 0, 0, GETTEXT_PACKAGE "-navigation" }, - /* This is a navigation label as in "go to the first page" */ - { GTK_STOCK_GOTO_FIRST, NC_("Stock label, navigation", "_First"), 0, 0, GETTEXT_PACKAGE "-navigation" }, - /* This is a navigation label as in "go to the last page" */ - { GTK_STOCK_GOTO_LAST, NC_("Stock label, navigation", "_Last"), 0, 0, GETTEXT_PACKAGE "-navigation" }, - /* This is a navigation label as in "go to the top of the page" */ - { GTK_STOCK_GOTO_TOP, NC_("Stock label, navigation", "_Top"), 0, 0, GETTEXT_PACKAGE "-navigation" }, - /* This is a navigation label as in "go back" */ - { GTK_STOCK_GO_BACK, NC_("Stock label, navigation", "_Back"), 0, 0, GETTEXT_PACKAGE "-navigation" }, - /* This is a navigation label as in "go down" */ - { GTK_STOCK_GO_DOWN, NC_("Stock label, navigation", "_Down"), 0, 0, GETTEXT_PACKAGE "-navigation" }, - /* This is a navigation label as in "go forward" */ - { GTK_STOCK_GO_FORWARD, NC_("Stock label, navigation", "_Forward"), 0, 0, GETTEXT_PACKAGE "-navigation" }, - /* This is a navigation label as in "go up" */ - { GTK_STOCK_GO_UP, NC_("Stock label, navigation", "_Up"), 0, 0, GETTEXT_PACKAGE "-navigation" }, - { GTK_STOCK_HARDDISK, NC_("Stock label", "_Hard Disk"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_HELP, NC_("Stock label", "_Help"), 0, GDK_KEY_F1, GETTEXT_PACKAGE }, - { GTK_STOCK_HOME, NC_("Stock label", "_Home"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_INDENT, NC_("Stock label", "Increase Indent"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_UNINDENT, NC_("Stock label", "Decrease Indent"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_INDEX, NC_("Stock label", "_Index"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_INFO, NC_("Stock label", "_Information"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_ITALIC, NC_("Stock label", "_Italic"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_JUMP_TO, NC_("Stock label", "_Jump to"), 0, 0, GETTEXT_PACKAGE }, - /* This is about text justification, "centered text" */ - { GTK_STOCK_JUSTIFY_CENTER, NC_("Stock label", "_Center"), 0, 0, GETTEXT_PACKAGE }, - /* This is about text justification */ - { GTK_STOCK_JUSTIFY_FILL, NC_("Stock label", "_Fill"), 0, 0, GETTEXT_PACKAGE }, - /* This is about text justification, "left-justified text" */ - { GTK_STOCK_JUSTIFY_LEFT, NC_("Stock label", "_Left"), 0, 0, GETTEXT_PACKAGE }, - /* This is about text justification, "right-justified text" */ - { GTK_STOCK_JUSTIFY_RIGHT, NC_("Stock label", "_Right"), 0, 0, GETTEXT_PACKAGE }, - - /* Media label, as in "fast forward" */ - { GTK_STOCK_MEDIA_FORWARD, NC_("Stock label, media", "_Forward"), 0, 0, GETTEXT_PACKAGE "-media" }, - /* Media label, as in "next song" */ - { GTK_STOCK_MEDIA_NEXT, NC_("Stock label, media", "_Next"), 0, 0, GETTEXT_PACKAGE "-media" }, - /* Media label, as in "pause music" */ - { GTK_STOCK_MEDIA_PAUSE, NC_("Stock label, media", "P_ause"), 0, 0, GETTEXT_PACKAGE "-media" }, - /* Media label, as in "play music" */ - { GTK_STOCK_MEDIA_PLAY, NC_("Stock label, media", "_Play"), 0, 0, GETTEXT_PACKAGE "-media" }, - /* Media label, as in "previous song" */ - { GTK_STOCK_MEDIA_PREVIOUS, NC_("Stock label, media", "Pre_vious"), 0, 0, GETTEXT_PACKAGE "-media" }, - /* Media label */ - { GTK_STOCK_MEDIA_RECORD, NC_("Stock label, media", "_Record"), 0, 0, GETTEXT_PACKAGE "-media" }, - /* Media label */ - { GTK_STOCK_MEDIA_REWIND, NC_("Stock label, media", "R_ewind"), 0, 0, GETTEXT_PACKAGE "-media" }, - /* Media label */ - { GTK_STOCK_MEDIA_STOP, NC_("Stock label, media", "_Stop"), 0, 0, GETTEXT_PACKAGE "-media" }, - { GTK_STOCK_NETWORK, NC_("Stock label", "_Network"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_NEW, NC_("Stock label", "_New"), PRIMARY_MODIFIER, 'n', GETTEXT_PACKAGE }, - { GTK_STOCK_NO, NC_("Stock label", "_No"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_OK, NC_("Stock label", "_OK"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_OPEN, NC_("Stock label", "_Open"), PRIMARY_MODIFIER, 'o', GETTEXT_PACKAGE }, - /* Page orientation */ - { GTK_STOCK_ORIENTATION_LANDSCAPE, NC_("Stock label", "Landscape"), 0, 0, GETTEXT_PACKAGE }, - /* Page orientation */ - { GTK_STOCK_ORIENTATION_PORTRAIT, NC_("Stock label", "Portrait"), 0, 0, GETTEXT_PACKAGE }, - /* Page orientation */ - { GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE, NC_("Stock label", "Reverse landscape"), 0, 0, GETTEXT_PACKAGE }, - /* Page orientation */ - { GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT, NC_("Stock label", "Reverse portrait"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_PAGE_SETUP, NC_("Stock label", "Page Set_up"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_PASTE, NC_("Stock label", "_Paste"), PRIMARY_MODIFIER, 'v', GETTEXT_PACKAGE }, - { GTK_STOCK_PREFERENCES, NC_("Stock label", "_Preferences"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_PRINT, NC_("Stock label", "_Print"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_PRINT_PREVIEW, NC_("Stock label", "Print Pre_view"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_PROPERTIES, NC_("Stock label", "_Properties"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_QUIT, NC_("Stock label", "_Quit"), PRIMARY_MODIFIER, 'q', GETTEXT_PACKAGE }, - { GTK_STOCK_REDO, NC_("Stock label", "_Redo"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_REFRESH, NC_("Stock label", "_Refresh"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_REMOVE, NC_("Stock label", "_Remove"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_REVERT_TO_SAVED, NC_("Stock label", "_Revert"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_SAVE, NC_("Stock label", "_Save"), PRIMARY_MODIFIER, 's', GETTEXT_PACKAGE }, - { GTK_STOCK_SAVE_AS, NC_("Stock label", "Save _As"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_SELECT_ALL, NC_("Stock label", "Select _All"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_SELECT_COLOR, NC_("Stock label", "_Color"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_SELECT_FONT, NC_("Stock label", "_Font"), 0, 0, GETTEXT_PACKAGE }, - /* Sorting direction */ - { GTK_STOCK_SORT_ASCENDING, NC_("Stock label", "_Ascending"), 0, 0, GETTEXT_PACKAGE }, - /* Sorting direction */ - { GTK_STOCK_SORT_DESCENDING, NC_("Stock label", "_Descending"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_SPELL_CHECK, NC_("Stock label", "_Spell Check"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_STOP, NC_("Stock label", "_Stop"), 0, 0, GETTEXT_PACKAGE }, - /* Font variant */ - { GTK_STOCK_STRIKETHROUGH, NC_("Stock label", "_Strikethrough"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_UNDELETE, NC_("Stock label", "_Undelete"), 0, 0, GETTEXT_PACKAGE }, - /* Font variant */ - { GTK_STOCK_UNDERLINE, NC_("Stock label", "_Underline"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_UNDO, NC_("Stock label", "_Undo"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_YES, NC_("Stock label", "_Yes"), 0, 0, GETTEXT_PACKAGE }, - /* Zoom */ - { GTK_STOCK_ZOOM_100, NC_("Stock label", "_Normal Size"), 0, 0, GETTEXT_PACKAGE }, - /* Zoom */ - { GTK_STOCK_ZOOM_FIT, NC_("Stock label", "Best _Fit"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_ZOOM_IN, NC_("Stock label", "Zoom _In"), 0, 0, GETTEXT_PACKAGE }, - { GTK_STOCK_ZOOM_OUT, NC_("Stock label", "Zoom _Out"), 0, 0, GETTEXT_PACKAGE } -}; - -/** - * gtk_stock_set_translate_func: - * @domain: the translation domain for which @func shall be used - * @func: a #GtkTranslateFunc - * @data: data to pass to @func - * @notify: a #GDestroyNotify that is called when @data is - * no longer needed - * - * Sets a function to be used for translating the @label of - * a stock item. - * - * If no function is registered for a translation domain, - * g_dgettext() is used. - * - * The function is used for all stock items whose - * @translation_domain matches @domain. Note that it is possible - * to use strings different from the actual gettext translation domain - * of your application for this, as long as your #GtkTranslateFunc uses - * the correct domain when calling dgettext(). This can be useful, e.g. - * when dealing with message contexts: - * - * |[ - * GtkStockItem items[] = { - * { MY_ITEM1, NC_("odd items", "Item 1"), 0, 0, "odd-item-domain" }, - * { MY_ITEM2, NC_("even items", "Item 2"), 0, 0, "even-item-domain" }, - * }; - * - * gchar * - * my_translate_func (const gchar *msgid, - * gpointer data) - * { - * gchar *msgctxt = data; - * - * return (gchar*)g_dpgettext2 (GETTEXT_PACKAGE, msgctxt, msgid); - * } - * - * ... - * - * gtk_stock_add (items, G_N_ELEMENTS (items)); - * gtk_stock_set_translate_func ("odd-item-domain", my_translate_func, "odd items"); - * gtk_stock_set_translate_func ("even-item-domain", my_translate_func, "even items"); - * ]| - * - * Since: 2.8 - * - * Deprecated: 3.10 - */ -void -gtk_stock_set_translate_func (const gchar *domain, - GtkTranslateFunc func, - gpointer data, - GDestroyNotify notify) -{ - GtkStockTranslateFunc *translate; - gchar *domainname; - - domainname = g_strdup (domain); - - translate = (GtkStockTranslateFunc *) - g_hash_table_lookup (translate_hash, domainname); - - if (translate) - { - if (translate->notify) - (* translate->notify) (translate->data); - } - else - translate = g_new0 (GtkStockTranslateFunc, 1); - - translate->func = func; - translate->data = data; - translate->notify = notify; - - g_hash_table_insert (translate_hash, domainname, translate); -} - -static gchar * -sgettext_swapped (const gchar *msgid, - gpointer data) -{ - gchar *msgctxt = data; - - return (gchar *)g_dpgettext2 (GETTEXT_PACKAGE, msgctxt, msgid); -} - -static void -init_stock_hash (void) -{ - if (stock_hash == NULL) - { - stock_hash = g_hash_table_new (g_str_hash, g_str_equal); - - real_add (builtin_items, G_N_ELEMENTS (builtin_items), FALSE, TRUE); - } - - if (translate_hash == NULL) - { - translate_hash = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, NULL); - - gtk_stock_set_translate_func (GETTEXT_PACKAGE, - sgettext_swapped, - "Stock label", - NULL); - gtk_stock_set_translate_func (GETTEXT_PACKAGE "-navigation", - sgettext_swapped, - "Stock label, navigation", - NULL); - gtk_stock_set_translate_func (GETTEXT_PACKAGE "-media", - sgettext_swapped, - "Stock label, media", - NULL); - } -} diff --git a/gtk/deprecated/gtkstock.h b/gtk/deprecated/gtkstock.h deleted file mode 100644 index 9a7a15f01c..0000000000 --- a/gtk/deprecated/gtkstock.h +++ /dev/null @@ -1,1136 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 2000 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_STOCK_H__ -#define __GTK_STOCK_H__ - - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - -G_BEGIN_DECLS - -/** - * GtkTranslateFunc: - * @path: The id of the message. In #GtkActionGroup this will be a label - * or tooltip from a #GtkActionEntry. - * @func_data: (closure): user data passed in when registering the - * function - * - * The function used to translate messages in e.g. #GtkIconFactory - * and #GtkActionGroup. - * - * Returns: the translated message - * - * Deprecated: 3.10 - */ -typedef gchar * (*GtkTranslateFunc) (const gchar *path, - gpointer func_data); - -typedef struct _GtkStockItem GtkStockItem; - -/** - * GtkStockItem: - * @stock_id: Identifier. - * @label: User visible label. - * @modifier: Modifier type for keyboard accelerator - * @keyval: Keyboard accelerator - * @translation_domain: Translation domain of the menu or toolbar item - * - * Deprecated: 3.10 - */ -struct _GtkStockItem -{ - gchar *stock_id; - gchar *label; - GdkModifierType modifier; - guint keyval; - gchar *translation_domain; -}; - -GDK_DEPRECATED_IN_3_10 -void gtk_stock_add (const GtkStockItem *items, - guint n_items); -GDK_DEPRECATED_IN_3_10 -void gtk_stock_add_static (const GtkStockItem *items, - guint n_items); -GDK_DEPRECATED_IN_3_10 -gboolean gtk_stock_lookup (const gchar *stock_id, - GtkStockItem *item); - -/* Should free the list (and free each string in it also). - * This function is only useful for GUI builders and such. - */ -GDK_DEPRECATED_IN_3_10 -GSList* gtk_stock_list_ids (void); - -GDK_DEPRECATED_IN_3_10 -GtkStockItem *gtk_stock_item_copy (const GtkStockItem *item); -GDK_DEPRECATED_IN_3_10 -void gtk_stock_item_free (GtkStockItem *item); - -GDK_DEPRECATED_IN_3_10 -void gtk_stock_set_translate_func (const gchar *domain, - GtkTranslateFunc func, - gpointer data, - GDestroyNotify notify); - -/* the following type exists just so we can get deprecation warnings */ -#ifndef GDK_DISABLE_DEPRECATION_WARNINGS -#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_10 -G_DEPRECATED -#endif -#endif -typedef char * GtkStock; - -#ifndef GTK_DISABLE_DEPRECATED - -/* Stock IDs (not all are stock items; some are images only) */ -/** - * GTK_STOCK_ABOUT: - * - * The “About” item. - * ![](help-about.png) - * - * Since: 2.6 - * - * Deprecated: 3.10: Use named icon "help-about" or the label "_About". - */ -#define GTK_STOCK_ABOUT ((GtkStock)"gtk-about") - -/** - * GTK_STOCK_ADD: - * - * The “Add” item and icon. - * - * Deprecated: 3.10: Use named icon "list-add" or the label "_Add". - */ -#define GTK_STOCK_ADD ((GtkStock)"gtk-add") - -/** - * GTK_STOCK_APPLY: - * - * The “Apply” item and icon. - * - * Deprecated: 3.10: Do not use an icon. Use label "_Apply". - */ -#define GTK_STOCK_APPLY ((GtkStock)"gtk-apply") - -/** - * GTK_STOCK_BOLD: - * - * The “Bold” item and icon. - * - * Deprecated: 3.10: Use named icon "format-text-bold". - */ -#define GTK_STOCK_BOLD ((GtkStock)"gtk-bold") - -/** - * GTK_STOCK_CANCEL: - * - * The “Cancel” item and icon. - * - * Deprecated: 3.10: Do not use an icon. Use label "_Cancel". - */ -#define GTK_STOCK_CANCEL ((GtkStock)"gtk-cancel") - -/** - * GTK_STOCK_CAPS_LOCK_WARNING: - * - * The “Caps Lock Warning” icon. - * - * Since: 2.16 - * - * Deprecated: 3.10: Use named icon "dialog-warning-symbolic". - */ -#define GTK_STOCK_CAPS_LOCK_WARNING ((GtkStock)"gtk-caps-lock-warning") - -/** - * GTK_STOCK_CDROM: - * - * The “CD-Rom” item and icon. - * - * Deprecated: 3.10: Use named icon "media-optical". - */ -#define GTK_STOCK_CDROM ((GtkStock)"gtk-cdrom") - -/** - * GTK_STOCK_CLEAR: - * - * The “Clear” item and icon. - * - * Deprecated: 3.10: Use named icon "edit-clear". - */ -#define GTK_STOCK_CLEAR ((GtkStock)"gtk-clear") - -/** - * GTK_STOCK_CLOSE: - * - * The “Close” item and icon. - * - * Deprecated: 3.10: Use named icon "window-close" or the label "_Close". - */ -#define GTK_STOCK_CLOSE ((GtkStock)"gtk-close") - -/** - * GTK_STOCK_COLOR_PICKER: - * - * The “Color Picker” item and icon. - * - * Since: 2.2 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_COLOR_PICKER ((GtkStock)"gtk-color-picker") - -/** - * GTK_STOCK_CONNECT: - * - * The “Connect” icon. - * - * Since: 2.6 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_CONNECT ((GtkStock)"gtk-connect") - -/** - * GTK_STOCK_CONVERT: - * - * The “Convert” item and icon. - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_CONVERT ((GtkStock)"gtk-convert") - -/** - * GTK_STOCK_COPY: - * - * The “Copy” item and icon. - * - * Deprecated: 3.10: Use the named icon "edit-copy" or the label "_Copy". - */ -#define GTK_STOCK_COPY ((GtkStock)"gtk-copy") - -/** - * GTK_STOCK_CUT: - * - * The “Cut” item and icon. - * - * Deprecated: 3.10: Use the named icon "edit-cut" or the label "Cu_t". - */ -#define GTK_STOCK_CUT ((GtkStock)"gtk-cut") - -/** - * GTK_STOCK_DELETE: - * - * The “Delete” item and icon. - * - * Deprecated: 3.10: Use the named icon "edit-delete" or the label "_Delete". - */ -#define GTK_STOCK_DELETE ((GtkStock)"gtk-delete") - -/** - * GTK_STOCK_DIALOG_AUTHENTICATION: - * - * The “Authentication” item and icon. - * - * Since: 2.4 - * - * Deprecated: 3.10: Use named icon "dialog-password". - */ -#define GTK_STOCK_DIALOG_AUTHENTICATION ((GtkStock)"gtk-dialog-authentication") - -/** - * GTK_STOCK_DIALOG_INFO: - * - * The “Information” item and icon. - * - * Deprecated: 3.10: Use named icon "dialog-information". - */ -#define GTK_STOCK_DIALOG_INFO ((GtkStock)"gtk-dialog-info") - -/** - * GTK_STOCK_DIALOG_WARNING: - * - * The “Warning” item and icon. - * - * Deprecated: 3.10: Use named icon "dialog-warning". - */ -#define GTK_STOCK_DIALOG_WARNING ((GtkStock)"gtk-dialog-warning") - -/** - * GTK_STOCK_DIALOG_ERROR: - * - * The “Error” item and icon. - * - * Deprecated: 3.10: Use named icon "dialog-error". - */ -#define GTK_STOCK_DIALOG_ERROR ((GtkStock)"gtk-dialog-error") - -/** - * GTK_STOCK_DIALOG_QUESTION: - * - * The “Question” item and icon. - * - * Deprecated: 3.10: Use named icon "dialog-question". - */ -#define GTK_STOCK_DIALOG_QUESTION ((GtkStock)"gtk-dialog-question") - -/** - * GTK_STOCK_DIRECTORY: - * - * The “Directory” icon. - * - * Since: 2.6 - * - * Deprecated: 3.10: Use named icon "folder". - */ -#define GTK_STOCK_DIRECTORY ((GtkStock)"gtk-directory") - -/** - * GTK_STOCK_DISCARD: - * - * The “Discard” item. - * - * Since: 2.12 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_DISCARD ((GtkStock)"gtk-discard") - -/** - * GTK_STOCK_DISCONNECT: - * - * The “Disconnect” icon. - * - * Since: 2.6 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_DISCONNECT ((GtkStock)"gtk-disconnect") - -/** - * GTK_STOCK_DND: - * - * The “Drag-And-Drop” icon. - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_DND ((GtkStock)"gtk-dnd") - -/** - * GTK_STOCK_DND_MULTIPLE: - * - * The “Drag-And-Drop multiple” icon. - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_DND_MULTIPLE ((GtkStock)"gtk-dnd-multiple") - -/** - * GTK_STOCK_EDIT: - * - * The “Edit” item and icon. - * - * Since: 2.6 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_EDIT ((GtkStock)"gtk-edit") - -/** - * GTK_STOCK_EXECUTE: - * - * The “Execute” item and icon. - * - * Deprecated: 3.10: Use named icon "system-run". - */ -#define GTK_STOCK_EXECUTE ((GtkStock)"gtk-execute") - -/** - * GTK_STOCK_FILE: - * - * The “File” item and icon. - * - * Since 3.0, this item has a label, before it only had an icon. - * - * Since: 2.6 - * - * Deprecated: 3.10: Use named icon "text-x-generic". - */ -#define GTK_STOCK_FILE ((GtkStock)"gtk-file") - -/** - * GTK_STOCK_FIND: - * - * The “Find” item and icon. - * - * Deprecated: 3.10: Use named icon "edit-find". - */ -#define GTK_STOCK_FIND ((GtkStock)"gtk-find") - -/** - * GTK_STOCK_FIND_AND_REPLACE: - * - * The “Find and Replace” item and icon. - * - * Deprecated: 3.10: Use named icon "edit-find-replace". - */ -#define GTK_STOCK_FIND_AND_REPLACE ((GtkStock)"gtk-find-and-replace") - -/** - * GTK_STOCK_FLOPPY: - * - * The “Floppy” item and icon. - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_FLOPPY ((GtkStock)"gtk-floppy") - -/** - * GTK_STOCK_FULLSCREEN: - * - * The “Fullscreen” item and icon. - * - * Since: 2.8 - * - * Deprecated: 3.10: Use named icon "view-fullscreen". - */ -#define GTK_STOCK_FULLSCREEN ((GtkStock)"gtk-fullscreen") - -/** - * GTK_STOCK_GOTO_BOTTOM: - * - * The “Bottom” item and icon. - * - * Deprecated: 3.10: Use named icon "go-bottom". - */ -#define GTK_STOCK_GOTO_BOTTOM ((GtkStock)"gtk-goto-bottom") - -/** - * GTK_STOCK_GOTO_FIRST: - * - * The “First” item and icon. The icon has an RTL variant. - * - * Deprecated: 3.10: Use named icon "go-first". - */ -#define GTK_STOCK_GOTO_FIRST ((GtkStock)"gtk-goto-first") - -/** - * GTK_STOCK_GOTO_LAST: - * - * The “Last” item and icon. The icon has an RTL variant. - * - * Deprecated: 3.10: Use named icon "go-last". - */ -#define GTK_STOCK_GOTO_LAST ((GtkStock)"gtk-goto-last") - -/** - * GTK_STOCK_GOTO_TOP: - * - * The “Top” item and icon. - * - * Deprecated: 3.10: Use named icon "go-top". - */ -#define GTK_STOCK_GOTO_TOP ((GtkStock)"gtk-goto-top") - -/** - * GTK_STOCK_GO_BACK: - * - * The “Back” item and icon. The icon has an RTL variant. - * - * Deprecated: 3.10: Use named icon "go-previous". -*/ -#define GTK_STOCK_GO_BACK ((GtkStock)"gtk-go-back") - -/** - * GTK_STOCK_GO_DOWN: - * - * The “Down” item and icon. - * - * Deprecated: 3.10: Use named icon "go-down". - */ -#define GTK_STOCK_GO_DOWN ((GtkStock)"gtk-go-down") - -/** - * GTK_STOCK_GO_FORWARD: - * - * The “Forward” item and icon. The icon has an RTL variant. - * - * Deprecated: 3.10: Use named icon "go-next". - */ -#define GTK_STOCK_GO_FORWARD ((GtkStock)"gtk-go-forward") - -/** - * GTK_STOCK_GO_UP: - * - * The “Up” item and icon. - * - * Deprecated: 3.10: Use named icon "go-up". - */ -#define GTK_STOCK_GO_UP ((GtkStock)"gtk-go-up") - -/** - * GTK_STOCK_HARDDISK: - * - * The “Harddisk” item and icon. - * - * Since: 2.4 - * - * Deprecated: 3.10: Use named icon "drive-harddisk". - */ -#define GTK_STOCK_HARDDISK ((GtkStock)"gtk-harddisk") - -/** - * GTK_STOCK_HELP: - * - * The “Help” item and icon. - * - * Deprecated: 3.10: Use named icon "help-browser". - */ -#define GTK_STOCK_HELP ((GtkStock)"gtk-help") - -/** - * GTK_STOCK_HOME: - * - * The “Home” item and icon. - * - * Deprecated: 3.10: Use named icon "go-home". - */ -#define GTK_STOCK_HOME ((GtkStock)"gtk-home") - -/** - * GTK_STOCK_INDEX: - * - * The “Index” item and icon. - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_INDEX ((GtkStock)"gtk-index") - -/** - * GTK_STOCK_INDENT: - * - * The “Indent” item and icon. The icon has an RTL variant. - * - * Since: 2.4 - * - * Deprecated: 3.10: Use named icon "format-indent-more". - */ -#define GTK_STOCK_INDENT ((GtkStock)"gtk-indent") - -/** - * GTK_STOCK_INFO: - * - * The “Info” item and icon. - * - * Since: 2.8 - * - * Deprecated: 3.10: Use named icon "dialog-information". - */ -#define GTK_STOCK_INFO ((GtkStock)"gtk-info") - -/** - * GTK_STOCK_ITALIC: - * - * The “Italic” item and icon. - * - * Deprecated: 3.10: Use named icon "format-text-italic". - */ -#define GTK_STOCK_ITALIC ((GtkStock)"gtk-italic") - -/** - * GTK_STOCK_JUMP_TO: - * - * The “Jump to” item and icon. The icon has an RTL variant. - * - * Deprecated: 3.10: Use named icon "go-jump". - */ -#define GTK_STOCK_JUMP_TO ((GtkStock)"gtk-jump-to") - -/** - * GTK_STOCK_JUSTIFY_CENTER: - * - * The “Center” item and icon. - * - * Deprecated: 3.10: Use named icon "format-justify-center". - */ -#define GTK_STOCK_JUSTIFY_CENTER ((GtkStock)"gtk-justify-center") - -/** - * GTK_STOCK_JUSTIFY_FILL: - * - * The “Fill” item and icon. - * - * Deprecated: 3.10: Use named icon "format-justify-fill". - */ -#define GTK_STOCK_JUSTIFY_FILL ((GtkStock)"gtk-justify-fill") - -/** - * GTK_STOCK_JUSTIFY_LEFT: - * - * The “Left” item and icon. - * - * Deprecated: 3.10: Use named icon "format-justify-left". - */ -#define GTK_STOCK_JUSTIFY_LEFT ((GtkStock)"gtk-justify-left") - -/** - * GTK_STOCK_JUSTIFY_RIGHT: - * - * The “Right” item and icon. - * - * Deprecated: 3.10: Use named icon "format-justify-right". - */ -#define GTK_STOCK_JUSTIFY_RIGHT ((GtkStock)"gtk-justify-right") - -/** - * GTK_STOCK_LEAVE_FULLSCREEN: - * - * The “Leave Fullscreen” item and icon. - * - * Since: 2.8 - * - * Deprecated: 3.10: Use named icon "view-restore". - */ -#define GTK_STOCK_LEAVE_FULLSCREEN ((GtkStock)"gtk-leave-fullscreen") - -/** - * GTK_STOCK_MISSING_IMAGE: - * - * The “Missing image” icon. - * - * Deprecated: 3.10: Use named icon "image-missing". - */ -#define GTK_STOCK_MISSING_IMAGE ((GtkStock)"gtk-missing-image") - -/** - * GTK_STOCK_MEDIA_FORWARD: - * - * The “Media Forward” item and icon. The icon has an RTL variant. - * - * Since: 2.6 - * - * Deprecated: 3.10: Use named icon "media-seek-forward" or the label "_Forward". - */ -#define GTK_STOCK_MEDIA_FORWARD ((GtkStock)"gtk-media-forward") - -/** - * GTK_STOCK_MEDIA_NEXT: - * - * The “Media Next” item and icon. The icon has an RTL variant. - * - * Since: 2.6 - * - * Deprecated: 3.10: Use named icon "media-skip-forward" or the label "_Next". - */ -#define GTK_STOCK_MEDIA_NEXT ((GtkStock)"gtk-media-next") - -/** - * GTK_STOCK_MEDIA_PAUSE: - * - * The “Media Pause” item and icon. - * - * Since: 2.6 - * - * Deprecated: 3.10: Use named icon "media-playback-pause" or the label "P_ause". - */ -#define GTK_STOCK_MEDIA_PAUSE ((GtkStock)"gtk-media-pause") - -/** - * GTK_STOCK_MEDIA_PLAY: - * - * The “Media Play” item and icon. The icon has an RTL variant. - * - * Since: 2.6 - * - * Deprecated: 3.10: Use named icon "media-playback-start" or the label "_Play". - */ -#define GTK_STOCK_MEDIA_PLAY ((GtkStock)"gtk-media-play") - -/** - * GTK_STOCK_MEDIA_PREVIOUS: - * - * The “Media Previous” item and icon. The icon has an RTL variant. - * - * Since: 2.6 - * - * Deprecated: 3.10: Use named icon "media-skip-backward" or the label "Pre_vious". - */ -#define GTK_STOCK_MEDIA_PREVIOUS ((GtkStock)"gtk-media-previous") - -/** - * GTK_STOCK_MEDIA_RECORD: - * - * The “Media Record” item and icon. - * - * Since: 2.6 - * - * Deprecated: 3.10: Use named icon "media-record" or the label "_Record". - */ -#define GTK_STOCK_MEDIA_RECORD ((GtkStock)"gtk-media-record") - -/** - * GTK_STOCK_MEDIA_REWIND: - * - * The “Media Rewind” item and icon. The icon has an RTL variant. - * - * Since: 2.6 - * - * Deprecated: 3.10: Use named icon "media-seek-backward" or the label "R_ewind". - */ -#define GTK_STOCK_MEDIA_REWIND ((GtkStock)"gtk-media-rewind") - -/** - * GTK_STOCK_MEDIA_STOP: - * - * The “Media Stop” item and icon. - * - * Since: 2.6 - * - * Deprecated: 3.10: Use named icon "media-playback-stop" or the label "_Stop". - */ -#define GTK_STOCK_MEDIA_STOP ((GtkStock)"gtk-media-stop") - -/** - * GTK_STOCK_NETWORK: - * - * The “Network” item and icon. - * - * Since: 2.4 - * - * Deprecated: 3.10: Use named icon "network-workgroup". - */ -#define GTK_STOCK_NETWORK ((GtkStock)"gtk-network") - -/** - * GTK_STOCK_NEW: - * - * The “New” item and icon. - * - * Deprecated: 3.10: Use named icon "document-new" or the label "_New". - */ -#define GTK_STOCK_NEW ((GtkStock)"gtk-new") - -/** - * GTK_STOCK_NO: - * - * The “No” item and icon. - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_NO ((GtkStock)"gtk-no") - -/** - * GTK_STOCK_OK: - * - * The “OK” item and icon. - * - * Deprecated: 3.10: Do not use an icon. Use label "_OK". - */ -#define GTK_STOCK_OK ((GtkStock)"gtk-ok") - -/** - * GTK_STOCK_OPEN: - * - * The “Open” item and icon. - * - * Deprecated: 3.10: Use named icon "document-open" or the label "_Open". - */ -#define GTK_STOCK_OPEN ((GtkStock)"gtk-open") - -/** - * GTK_STOCK_ORIENTATION_PORTRAIT: - * - * The “Portrait Orientation” item and icon. - * - * Since: 2.10 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_ORIENTATION_PORTRAIT ((GtkStock)"gtk-orientation-portrait") - -/** - * GTK_STOCK_ORIENTATION_LANDSCAPE: - * - * The “Landscape Orientation” item and icon. - * - * Since: 2.10 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_ORIENTATION_LANDSCAPE ((GtkStock)"gtk-orientation-landscape") - -/** - * GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE: - * - * The “Reverse Landscape Orientation” item and icon. - * - * Since: 2.10 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE ((GtkStock)"gtk-orientation-reverse-landscape") - -/** - * GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT: - * - * The “Reverse Portrait Orientation” item and icon. - * - * Since: 2.10 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT ((GtkStock)"gtk-orientation-reverse-portrait") - -/** - * GTK_STOCK_PAGE_SETUP: - * - * The “Page Setup” item and icon. - * - * Since: 2.14 - * - * Deprecated: 3.10: Use named icon "document-page-setup" or the label "Page Set_up". - */ -#define GTK_STOCK_PAGE_SETUP ((GtkStock)"gtk-page-setup") - -/** - * GTK_STOCK_PASTE: - * - * The “Paste” item and icon. - * - * Deprecated: 3.10: Use named icon "edit-paste" or the label "_Paste". - */ -#define GTK_STOCK_PASTE ((GtkStock)"gtk-paste") - -/** - * GTK_STOCK_PREFERENCES: - * - * The “Preferences” item and icon. - * - * Deprecated: 3.10: Use named icon "preferences-system" or the label "_Preferences". - */ -#define GTK_STOCK_PREFERENCES ((GtkStock)"gtk-preferences") - -/** - * GTK_STOCK_PRINT: - * - * The “Print” item and icon. - * - * Deprecated: 3.10: Use named icon "document-print" or the label "_Print". - */ -#define GTK_STOCK_PRINT ((GtkStock)"gtk-print") - -/** - * GTK_STOCK_PRINT_ERROR: - * - * The “Print Error” icon. - * - * Since: 2.14 - * - * Deprecated: 3.10: Use named icon "printer-error". - */ -#define GTK_STOCK_PRINT_ERROR ((GtkStock)"gtk-print-error") - -/** - * GTK_STOCK_PRINT_PAUSED: - * - * The “Print Paused” icon. - * - * Since: 2.14 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_PRINT_PAUSED ((GtkStock)"gtk-print-paused") - -/** - * GTK_STOCK_PRINT_PREVIEW: - * - * The “Print Preview” item and icon. - * - * Deprecated: 3.10: Use label "Pre_view". - */ -#define GTK_STOCK_PRINT_PREVIEW ((GtkStock)"gtk-print-preview") - -/** - * GTK_STOCK_PRINT_REPORT: - * - * The “Print Report” icon. - * - * Since: 2.14 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_PRINT_REPORT ((GtkStock)"gtk-print-report") - - -/** - * GTK_STOCK_PRINT_WARNING: - * - * The “Print Warning” icon. - * - * Since: 2.14 - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_PRINT_WARNING ((GtkStock)"gtk-print-warning") - -/** - * GTK_STOCK_PROPERTIES: - * - * The “Properties” item and icon. - * - * Deprecated: 3.10: Use named icon "document-properties" or the label "_Properties". - */ -#define GTK_STOCK_PROPERTIES ((GtkStock)"gtk-properties") - -/** - * GTK_STOCK_QUIT: - * - * The “Quit” item and icon. - * - * Deprecated: 3.10: Use named icon "application-exit" or the label "_Quit". - */ -#define GTK_STOCK_QUIT ((GtkStock)"gtk-quit") - -/** - * GTK_STOCK_REDO: - * - * The “Redo” item and icon. The icon has an RTL variant. - * - * Deprecated: 3.10: Use named icon "edit-redo" or the label "_Redo". - */ -#define GTK_STOCK_REDO ((GtkStock)"gtk-redo") - -/** - * GTK_STOCK_REFRESH: - * - * The “Refresh” item and icon. - * - * Deprecated: 3.10: Use named icon "view-refresh" or the label "_Refresh". - */ -#define GTK_STOCK_REFRESH ((GtkStock)"gtk-refresh") - -/** - * GTK_STOCK_REMOVE: - * - * The “Remove” item and icon. - * - * Deprecated: 3.10: Use named icon "list-remove" or the label "_Remove". - */ -#define GTK_STOCK_REMOVE ((GtkStock)"gtk-remove") - -/** - * GTK_STOCK_REVERT_TO_SAVED: - * - * The “Revert” item and icon. The icon has an RTL variant. - * - * Deprecated: 3.10: Use named icon "document-revert" or the label "_Revert". - */ -#define GTK_STOCK_REVERT_TO_SAVED ((GtkStock)"gtk-revert-to-saved") - -/** - * GTK_STOCK_SAVE: - * - * The “Save” item and icon. - * - * Deprecated: 3.10: Use named icon "document-save" or the label "_Save". - */ -#define GTK_STOCK_SAVE ((GtkStock)"gtk-save") - -/** - * GTK_STOCK_SAVE_AS: - * - * The “Save As” item and icon. - * - * Deprecated: 3.10: Use named icon "document-save-as" or the label "Save _As". - */ -#define GTK_STOCK_SAVE_AS ((GtkStock)"gtk-save-as") - -/** - * GTK_STOCK_SELECT_ALL: - * - * The “Select All” item and icon. - * - * Since: 2.10 - * - * Deprecated: 3.10: Use named icon "edit-select-all" or the label "Select _All". - */ -#define GTK_STOCK_SELECT_ALL ((GtkStock)"gtk-select-all") - -/** - * GTK_STOCK_SELECT_COLOR: - * - * The “Color” item and icon. - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_SELECT_COLOR ((GtkStock)"gtk-select-color") - -/** - * GTK_STOCK_SELECT_FONT: - * - * The “Font” item and icon. - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_SELECT_FONT ((GtkStock)"gtk-select-font") - -/** - * GTK_STOCK_SORT_ASCENDING: - * - * The “Ascending” item and icon. - * - * Deprecated: 3.10: Use named icon "view-sort-ascending". - */ -#define GTK_STOCK_SORT_ASCENDING ((GtkStock)"gtk-sort-ascending") - -/** - * GTK_STOCK_SORT_DESCENDING: - * - * The “Descending” item and icon. - * - * Deprecated: 3.10: Use named icon "view-sort-descending". - */ -#define GTK_STOCK_SORT_DESCENDING ((GtkStock)"gtk-sort-descending") - -/** - * GTK_STOCK_SPELL_CHECK: - * - * The “Spell Check” item and icon. - * - * Deprecated: 3.10: Use named icon "tools-check-spelling". - */ -#define GTK_STOCK_SPELL_CHECK ((GtkStock)"gtk-spell-check") - -/** - * GTK_STOCK_STOP: - * - * The “Stop” item and icon. - * - * Deprecated: 3.10: Use named icon "process-stop" or the label "_Stop". - */ -#define GTK_STOCK_STOP ((GtkStock)"gtk-stop") - -/** - * GTK_STOCK_STRIKETHROUGH: - * - * The “Strikethrough” item and icon. - * - * Deprecated: 3.10: Use named icon "format-text-strikethrough" or the label "_Strikethrough". - */ -#define GTK_STOCK_STRIKETHROUGH ((GtkStock)"gtk-strikethrough") - -/** - * GTK_STOCK_UNDELETE: - * - * The “Undelete” item and icon. The icon has an RTL variant. - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_UNDELETE ((GtkStock)"gtk-undelete") - -/** - * GTK_STOCK_UNDERLINE: - * - * The “Underline” item and icon. - * - * Deprecated: 3.10: Use named icon "format-text-underline" or the label "_Underline". - */ -#define GTK_STOCK_UNDERLINE ((GtkStock)"gtk-underline") - -/** - * GTK_STOCK_UNDO: - * - * The “Undo” item and icon. The icon has an RTL variant. - * - * Deprecated: 3.10: Use named icon "edit-undo" or the label "_Undo". - */ -#define GTK_STOCK_UNDO ((GtkStock)"gtk-undo") - -/** - * GTK_STOCK_UNINDENT: - * - * The “Unindent” item and icon. The icon has an RTL variant. - * - * Since: 2.4 - * - * Deprecated: 3.10: Use named icon "format-indent-less". - */ -#define GTK_STOCK_UNINDENT ((GtkStock)"gtk-unindent") - -/** - * GTK_STOCK_YES: - * - * The “Yes” item and icon. - * - * Deprecated: 3.10 - */ -#define GTK_STOCK_YES ((GtkStock)"gtk-yes") - -/** - * GTK_STOCK_ZOOM_100: - * - * The “Zoom 100%” item and icon. - * - * Deprecated: 3.10: Use named icon "zoom-original" or the label "_Normal Size". - */ -#define GTK_STOCK_ZOOM_100 ((GtkStock)"gtk-zoom-100") - -/** - * GTK_STOCK_ZOOM_FIT: - * - * The “Zoom to Fit” item and icon. - * - * Deprecated: 3.10: Use named icon "zoom-fit-best" or the label "Best _Fit". - */ -#define GTK_STOCK_ZOOM_FIT ((GtkStock)"gtk-zoom-fit") - -/** - * GTK_STOCK_ZOOM_IN: - * - * The “Zoom In” item and icon. - * - * Deprecated: 3.10: Use named icon "zoom-in" or the label "Zoom _In". - */ -#define GTK_STOCK_ZOOM_IN ((GtkStock)"gtk-zoom-in") - -/** - * GTK_STOCK_ZOOM_OUT: - * - * The “Zoom Out” item and icon. - * - * Deprecated: 3.10: Use named icon "zoom-out" or the label "Zoom _Out". - */ -#define GTK_STOCK_ZOOM_OUT ((GtkStock)"gtk-zoom-out") - -#endif - -G_END_DECLS - -#endif /* __GTK_STOCK_H__ */ diff --git a/gtk/gtk.h b/gtk/gtk.h index 5d58d629ba..ac265ce972 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -250,7 +250,6 @@ #include #include #include -#include #include #include #include diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index 3755dc5981..a550e92650 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -179,7 +179,6 @@ * * * gtk-ok - * TRUE * * * @@ -221,7 +220,6 @@ #include "gtkwindow.h" #include "gtkicontheme.h" #include "gtktestutils.h" -#include "deprecated/gtkstock.h" static void gtk_builder_finalize (GObject *object); diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 01ab7e449f..18da8e6bb4 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -45,7 +45,6 @@ #include "gtkbuilderprivate.h" #include "gtksettings.h" #include "gtktypebuiltins.h" -#include "deprecated/gtkstock.h" #include "gtksizegroup.h" /** diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c index 109f84179c..c98150593e 100644 --- a/gtk/gtkfontchooserdialog.c +++ b/gtk/gtkfontchooserdialog.c @@ -28,7 +28,6 @@ #include "gtkfontchooserwidget.h" #include "gtkfontchooserutils.h" #include "gtkbox.h" -#include "deprecated/gtkstock.h" #include "gtkintl.h" #include "gtkaccessible.h" #include "gtkbuildable.h" diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c index 9974f72bdd..54abb2ead0 100644 --- a/gtk/gtkinfobar.c +++ b/gtk/gtkinfobar.c @@ -49,7 +49,6 @@ #include "gtkrender.h" #include "gtktypebuiltins.h" #include "gtkwidgetprivate.h" -#include "deprecated/gtkstock.h" /** * SECTION:gtkinfobar @@ -655,7 +654,7 @@ add_buttons_valist (GtkInfoBar *info_bar, /** * gtk_info_bar_add_buttons: * @info_bar: a #GtkInfoBar - * @first_button_text: button text or stock ID + * @first_button_text: button text * @...: response ID for first button, then more text-response_id pairs, * ending with %NULL * @@ -695,14 +694,13 @@ gtk_info_bar_new (void) /** * gtk_info_bar_new_with_buttons: - * @first_button_text: (allow-none): stock ID or text to go in first button, or %NULL + * @first_button_text: (allow-none): ext to go in first button, or %NULL * @...: response ID for first button, then additional buttons, ending * with %NULL * * Creates a new #GtkInfoBar with buttons. Button text/response ID * pairs should be listed, with a %NULL pointer ending the list. - * Button text can be either a stock ID such as %GTK_STOCK_OK, or - * some arbitrary text. A response ID can be any positive number, + * A response ID can be any positive number, * or one of the values in the #GtkResponseType enumeration. If the * user clicks one of these dialog buttons, GtkInfoBar will emit * the “response” signal with the corresponding response ID. diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 6fc5775530..594d6af911 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -23,7 +23,6 @@ #include "gtkbutton.h" #include "gtkimage.h" #include "gtklabel.h" -#include "deprecated/gtkstock.h" #include "gtkbox.h" #include "gtkintl.h" #include "gtktoolbarprivate.h" @@ -46,19 +45,15 @@ * Use gtk_tool_button_new() to create a new #GtkToolButton. * * The label of a #GtkToolButton is determined by the properties - * #GtkToolButton:label-widget, #GtkToolButton:label, and - * #GtkToolButton:stock-id. If #GtkToolButton:label-widget is + * #GtkToolButton:label-widget and #GtkToolButton:label. + * If #GtkToolButton:label-widget is * non-%NULL, then that widget is used as the label. Otherwise, if * #GtkToolButton:label is non-%NULL, that string is used as the label. - * Otherwise, if #GtkToolButton:stock-id is non-%NULL, the label is - * determined by the stock item. Otherwise, the button does not have a label. * - * The icon of a #GtkToolButton is determined by the properties - * #GtkToolButton:icon-widget and #GtkToolButton:stock-id. If + * The icon of a #GtkToolButton is determined by the + * #GtkToolButton:icon-widget property. If * #GtkToolButton:icon-widget is non-%NULL, then - * that widget is used as the icon. Otherwise, if #GtkToolButton:stock-id is - * non-%NULL, the icon is determined by the stock item. Otherwise, - * the button does not have a icon. + * that widget is used as the icon. Otherwise it does not have an icon. * * # CSS nodes * @@ -867,9 +862,7 @@ gtk_tool_button_new (GtkWidget *icon_widget, * Sets @label as the label used for the tool button. The #GtkToolButton:label * property only has an effect if not overridden by a non-%NULL * #GtkToolButton:label-widget property. If both the #GtkToolButton:label-widget - * and #GtkToolButton:label properties are %NULL, the label is determined by the - * #GtkToolButton:stock-id property. If the #GtkToolButton:stock-id property is - * also %NULL, @button will not have a label. + * and #GtkToolButton:label properties are %NULL, @button will not have a label. * * Since: 2.4 **/ @@ -904,13 +897,13 @@ gtk_tool_button_set_label (GtkToolButton *button, /** * gtk_tool_button_get_label: * @button: a #GtkToolButton - * + * * Returns the label used by the tool button, or %NULL if the tool button - * doesn’t have a label. or uses a the label from a stock item. The returned + * doesn’t have a label. The returned * string is owned by GTK+, and must not be modified or freed. - * - * Returns: (nullable): The label, or %NULL - * + * + * Returns: (nullable) (transfer none): The label, or %NULL + * * Since: 2.4 **/ const gchar * @@ -982,8 +975,8 @@ gtk_tool_button_get_use_underline (GtkToolButton *button) * Sets the icon for the tool button from a named themed icon. * See the docs for #GtkIconTheme for more details. * The #GtkToolButton:icon-name property only has an effect if not - * overridden by non-%NULL #GtkToolButton:label-widget, - * #GtkToolButton:icon-widget and #GtkToolButton:stock-id properties. + * overridden by non-%NULL #GtkToolButton:label-widget or + * #GtkToolButton:icon-widget properties. * * Since: 2.8 **/ @@ -1030,10 +1023,8 @@ gtk_tool_button_get_icon_name (GtkToolButton *button) * @button: a #GtkToolButton * @icon_widget: (allow-none): the widget used as icon, or %NULL * - * Sets @icon as the widget used as icon on @button. If @icon_widget is - * %NULL the icon is determined by the #GtkToolButton:stock-id property. If the - * #GtkToolButton:stock-id property is also %NULL, @button will not have an icon. - * + * Sets @icon as the widget used as icon on @button. + * * Since: 2.4 **/ void @@ -1074,10 +1065,8 @@ gtk_tool_button_set_icon_widget (GtkToolButton *button, * * Sets @label_widget as the widget that will be used as the label * for @button. If @label_widget is %NULL the #GtkToolButton:label property is used - * as label. If #GtkToolButton:label is also %NULL, the label in the stock item - * determined by the #GtkToolButton:stock-id property is used as label. If - * #GtkToolButton:stock-id is also %NULL, @button does not have a label. - * + * as label. If #GtkToolButton:label is also %NULL, @button does not have a label. + * * Since: 2.4 **/ void diff --git a/tests/testactions.c b/tests/testactions.c index 115b308431..97598f97ba 100644 --- a/tests/testactions.c +++ b/tests/testactions.c @@ -130,13 +130,13 @@ static GtkActionEntry entries[] = { { "attach", "mail-attachment", "_Attachment...", "m", "Attach a file", G_CALLBACK (activate_action) }, - { "cut", GTK_STOCK_CUT, "C_ut", "X", + { "cut", NULL, "C_ut", "X", "Cut the selected text to the clipboard", G_CALLBACK (activate_action) }, - { "copy", GTK_STOCK_COPY, "_Copy", "C", + { "copy", NULL, "_Copy", "C", "Copy the selected text to the clipboard", G_CALLBACK (activate_action) }, - { "paste", GTK_STOCK_PASTE, "_Paste", "V", + { "paste", NULL, "_Paste", "V", "Paste the text from the clipboard", G_CALLBACK (activate_action) }, - { "quit", GTK_STOCK_QUIT, NULL, "Q", + { "quit", NULL, NULL, "Q", "Quit the application", G_CALLBACK (gtk_main_quit) }, { "customise-accels", NULL, "Customise _Accels", NULL, "Customise keyboard shortcuts", G_CALLBACK (show_accel_dialog) }, @@ -148,7 +148,7 @@ static GtkActionEntry entries[] = { static guint n_entries = G_N_ELEMENTS (entries); static GtkToggleActionEntry toggle_entries[] = { - { "bold", GTK_STOCK_BOLD, "_Bold", "B", + { "bold", NULL, "_Bold", "B", "Change to bold face", G_CALLBACK (toggle_action), FALSE }, { "toggle-cnp", NULL, "Enable Cut/Copy/Paste", NULL, diff --git a/tests/testgtk.c b/tests/testgtk.c index d493bba2e8..f5b61a3488 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -857,11 +857,10 @@ set_toolbar_both_horiz (GtkWidget *widget, gtk_toolbar_set_style (GTK_TOOLBAR (data), GTK_TOOLBAR_BOTH_HORIZ); } -G_GNUC_BEGIN_IGNORE_DEPRECATIONS; static GtkActionEntry create_toolbar_items[] = { - { NULL, GTK_STOCK_NEW, NULL, NULL, "Stock icon: New", + { NULL, NULL, NULL, NULL, "Stock icon: New", G_CALLBACK (set_toolbar_small_stock) }, - { NULL, GTK_STOCK_OPEN, NULL, NULL, "Stock icon: Open", + { NULL, NULL, NULL, NULL, "Stock icon: Open", G_CALLBACK (set_toolbar_large_stock) }, { NULL, NULL, "Horizontal", NULL, "Horizontal toolbar layout", G_CALLBACK (set_toolbar_horizontal) }, @@ -891,7 +890,6 @@ static GtkActionEntry create_toolbar_items[] = { { NULL, NULL, "Bar", NULL, "Bar tooltip", NULL }, }; -G_GNUC_END_IGNORE_DEPRECATIONS; static void create_toolbar (GtkWidget *widget) diff --git a/tests/testmerge.c b/tests/testmerge.c index 59d185611f..2a1fa5508b 100644 --- a/tests/testmerge.c +++ b/tests/testmerge.c @@ -89,13 +89,13 @@ delayed_toggle_dynamic (GtkUIManager *merge) dyn = g_object_new (GTK_TYPE_ACTION, "name", "dyn1", "label", "Dynamic action 1", - "stock_id", GTK_STOCK_COPY, + "stock_id", NULL, NULL); gtk_action_group_add_action (dynamic, dyn); dyn = g_object_new (GTK_TYPE_ACTION, "name", "dyn2", "label", "Dynamic action 2", - "stock_id", GTK_STOCK_EXECUTE, + "stock_id", NULL, NULL); gtk_action_group_add_action (dynamic, dyn); } @@ -172,19 +172,19 @@ static GtkActionEntry entries[] = { { "EmptyMenu2Action", NULL, "Empty 2" }, { "Test", NULL, "Test" }, - { "QuitAction", GTK_STOCK_QUIT, NULL, "q", "Quit", G_CALLBACK (gtk_main_quit) }, - { "NewAction", GTK_STOCK_NEW, NULL, "n", "Create something", G_CALLBACK (activate_action) }, - { "New2Action", GTK_STOCK_NEW, NULL, "m", "Create something else", G_CALLBACK (activate_action) }, - { "OpenAction", GTK_STOCK_OPEN, NULL, NULL, "Open it", G_CALLBACK (activate_action) }, - { "CutAction", GTK_STOCK_CUT, NULL, "x", "Knive", G_CALLBACK (activate_action) }, - { "CopyAction", GTK_STOCK_COPY, NULL, "c", "Copy", G_CALLBACK (activate_action) }, - { "PasteAction", GTK_STOCK_PASTE, NULL, "v", "Paste", G_CALLBACK (activate_action) }, + { "QuitAction", NULL, NULL, "q", "Quit", G_CALLBACK (gtk_main_quit) }, + { "NewAction", NULL, NULL, "n", "Create something", G_CALLBACK (activate_action) }, + { "New2Action", NULL, NULL, "m", "Create something else", G_CALLBACK (activate_action) }, + { "OpenAction", NULL, NULL, NULL, "Open it", G_CALLBACK (activate_action) }, + { "CutAction", NULL, NULL, "x", "Knive", G_CALLBACK (activate_action) }, + { "CopyAction", NULL, NULL, "c", "Copy", G_CALLBACK (activate_action) }, + { "PasteAction", NULL, NULL, "v", "Paste", G_CALLBACK (activate_action) }, { "AboutAction", NULL, "_About", NULL, "About", G_CALLBACK (activate_action) }, }; static guint n_entries = G_N_ELEMENTS (entries); static GtkToggleActionEntry toggle_entries[] = { - { "BoldAction", GTK_STOCK_BOLD, "_Bold", "b", "Make it bold", G_CALLBACK (toggle_action), + { "BoldAction", NULL, "_Bold", "b", "Make it bold", G_CALLBACK (toggle_action), TRUE }, }; static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);