GNOME.org
 

[gtk+/wip/baedert/box] Remove GtkStock

commit b571790027faac51fad6dc0e6ae03bf298a91f65
Author: Timm Bäder <mail baedert org>
Date:   Sun Oct 16 13:12:16 2016 +0200

    Remove GtkStock

 docs/reference/gtk/gtk3-sections.txt |  219 -------
 gtk/deprecated/Makefile.inc          |    2 -
 gtk/deprecated/gtkaction.c           |    9 -
 gtk/deprecated/gtkactiongroup.c      |    7 -
 gtk/deprecated/gtkstock.c            |  575 -----------------
 gtk/deprecated/gtkstock.h            | 1136 ----------------------------------
 gtk/gtk.h                            |    1 -
 7 files changed, 0 insertions(+), 1949 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index fdb5077..63c764a 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-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,41 +1742,12 @@ GtkImagePrivate
 gtk_image_get_type
 GtkImageIconSetData
 GtkImagePixbufData
-GtkImageStockData
 GtkImageAnimationData
 GtkImageIconNameData
 GtkImageGIconData
 </SECTION>
 
 <SECTION>
-<FILE>gtkimagemenuitem</FILE>
-<TITLE>GtkImageMenuItem</TITLE>
-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
-<SUBSECTION Standard>
-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
-<SUBSECTION Private>
-GtkImageMenuItemPrivate
-gtk_image_menu_item_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkimcontext</FILE>
 <TITLE>GtkIMContext</TITLE>
 GtkIMContext
@@ -3145,57 +3108,6 @@ gtk_statusbar_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkstatusicon</FILE>
-<TITLE>GtkStatusIcon</TITLE>
-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
-
-<SUBSECTION Standard>
-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
-<SUBSECTION Private>
-GtkStatusIconPrivate
-gtk_status_icon_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtklevelbar</FILE>
 <TITLE>GtkLevelBar</TITLE>
 GTK_LEVEL_BAR_OFFSET_LOW
@@ -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
 <TITLE>GtkRadioToolButton</TITLE>
 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
@@ -6012,127 +5914,6 @@ GtkSortType
 </SECTION>
 
 <SECTION>
-<FILE>gtkstock</FILE>
-<TITLE>Stock Items</TITLE>
-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
-<SUBSECTION Stock IDs>
-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
-<SUBSECTION Private>
-GtkStock
-</SECTION>
-
-<SECTION>
 <FILE>gtkicontheme</FILE>
 <TITLE>GtkIconTheme</TITLE>
 GtkIconInfo
diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc
index fdc44f0..c61a564 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 810c448..c7df6d4 100644
--- a/gtk/deprecated/gtkaction.c
+++ b/gtk/deprecated/gtkaction.c
@@ -1426,13 +1426,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 +1697,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 d163db2..1e6bf8e 100644
--- a/gtk/deprecated/gtkactiongroup.c
+++ b/gtk/deprecated/gtkactiongroup.c
@@ -1003,18 +1003,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);
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 5d58d62..ac265ce 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -250,7 +250,6 @@
 #include <gtk/deprecated/gtkgradient.h>
 #include <gtk/deprecated/gtkradioaction.h>
 #include <gtk/deprecated/gtkrecentaction.h>
-#include <gtk/deprecated/gtkstock.h>
 #include <gtk/deprecated/gtksymboliccolor.h>
 #include <gtk/deprecated/gtktoggleaction.h>
 #include <gtk/deprecated/gtkuimanager.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]