kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- main.c: Do not use gkrellm xpm-icon on win32, gkrellm on windows as an icon of its own that is set via win32-resource.rc

This commit is contained in:
Stefan Gehn 2008-09-30 16:57:07 +00:00
parent 2119506e02
commit 8cddbba126
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.c
View File

@ -24,7 +24,8 @@
#include "gkrellm-sysdeps.h" #include "gkrellm-sysdeps.h"
#include "log-private.h" #include "log-private.h"
#if GTK_CHECK_VERSION(2,4,0) // GTK+-win32 automatically uses the application-icon
#if GTK_CHECK_VERSION(2,4,0) && !defined(WIN32)
#include "icon.xpm" #include "icon.xpm"
#endif #endif
@ -1482,14 +1483,14 @@ static void
create_widget_tree() create_widget_tree()
{ {
gchar *title; gchar *title;
#if GTK_CHECK_VERSION(2,4,0) #if GTK_CHECK_VERSION(2,4,0) && !defined(WIN32)
GdkPixbuf *icon; GdkPixbuf *icon;
#endif #endif
gtree.window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtree.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name(gtree.window, PACKAGE); gtk_widget_set_name(gtree.window, PACKAGE);
#if GTK_CHECK_VERSION(2,4,0) #if GTK_CHECK_VERSION(2,4,0) && !defined(WIN32)
icon = gdk_pixbuf_new_from_xpm_data((const gchar **) icon_xpm); icon = gdk_pixbuf_new_from_xpm_data((const gchar **) icon_xpm);
gtk_window_set_default_icon(icon); gtk_window_set_default_icon(icon);
#endif #endif