From b2beea777c910d38b75b52f7816b0385d4092109 Mon Sep 17 00:00:00 2001 From: kichik Date: Mon, 20 Jan 2003 13:57:30 +0000 Subject: [PATCH] Fixed bug #671161: DISABLED dir and file request fields now disable the browse button too. git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2074 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 19 +++++++++++-------- Plugins/InstallOptions.dll | Bin 12800 -> 12800 bytes 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index f9ad9d08..3474b09c 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -427,6 +427,7 @@ void AddBrowseButtons() { pNewField->nControlID = 1200 + nNumFields; pNewField->nParentIdx = nIdx; pNewField->nType = FIELD_BROWSEBUTTON; + pNewField->nFlags = pFields[nIdx].nFlags & (FLAG_DISABLED | FLAG_NOTABSTOP); //pNewField->pszListItems = NULL; //pNewField->nMaxLength = 0; //pNewField->nMinLength = 0; @@ -875,9 +876,11 @@ int createCfgDlg() WS_EX_TRANSPARENT } }; + int nType = pFields[nIdx].nType; + #undef DEFAULT_STYLES - if (pFields[nIdx].nType < 1 || pFields[nIdx].nType > (sizeof(ClassTable) / sizeof(ClassTable[0]))) + if (nType < 1 || nType > (sizeof(ClassTable) / sizeof(ClassTable[0]))) continue; DWORD dwStyle = ClassTable[pFields[nIdx].nType - 1].dwStyle; @@ -904,7 +907,7 @@ int createCfgDlg() rect.bottom += dialog_r.bottom - dialog_r.top; char *title = pFields[nIdx].pszText; - switch (pFields[nIdx].nType) { + switch (nType) { case FIELD_CHECKBOX: case FIELD_RADIOBUTTON: if (pFields[nIdx].nFlags & FLAG_RIGHT) @@ -952,7 +955,7 @@ int createCfgDlg() SendMessage(hwCtrl, WM_SETFONT, (WPARAM)hFont, TRUE); // make sure we created the window, then set additional attributes if (pFields[nIdx].nMaxLength > 0) { - switch (pFields[nIdx].nType) { + switch (nType) { case FIELD_TEXT: case FIELD_DIRREQUEST: case FIELD_FILEREQUEST: @@ -960,15 +963,15 @@ int createCfgDlg() break; } } - if ((pFields[nIdx].nType == FIELD_CHECKBOX) || (pFields[nIdx].nType == FIELD_RADIOBUTTON)) { + if ((nType == FIELD_CHECKBOX) || (nType == FIELD_RADIOBUTTON)) { if (pFields[nIdx].pszState[0] == '1') { SendMessage(hwCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); } } else if (pFields[nIdx].pszListItems && ( - ((pFields[nIdx].nType == FIELD_COMBOBOX) && (nAddMsg = CB_ADDSTRING) + ((nType == FIELD_COMBOBOX) && (nAddMsg = CB_ADDSTRING) && (nFindMsg = CB_FINDSTRINGEXACT) && (nSetSelMsg = CB_SETCURSEL)) || - ((pFields[nIdx].nType == FIELD_LISTBOX ) && (nAddMsg = LB_ADDSTRING) + ((nType == FIELD_LISTBOX ) && (nAddMsg = LB_ADDSTRING) && (nFindMsg = LB_FINDSTRINGEXACT) && (nSetSelMsg = LB_SETCURSEL)) )) { // if this is a listbox or combobox, we need to add the list items. @@ -1017,8 +1020,8 @@ int createCfgDlg() } } } - } else if (pFields[nIdx].nType == FIELD_BITMAP || pFields[nIdx].nType == FIELD_ICON) { - WPARAM nImageType = pFields[nIdx].nType == FIELD_BITMAP ? IMAGE_BITMAP : IMAGE_ICON; + } else if (nType == FIELD_BITMAP || nType == FIELD_ICON) { + WPARAM nImageType = nType == FIELD_BITMAP ? IMAGE_BITMAP : IMAGE_ICON; SendMessage( hwCtrl, STM_SETIMAGE, diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 1628031c3e60b2a88255c7a0139b1bec1746af3d..60598e80acfc750fcf960c6679b64899e38f9992 100644 GIT binary patch delta 2856 zcmZuzeQ*=k5x$)fL(RTR5 z_x88HeY^X1_dVI$=xy8_PO``)TO#A|%ThYNR<$un>QE8VQT%z_EM3QU;yH&}RYZy> zcToeTs|&7_1B2R)9T-f~>T|6p4yeIK-6hy< zLeq>cTMj@>%#9l_$|Ack%!cWFU*!mP@`<)cuowAG+!O41PgHuru2(=A#8{M7DA)@{ z+auN&P7-Eh6^Zf8rVH_9p6}KyNHF+@v>^Q@{4MFX>0jbaQp<=sJYTvnVv6b;?XNQY z_u57!E3KPa5-Bb_P4PJ=Bx;m%fQEr#(9G(Jj z7SB}RyPeBq^n$V>*QF$JYEKRTt-m%I=7B#0-l8unWG|2+`U!j!+W0vy1^EkLk&s3H z3ujIV-)k573nj`rTSUkul7e3%6Nj%l>(?|~3huX3to_sPya zmAoQP+#H4*AbR`ZE7T4Nd{jO!W-9kX;IDQl&f~^Gbx3w~7Cq)X0)HbxrpfM5f-HPY z3Vh%Hb9#kSoC$n5s6L$t5Y%)+NquYbu$FWvEY4qz!y>FDB@S=+))Zn;eTD7C`92VR zYxHr}12`<=zF4xr4>ZsB#ZuPUe6jR(Wxm)5SC%i9;bsOaNt+9K=MJYu%EU@?k{51` z_YB?{PEF^B#7Z@6jEn}OBG-N2+@YdKKgcSVT9LtgpW3DN&Xv>lr73GnwND4@vRF*y z!%E{>WwJ{6K6!;r;QK}XhB!MX(eo1is_gC;_~Z7VdbaHDlih%aWcPqf25vx&Wp`BS z%6`uCxJzPn4;wfw%pKDDITeOInxh)|a=e63nh9p5fz#^>eX-Q$F>q4PC?{6q_zcdZ zcuyEZHMIWoxYFtrt-l9^C)<@-sL=$@Y5mqXKf>c4)5S-t0Ce#Ki{nfGJXj**p?KOr zeq0mvCivY6{+F;o9C1epjevAy<#S58ZvqXoQMnlok}J}eE4xm?Ug;ITp^ zOnlf97tM-T78hAX)Jy-)oBZnVZCOq%vE#rA`ZXNKN^A zyjglL{~+EY%_^wJS036`uoT}?o_erQoud5jAf*;hNKcuJVT<5z$00-U`EEg(L|>w>(H-;vVN?p0L5-ruQbp7hil8{E zimIk+sCsHCwTya``Z=|l+Cu%B+D{#({zCOo=cs>D5o&-+HjOb&G?kdzOxsKyrjJY? zn=YC9Ot(#UOhcv&k2%YnXP#g#F&oW{*=DwzmzV`}yLqd5m-(>y6LYuuZ|1Q1jyY;p z(dqOkx{#hom(mo?(KG2ebR*qFzfHH$JL$djhx7^hHl1dfYN0I0ET38aYPn(wTgEeb zW(q?yRm^KlE7QhoV%nK)Ob2t2Im+}fml)4A<|fn63^2n?602cHu?1`~`#f95T38#) zv(;=p`zre*b~)R`u4P-<^=y!BXLquD*$>!bY$tn${er#5-eDiG4_S=Ua5-E7H;F6Z zjNEi?7B`Pu%r$a;ZUgrlZYQ^w`;a@ro#L)=*SUwB%9?7;w&r`Rv#j&14c12MYOB}U zZrx!$U_EYqr{dj;{S`+lKB+ia(OYq;;=79B3akjj^572W%h~dS<(=h2Ah*UC@%qH{6 zVsZ*uMk10Wr<1eE`D6pxNIJ=t=xruBix04;@`{W_=DETSbLtZ5N$h+hN5{D@p zgI++>PzB;q9cn;7MQ@{K)K-PIqTT2Nv>$zp`p``jMKPp_51F2tN|DsdFkH*2mDF15 i7u37dZfYO(5p|5}q|Q>;sk_u5m2bkZL#1VBRR00QkR$~F delta 2856 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 DQCibP