AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

tooltip: Set icon from texture instead of pixbuf

Browse Source 
Another part of removing GdkPixbuf from APIs.
This commit is contained in:
Matthias Clasen 2017-11-29 22:17:59 -05:00
parent dfd194a5fa
commit 0063145ed8
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtktooltip.c
View File

@ -275,21 +275,21 @@ gtk_tooltip_set_text (GtkTooltip *tooltip,
/**
* gtk_tooltip_set_icon:
* @tooltip: a #GtkTooltip
* @pixbuf: (allow-none): a #GdkPixbuf, or %NULL
* @texture: (allow-none): a #GdkTexture, or %NULL
*
* Sets the icon of the tooltip (which is in front of the text) to be
* @pixbuf. If @pixbuf is %NULL, the image will be hidden.
* @texture. If @texure is %NULL, the image will be hidden.
*
* Since: 2.12
* Since: 3.94
*/
void
gtk_tooltip_set_icon (GtkTooltip *tooltip,
GdkPixbuf *pixbuf)
GdkTexture *texture)
{
g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf));
g_return_if_fail (texture == NULL || GDK_IS_TEXTURE (texture));
gtk_tooltip_window_set_image_icon (GTK_TOOLTIP_WINDOW (tooltip->window), pixbuf);
gtk_tooltip_window_set_image_icon (GTK_TOOLTIP_WINDOW (tooltip->window), texture);
}
/**

4
gtk/gtktooltip.h
View File

@ -41,9 +41,9 @@ void gtk_tooltip_set_markup (GtkTooltip *tooltip,
GDK_AVAILABLE_IN_ALL
void gtk_tooltip_set_text (GtkTooltip *tooltip,
const gchar *text);
GDK_AVAILABLE_IN_ALL
GDK_AVAILABLE_IN_3_94
void gtk_tooltip_set_icon (GtkTooltip *tooltip,
GdkPixbuf *pixbuf);
GdkTexture *texture);
GDK_AVAILABLE_IN_ALL
void gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip,
const gchar *icon_name);

6
gtk/gtktooltipwindow.c
View File

@ -121,12 +121,12 @@ gtk_tooltip_window_set_label_text (GtkTooltipWindow *window,
void
gtk_tooltip_window_set_image_icon (GtkTooltipWindow *window,
GdkPixbuf *pixbuf)
GdkTexture *texture)
{
if (pixbuf != NULL)
if (texture != NULL)
{
gtk_image_set_from_pixbuf (GTK_IMAGE (window->image), pixbuf);
gtk_image_set_from_texture (GTK_IMAGE (window->image), texture);
gtk_widget_show (window->image);
}
else

2
gtk/gtktooltipwindowprivate.h
View File

@ -42,7 +42,7 @@ void gtk_tooltip_window_set_label_markup (GtkTooltipWindo
void gtk_tooltip_window_set_label_text (GtkTooltipWindow *window,
const char *text);
void gtk_tooltip_window_set_image_icon (GtkTooltipWindow *window,
GdkPixbuf *pixbuf);
GdkTexture *texture);
void gtk_tooltip_window_set_image_icon_from_name (GtkTooltipWindow *window,
const char *icon_name);
void gtk_tooltip_window_set_image_icon_from_gicon (GtkTooltipWindow *window,