[PATCH] Win32 Icons and Request for Assistance

Attached find "abiword_app.ico", the replacement for abiword_app_16.ico
and abiword_app_32.ico. It has the Swoosh A art as will now be used in
the "Stable" serie (2.2.x, 2.(2n).x). I also have attached a diff -u of
the Icons rc2 file for the Windows port. However, with this patch, the
Windows build does not build - there is code in ap_Win32App.cpp that
refers to the old separate icons (search for _16 and _32 to find the
locations.). This icon contains all sizes and color depths (48, 32, and
16 pixels square, each at 4, 8, and 32 (24+8alpha) bit color) arranged
how Windows likes them, so as far as I can tell, we only need a single
app icon now. However, I am not experienced enough with Win32 API
programming to be able to fix ap_Win32App.cpp myself. FJF, Mikey, KJD,
anyone?

Thank you!

-- 
Ryan Pavlik
Open-Source Software Contributor
--
Visual Design and Branding | Packaging | Win32 QA and Porting
--
AbiWord | Divifund | GNOME-Office
--
"Your teacher can open the door, but you must enter by yourself." --Chinese Proverb

Index: ap_Win32Res_Icons.rc2
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/win/ap_Win32Res_Icons.rc2,v
retrieving revision 1.6
diff -u -r1.6 ap_Win32Res_Icons.rc2
--- ap_Win32Res_Icons.rc2 6 Jun 2004 02:22:28 -0000 1.6
+++ ap_Win32Res_Icons.rc2 21 Oct 2004 03:46:28 -0000
@@ -27,9 +27,8 @@
 //
 //////////////////////////////////////////////////////////////////
 
-#define AP_RID_ICON_APPLICATION_32 10000
-#define AP_RID_ICON_APPLICATION_16 10001
-#define AP_RID_ICON_DOCUMENT 10002
+#define AP_RID_ICON_APPLICATION 10000
+#define AP_RID_ICON_DOCUMENT 10001
 
 
 #ifdef RC_INVOKED
@@ -56,8 +55,7 @@
 
 
                         
-AP_RID_ICON_APPLICATION_32 ICON DISCARDABLE "abiword_app_32.ico"
-AP_RID_ICON_APPLICATION_16 ICON DISCARDABLE "abiword_app_16.ico"
+AP_RID_ICON_APPLICATION ICON DISCARDABLE "abiword_app.ico"
 AP_RID_ICON_DOCUMENT ICON DISCARDABLE "abiword_doc.ico"