From e6b0d1938990e1b538437876fe9a4948e0f0ce03 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Thu, 28 May 2009 17:05:24 +0200
Subject: [PATCH] bug 389448 - Icons not included in static SeaMonkey build,
 r=Standard8

---
 suite/app/Makefile.in |  1 +
 suite/app/splash.rc   | 44 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
index e6fa46a3d7..97475a5a83 100644
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -48,6 +48,7 @@ GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py
 GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 
 DEFINES += \
+	-DSEAMONKEY_ICO=\"../branding/icons/windows/seamonkey.ico\" \
 	-DAB_CD=$(AB_CD) \
 	-DAPP_VERSION="$(MOZ_APP_VERSION)" \
 	-DGRE_MILESTONE=$(GRE_MILESTONE) \
diff --git a/suite/app/splash.rc b/suite/app/splash.rc
index 2a6db81a15..15a85ce1af 100644
--- a/suite/app/splash.rc
+++ b/suite/app/splash.rc
@@ -41,10 +41,50 @@
 1 24 "seamonkey.exe.manifest"
 
 // Program icon.
-IDI_APPLICATION ICON
-	"..\branding\icons\windows\seamonkey.ico"
+IDI_APPLICATION ICON SEAMONKEY_ICO
 
 STRINGTABLE DISCARDABLE
 BEGIN
 	IDS_STARTMENU_APPNAME,              "@MOZ_APP_DISPLAYNAME@"
 END
+
+#ifdef MOZ_STATIC_BUILD
+
+// XXX This code is copied from resource.h and widget.rc.  It's a work-around
+// for the limitation that only one resource file can be used in an .exe.  We
+// should develop a method, for static builds only, to combine multiple .rc
+// files into a single .rc file, and then use that to build the single .res
+// file for the .exe.
+
+#define IDC_GRAB                        4101
+#define IDC_GRABBING                    4102
+#define IDC_CELL                        4103
+#define IDC_COPY                        4104
+#define IDC_ALIAS                       4105
+#define IDC_ZOOMIN                      4106
+#define IDC_ZOOMOUT                     4107
+#define IDC_COLRESIZE                   4108
+#define IDC_ROWRESIZE                   4109
+#define IDC_VERTICALTEXT                4110
+#define IDC_NONE                        4112
+
+IDC_GRAB                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/grab.cur"
+IDC_GRABBING            CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/grabbing.cur"
+IDC_CELL                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/cell.cur"
+IDC_COPY                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/copy.cur"
+IDC_ALIAS               CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/aliasb.cur"
+IDC_ZOOMIN              CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/zoom_in.cur"
+IDC_ZOOMOUT             CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/zoom_out.cur"
+IDC_COLRESIZE           CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/col_resize.cur"
+IDC_ROWRESIZE           CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/row_resize.cur"
+IDC_VERTICALTEXT        CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/vertical_text.cur"
+IDC_NONE                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/none.cur"
+
+// For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds
+#define IDI_MAILBIFF 101
+IDI_MAILBIFF  ICON  "../../mailnews/build/newmail.ico"
+
+#define IDI_APPICON 100
+IDI_APPICON  ICON  SEAMONKEY_ICO
+
+#endif