diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-07-24 21:34:52 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-07-24 21:34:52 +0000 |
| commit | 43225ffd5e48f21fbc4b6f20ee901dde9ea0511f (patch) | |
| tree | a47d29c20fd3936b43d576f3f710e7c56d9c9173 | |
| parent | dfb996beb44128a845a1494266ba82c82e4cb9d3 (diff) | |
Use gtk_window_set_icon_list isof gdk_pixmap_create_from_xpm_d.
svn path=/trunk/; revision=38193
| -rw-r--r-- | gtk/gui_utils.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c index 9156962713..9d2f1d619e 100644 --- a/gtk/gui_utils.c +++ b/gtk/gui_utils.c @@ -52,6 +52,9 @@ #include "gtk/old-gtk-compat.h" #include "image/wsicon16.xpm" +#include "image/wsicon32.xpm" +#include "image/wsicon48.xpm" +#include "image/wsicon64.xpm" #include "../version_info.h" @@ -114,19 +117,20 @@ static void window_icon_realize_cb (GtkWidget *win, gpointer data _U_) { #ifndef _WIN32 - static GdkPixmap *icon_pmap = NULL; - static GdkBitmap *icon_mask = NULL; - GtkStyle *style; + GList *ws_icon_list=NULL; + GdkPixbuf *icon; - style = gtk_widget_get_style (win); - if (icon_pmap == NULL) { - icon_pmap = gdk_pixmap_create_from_xpm_d (gtk_widget_get_window(win), - &icon_mask, &style->bg[GTK_STATE_NORMAL], - (gchar **) wsicon16_xpm); - } + icon = gdk_pixbuf_new_from_xpm_data ((const char **) wsicon16_xpm); + ws_icon_list = g_list_append (ws_icon_list, icon); + icon = gdk_pixbuf_new_from_xpm_data ((const char **) wsicon32_xpm); + ws_icon_list = g_list_append (ws_icon_list, icon); + icon = gdk_pixbuf_new_from_xpm_data ((const char **) wsicon48_xpm); + ws_icon_list = g_list_append (ws_icon_list, icon); + icon = gdk_pixbuf_new_from_xpm_data ((const char **) wsicon64_xpm); + ws_icon_list = g_list_append (ws_icon_list, icon); + gtk_window_set_icon_list(GTK_WINDOW(win), ws_icon_list); - gdk_window_set_icon (gtk_widget_get_window(win), NULL, icon_pmap, icon_mask); #endif } |