From 9628bee08ea31a2ecb77ed2d3a0f9b9a307be533 Mon Sep 17 00:00:00 2001
From: foudfou <foudil.newbie+git@gmail.com>
Date: Sun, 14 Sep 2014 15:25:50 +0200
Subject: [PATCH] * Make menu icons "transparent" during initialization. *
 Replace winnt menu icons with smaller ones.

---
 .../skin/icons/winnt/application-exit.bmp     | Bin 2358 -> 1644 bytes
 src/chrome/skin/icons/winnt/document-new.bmp  | Bin 2358 -> 1644 bytes
 src/chrome/skin/icons/winnt/gtk-apply.bmp     | Bin 1654 -> 1644 bytes
 src/chrome/skin/icons/winnt/gtk-edit.bmp      | Bin 2358 -> 1516 bytes
 .../skin/icons/winnt/gtk-preferences.bmp      | Bin 2358 -> 1644 bytes
 src/modules/ctypes/winnt/gdi32.jsm            |   4 ++
 src/modules/ctypes/winnt/user32.jsm           |   3 +
 src/modules/winnt/FiretrayStatusIcon.jsm      |  52 +++++++++++++++---
 8 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/chrome/skin/icons/winnt/application-exit.bmp b/src/chrome/skin/icons/winnt/application-exit.bmp
