From f04cc9e9ec0be48d8d3712fc91094c401e3cc471 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 9 Feb 2011 01:32:53 +0000 Subject: use the netsurf icons on the window decoration svn path=/trunk/netsurf/; revision=11635 --- windows/gui.c | 4 ++-- windows/res/resource.rc | 3 ++- windows/resourceid.h | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/windows/gui.c b/windows/gui.c index 35ab01b72..ba4dad571 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -1646,12 +1646,12 @@ static void create_local_windows_classes(void) { w.cbClsExtra = 0; w.cbWndExtra = 0; w.hInstance = hinstance; - w.hIcon = LoadIcon(NULL, IDI_APPLICATION); /* -> NetSurf */ + w.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(NSWS_ID_NETSURF32_ICON)); /* -> NetSurf */ w.hCursor = NULL; w.hbrBackground = (HBRUSH)(COLOR_MENU + 1); w.lpszMenuName = NULL; w.lpszClassName = windowclassname_main; - w.hIconSm = LoadIcon(NULL, IDI_APPLICATION); /* -> NetSurf */ + w.hIconSm = LoadIcon(hinstance, MAKEINTRESOURCE(NSWS_ID_NETSURF16_ICON)); /* -> NetSurf */ RegisterClassEx(&w); /* drawable area */ diff --git a/windows/res/resource.rc b/windows/res/resource.rc index be02d8eaa..b32f49c7f 100644 --- a/windows/res/resource.rc +++ b/windows/res/resource.rc @@ -221,4 +221,5 @@ FONT 8, "MS Sans Serif" // // Icon resources // -ID ICON "NetSurf32.ico" +NSWS_ID_NETSURF32_ICON ICON "NetSurf32.ico" +NSWS_ID_NETSURF16_ICON ICON "NetSurf16.ico" diff --git a/windows/resourceid.h b/windows/resourceid.h index f4a089495..b846e3cf9 100644 --- a/windows/resourceid.h +++ b/windows/resourceid.h @@ -23,6 +23,9 @@ #define IDC_STATIC (-1) #endif +#define NSWS_ID_NETSURF32_ICON 10 +#define NSWS_ID_NETSURF16_ICON 11 + #define NSWS_ID_MAINMENU 101 #define NSWS_ID_CTXMENU 103 #define NSWS_ID_TOOLBAR_BITMAP 107 -- cgit v1.2.3