diff options
| author | William Jon McCann <william.jon.mccann@gmail.com> | 2013-06-27 17:51:38 -0400 |
|---|---|---|
| committer | William Jon McCann <william.jon.mccann@gmail.com> | 2013-06-27 17:51:38 -0400 |
| commit | d741b7b87352db52eee4493cea8d45c9f9ee7342 (patch) | |
| tree | b4723f31c1a3a622d042345d53a0ee207d05caec /gtk/gtktoolbutton.c | |
| parent | a02f2c42917a6bae8ef836a26f1afc54879fc96b (diff) | |
| download | gtk+-d741b7b87352db52eee4493cea8d45c9f9ee7342.tar.gz | |
Deprecate the gtk stock functions
Diffstat (limited to 'gtk/gtktoolbutton.c')
| -rw-r--r-- | gtk/gtktoolbutton.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 126c8e6390..7999ef82f3 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -447,6 +447,8 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) gboolean elide; gchar *label_text; + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + if (button->priv->label_text) { label_text = button->priv->label_text; @@ -463,6 +465,8 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) elide = FALSE; } + G_GNUC_END_IGNORE_DEPRECATIONS; + if (elide) label_text = _gtk_toolbar_elide_underscores (label_text); else @@ -837,7 +841,9 @@ gtk_tool_button_create_menu_proxy (GtkToolItem *item) if (_gtk_tool_item_create_menu_proxy (item)) return TRUE; - + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + if (GTK_IS_LABEL (button->priv->label_widget)) { label = gtk_label_get_label (GTK_LABEL (button->priv->label_widget)); @@ -856,7 +862,9 @@ gtk_tool_button_create_menu_proxy (GtkToolItem *item) { label = ""; } - + + G_GNUC_END_IGNORE_DEPRECATIONS; + if (use_mnemonic) menu_item = gtk_image_menu_item_new_with_mnemonic (label); else |