index 99e6f29b52d809955c439461d0a6ee4ce11b6d43..b4c7d6fa02a3639e3d41e4218bcac3130bb4bf83 100644
GIT binary patch
literal 1644
zcmZ?rHDhLA2+7aQG-F_3&;ViqC}w1k0J4ApD31>QBY{7E{`|rLfKo^bLCh~-zHHsP
zdG_2{Skb0U8$W#bfUM=yr%!z|C*&?}HEs;muM0A$M<D%%;KcR<H1$BemDSsxJ%4-d
z+NJWDZC0g0hQ&UH#l9d^;+sFE4%u)BJ1*|DtIO$2S03MeaR1=3!<7@7%`&`oGTd~s
z+zO`DL)2{F_9Q*+T3RXySy`Rs<h*5MbY|n0^G8pg*mG!qX-BPktgU*SUH-%xi27MG
zZ;FcEVPd+)$OuF?85nM|vfffvz0fyt|F*rmO519b0?m|y&GY)I;OZ3>-^<9n)6jUY
ztNQ_nR8`-rs=oE}JFso<?&9VuSvNgdcm3S%N{ITIGj4i${qgqx3r7EJZU1?A{LINc
zd+_-2@|vo`x^f9CH3=K_oX&EH`rEfYu37zX-C7U|3%zV_|E;$6^7UIckDfj`aoUuE
z>QZ5Sc@YDJthO?UdSo&&@oaD3^_Op6U%!3p=&2Jx_vcrX@F|P)t4d@wmmsTzu%}Mn
z@b1I=7q4Hz)#sHKa!T-XNeW~%7GbJixn||t_aOB*Zr?h5;@Fx^>(jC_Sh(3)c{$SS
z3b3kw_wnQXhYwe-UftT!UQt`^<l@Z02u!DpsnvOy>gUd#)zDOzoRSn98x;{577`ll
i<KyY<WbfkQ(B9dKsh$`Sr_o$9nrlXL4KY~-Neuu$k0JE{

literal 2358
zcmc(gSx8h-7{~80E*Q8%)>}S=xnU7Hn3<Znl)0c}*`h%<+9WkC;*^@wTt^)pNyc((
ztlTI9bHt>AO3~^iO^q?z)XFqNq@;%yb^hIR^A0oaCeeZ4<-FYA`QPuH^IgACff>aP
z0rPZVSUm-gvSVg{Mvpl~5x4<>`d<j#T(KM$%IzW8fQay5MD2}4L`FQ^Wig9}<XVjX
z{l@_mmlk1Xus?Q$1;Rxb1b%|sypSA=^$!dUqP?pV_nRMr&Y}?%=!<RJec>7x2rIGo
ztoSN~bNVStx`JUN`8HA?&i|mL8MU|Tp{lNcI7y7HeqQkQ_kzcfFswTlVL)VY(tLg^
zilV<VYq-tkFR!UYevuNXSyCK`i-nJmCp-c-!6)yq4q+udub;=GCyk79#$25IX5{Dm
zY1uSRq)8x7O=exYOC{hqQ>)bZnVd{s1J>~QSw8{-+F@!+qqeS{tv^?v>3*^X*~??s
zb9Ln2tI+p@`1CP0&ife?(+{$SrKJL;s{2^TFKbkRqx_NDz`t)_AEpx>-3L$4m&_U+
zu&_`-o?plA?_Bv+t##l~cQnoL^ZD(ds5S$5ytb(|I$>^}hm?#e%;j(BY5_;f>t_c3
zxVU$)x7WbYQ3EF@4V<03;ozWwo!xWT+IC{suD4jf{w{26<S4mTf%v2G*s?`{-3Rut
zdra#8w7*+N_h7GqUncv6@bI??4K*Yr<PDOO2au4^1#9a(T)KRd&F}5)!M?xQ%U$RH
zFggs5;jvKze@V$ORI1O@7=c_q42h&0D_7>D^7<WJ{b$SnYhoN6<C7D5e)^k{QPy{T
zOigpf)#@+E%zTAat1dv@@OZ)Vqt$Am&s_b7+y!!03krI*W@b{fKIvK1`PX-o`FwsJ
zPpUOB$r;(;>b2ng<?h!~{7nBDV!mT7=|7sD7iem2fx58)6*p>7SXPWoMGlhEQy^mc
z9D!tAf}i=zO6|G++03|a)vIx>x(bCQMUW}vkYuDmbV`haA|cCC{QCbKlE1d@7F1WS
zpx~ksneuE%(o>PhxMLFzBPw=3%X0jsWo0N(Dv_NlM+SW!lGL*}e)=SYi6R^n9%A`h
OKY4FC=-1+3&3^;$Y^Oy4

diff --git a/src/chrome/skin/icons/winnt/document-new.bmp b/src/chrome/skin/icons/winnt/document-new.bmp
index e7cf0af1d2f69dd517c8fb8a1aeaca8e804a3bf8..b91bef3499a3321f233688a6da7a333ad21ddcfc 100644
GIT binary patch
literal 1644
zcmeHGy-LGS7>)P>jy{4<&<E)5rca=YgLD(z1rb~YL0t-NLZ@!7rh`-IkF`pF^4r|@
zCT)|O<Vq7g<eCs7g6=(#@Fh9teCOugue@8@l%&1N@li>Vq#aya-`9q;jS9f`B0dwu
zalBfsIOmM9#bV(kK!HcR#3v90Q`}`)ZnxW=PN&=Lz9i`NdapS&8jU=^)oM*96GF&r
zHiI{uUDt(qkN^cd@_d*JKBY9{`@SD0KvCc$$-n%;H%(LIv2A-kpD&k7&-0K3K!J7T
z^9a6WS<~q>iv$T)0igKFHw+_-BqZp9g###HSn$_%9g)yNq=E#&#73Yf@X=1wG_=Sh
z2!?<AMrqA<?ri72-w$(J2EMAQnFPVm=$(*D+qw3GLyuih`oKS;R095ZJQflJ6OA4T
z*{2SPA|$VIUhxAnsqu*I7>!1dD2jqEkN|bdsxl_djTgt~L8zpB_zwny;czG<Xaqd#
z#))B`y3B~80~TC`94hgbn$2eZfT0F(@@}5wGgZG0c{Su(YAz(d-Qj6R5l@}V>#6zk
NREjBBPtAI2z5qI2jhp}g

literal 2358
zcmbW3%Wl&^6o%6%AV6Zzk|hha^a0rOAZ(D}0T3WSZAhCUSfCQhMHRdOh-Fo(0HG|?
zC<|x+RW$K6aqQT!efZDV<2oTx5|4Be+tPgg^v{_|u3lR{n-gOhpO;V<;#$gG#8os7
z&gXJmau5+;=253mXHZNzm$7&*GnkcUcFZr_xOMYNaeZy?L2)HSQN{|H!7T6#F?$Ku
zr;FvaYHj};g<*)t*+viq^riNd@Qx}oQOp*6_RY%Xc|jP6`99vkEXju{E^`HbmSqSw
zn7;4R&>sp!%oq8@{QRQ)$T=kT9Wr}3B+v8G{A7Lk9gFbCoxPz)F4zOtP58`A*S!1@
zcI@nWF4zNd22N&v!VRLFJ+P&-GZ>H!cHglx@e{VpS>$ozY&&4vHd%ImA%4OY&OVJe
zBM<4!++N?JuGO2HpRgx7gU!y!Bh5B@-I;vB#a@wpmv)wGXoK5_v(-QGX138aXYzTE
z%e|8ByYw24I~zTdbg(tkn8_FH34Iqi|DOjt>)>jpPO72J<frqP>TDqk<RP6^LnlSo
zsH3Yh`RToq?mO8ZGH1OTIUoLR(a&Ek`q4TR-==Ab^9?VWxPP4~eP^Qgq_fBa&hI~d
zpyyi^+IaeeR!YU>Hv?z=@ihLlz7sje&N7dkPrJnZz=OT(^*TMPY&xs!rR&r9QQuj~
zeo6A+HH0&-p@N({nnJbj`{K;EEK9IAw<<Q+x5wFhFVDA;oJHSp&IY*g8fq%F!9G?y
zRBs$mAA6wDXwZw-FWLLfBzDXXqkea(+e6l4eJ7pUD%eVg{wi(yb96+_W|LlRzhUpY
z)7bpHv{ByO`&<=gBJSrJ9Yvw-cW>GI9wv<R%lJL=xm<c&-of|W{~sPcS|zaWkF(PE
F{{REwZ?OOX

diff --git a/src/chrome/skin/icons/winnt/gtk-apply.bmp b/src/chrome/skin/icons/winnt/gtk-apply.bmp
index 7b5681a511107822faf999a647f6eb7fa044c195..125a98dc29672d1ad5ad075cb8bb5d986ec020c5 100644
GIT binary patch
literal 1644
zcmZ?rHDhLA2+7aQG-F_3&;ViqC}w1k0J4ApD31>QBY{7E{`>-iA7B7s0|k+kK$$?P
zFJHdAdGqGkvu6(;Jh%e}Kn9Qt6a-2E6(H+ERzG#m%8(^Z2hJVGqaLF7=dWK~`<DBy
z>9$$cRKIHh9`^v%zy12LblXhtbv?#Q>VPO{ZTGpyH<8_d%)a^RVfv;i?(2IjRy13#
zYypz?tJ^Df&P7&(%#K^v<Gi8UW^H@m*2ytzx`MY&0kR{uPT76)G_o={d%>9<;X9^9
z@0i|kVEOxRpHntZcHG$Gys0;T`^?|i!t?LnzY~wHU48KY#Dvus_s8v><GOW1?A|$R
zE<pw1hGQ~-+6#8f^4&enYuA*_9W%cE{En#xO=QolGbslb`0ksLcx3VXGuzQ*v2ttn
zEs8v{FzC?SjNP+eeSU{k4YJ_5CpR+>FA6)hF#GJ9dBj=Kd3aU9$(7BAmfwBz1lcHD
dY+$6He0UX?EHUCvqq$}@*No;GVzLU78UV=VQaAtr

literal 1654
zcmbVLYe*AN6yDsXt(sU!q5UWW%OWcK5f(vFIxTzzT8M-{iV6x1dl*8IE3@3(Y`rzo
zG%a!S0hy6n5fdy?vv>JOtCh8>D{V6&_jQhKF)B;D@a^86^PTU0=iF^|M6$bJWG$u7
z0D`vzLcuIL{aDXs0s+Ih00^9*n2_K`5EEE!0%0OyvICQ7ml8Y(5`u`p{GS@E<%n@T
zbGg=&FonRDrW1S!zK)&0bDZ<cV?Nih2ce4|-{<th9e9b7m&Zvm<vo&&kXoUyYzD=q
z5m;*~=LyVX|6IrQBYH0VQb^$D7BNREQOeKx=EPbRUF8TYO&k;-3qDLa_QAE>FZaWq
ze(Tq%$Ga#a*iWJkeY)nx0b9lA7925GLD$;|nKr^oxtXrqf1QaREzMfjzwcSmu)e<;
z;cw1jUb_Mc({=26m^UoZgw_5_gY%^0L7p!9<;D->nd)%fVnB@X0)o4=2<lWKup=F%
zpB`XN{$}<V{x?m^&!&4@BX1uayw?8+spMr#cOed$E0Oo<9@0!zSk<XPyzvrF8*4!K
zny5xPnx=c!TEnKMQ}(j{79@QvMdAk?@+|c@|Nah^mG8FYel#HYLm2|w(~;e4KxA#&
zSFt)&HM(Bd&Dc8iP{}|u6g^d_9C(cFP1)Z()N4PJkDNutJFMmOF43>EvGSD~`o2a?
zIkleqp8F?FihEKIZ7Gkh3}5c4M_|cLEA?-nxDP={xt8Q-MRt|B20`r^*xy}-y-y46
z5>4p+Kk0Fd>U`ZbVJ%{n+(t-Z9VeI03%yQ8+4PnsY&8~QQR@+uSQ@dQXuDOU432a1
z#<P>hGm*E_z8272LprqB(3LYXUyAq9eV*gdVlLIl#F_G5t+5&@-SmHXnFg)-7Gmxy
zhv;o`#;fPh+~}Xb`AY@;4r4mAv7${09leeBnP`5S#s8y8{naHr%pF#ls<FB~3wz$_
zkn*C~F4lxTA<dsNAFDRi_)k6&ZY%C-K>X`mtZGx^YF`7E=n||VRmirn>bUY~j_L9n
z2M6=}>XGoa7<x-Hq729FG{*v0-dNA%ae`Pa?>^XCg4DKB1Qcwsl2$9l=Z{t6S02@_
NAdU9~o?C=#{yRHBjA8%)

diff --git a/src/chrome/skin/icons/winnt/gtk-edit.bmp b/src/chrome/skin/icons/winnt/gtk-edit.bmp
index 38b0a878fe85c0db884dbe5e421c885165e87a65..b9b1367115572092d3a399575b8421e1f0fb8063 100644
GIT binary patch
literal 1516
zcmeH_ze>YU6o-!vPAVOJg!%%`(#gf`PA+bOg1G2g_yQ?K>jO9xYz?i&5>e`4h71MC
zk}0;aNE&NX+rssC&n2Z=@&xwd+{@*h@BT|}Zg;RuBu<VGw}>c<wvLuTTcQp0L=Dvc
zQYw`$i$xuBhG|j{pb3FttJQjDpswxgWzMfw&R#LrN%Rn)vFp07&7ckuK}AUyY7?D@
zkhmV>I1Y+O_cjeAeJYm<O4rrI^?lzo&1(k5LNunHqz~m%Ug;1L_np!6(JQ?-rmm!p
zBtvc<SjZ%97={g|%2X;9rH5nkrC}JW*%*Ng-|Z^_lR%e2vF5#P?|X<DcQ_nAF^|jx
zgCX?Oe4uq+_pV+a{pOp|IVe+vn0K{>32_|v`~4`2&{u1<bQdDd-fp+?!Ga*THO+Jv
zYeAeI;HF$ocd<2A)UIV&_}S?$*2UIvAvT*$d@CXF*l@l1z-4eoZ2e-}5GRv~5V^&x
LU%dL!e|z;mtKw?q

literal 2358
zcmbW3ZEO@(6oz-(QYlFj8xuo}Miik{l+cL%tFg5pk@Cl=3DPG1A`(f9i9|6`S_^I6
zw)(>ujav$A+r*&4))KNnYYSL$fkY*A)3jO(UCMrc&3?|z>p6FKmg%NR*S*P^xpy-6
zdC$D}oXx(xv!=`-Mh#u7DAs1eXjn(H^q49)7&x>6fTu+it0-1eFl9}F!F!p(tRiM-
z_$B)fw7k&O(|x7At3#zgfuS;kS;Q~Nu#Ge??dt8Gv|qmlRaNP6VM9?AT($oW(wJl>
z1+xX8^DUIk`xI3X`(@H#md2+{X=*6pXN3&GCZ;UQNXaRI$nb?f8Gh0K<)?F2!TF|`
zok}5@OzQdB^JR@(zRhL>$F@CtvAg+W{Ae8!YxX!d=VU601hM0ZM3&D?edO}Ri*#xI
zsvk95H)CV{n`r#nhHJBnU=86%Cg(&lLF_nU@tD|_VdcdSMkG|$zlB|=T-exo6%Xz0
zL*0>|5R_usoMZ7gqQsVB(Y*PZKYZW*$#J}X;wG9dD5yQ1!sCa|VN;74XGYEm&!RD6
zN27>DrM&t4qUQ5u#~svl4CB2C1+V@r;}xrnCqErU^+$ua>k9~OSc)JN3Fpn%*qYDJ
z9~wfNZ5B-zNn=<>J!!0O9ml2*ESPtB1v?lHt;kQ;og%(l@6q?xv#4tBL;Lx^g-_c_
zgLT%oO<==;<Ct;YLm(7fk)N#%>J@$6@fps!e0c7l1s$VvXuKdpXpmnUj!t6T{$sc`
z?_80u`N6%Sue&JK2A|=~UANHa8k@%+(%44d@Y;w>wPnYn`^=bg2gUCL2`yWnNvdh?
z6}>mP^P$rtsBAd~)A((?eLj5_4QFLknQq{bcfZ5?ZJqob%kr1ze829r`rtEUpKt!V
zfX(Dp_rwBrXEb(^#?#$@ptRBq<1^px&}(S@8>2qddWGvb%ca^25Zg~|e=q=Fz>oeP
ztf-_j?;(wMMiuO%`hBXwj#aBq!SH}ZHE#JPtD*5luaMWdo-DUMGi=4|q90p69K_LI
z7VyU58SL2kE2^ufP*!#k#`2T0_6-_eqMRetE7`m=erP#+13q~CUbuZ8*l%1HJ^0r@
zPL$W0QCl~L=4Lk<8gAp^wPP?=oSe?(FX4vCix7E1et5|bkKadJFI>dF=XK+jV+xWa
z!QpV=V0&Mpc+G&?*ffh5U-}b8r2~qgqW=jUUrpD00--Q@t@#}E6Z?M7E-$e?ZY+9S
zxZ`wUdU_iDmJ`v=9@Aku)B55E2U5iq13}|s=B*l=@1`$$FJ1X<Qq(4`^BQiC2bQ71
k7_nPv!;*T;U6cRMn!fBEr+eQ2AC7$931WYi%hIp^19;!+7ytkO

diff --git a/src/chrome/skin/icons/winnt/gtk-preferences.bmp b/src/chrome/skin/icons/winnt/gtk-preferences.bmp
index 4d579e6d4a7a46b7a50280f6ebf3ca9eee2170a3..6c48c8bda3b820da34332b1f66b2ed0082ff537d 100644
GIT binary patch
literal 1644
zcmeH`%Wl(95QdF-0hT-hPtXVG9;rf=SRhucP=)9cR;X2rvZ{ClPz4A@K}Cf$iJhBo
z@g-^8#FyjLX`PE*I}K^;rcRnPfg?<h(g+qT*kz=1^v}#UqtQ8<`TKLXF>LYqv!`<y
zhTVhb&hK*zy9*UGn4h*EzwGMT0(bJh&Rn6O@B7WeD)r^Pp@Vk24PD5<Y`@>{bULyk
ze~U(K+wOL|LEQU(oY+{x*B?bzp0un6#DZ3X!C>Do;y4Z}I+04ExFMv<pVqcsJq*8C
z*bXiE-buhajziL9-D--(LXPLqJcFK3y<L+&uELVY%LlQI<x9Wox^9-tg0g5BfJi5Y
z!y)3K=$)Ujn<44L3K4o7eY4E%gtJt3H_u8%A(cr_!9ijF!lU24rZ?BapCj=^jAk;N
zz-CDDk8n^jyzK2}qBs#J(gej)Bt!oV9*st3%~Ul_D2VZ7f@H|8uiJEvotznI_~0zh
zRqLkNtnZr#MR|`C`LZH2JjaOw!jMpb=C+R|xzsqaYIZYUECl}obe-XO*b2RTP*Rf1
zQfUv4B&$lpvGhs>wbB5{OHwRJxUCinI<7k&k5A7|RUOo<hH+3uDJXIRZ#xbr+!zct
lPY`%XkrhpygrWA%J+Y97z*PJ{x%0EFnQhH%YyNS&egeejaL@n%

literal 2358
zcmb_cc~FyA5QkP2Y;mw^rC#GzbU>7f;#e!idV|*19=2mqxuT5Vfq)za639scDHV-D
z1+imA1$0!ZA_5|j0tts91W}Nigdm8Lph&Xamy%9~!RjCVW`5u9d%N$qyYKCLUu|}=
zGBbQG_@9rk9fG;pOw|7Q6xL>D1jY{ljH)>*?;}PdED;|d#v#TdCL$&wCJ*7`q45Ni
zHdCif{Rrh)#2CaV#Cr(BXZ*;R%oDryDm$A+<E^Zwqdo&M2SL(xKr9@BBTD-fE5F#}
zvxjoeo8sHD#APY5+aO3Bk|W8L#4zSPCe(GBJI#Ggcli3bF9Td>Jexbw(hcp-h|dvU
zB32{TSXo)E^YZh_+q*xoKP~;7K0D{;AdcG{ofbKv-B^nS>c%=o{rb)9)hD*uYveal
zL0wY_mw5*V0^Md+pwDuI8)6;89pT}-hf>bsb6-iSD?!=S3DSyk9rCN37Js%3?PMRx
z36L5L{Lap17Fpg4pEioKphcVk@=FZpD8B&-J639UE}fEye&k43AY84+j$PxwFJO>x
zKd7sLp5ABRz1#1(gX03?W4n6Y+7+&=+-9L}%-<}BV!tf^(8}k^%3IJWFNBujOsL6V
zLF4@^K==5x-`(D33;Nq3=8v(obl7`fU*FvlF;v!8L-(^Dz<Sy~w6>nS-eco(Pp_T5
z+jn|4du-V}75&Xg{}g%8v(67#+$lR9`m$Y;4XWw_Xf3${ipz0Oo|y!UO?DkirWnqf
z^veXyKRxx2v$_g}4C)%|A@O)pzZb=)XNQlMHa+W-J}Fr^@U!Rk#_zWMU_tl^?)f{8
zFWBdDRUE$NMT<BSRI+?%Exig4uL<Bf({GUd^}I{SP4;v&@+ZV{Sz5wRAeC3a-M@;U
zpt#5|7NwqgjWuK&xlLuh|Ds>=1Ds#TFR=8ajyB1kP;*TPiCgUkx!*3B78rCOB<OI6
zwy^X*C>rXZtEU?tH8nuhL%D%lUZ;RvzTVpJfBJEjDX*!1o8mAdFVIC=MBl2b&q;+0
z$`TOqsr^hYM-~(stj#aJhun{#vr7#}g~zng$_kxQt%7!y5{}TL`nK=#q?_`Mq|<0-
z@7)Pl8kM`(S(lS_cA&Yv6@;gf;pmBDkXw)oDs?9u!aBStzP{eOePjLncPmhD#`9&4
z#P_DTl<-}X*nDnlsk97QI@;jmnH0#lk_ka!AzJL44R2cauJebf5y6qPD9y2CA(T}}
zp;g%q!jxoS@i=8P8g10O^3d4~OGX?!FPcGr8O5M0kHkca!l)5EYAj77mXtt4b0Zu-
zDS{HLqfONTqBEzpTmk>4NF@5V2mdP;-uLvAXH&IhvI-#QcRur?K2ey|FP4^o3eWK=
z_DOhDq=wCpt1ppCUblBDL6l~Qk@L0~*vk&cuOWBd*waSY-P;4|r(F<Ejpz#u+P{Iz
z<yvzS_*EoE2lh;IT8fq<;NM~JI6<s9mitIGa1wa8iY29ba^Ferw+r)t)InlA?|T6$
zzo%*T2Or#HTub|nHV$JvATh}Mb}r+>t8*964{!uL4U@}VYxE<M$>UgH?oTRYRfEN4
zC4)3(Oiwg3rk*Q^?~_(n8G5FyT%rp)9LzCYXNV!-%M^9Bx`x&!LoWH^Lcm=6SUlD;
zQ(xR4Ta43$vW*%O{YeCkYJP+sttNNA`cbW6e?lX}6sBv4&f>?>tK>3$Lu)hCK6#99
zQ3G7a%Fwand6mO`v43na@9AV7`JJ#QwT1Xb*5W;F!u7~sJA4g;&-KKf()8dPO75<-
zs#1shrewr33_QdA$r$r@#GdTU&b_54Ysmid69pRFp93TLGx?m2NhgGwy2p?8JVAn*
z&1TOY$<H{4{I=NtO%i-l8XBMIqhjgWkchBoqkSaF<nb1=`Mh#gJj-q*`|vs3AKOTJ
cRAVHKdi_v%=*;2v|6?3RjeMtj`L<Yp14F1yU;qFB

diff --git a/src/modules/ctypes/winnt/gdi32.jsm b/src/modules/ctypes/winnt/gdi32.jsm
index c8b430f..ba99226 100644
--- a/src/modules/ctypes/winnt/gdi32.jsm
+++ b/src/modules/ctypes/winnt/gdi32.jsm
@@ -43,6 +43,7 @@ function gdi32_defines(lib) {
   this.NOMIRRORBITMAP = win32.DWORD(0x80000000); /* Do not Mirror the bitmap in this call */
   this.CAPTUREBLT     = win32.DWORD(0x40000000); /* Include layered windows */
   lib.lazy_bind("CreateCompatibleBitmap", win32.HBITMAP, win32.HDC, ctypes.int, ctypes.int);
+  lib.lazy_bind("CreateBitmap", win32.HBITMAP, ctypes.int, ctypes.int, win32.UINT, win32.UINT, ctypes.voidptr_t);
   lib.lazy_bind("CreateBitmapIndirect", win32.HBITMAP, win32.BITMAP.ptr);
   lib.lazy_bind("GetObjectW", ctypes.int, win32.HGDIOBJ, ctypes.int, win32.LPVOID);
   lib.lazy_bind("GetCurrentObject", win32.HGDIOBJ, win32.HDC, win32.UINT);
@@ -177,6 +178,9 @@ function gdi32_defines(lib) {
   this.PBITMAPINFO = this.BITMAPINFO.ptr;
   lib.lazy_bind("SetDIBits", ctypes.int, win32.HDC, win32.HBITMAP, win32.UINT, win32.UINT, ctypes.voidptr_t, this.BITMAPINFO.ptr, win32.UINT);
 
+  lib.lazy_bind("GetPixel", win32.COLORREF, win32.HDC, ctypes.int, ctypes.int);
+  lib.lazy_bind("SetPixel", win32.COLORREF, win32.HDC, ctypes.int, ctypes.int, win32.COLORREF);
+
 }
 
 new ctypes_library(GDI32_LIBNAME, GDI32_ABIS, gdi32_defines, this);
diff --git a/src/modules/ctypes/winnt/user32.jsm b/src/modules/ctypes/winnt/user32.jsm
index 054f262..d29022e 100644
--- a/src/modules/ctypes/winnt/user32.jsm
+++ b/src/modules/ctypes/winnt/user32.jsm
@@ -412,6 +412,9 @@ function user32_defines(lib) {
   this.SWP_DEFERERASE     = 0x2000;
   this.SWP_ASYNCWINDOWPOS = 0x4000;
 
+  lib.lazy_bind("GetSysColor", win32.DWORD, ctypes.int);
+  this.COLOR_MENU = 4;
+
 }
 
 new ctypes_library(USER32_LIBNAME, USER32_ABIS, user32_defines, this);
diff --git a/src/modules/winnt/FiretrayStatusIcon.jsm b/src/modules/winnt/FiretrayStatusIcon.jsm
index f2acb10..8f90320 100644
--- a/src/modules/winnt/FiretrayStatusIcon.jsm
+++ b/src/modules/winnt/FiretrayStatusIcon.jsm
@@ -29,14 +29,13 @@ if ("undefined" == typeof(firetray.Handler))
 
 const ICON_CHROME_PATH = "chrome://firetray/skin/icons/winnt";
 const ICON_CHROME_FILES = {
-  'blank-icon': ICON_CHROME_PATH+"/blank-icon.bmp",
-  'mail-unread': ICON_CHROME_PATH+"/mail-unread.ico",
-  // these are for the popup menu:
-  'prefs': ICON_CHROME_PATH+"/gtk-preferences.bmp",
-  'quit': ICON_CHROME_PATH+"/application-exit.bmp",
-  'new-wnd': ICON_CHROME_PATH+"/document-new.bmp",
-  'new-msg': ICON_CHROME_PATH+"/gtk-edit.bmp",
-  'reset': ICON_CHROME_PATH+"/gtk-apply.bmp"
+  'blank-icon': { use:'tray', path:ICON_CHROME_PATH+"/blank-icon.bmp" },
+  'mail-unread': { use:'tray', path:ICON_CHROME_PATH+"/mail-unread.ico" },
+  'prefs': { use:'menu', path:ICON_CHROME_PATH+"/gtk-preferences.bmp" },
+  'quit': { use:'menu', path:ICON_CHROME_PATH+"/application-exit.bmp" },
+  'new-wnd': { use:'menu', path:ICON_CHROME_PATH+"/document-new.bmp" },
+  'new-msg': { use:'menu', path:ICON_CHROME_PATH+"/gtk-edit.bmp" },
+  'reset': { use:'menu', path:ICON_CHROME_PATH+"/gtk-apply.bmp" },
 };
 
 
@@ -97,8 +96,13 @@ firetray.StatusIcon = {
     /* we'll take the first icon in the .ico file. To get the icon count in the
      file, pass ctypes.cast(ctypes.int(-1), win32.UINT); */
     for (let imgName in ICON_CHROME_FILES) {
-      let path = firetray.Utils.chromeToPath(ICON_CHROME_FILES[imgName]);
+      let path = firetray.Utils.chromeToPath(ICON_CHROME_FILES[imgName].path);
       let img = this.loadImageFromFile(path);
+      if (img && ICON_CHROME_FILES[imgName].use == 'menu')
+        /* Ideally we should rebuild the menu each time it is shown as the menu
+         color may change. But, let's just consider it's not worth it for
+         now. */
+        img.himg = this.makeBitMapTransparent(img.himg);
       if (img)
         this[this.IMG_TYPES[img['type']]['map']].insert(imgName, img['himg']);
     }
@@ -418,6 +422,36 @@ firetray.StatusIcon = {
       log.error("icon '"+name+"' not defined.");
     }
     return hicon;
+  },
+
+  // http://www.dreamincode.net/forums/topic/281612-how-to-make-bitmaps-on-menus-transparent-in-c-win32/
+  makeBitMapTransparent: function(hbmSrc) {
+    log.debug("hbmSrc="+hbmSrc);
+    let hdcSrc = gdi32.CreateCompatibleDC(null);
+    let hdcDst = gdi32.CreateCompatibleDC(null);
+    if (!hdcSrc || !hdcSrc) return null;
+
+    let bm = new win32.BITMAP();
+    let err = gdi32.GetObjectW(hbmSrc, win32.BITMAP.size, bm.address());
+    let hbmOld = ctypes.cast(gdi32.SelectObject(hdcSrc, hbmSrc), win32.HBITMAP);
+    let width = bm.bmWidth, height = bm.bmHeight;
+    let hbmNew = gdi32.CreateBitmap(width, height, bm.bmPlanes, bm.bmBitsPixel, null);
+    gdi32.SelectObject(hdcDst, hbmNew);
+
+    gdi32.BitBlt(hdcDst,0,0,width, height,hdcSrc,0,0,gdi32.SRCCOPY);
+
+    let clrTP = gdi32.GetPixel(hdcDst, 0, 0);          // color of first pixel
+    let clrBK = user32.GetSysColor(user32.COLOR_MENU); // current background color
+
+    for (let nRow=0, len=height; nRow<len; ++nRow)
+      for (let nCol=0, len=width; nCol<len; ++nCol)
+        if (firetray.js.strEquals(gdi32.GetPixel(hdcDst, nCol, nRow), clrTP))
+          gdi32.SetPixel(hdcDst, nCol, nRow, clrBK);
+
+    gdi32.DeleteDC(hdcDst);
+    gdi32.DeleteDC(hdcSrc);
+
+    return hbmNew;
   }
 
 }; // firetray.StatusIcon