diff options
| -rw-r--r-- | windows/gui.c | 4 | ||||
| -rw-r--r-- | windows/res/NetSurf.ico | bin | 0 -> 18614 bytes | |||
| -rw-r--r-- | windows/res/NetSurf16.ico | bin | 1406 -> 0 bytes | |||
| -rw-r--r-- | windows/res/NetSurf32.ico | bin | 4286 -> 0 bytes | |||
| -rw-r--r-- | windows/res/resource.rc | 11 | ||||
| -rw-r--r-- | windows/resourceid.h | 3 |
6 files changed, 8 insertions, 10 deletions
diff --git a/windows/gui.c b/windows/gui.c index 6abb64f42..e6c196d9b 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -1638,12 +1638,12 @@ static void create_local_windows_classes(void) { w.cbClsExtra = 0; w.cbWndExtra = 0; w.hInstance = hinstance; - w.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF32_ICON)); /* -> NetSurf */ + w.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF_ICON)); w.hCursor = NULL; w.hbrBackground = (HBRUSH)(COLOR_MENU + 1); w.lpszMenuName = NULL; w.lpszClassName = windowclassname_main; - w.hIconSm = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF16_ICON)); /* -> NetSurf */ + w.hIconSm = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF_ICON)); RegisterClassEx(&w); /* drawable area */ diff --git a/windows/res/NetSurf.ico b/windows/res/NetSurf.ico Binary files differnew file mode 100644 index 000000000..e0c3d01e6 --- /dev/null +++ b/windows/res/NetSurf.ico diff --git a/windows/res/NetSurf16.ico b/windows/res/NetSurf16.ico Binary files differdeleted file mode 100644 index 1cb432828..000000000 --- a/windows/res/NetSurf16.ico +++ /dev/null diff --git a/windows/res/NetSurf32.ico b/windows/res/NetSurf32.ico Binary files differdeleted file mode 100644 index 28198ccb6..000000000 --- a/windows/res/NetSurf32.ico +++ /dev/null diff --git a/windows/res/resource.rc b/windows/res/resource.rc index c79ebc090..5b620596d 100644 --- a/windows/res/resource.rc +++ b/windows/res/resource.rc @@ -5,8 +5,7 @@ #include "../resourceid.h"
-IDR_NETSURF32_ICON ICON DISCARDABLE "NetSurf32.ico"
-IDR_NETSURF16_ICON ICON DISCARDABLE "NetSurf16.ico"
+IDR_NETSURF_ICON ICON DISCARDABLE "NetSurf.ico"
IDR_TOOLBAR_BITMAP BITMAP DISCARDABLE "toolbar.bmp"
IDR_TOOLBAR_BITMAP_GREY BITMAP DISCARDABLE "toolbarg.bmp"
IDR_TOOLBAR_BITMAP_HOT BITMAP DISCARDABLE "toolbarh.bmp"
@@ -118,15 +117,15 @@ BEGIN END
END
-IDD_DLG_ABOUT DIALOGEX 10,10,309,180
+IDD_DLG_ABOUT DIALOGEX 10,10,206,180
CAPTION "About NetSurf"
FONT 8,"MS Sans Serif",0,0,0
STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU
EXSTYLE WS_EX_DLGMODALFRAME
BEGIN
- CONTROL IDR_NETSURF_BANNER,IDC_IMG1,"Static",SS_BITMAP,0,0,308,86
- CONTROL "",IDC_ABOUT_CONTENT,"Static",WS_CHILDWINDOW|WS_VISIBLE,10,93,288,63
- CONTROL "&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,246,160,54,15
+ CONTROL IDR_NETSURF_BANNER,IDC_IMG1,"Static",SS_BITMAP|0x40L /*SS_REALSIZECONTROL*/,0,0,205,53
+ CONTROL "",IDC_ABOUT_CONTENT,"Static",WS_CHILDWINDOW|WS_VISIBLE,10,60,185,63
+ CONTROL "&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,143,160,54,15
CONTROL "&Credits",IDC_BTN_CREDITS,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,10,160,54,15
CONTROL "&Licence",IDC_BTN_LICENCE,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,70,160,54,15
END
diff --git a/windows/resourceid.h b/windows/resourceid.h index 84076a653..57b2b938d 100644 --- a/windows/resourceid.h +++ b/windows/resourceid.h @@ -23,8 +23,7 @@ #define IDC_STATIC (-1) #endif -#define IDR_NETSURF32_ICON 100 -#define IDR_NETSURF16_ICON 101 +#define IDR_NETSURF_ICON 100 #define IDR_TOOLBAR_BITMAP 102 #define IDR_TOOLBAR_BITMAP_GREY 103 #define IDR_TOOLBAR_BITMAP_HOT 104 |