From d4645d0ec5d920380db1c3d2865561c9b2a3516e Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Mon, 7 Jun 2004 02:51:00 +0000
Subject: [PATCH] Bug #245430 --> More Thunderbird static build work. Hook up
 the biff icon from the system tray to work with the static Windows build.

---
 mail/app/splash.rc                            | 27 ++++++++++++++++---
 mailnews/base/src/Makefile.in                 |  5 ++++
 .../base/src/nsMessengerWinIntegration.cpp    |  9 +++++++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/mail/app/splash.rc b/mail/app/splash.rc
index 82ac1506c8c..d4335dc93bc 100644
--- a/mail/app/splash.rc
+++ b/mail/app/splash.rc
@@ -68,9 +68,30 @@ IDD_SPLASH DIALOGEX
 			0,0,0,0
 	END
 
-// Splash screen bitmap.
-//IDB_SPLASH BITMAP
-//	"splash.bmp"
+#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.
+
+// We need this cursor for versions of Windows that don't support IDC_HAND,
+// namely Win95 and NT4.
+#define IDC_SELECTANCHOR 4100
+IDC_SELECTANCHOR CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\select.cur"
+
+#define IDC_ZOOMIN       4114
+IDC_ZOOMIN       CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\zoom_in.cur"
+
+#define IDC_ZOOMOUT      4115
+IDC_ZOOMOUT      CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\zoom_out.cur"
+
+// For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds
+#define IDI_MAILBIFF 32520
+IDI_MAILBIFF  ICON  "..\\..\\mailnews\\build\\newmail.ico"
+
+#endif
 
 STRINGTABLE DISCARDABLE
 BEGIN
diff --git a/mailnews/base/src/Makefile.in b/mailnews/base/src/Makefile.in
index a6c094d1899..b425851a603 100644
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -130,6 +130,11 @@ ifeq ($(OS_ARCH),WINNT)
 REQUIRES	+= appcomps \
 		   profile \
 		   $(NULL)
+
+ifdef BUILD_STATIC_LIBS
+DEFINES	+= -DMOZ_STATIC_BUILD
+endif
+
 CPPSRCS		+= nsMessengerWinIntegration.cpp 
 endif
 
diff --git a/mailnews/base/src/nsMessengerWinIntegration.cpp b/mailnews/base/src/nsMessengerWinIntegration.cpp
index f9d06cbec37..897e6167c2f 100644
--- a/mailnews/base/src/nsMessengerWinIntegration.cpp
+++ b/mailnews/base/src/nsMessengerWinIntegration.cpp
@@ -78,7 +78,12 @@
 #define PROFILE_COMMANDLINE_ARG " -p "
 #define MAIL_COMMANDLINE_ARG " -mail"
 #define TIMER_INTERVAL_PREF "mail.windows_xp_integration.unread_count_interval"
+
+#ifdef MOZ_STATIC_BUILD
+#define IDI_MAILBIFF 32520
+#else
 #define IDI_MAILBIFF 101
+#endif
 
 #define NEW_MAIL_ALERT_ICON "chrome://messenger/skin/icons/new-mail-alert.png"
 #define SHOW_ALERT_PREF "mail.biff.show_alert"
@@ -344,7 +349,11 @@ NOTIFYICONDATAW nsMessengerWinIntegration::mWideBiffIconData = { sizeof(NOTIFYIC
                                                     0 };
 
 #ifdef MOZ_THUNDERBIRD
+#ifdef MOZ_STATIC_BUILD
+#define MAIL_DLL_NAME "thunderbird.exe"
+#else
 #define MAIL_DLL_NAME "mail.dll"
+#endif
 #else
 #define MAIL_DLL_NAME "msgbase.dll"
 #endif