From 4d4f9086fe1fc976185883af330f0b9fea11bd76 Mon Sep 17 00:00:00 2001 From: Konstantin Triger Date: Mon, 28 Nov 2005 14:36:16 +0000 Subject: [PATCH] merge -r 53554:53555 svn path=/branches/mainsoft/gh1.7/mcs/; revision=53557 --- .../System.Drawing/Assembly/Application.ico | Bin 0 -> 3262 bytes .../System.Drawing/Assembly/Asterisk.ico | Bin 0 -> 3262 bytes mcs/class/System.Drawing/Assembly/ChangeLog | 4 + mcs/class/System.Drawing/Assembly/Error.ico | Bin 0 -> 3262 bytes .../System.Drawing/Assembly/Exclamation.ico | Bin 0 -> 3262 bytes mcs/class/System.Drawing/Assembly/Hand.ico | Bin 0 -> 3262 bytes .../System.Drawing/Assembly/Information.ico | Bin 0 -> 3262 bytes .../System.Drawing/Assembly/Question.ico | Bin 0 -> 3262 bytes mcs/class/System.Drawing/Assembly/Warning.ico | Bin 0 -> 3262 bytes mcs/class/System.Drawing/Assembly/WinLogo.ico | Bin 0 -> 3262 bytes mcs/class/System.Drawing/ChangeLog | 4 + .../System.Drawing/System.Drawing.vmwcsproj | 11 ++- .../System.Drawing/System.Drawing/ChangeLog | 4 + .../System.Drawing/System.Drawing/Icon.cs | 17 +++- .../System.Drawing/SystemIcons.jvm.cs | 91 ++++++------------ 15 files changed, 63 insertions(+), 68 deletions(-) create mode 100755 mcs/class/System.Drawing/Assembly/Application.ico create mode 100755 mcs/class/System.Drawing/Assembly/Asterisk.ico create mode 100755 mcs/class/System.Drawing/Assembly/Error.ico create mode 100755 mcs/class/System.Drawing/Assembly/Exclamation.ico create mode 100755 mcs/class/System.Drawing/Assembly/Hand.ico create mode 100755 mcs/class/System.Drawing/Assembly/Information.ico create mode 100755 mcs/class/System.Drawing/Assembly/Question.ico create mode 100755 mcs/class/System.Drawing/Assembly/Warning.ico create mode 100755 mcs/class/System.Drawing/Assembly/WinLogo.ico diff --git a/mcs/class/System.Drawing/Assembly/Application.ico b/mcs/class/System.Drawing/Assembly/Application.ico new file mode 100755 index 0000000000000000000000000000000000000000..7a7840be1fdff2761cf45ef28d7b0b5e7797676d GIT binary patch literal 3262 zcmdVcc~nzZ8UXMwQS!1;Qjc3l1=$2d$`TS1vWF#MU$wHTMLffF6tUGRDp*j|x(*|w zj-UY*0tCn-BG_?`)}_;0wLP5~bpTtniaLynh>A({&W(u~5jf7wf4#|<_wwcCcfZ{G zog@Ghe49QU@Z)6AvH>OnfHw}D0yz##{ueQ56w2I*`feQLPAi;y6 zVNrTr-rVYf%)N=yY9IGHkLg-Z*Lp8Et+z+rO!pdJkNN;_9oM&6@V-tIsFem(Ndp#o zyZ)C`><$-p&aq?*#$B`!}KoC{~(#`tRsE&^ow8qNG7%3Sg zAyr~BQbdLe^bL)5`Q)& z{cKFSZj8HT47&7$LK`~8JOs&CKy?IM6I#2j|e5hFdm|p^EFCQLi^d6 z9&^eabM$SK{Dw(<-6Z_U6!N2qch$)2GAe&G3eVr>f3kMSN612u)CqDePGY}(QHG`d zVgB#pRnb@PrS_WDJ!bhWv-GA(a>FEg%@6J}O0F73zk)G|TshZDjOA z!g=d?`i$wgXO3p2yxLj3IKn0wKdZAx)oYHp`xf8x`~c(V1D~Qj8B1r|aNL#|0}%Hu zIQfA05}a&Q%ZK`c<@%#B|1w*Bw+4;u+T#(|N6=-Q_(d;%fo1cRq^AW^< z4XV>1Z3YLX;=tAVxX89Sv6jUN6YA8mynDu|m%iZQ6{4e*K^8gdG?MFsZ>)d7Xsj8$TPTSY}~-*c<)+W1G} zSSiuAmabpP(G&%p`rGUK>+{_JReKA_erUMMcyFrB{}90fBh2oE^Ks& zJul8GAfsfYQa~y~s`7G|96yuL^VpHxWcQi6kJ;7B{0ygU{n`C&!s#bacLT^i(Dg$4 zYMYM_^GuL-2jVY6YPVSb5c}eG6w+eek(8-d2yol$r98bjcvD2`lr85td&?P(YjFK^ z-LfhALe9Pd|Bj2e|GAxmRKr8qcM0@;(AWzr58Hie+9OKZJxDmm&L0Rn@xtm04Jf$L zoIij4OFvjI<|=XydsHCToyd7BVpXrfK0~|MwWV;vjzaE*JAqv$XzqtCCxLtf+S{<= zkli1XaC^+0K5BfY*UtX1lgRG#TM)Mag%^FJQHJS6Jdce%R)5mEztUSiwff`g^Cur# z>`~L~Fl8Fl--VAW@&1DLCj7SC?vM4`PD^+|i@T+09T@Hh)FQv?7s1O;c&_Wrcj&#un# zYFN(rJP~GzK+^?PmtbY>5FbEt#FX(p!u3adY1v;%2a>fRWgAi%kW!CkRrNd7R?<#v zCI0-M{Jtg<_8*MH>p% zKKIi+ApW$KcBY*6<+jm$|K>tw`CQm{0V;ohj=|wR&P08KB2JlP$NEKv{?OJz0r?#F zr{zlgW9Z^YUlBz#E+>u@5gjG;wzUj$mA!seb&h}YYI;Q;RD1=kFI#BD32+j7yTa(p zx%6n4F>W0DRgQ&R)_M`MRLUw5v$jMr_UAC_^T)NUn$Ywqr*4U3^}<x@81;;WzvrI-W6BBDCtYQ(fNJL*LWEY88>%`1;67~lCK@`;W^J&`_ zGqz_lcBe6`vWFROPcSw~iBc(hlNis%C>66e%2*r4%nfqTJ_Q4Uvk1!8KnV{H$e}pu z?c6W$3S=2C2=oHC4vu0o&|Ug~>U0e_#5I61Cvlvy1_l2Cpp@WP_gdiBDX&G+H2`-@ c;M^E|BrMU#0jEI$xR?QCxIc^0NgTHEZ{7&}ssI20 literal 0 HcmV?d00001 diff --git a/mcs/class/System.Drawing/Assembly/Asterisk.ico b/mcs/class/System.Drawing/Assembly/Asterisk.ico new file mode 100755 index 0000000000000000000000000000000000000000..3000fe3e845ef185c8cb203d880ef279ea7d4a75 GIT binary patch literal 3262 zcmZQzU<5)11qL7~!LWjdfkBLcfk6X^fkF%pKnxP6956F7L@9`+Ybyg8)B-^=!mWA= zEm~63%+!`U8tw6S+~#Y)!o_s9jc&VvLWjAQkAf6=cBLzdwP{MOvemsE84KWUA(ZI7v1tfnIIwy1M5cWFtjuuy*;<9pObZ<&(F zBtd4ZXo-sWaZlS1)rD)kZ2By<`Pf(q+L9qF(4j7N&CBY#tJ!P`F096)3C@({z8dLw zH$P>9xrV(gzL?ID;pTU~dWMx41 zYHhjKmAODGB)K>-t!S3xoh;6=S4#>_SHCEGkFo0d?v~5fu3frv<-(;)I~L68G1KUk z=0#HpCRJM**@^~fE?}rm6=uPy(aH4so!i%L-Mo6^`phVQoXP~5XG`(`H8zI^!N#k_=2 zg6ek|tL^f%%2JmpB*Oe&UHS8e_dk30?#Y`sk6*o-pAt#fd?S_J?v{D#(xC7mlsG3C zscf0l_2kuy=kMP?efxG{MjS!&4_Rujw$rl|;sToANJRJp3$#8Xm3fI_CwFXFm>Eyd z{4)-Q^T6o`7{&EOm=8CwOO&lwSrpF2#ds3v)UPW8N&ig}Y`p~Y7iwvY%UFo`0%_iR z{`MVO(5kZp7zIQmA)sC&opHoiWs{{wjsl`0sFh%YR3Eq;HbI7OetOK2)k~*`dr#Dm z#-$7>K3kmQg_mWgI;ar?2ep#y&3L^q&C}-d|NlVr>F?i_Ww~gT7qWF{jFr|JDby&7 z!VQNofL`boLaFkQbuGSK0~aS8xsIG5Sg(;n&-ZSTB|%?zBI6rhXs^MvR8>?j|gDwbZg5l&re+t9ng=h zT`^gRd7%Vny)V!Z literal 0 HcmV?d00001 diff --git a/mcs/class/System.Drawing/Assembly/ChangeLog b/mcs/class/System.Drawing/Assembly/ChangeLog index d4031860441..f56a4ddb1d2 100644 --- a/mcs/class/System.Drawing/Assembly/ChangeLog +++ b/mcs/class/System.Drawing/Assembly/ChangeLog @@ -1,3 +1,7 @@ +2005-11-28 Konstantin Triger + + * Added system icons. + 2005-08-03 Andrew Skiba * AssemblyInfo.cs: add TARGET_JVM mode diff --git a/mcs/class/System.Drawing/Assembly/Error.ico b/mcs/class/System.Drawing/Assembly/Error.ico new file mode 100755 index 0000000000000000000000000000000000000000..324796a4acbe06eeb06014e416c0607429b33735 GIT binary patch literal 3262 zcmb`J3rtg27{|}0^g$_oKm`hIZ+W)0r3h>jh)#!bMszNFBojpwow^aDE@7;3h6qB2 zB8XsxsZ-qW(So4Vf+!Bzd}IpZc$U!dR^A8*Dk|EYa?7=p^4Q|-JpkB& zw*VmUBM<=i?F^JO02~1TBG{k{EQQVBe-{_g-dT>$-vfa4yPz2uban*CJ==k!LB%DK zpt9gK+Mv}nz8{te-@EDJUg+hQ?SyXle_Bk(c$Tx;)4wbvyz`65q2P5TexK)vLr(}- zC>E~G`8eXnj&S56$_k;shDc(~szPNRptCiyW$p7<+$MQ$wTLxyQbb>`+Eub?Z?A{!nj>%Z3=$N2 zGL3!3cV#cu%`yF6 z3p8eYGUJRDb3f4|0t@3x6Y?%K>Gk@`s(xX>v=V%ugSmONU0q$5@@r6^By8^Th~kBz z6{z?}QweLk(|{L_2*P0u!rds}eILTHYdQ%C&%3DY?(XjB=y>?>VQkzT0&fePP8Dz4 znlRudEyDTM6txvA0aM4mT_kbml)4E83%>$|@JrgBo*tO|qeqXTOnSM+%MAH@P7{9=B6Z*MP_yfXW5o(UYrFno8djp}og zUcmTPwwb16+{PtdzkdDl<;$}2E-ycYU_oNOx}m?nA4^`9UCEOq;!|+rOL;RYE*|Hr z5W8tt5R(`i8-x7k&!1OTb>FD>Pi; zEv!Bf>IocZY6yIjuU>1#R~D8fUv|(*9Gh{h4DPA6wzlTx=7Pd1H%k)lf2L#eu1@f? zfa_*cGPKdOuAK)_<0M6rtWyREIQO-)TYoldQ;aPv8AI-Mfi8L+CG z#kq*_0U-ylCY2C`7hi9OHIF5)*646JE|IFZ)7aS9(9odOYIF1M38Zg}oExO%OCQ)d zBpLbeABN3Iz+Z>Wh38w8y!_RxS6K3w3v}>6FimelA|@sER(*YaU0q#ub@dPO>sGGc zz#*c?Hs8=L`n&=h4h@8S4q?XQka?nLMMfn|9+o{SvjE2;9fdJThyJLotxZY2;V6v7 zoZP?yC+~9lyi=xpgM>{caNUGUutm{PyKm#CI_@_!pv2a1HBLg~4r2JEc`oX(b+~K> zAMdIVo8y4D0Vg2bw{p01s)2`5y!W7iEo8<867{$xKKx&H9@u2y3o#WnqbH2y9z~#? zqR@Y_49C30v%u!q)Yrj`djUUeb}W1=@xu^SJi#uD zK+2zqI(ZDCWCF^#3UB?iD!g#Oih+eeu+5u1d(J)5ZwOp0YC51D2F!hc{XKAy17;kc zr6JUx5!=%Uc`grRE^;cvNr)%`Im=)e?m1ohu_bzaDM7CXKtBe+l2HKAK>!#n0FVu> p6aa#u#lRgh(EzkzGr#ch7&u;PoY!LH7?=jOLBpUmt~rY8{{=a%9h3k7 literal 0 HcmV?d00001 diff --git a/mcs/class/System.Drawing/Assembly/Exclamation.ico b/mcs/class/System.Drawing/Assembly/Exclamation.ico new file mode 100755 index 0000000000000000000000000000000000000000..b29ae3641af422aa1cfac080cbc891ac8885acfc GIT binary patch literal 3262 zcmbuCc~BE)7{(XTdK5tslRyaJQs`x^we_eLJX;U6w)WE2tF@iZv@`8E<5-<`oc`fx z|EN~SPDMmv1f>TeLm8n^0!YFUPzZq#js)Zk7?N;9^zF0zK^lWqTR)!N`SyB#`yStB z;5aw@1qO21OSsD(94F#9E*u+9ago^g^N&B=CQh31$szC0zQyG6-I&A7ZC^-FrT9f> z$}ScJUMUaBs0&K32}mxNCKgK0W{G}G_Sn4Z|FJ~-j`>Gt%t_VEFYR7bM=Oo=S`%$- zrp?W?u8BWu zql0#v=%Y^B+eIIC(E3{xt{L)At`MKenBY0{p%lr12V#S^dqbr; zN^9P%HE(afi$Hdn_*ek?xRau8(cJPO$%VWri&owj;eGJ5IR5$?{lKdRdZmG|cSfu? z*pC%x)%8s!b&W}7x+tA(TRVNw!N&p+!U1b*D}|Qzi(?fNedXg3e)0L!@~n|YdZ~^U z*WZI!i$EIeXUl3$CR0a;DNkouS8YQ@kS-JjAS4Ye2&E4yvWU)PxcCR0`_t<;tw$L> zucrmI_aKnlRmfGnJ?2JjXJ?nm)S0h0uC2Dc*}}gtiUQEP0*m1gyY!02>(g(X5x()) z-BiO*meI2{_aK(m)A9zse3A9`JsD*uN@|W5*L_E8NxKf zl9<07{_@ytujFd3nDG8j>Ha}1tR-|l5X;8OvC?pNwec>B{<={24MKM@5Y`2pnQ*@> zwc2aV_9j}5mog`b?sVZ6IzQe$`}Ye z1{SnY5YC4dTg9hRnZI9x3g*xxHHB1-BA(F^5cBo)qEHS5vO?M1dE0C@cW+S|kumfz zUzbK&Gsc1~BVvy_`kv2)|LhYf;>)GX->sMewLD@@6@^#R(>nemfIATgDC-LvEf!06 zw`H5k$TAjzx(ICy7Q=zagsAb$=?>U%nEMp}czpG{Ec88=BRfDj0yd|qVi z5yqjC2Gj-11W5x3!jgocvv4vvqkh)@ACP}ha;1yE^C2RdUdAWwK#8GO7)MJR5DrR% z20(SdLV+L2Q6f^*;!&nRlBGUpr z$$u$f{V7W<9Pj3G#;x$q>GH;YVdNNEgVnw0G2{(BfC53lF(RN4Qs;j`!TduntK9Q? zT?}0g-Shi04ebL110d9y%wftdGyvKR&5Qy;z&Qlm{F^<}pVOJYJo=hai@82mbo{coBO@aq^bQOLX0_lFYu#Bl z2?7g3xtD7D@N42?jzcsmKBR8SVTY&l1pZo+rDt#m>gw%h{_KV))cl9t>jqzr<@zCM zT(0;?{CIzy35v<|y{NixAttCs0NIr5}p-^3!HOKQ(#-Q@JIT<7moj6P=^_2E5vZ=S)k1m>We{svVY34;It literal 0 HcmV?d00001 diff --git a/mcs/class/System.Drawing/Assembly/Hand.ico b/mcs/class/System.Drawing/Assembly/Hand.ico new file mode 100755 index 0000000000000000000000000000000000000000..324796a4acbe06eeb06014e416c0607429b33735 GIT binary patch literal 3262 zcmb`J3rtg27{|}0^g$_oKm`hIZ+W)0r3h>jh)#!bMszNFBojpwow^aDE@7;3h6qB2 zB8XsxsZ-qW(So4Vf+!Bzd}IpZc$U!dR^A8*Dk|EYa?7=p^4Q|-JpkB& zw*VmUBM<=i?F^JO02~1TBG{k{EQQVBe-{_g-dT>$-vfa4yPz2uban*CJ==k!LB%DK zpt9gK+Mv}nz8{te-@EDJUg+hQ?SyXle_Bk(c$Tx;)4wbvyz`65q2P5TexK)vLr(}- zC>E~G`8eXnj&S56$_k;shDc(~szPNRptCiyW$p7<+$MQ$wTLxyQbb>`+Eub?Z?A{!nj>%Z3=$N2 zGL3!3cV#cu%`yF6 z3p8eYGUJRDb3f4|0t@3x6Y?%K>Gk@`s(xX>v=V%ugSmONU0q$5@@r6^By8^Th~kBz z6{z?}QweLk(|{L_2*P0u!rds}eILTHYdQ%C&%3DY?(XjB=y>?>VQkzT0&fePP8Dz4 znlRudEyDTM6txvA0aM4mT_kbml)4E83%>$|@JrgBo*tO|qeqXTOnSM+%MAH@P7{9=B6Z*MP_yfXW5o(UYrFno8djp}og zUcmTPwwb16+{PtdzkdDl<;$}2E-ycYU_oNOx}m?nA4^`9UCEOq;!|+rOL;RYE*|Hr z5W8tt5R(`i8-x7k&!1OTb>FD>Pi; zEv!Bf>IocZY6yIjuU>1#R~D8fUv|(*9Gh{h4DPA6wzlTx=7Pd1H%k)lf2L#eu1@f? zfa_*cGPKdOuAK)_<0M6rtWyREIQO-)TYoldQ;aPv8AI-Mfi8L+CG z#kq*_0U-ylCY2C`7hi9OHIF5)*646JE|IFZ)7aS9(9odOYIF1M38Zg}oExO%OCQ)d zBpLbeABN3Iz+Z>Wh38w8y!_RxS6K3w3v}>6FimelA|@sER(*YaU0q#ub@dPO>sGGc zz#*c?Hs8=L`n&=h4h@8S4q?XQka?nLMMfn|9+o{SvjE2;9fdJThyJLotxZY2;V6v7 zoZP?yC+~9lyi=xpgM>{caNUGUutm{PyKm#CI_@_!pv2a1HBLg~4r2JEc`oX(b+~K> zAMdIVo8y4D0Vg2bw{p01s)2`5y!W7iEo8<867{$xKKx&H9@u2y3o#WnqbH2y9z~#? zqR@Y_49C30v%u!q)Yrj`djUUeb}W1=@xu^SJi#uD zK+2zqI(ZDCWCF^#3UB?iD!g#Oih+eeu+5u1d(J)5ZwOp0YC51D2F!hc{XKAy17;kc zr6JUx5!=%Uc`grRE^;cvNr)%`Im=)e?m1ohu_bzaDM7CXKtBe+l2HKAK>!#n0FVu> p6aa#u#lRgh(EzkzGr#ch7&u;PoY!LH7?=jOLBpUmt~rY8{{=a%9h3k7 literal 0 HcmV?d00001 diff --git a/mcs/class/System.Drawing/Assembly/Information.ico b/mcs/class/System.Drawing/Assembly/Information.ico new file mode 100755 index 0000000000000000000000000000000000000000..3000fe3e845ef185c8cb203d880ef279ea7d4a75 GIT binary patch literal 3262 zcmZQzU<5)11qL7~!LWjdfkBLcfk6X^fkF%pKnxP6956F7L@9`+Ybyg8)B-^=!mWA= zEm~63%+!`U8tw6S+~#Y)!o_s9jc&VvLWjAQkAf6=cBLzdwP{MOvemsE84KWUA(ZI7v1tfnIIwy1M5cWFtjuuy*;<9pObZ<&(F zBtd4ZXo-sWaZlS1)rD)kZ2By<`Pf(q+L9qF(4j7N&CBY#tJ!P`F096)3C@({z8dLw zH$P>9xrV(gzL?ID;pTU~dWMx41 zYHhjKmAODGB)K>-t!S3xoh;6=S4#>_SHCEGkFo0d?v~5fu3frv<-(;)I~L68G1KUk z=0#HpCRJM**@^~fE?}rm6=uPy(aH4so!i%L-Mo6^`phVQoXP~5XG`(`H8zI^!N#k_=2 zg6ek|tL^f%%2JmpB*Oe&UHS8e_dk30?#Y`sk6*o-pAt#fd?S_J?v{D#(xC7mlsG3C zscf0l_2kuy=kMP?efxG{MjS!&4_Rujw$rl|;sToANJRJp3$#8Xm3fI_CwFXFm>Eyd z{4)-Q^T6o`7{&EOm=8CwOO&lwSrpF2#ds3v)UPW8N&ig}Y`p~Y7iwvY%UFo`0%_iR z{`MVO(5kZp7zIQmA)sC&opHoiWs{{wjsl`0sFh%YR3Eq;HbI7OetOK2)k~*`dr#Dm z#-$7>K3kmQg_mWgI;ar?2ep#y&3L^q&C}-d|NlVr>F?i_Ww~gT7qWF{jFr|JDby&7 z!VQNofL`boLaFkQbuGSK0~aS8xsIG5Sg(;n&-ZSTB|%?zBI6rhXs^MvR8>?j|gDwbZg5l&re+t9ng=h zT`^gRd7%Vny)V!Z literal 0 HcmV?d00001 diff --git a/mcs/class/System.Drawing/Assembly/Question.ico b/mcs/class/System.Drawing/Assembly/Question.ico new file mode 100755 index 0000000000000000000000000000000000000000..b2f111ccf3757c78b9df12ff4136f3e5906257e4 GIT binary patch literal 3262 zcmZQzU<5)11qL7~!LWjdfkBLcfk6X^fkF%pKnxP6956F7L@9`+Ybyg8)B-^=!mWA= zEm~63%+!`U8tw6S+~#Y)!o_s9jc&VvLWjAQkAf6=cBLzdwP{MOvemsE84KWUA(ZI7v1tfnIIwy1M5cWFtjuuy*;<9pObZ<&(F zBtd4ZXo-sWaZlS1)rD)kZ2By<`Pf(q+L9qF(4j7N&CBY#tJ!P`F096)3C@({z8dLw zH$P>9xrV(gzL?ID;p($%Y%u3VWNA370Rh^^L^dtI3ev_g`L6Vr-j zIo`?Q9DB8-FbxNa%uk8Da^w2t>(?${yLxo*t{!O~tjc!T=szq-?X%EAGrviWw@I9R zt~du)T|mKk31Qc6-n@F_#+B>W4{hDpBZ)I=E`@on^R`LVRz|j>L7HoVAoEmV7F^~} z(3IJ;Y|*t_w=Q3~JT2HAmolLEY-!%NWtn|uYH;%#WVxEf*zjn9NcGDLPH{4uV5EvQ z@R7Bj@U+?FV;id~3$dbAinB)ur^}Hw63JeuAoMURw$nr%Vt%6}mh^^ZRKJSY{FtD5 zAQU*s)(}k=llw9~dZMW+(EJ=pwk8Q8%-2`C^YG#A2M=!FzrQ3m8Ph;Ck#pX5^KEp2 z=4VT?w}=xC{9a|zD_1VvdGrWq%h7F{`qd=S3`FA|wliGqWNakFT`bAoF3O4~i^&DX z>7uNJyN@5=1zWLu!K?}TN|?&vB0G%Lc6nN5sml}+XFgD4zXaEk{Iq*dp4@%>=+2{u zC-&@^XrT=^5RI|JNM*OXWuCe;D13-WoDl63gxTgNM*zJ5@yO|e`z9EwpqUKe92HSKWZ>p3N{e~)^2Ng!&mTO0Hr>?%E)HQFF;>}Rsga|As0eB$*ns65nz9MH@{gZA zef9Y>(3a=#->)djoM@`irztbT&*}P=OOIc@di3(;y~mIG^%apd&KBo*;bqyW4r;`} zL9HZvGlmy{X?|r%*6S}{AXWf9^6dTl$1h(#d-v|?+c!_%yng)p)#m(^thClh zp+;F0Za9Pi^g^!?h8Glt_s*RPvEtRIPcJ`yeDUD}&@W&s-kv?MXOgihvg5ZYi`=u* z=};CzGaSeTCe&(iwth@2Wce4T#azE|7TF^Y9zR-JS2|Hg9@+2}(meMq)LP~F@}+@| zJS?D8lD$eCOGE$->5~(f=4di6)N6i(&nz#yeobk#T41se^Fj&EdTGu|Szatg!-UEu z*nqwuqdEX;sgvUDkjG~@#1ddY0driVC@Y!^k%I!64O9j!VOpd)t7W)g&Lm9NNU&9a zZNW^paKnL8O`@zd66_t)SQ;dR?OBEr%v!V2_Soj4m1wMei5 z>po)4A*cozXh4)J$qw`vgiTNjM8W?*_W%DMVE+G~f#Lrj1_t{d3=Hxg7#R2;Ffg!# t@Bsz}W)N-wb|YYz0o0|y1aNtfx&u&s51{6N%mkSYvIArn*v=pF{{e*^2r&Qv literal 0 HcmV?d00001 diff --git a/mcs/class/System.Drawing/Assembly/Warning.ico b/mcs/class/System.Drawing/Assembly/Warning.ico new file mode 100755 index 0000000000000000000000000000000000000000..b29ae3641af422aa1cfac080cbc891ac8885acfc GIT binary patch literal 3262 zcmbuCc~BE)7{(XTdK5tslRyaJQs`x^we_eLJX;U6w)WE2tF@iZv@`8E<5-<`oc`fx z|EN~SPDMmv1f>TeLm8n^0!YFUPzZq#js)Zk7?N;9^zF0zK^lWqTR)!N`SyB#`yStB z;5aw@1qO21OSsD(94F#9E*u+9ago^g^N&B=CQh31$szC0zQyG6-I&A7ZC^-FrT9f> z$}ScJUMUaBs0&K32}mxNCKgK0W{G}G_Sn4Z|FJ~-j`>Gt%t_VEFYR7bM=Oo=S`%$- zrp?W?u8BWu zql0#v=%Y^B+eIIC(E3{xt{L)At`MKenBY0{p%lr12V#S^dqbr; zN^9P%HE(afi$Hdn_*ek?xRau8(cJPO$%VWri&owj;eGJ5IR5$?{lKdRdZmG|cSfu? z*pC%x)%8s!b&W}7x+tA(TRVNw!N&p+!U1b*D}|Qzi(?fNedXg3e)0L!@~n|YdZ~^U z*WZI!i$EIeXUl3$CR0a;DNkouS8YQ@kS-JjAS4Ye2&E4yvWU)PxcCR0`_t<;tw$L> zucrmI_aKnlRmfGnJ?2JjXJ?nm)S0h0uC2Dc*}}gtiUQEP0*m1gyY!02>(g(X5x()) z-BiO*meI2{_aK(m)A9zse3A9`JsD*uN@|W5*L_E8NxKf zl9<07{_@ytujFd3nDG8j>Ha}1tR-|l5X;8OvC?pNwec>B{<={24MKM@5Y`2pnQ*@> zwc2aV_9j}5mog`b?sVZ6IzQe$`}Ye z1{SnY5YC4dTg9hRnZI9x3g*xxHHB1-BA(F^5cBo)qEHS5vO?M1dE0C@cW+S|kumfz zUzbK&Gsc1~BVvy_`kv2)|LhYf;>)GX->sMewLD@@6@^#R(>nemfIATgDC-LvEf!06 zw`H5k$TAjzx(ICy7Q=zagsAb$=?>U%nEMp}czpG{Ec88=BRfDj0yd|qVi z5yqjC2Gj-11W5x3!jgocvv4vvqkh)@ACP}ha;1yE^C2RdUdAWwK#8GO7)MJR5DrR% z20(SdLV+L2Q6f^*;!&nRlBGUpr z$$u$f{V7W<9Pj3G#;x$q>GH;YVdNNEgVnw0G2{(BfC53lF(RN4Qs;j`!TduntK9Q? zT?}0g-Shi04ebL110d9y%wftdGyvKR&5Qy;z&Qlm{F^<}pVOJYJo=hai@82mbo{coBO@aq^bQOLX0_lFYu#Bl z2?7g3xtD7D@N42?jzcsmKBR8SVTY&l1pZo+rDt#m>gw%h{_KV))cl9t>jqzr<@zCM zT(0;?{CIzy35v<|y{NixAttCs0NIr5}p-^3!HOKQ(#-Q@JIT<7moj6P=^_2E5vZ=S)k1m>We{svVY34;It literal 0 HcmV?d00001 diff --git a/mcs/class/System.Drawing/Assembly/WinLogo.ico b/mcs/class/System.Drawing/Assembly/WinLogo.ico new file mode 100755 index 0000000000000000000000000000000000000000..7a7840be1fdff2761cf45ef28d7b0b5e7797676d GIT binary patch literal 3262 zcmdVcc~nzZ8UXMwQS!1;Qjc3l1=$2d$`TS1vWF#MU$wHTMLffF6tUGRDp*j|x(*|w zj-UY*0tCn-BG_?`)}_;0wLP5~bpTtniaLynh>A({&W(u~5jf7wf4#|<_wwcCcfZ{G zog@Ghe49QU@Z)6AvH>OnfHw}D0yz##{ueQ56w2I*`feQLPAi;y6 zVNrTr-rVYf%)N=yY9IGHkLg-Z*Lp8Et+z+rO!pdJkNN;_9oM&6@V-tIsFem(Ndp#o zyZ)C`><$-p&aq?*#$B`!}KoC{~(#`tRsE&^ow8qNG7%3Sg zAyr~BQbdLe^bL)5`Q)& z{cKFSZj8HT47&7$LK`~8JOs&CKy?IM6I#2j|e5hFdm|p^EFCQLi^d6 z9&^eabM$SK{Dw(<-6Z_U6!N2qch$)2GAe&G3eVr>f3kMSN612u)CqDePGY}(QHG`d zVgB#pRnb@PrS_WDJ!bhWv-GA(a>FEg%@6J}O0F73zk)G|TshZDjOA z!g=d?`i$wgXO3p2yxLj3IKn0wKdZAx)oYHp`xf8x`~c(V1D~Qj8B1r|aNL#|0}%Hu zIQfA05}a&Q%ZK`c<@%#B|1w*Bw+4;u+T#(|N6=-Q_(d;%fo1cRq^AW^< z4XV>1Z3YLX;=tAVxX89Sv6jUN6YA8mynDu|m%iZQ6{4e*K^8gdG?MFsZ>)d7Xsj8$TPTSY}~-*c<)+W1G} zSSiuAmabpP(G&%p`rGUK>+{_JReKA_erUMMcyFrB{}90fBh2oE^Ks& zJul8GAfsfYQa~y~s`7G|96yuL^VpHxWcQi6kJ;7B{0ygU{n`C&!s#bacLT^i(Dg$4 zYMYM_^GuL-2jVY6YPVSb5c}eG6w+eek(8-d2yol$r98bjcvD2`lr85td&?P(YjFK^ z-LfhALe9Pd|Bj2e|GAxmRKr8qcM0@;(AWzr58Hie+9OKZJxDmm&L0Rn@xtm04Jf$L zoIij4OFvjI<|=XydsHCToyd7BVpXrfK0~|MwWV;vjzaE*JAqv$XzqtCCxLtf+S{<= zkli1XaC^+0K5BfY*UtX1lgRG#TM)Mag%^FJQHJS6Jdce%R)5mEztUSiwff`g^Cur# z>`~L~Fl8Fl--VAW@&1DLCj7SC?vM4`PD^+|i@T+09T@Hh)FQv?7s1O;c&_Wrcj&#un# zYFN(rJP~GzK+^?PmtbY>5FbEt#FX(p!u3adY1v;%2a>fRWgAi%kW!CkRrNd7R?<#v zCI0-M{Jtg<_8*MH>p% zKKIi+ApW$KcBY*6<+jm$|K>tw`CQm{0V;ohj=|wR&P08KB2JlP$NEKv{?OJz0r?#F zr{zlgW9Z^YUlBz#E+>u@5gjG;wzUj$mA!seb&h}YYI;Q;RD1=kFI#BD32+j7yTa(p zx%6n4F>W0DRgQ&R)_M`MRLUw5v$jMr_UAC_^T)NUn$Ywqr*4U3^}<x@81;;WzvrI-W6BBDCtYQ(fNJL*LWEY88>%`1;67~lCK@`;W^J&`_ zGqz_lcBe6`vWFROPcSw~iBc(hlNis%C>66e%2*r4%nfqTJ_Q4Uvk1!8KnV{H$e}pu z?c6W$3S=2C2=oHC4vu0o&|Ug~>U0e_#5I61Cvlvy1_l2Cpp@WP_gdiBDX&G+H2`-@ c;M^E|BrMU#0jEI$xR?QCxIc^0NgTHEZ{7&}ssI20 literal 0 HcmV?d00001 diff --git a/mcs/class/System.Drawing/ChangeLog b/mcs/class/System.Drawing/ChangeLog index c2a646fd824..8394b2eb0d1 100644 --- a/mcs/class/System.Drawing/ChangeLog +++ b/mcs/class/System.Drawing/ChangeLog @@ -1,3 +1,7 @@ +2005-11-28 Konstantin Triger + + * System.Drawing.vmwcsproj: Added System icons; changed to mono icon implementation. + 2005-11-14 Andrew Skiba * net_1_1_java_System.Drawing.dll.sources, diff --git a/mcs/class/System.Drawing/System.Drawing.vmwcsproj b/mcs/class/System.Drawing/System.Drawing.vmwcsproj index babbfc09724..3c4478b53dd 100644 --- a/mcs/class/System.Drawing/System.Drawing.vmwcsproj +++ b/mcs/class/System.Drawing/System.Drawing.vmwcsproj @@ -18,6 +18,15 @@ + + + + + + + + + @@ -37,7 +46,7 @@ - + diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog index abfc3338a66..446e929e831 100644 --- a/mcs/class/System.Drawing/System.Drawing/ChangeLog +++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog @@ -1,3 +1,7 @@ +2005-11-28 Konstantin Triger + + * Icon.cs: TARGET_JVM changes. + 2005-11-17 Vladimir Krasnov * Image.jvm.cs: fixed Save, flush output stream diff --git a/mcs/class/System.Drawing/System.Drawing/Icon.cs b/mcs/class/System.Drawing/System.Drawing/Icon.cs index d943b6bfe7b..cfe033e21a8 100644 --- a/mcs/class/System.Drawing/System.Drawing/Icon.cs +++ b/mcs/class/System.Drawing/System.Drawing/Icon.cs @@ -100,7 +100,7 @@ namespace System.Drawing private Icon () { } - +#if INTPTR_SUPPORTED [MonoTODO ("Implement fully")] private Icon (IntPtr handle) { @@ -118,7 +118,7 @@ namespace System.Drawing this.destroyIcon = false; } - +#endif public Icon (Icon original, int width, int height) : this (original, new Size(width, height)) { } @@ -211,10 +211,12 @@ namespace System.Drawing public void Dispose () { +#if !TARGET_JVM DisposeIcon (); GC.SuppressFinalize(this); +#endif } - +#if !TARGET_JVM void DisposeIcon () { if (winHandle ==IntPtr.Zero) @@ -225,12 +227,13 @@ namespace System.Drawing winHandle = IntPtr.Zero; } } +#endif public object Clone () { return new Icon (this, this.Width, this.Height); } - +#if INTPTR_SUPPORTED public static Icon FromHandle (IntPtr handle) { if (handle == IntPtr.Zero) @@ -238,7 +241,7 @@ namespace System.Drawing return new Icon (handle); } - +#endif public void Save (Stream outputStream) { if (iconDir.idEntries!=null){ @@ -351,6 +354,8 @@ namespace System.Drawing writer.Flush (); + stream.Position = 0; + // create bitmap from stream and return if (colCount > 0) { Bitmap new_bmp; @@ -419,10 +424,12 @@ namespace System.Drawing } } +#if !TARGET_JVM ~Icon () { DisposeIcon (); } +#endif private void InitFromStreamWithSize (Stream stream, int width, int height) { diff --git a/mcs/class/System.Drawing/System.Drawing/SystemIcons.jvm.cs b/mcs/class/System.Drawing/System.Drawing/SystemIcons.jvm.cs index 67052078a03..2a382fa4d5d 100644 --- a/mcs/class/System.Drawing/System.Drawing/SystemIcons.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing/SystemIcons.jvm.cs @@ -1,8 +1,9 @@ // -// System.Drawing.SystemIcons.cs +// System.Drawing.systemIcons.cs // // Authors: // Vladimir Krasnov (vladimirk@mainsoft.com) +// Konstantin Triger (kostat@mainsoft.com) // // Copyright (C) 2005 Mainsoft Corporation (http://www.mainsoft.com) // @@ -33,74 +34,40 @@ using System.IO; using System.Configuration; using System.Collections; using System.Collections.Specialized; +using System.Reflection; -namespace System.Drawing -{ - public sealed class SystemIcons - { - private static readonly string SYSTEM_ICONS = "IconsResource"; +namespace System.Drawing { + public sealed class SystemIcons { + static readonly ArrayList systemIcons; - private SystemIcons() - { + enum IconName { + Application, Asterisk, Error, + Exclamation, Hand, Information, + Question, Warning, WinLogo } - public static Icon Application { get { return LoadIcon("Application");} } - public static Icon Asterisk { get { return LoadIcon("Asterisk");} } - public static Icon Error { get { return LoadIcon("Error");} } - public static Icon Exclamation { get { return LoadIcon("Exclamation");} } - public static Icon Hand { get { return LoadIcon("Hand");} } - public static Icon Information { get { return LoadIcon("Information");} } - public static Icon Question { get { return LoadIcon("Question");} } - public static Icon Warning { get { return LoadIcon("Warning");} } - public static Icon WinLogo { get { return LoadIcon("WinLogo");} } - - private static Icon LoadIcon (string iconName) - { - Hashtable systemIcons = (Hashtable)AppDomain.CurrentDomain.GetData("SYSTEM_ICONS"); - - if (systemIcons == null) - { - systemIcons = LoadSystemIconsFromResource(); - AppDomain.CurrentDomain.SetData(SYSTEM_ICONS, systemIcons); - } - - return (Icon)systemIcons[iconName]; - } - - private static Hashtable LoadSystemIconsFromResource() - { - string [] iconNames = { - "Application", "Asterisk", "Error", - "Exclamation", "Hand", "Information", - "Question", "Warning", "WinLogo" - }; - - NameValueCollection config = (NameValueCollection) ConfigurationSettings.GetConfig ("system.drawing/icons"); - Hashtable icons = new Hashtable(9); - + static SystemIcons() { + + Type nameType = typeof(IconName); + string [] iconNames = Enum.GetNames(nameType); + systemIcons = new ArrayList(iconNames.Length); + Assembly assembly = Assembly.GetExecutingAssembly(); for (int i = 0; i < iconNames.Length; i++) - icons.Add(iconNames[i], LoadIconFromResource( config[ iconNames[i] ] )); - - return icons; + systemIcons.Insert((int)(IconName)Enum.Parse(nameType, iconNames[i]), + new Icon(assembly.GetManifestResourceStream(String.Format("System.Drawing.Assembly.{0}.ico", iconNames[i])))); } - private static Icon LoadIconFromResource(string iconName) - { - Stream s; - try - { - java.lang.ClassLoader cl = (java.lang.ClassLoader) - AppDomain.CurrentDomain.GetData("GH_ContextClassLoader"); - if (cl == null) - return null; - java.io.InputStream inputStream = cl.getResourceAsStream(iconName); - s = (Stream)vmw.common.IOUtils.getStream(inputStream); - } - catch (Exception e) - { - return null; - } - return new Icon(new Bitmap(s)); + private SystemIcons() { } + + public static Icon Application { get { return (Icon)systemIcons[(int)IconName.Application];} } + public static Icon Asterisk { get { return (Icon)systemIcons[(int)IconName.Asterisk];} } + public static Icon Error { get { return (Icon)systemIcons[(int)IconName.Error];} } + public static Icon Exclamation { get { return (Icon)systemIcons[(int)IconName.Exclamation];} } + public static Icon Hand { get { return (Icon)systemIcons[(int)IconName.Hand];} } + public static Icon Information { get { return (Icon)systemIcons[(int)IconName.Information];} } + public static Icon Question { get { return (Icon)systemIcons[(int)IconName.Question];} } + public static Icon Warning { get { return (Icon)systemIcons[(int)IconName.Warning];} } + public static Icon WinLogo { get { return (Icon)systemIcons[(int)IconName.WinLogo];} } } } -- 2.25.1