From b40bedfd6943885a6d7db6e74044bacfc9cf4eb0 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Fri, 2 Jan 2004 13:40:57 +0000 Subject: [PATCH] more diabled images, free image lists git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3345 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Makensisw/makensisw.cpp | 3 +++ Contrib/Makensisw/toolbar.cpp | 10 +++++++--- Contrib/Makensisw/toolbar.h | 3 +++ Contrib/Makensisw/toolbar24d.bmp | Bin 12344 -> 12344 bytes 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp index 4210516e..33e9dcba 100644 --- a/Contrib/Makensisw/makensisw.cpp +++ b/Contrib/Makensisw/makensisw.cpp @@ -192,6 +192,9 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { { if (!g_sdata.thread) { DragAcceptFiles(g_sdata.hwnd,FALSE); + ImageList_Destroy(g_toolbar.imagelist); + ImageList_Destroy(g_toolbar.imagelistd); + ImageList_Destroy(g_toolbar.imagelisth); DestroyWindow(hwndDlg); FreeLibrary(hRichEditDLL); } diff --git a/Contrib/Makensisw/toolbar.cpp b/Contrib/Makensisw/toolbar.cpp index 180c54e7..86b8c2f5 100644 --- a/Contrib/Makensisw/toolbar.cpp +++ b/Contrib/Makensisw/toolbar.cpp @@ -83,9 +83,13 @@ void CreateToolBar() if (GetProcAddress(hMod, "InitCommonControlsEx")) { // Version 4.70 // Modern toolbar, 24-bit bitmaps - SendMessage(g_toolbar.hwnd, TB_SETIMAGELIST, 0, (LPARAM) ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION)); - SendMessage(g_toolbar.hwnd, TB_SETDISABLEDIMAGELIST, 0, (LPARAM) ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24D), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION)); - SendMessage(g_toolbar.hwnd, TB_SETHOTIMAGELIST, 0, (LPARAM) ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24H), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION)); + g_toolbar.imagelist = ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + g_toolbar.imagelistd = ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24D), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + g_toolbar.imagelisth = ImageList_LoadImage(g_sdata.hInstance, MAKEINTRESOURCE(IDB_TOOLBAR24H), 16, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + + SendMessage(g_toolbar.hwnd, TB_SETIMAGELIST, 0, (LPARAM) g_toolbar.imagelist); + SendMessage(g_toolbar.hwnd, TB_SETDISABLEDIMAGELIST, 0, (LPARAM) g_toolbar.imagelistd); + SendMessage(g_toolbar.hwnd, TB_SETHOTIMAGELIST, 0, (LPARAM) g_toolbar.imagelisth); // Version 4.71 if (GetProcAddress(hMod, "DllGetVersion")) { diff --git a/Contrib/Makensisw/toolbar.h b/Contrib/Makensisw/toolbar.h index 107e46b5..ffc2d89a 100644 --- a/Contrib/Makensisw/toolbar.h +++ b/Contrib/Makensisw/toolbar.h @@ -67,6 +67,9 @@ typedef struct ToolBarStruct { HWND hwnd; HMENU dropdownmenu; POINT dropdownpoint; + HIMAGELIST imagelist; + HIMAGELIST imagelistd; + HIMAGELIST imagelisth; } NTOOLBAR; void CreateToolBar(); diff --git a/Contrib/Makensisw/toolbar24d.bmp b/Contrib/Makensisw/toolbar24d.bmp index b0260c490c676df6c8fff19ea88410554e93aae0..b384a966eeb63ef8858278c7220c152f92d27c9b 100644 GIT binary patch literal 12344 zcmeI&$MaQL5eM*}Zrxa}{1aTdvRu3Ozky;wutahY1&I=e9EY5dC<21yoO8}OiJ#x= zq3g`O@Auxr(HgMqVh(-J?Q>3_?r(?tm|y++mp|`n&@YTX>*jvY)%D}XUq9`B>iVJg zKlxGo*O)MT==$)-&WPl9|I^~Ae*OBz{(buN*|KHJzjxNSapV5u@K68QgoYYPD6v}x0J?b>zh*s;GAw0rk% zPcbf7uz*-)pWip=FU@GkkRe`H({S0L7?gK4ku^Np6!&ockdoPd^n=O*m^CWE?v5G z&YU^RmoHzra%Cq*mKJ)Vrf2meZ2mKp=h-!D*36wd_u|Eie{V*dwP?{I9xOuuY~O!A1Dh5+!79z9y}Bpl!em?SfTfnU(earGso;;D*DUV!DXb1rYjQyR+k0M3cm0`jx z7>_Ssz9g&|rT%rMuAZ5?Sk8Pw@?6Q1(jy$A$WfJ%B_XzSI&8x~FED%H|IVE|4C+suU_eAXzmJb#GVqnD2`Qo_Ur+EZY6*)iU1!W z+3)r1*Nm3?R~VYeRCO|6k&MSLOP(KDL+ao)E-2Gf@WX};(<>^Js%JVq@UJg=_Uzfy zr%yo|{*8#C1`i$#KY{;B!>{v{tP~4ft7Zv2RAj9ec$D~ON&0NqumNawQyw)=jstJF zEzQoG(j5|0P@ky4$i3pC3<1gv8Z?O0-Pb;p)bLE7K3y4#h3*(3U>-Q@E@lB?9+cK7 z^|2~CADuQ{eo*fiCn+v2`TGcJjeq;p6>t{(N5JM~-@SWhX6@RwtU-T$sVGbQ3p9sv zE-S^A8CE$U+=zflj313qT*RSmiI>Uz56E+(bR-Ed1$zQ#Nx(0w7^N3bPmja)iWMt3 z!dqpO<>OKFX+~ePYSpU1f2HAr}bVqg8PW`iR-46b3O?@SnoI7K37@tvs=hEB4{r$`j7BI+1U?KMzJ}9y@j{bCm@4 zia6k{TelAHRk|CtVVK=~F>9Zo)ToE#bi9O<_y;XIWWx`5&!0aR0>BJE>V?D@Z!7sf z5hb$ZXRs%%a0mgpj(_9#Lr$cgphI9F7##uO)FT7`NWk&A3C=naZzr|?+{oalTAYa{+Yrn<%|(nKsBK@J3Cqk zsABRt$8nic*vHPIBcfguL`0~(ECc^i1c5B9&b3uj>KvZ|)VA_YDIwijJ|sJrk1Mp6 z=S_vUP5|#mcz9MCSd#V3q|4wR!V@rcCh=cs_|5y^f;~|Hduol$FEyF(3IB4tnBq|2 z2UMSXffE>}j~p%rd7MwFp=T475H18fDhCz(yDwofb)9p@L6IB%vp`-snG*l?5&+oI z`FK@=PpTa-9CFEM;IqlPle9Dv|)5-qj!n!nMCN}JCdt$56o zW4S7L-hsmknXH6>E7OoA{RAOz2nW#$>QM#a)4;t{hcRQu*jak9rvgpbSC!wR1cLU@ zt@N%ZRINq{~PkDlCzrbA0Yr>K^`MZ7{Q*ESQrz= zi81jHgmnTWrY1uefXjxTwFCb~g+LVme)~tJDvt=>a{l6L&V^)2RR|!A@-4W4LF*3r zLO_`?>6P|CdLUw_MV$P!U+bKe^BzY)(< z7PWbMiLPFgTZb-9P;`NV6m>I*~k?{PDb^Qapym)Gt&T4d&^V z_z9+U=Tq6Arz-gO814&6_}AcR;R6472}DIu1(Yq1Lx&Dkyvl6_xJ_J82(VJ@?-xzTq+~Ga8o$_60?`P` zX$T`Qfge+mr$CVTkLpV%YtF@sdSOE-LO|u#@ykhF znQ|sdK$-mWZQ1$cxF@FavhqH+gU5WJ#5{7MUqqXej2rA)~~peg|WWn_8uV>0uW zk`g=5MJyk`ba@wn`J}v8h3QW3JyRrqOFp&XubdK((96*fD^r0hv#0zSw#^*MvwbShgSWFZzOj{*=Be0BO z>IWiMZYxh9!!ViFt5PhPFGW6Kk7=!Qhi^Z%;cu}m=R#~9`Q;MDf&fXG5aZ*bd|T&z e0yN^_o1yjQ_2u9DjGH2AB=fzi^kpf~)%7pUgLzE= delta 269 zcmdmyup?oDnt&iT0|N-dz+^_I{KV%MQe&Jfz!b7MpSc-{m&1nOg>TN` z3}D>M&ZG}g*|<4}$Cq(43zHF)$B)7j@@1SnTf-P;Zq()+QJ`L4CQXp)_Q^SlTAQay zXu@rRib(6gMOrrJ$VI|=K-&~!;JmucIV$mRUiIc2^&})-z81pGb(^Q@B2-E