From b98ede7c889ad7e4d61c29a2c2d697fc25675545 Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 29 Dec 2002 20:16:35 +0000 Subject: [PATCH] Group flag added for radio buttons only git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2015 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 32 ++++++++++++-------- Plugins/InstallOptions.dll | Bin 12800 -> 12800 bytes 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index bc671fb3..c4c48f2c 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -113,20 +113,23 @@ char *STRDUP(const char *c) #define FIELD_GROUPBOX (12) // general flags -#define FLAG_BOLD (0x1) -#define FLAG_RIGHT (0x2) +#define FLAG_BOLD (1) +#define FLAG_RIGHT (2) // text box flags -#define FLAG_PASSWORD (0x100) +#define FLAG_PASSWORD (4) // listbox flags -#define FLAG_MULTISELECT (0x200) +#define FLAG_MULTISELECT (8) // combobox flags -#define FLAG_DROPLIST (0x400) +#define FLAG_DROPLIST (16) // bitmap flags -#define FLAG_RESIZETOFIT (0x800) +#define FLAG_RESIZETOFIT (32) + +// radio button flags +#define FLAG_GROUP (64) struct TableEntry { char *pszName; @@ -515,6 +518,7 @@ bool ReadSettings(void) { { "FILE_EXPLORER", OFN_EXPLORER }, { "FILE_HIDEREADONLY", OFN_HIDEREADONLY }, { "RESIZETOFIT", FLAG_RESIZETOFIT }, + { "GROUP", FLAG_GROUP }, /* { "NO_ALPHA", 0 }, { "NO_NUMBERS", 0 }, @@ -828,7 +832,7 @@ int createCfgDlg() DeleteDC(memDC); -#define DEFAULT_STYLES (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS) +#define DEFAULT_STYLES (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_GROUP) for (nIdx = 0; nIdx < nNumFields; nIdx++) { static struct { @@ -837,22 +841,22 @@ int createCfgDlg() DWORD dwExStyle; } ClassTable[] = { { "STATIC", // FIELD_LABEL - DEFAULT_STYLES | WS_GROUP /*| WS_TABSTOP*/, + DEFAULT_STYLES /*| WS_TABSTOP*/, WS_EX_TRANSPARENT }, { "STATIC", // FIELD_ICON - DEFAULT_STYLES | WS_GROUP /*| WS_TABSTOP*/ | SS_ICON, + DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_ICON, 0 }, { "STATIC", // FIELD_BITMAP - DEFAULT_STYLES | WS_GROUP /*| WS_TABSTOP*/ | SS_BITMAP, + DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_BITMAP, 0 }, { "BUTTON", // FIELD_BROWSEBUTTON - DEFAULT_STYLES | WS_GROUP | WS_TABSTOP, + DEFAULT_STYLES | WS_TABSTOP, 0 }, { "BUTTON", // FIELD_CHECKBOX DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX, 0 }, { "BUTTON", // FIELD_RADIOBUTTON - DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON, + (DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON) & ~WS_GROUP, 0 }, { "EDIT", // FIELD_TEXT DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL, @@ -867,7 +871,7 @@ int createCfgDlg() DEFAULT_STYLES | WS_TABSTOP | WS_VSCROLL | WS_CLIPCHILDREN | CBS_AUTOHSCROLL | CBS_HASSTRINGS, WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE }, { "LISTBOX", // FIELD_LISTBOX - DEFAULT_STYLES | WS_GROUP | WS_TABSTOP | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT, + DEFAULT_STYLES | WS_TABSTOP | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT, WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE }, { "BUTTON", // FIELD_GROUPBOX DEFAULT_STYLES | BS_GROUPBOX, @@ -908,6 +912,8 @@ int createCfgDlg() case FIELD_RADIOBUTTON: if (pFields[nIdx].nFlags & FLAG_RIGHT) dwStyle |= BS_RIGHTBUTTON; + if (pFields[nIdx].nFlags & FLAG_GROUP) + dwStyle |= WS_GROUP; break; case FIELD_FILEREQUEST: case FIELD_DIRREQUEST: diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 44cfaeab052ec502bcc1fc5eb49edd62fbd4a8e5..20f1e8944fccecf8f0bf27e4c91ee94be901ca71 100644 GIT binary patch delta 4830 zcmb6ce{@sj^-GhcX-S(<8)>nX6vGiH9Fx2}q&BZjrIF$&q_jz`3c?OM=MgyyJ1^SK zLL#qK;%o3naD&M_X5mQZL8q&3%paIarNEdgQc9h8>=ZZ;+nwP~ho!50yZ0q2b%*`2 z^fcf7_1$~Fd+&Gem(a%0#^;7h^P3EnB=s34d8IQ{T0#neFgHn5M^&mPGTPM9SOyb) zOLeqfrK;lSTiRQ5&#fj#YU;HTBXZAampD<@uxp2k5Q*yt zdbq|?06d^djR2J-faa1m=Qut5!Mll(Z(E_rETX4lU^r{Hsw?_+)(X}B=wjV+{TQhC z@%t3HXh>H8R$tVaXQK^YWGn5sV(5Gx4jd`C($w>nTH*?#f6>{4im{bB=5Vc9?D;la zTbQ!HGRG3GwM-$!;o4%!m12srI$V=umU2;dby!(eiQm+MiOA!W(udX^p)9%+nir}e zM#9T#LU;suGwh&(rBL}d&9_EF*|UPkk%JSIHjiX5iH~$d9Mw1Ynhw9Y40d$Emrw2k zwft@bi{^B+g`2%>lE zr!(Fogwl8+a2xo>>5RBeq1F6=rdMc7leD-Iuox=tNEmhnKy^fu=o!{{~s!1gl1D}6N<%lPrJ|*oS8d zYx1C^if7yx!~$xP|N1@XmtPuJ1c2YCvCK!qU_c{(1I(m7zBonH$z4F~NC;(OBEusu zo7(8*3qb_7=@q}Ipw*|(VoW8d1QP_gF`_Pxo}N0&qND(@bjV6`_;GX*RL++-OnCyR z6;5E)-!T&_PboPsFXL?(j&9Mu8O3scK|4T%H2Vr;=D%ioTpX7aC1ZZV6oZFLNz9SbY_zw!0x7 zxp}+tTcB%**IEKvnt2lHi)ISZ*YmaneN7B4=Y}CzVGc#Y9C8EsP4YqLkC5;hsKZMy z037QFMn#{Yy#)}7AoK`8VnS2V7sqHD+SdUdS_&2C1wdW|cey=bXs-pNiFbmYCd#5E zYT60sk=S-C2|^dd8wM&8pkB~Dd36G=gOFFB5*<|N6@BQ@EuaWIvYIE+XQVawRq^v^HEDa$ua3)8Xpjy{Tnmb;D2wFyDDuuqB`1M+m_SqZ z@vqe3ZqyOyYXLkR!)^m*p6f}Hsp%L<`}iTWuBZVS>_90Q#a>Eg3u<5$E2m?c;B_H| zqzJ|EE*{42Q*l(t1{+DAV%TDUa#Pys+3$vKNx0&@U^Rvf2Y5wD5{GqZ5hWDyeQ*G& z1ZN9##pm;tZyEyGilcEHR)+RAXi5?H0O(AHcMC8j zb~Ah@sY*@-$x=gM$rV2B0={DiW}@h8Auh6qJPN#WY zz=OT~Ta`{>ko*xgS}Mqn_B z@=PrK_%R5JVOKp=lf*8<9VTpv5q%<3a6-DbK)k9lbd~~Fys9@mT?jx#v%;^Tf&QN1 z4EobTY3C3$Oeu8E1w|UJn+&^qp;nZ!9Cphw)UHTFW2Zuo`8w}%lBc7AlSy9jb>8TI z^DM|iU19fFL~}f;Kceq}xQVTWWSdUvFY^WmR9;zZHIr>x2&T$?S!^vP5aJ|vNaYI)>5IFT84kGFZn3GH@HoXFn3NSw$KW{MLt0@YWl9Xg>RRQJ7Zgq5lt z;;>O~?vXXw?n$Xy1G`4%fP_Z)r&u>>9vKCRU{{8qL9ELqXhL<@G9>pH<`PS#%sooC zy29>blKXNpgJo`+29AZ@2~R|`h6YAy0Psl~7^jYo0SGA#^itD7Oo(#ubXtywYfdrDY=OLgjBz%Bb&x2%{13IbRQdVC)qL#eJfT%^HpqAVTzi|!RzVW7Lp=ojOCO^cG{}$9=kBO^d z+I8uCXOdEp!^ag7=JNzDKEDTgYwBK`PD0u!i|jN78(%W-5%(T`KTIpQyZA~0)FW@g zlk~!!9GT~nEeimH{yhM%F`@JLUDV`JJVBCl8D^tCa*qaFu>w_@ToMUu6(DR~ zcSIa5ZtzL$E5K~x$1HG_C)2Hq`8+-Z=WA$i@VRjO^f~)M)UQkTC>$`UMsFGbSmO4< zceq4|zJGIJzS85)b|eC2ks6EM11h2yZ=M$va7evTUZM=xO!?G5D2<`1iX*}d&vgg9 zX(OGWvb+Q*j{q_i?4hp-AEbkQ71B3!qN^ zJzT=(BXT_YXi-t{|JunbJNq(m6Lb=C=|}&9M><$cdvIgJft29|%66KI+b=x?h*VPu z-nUtF>NqxgAq!y=&_juK&zb!i+R+|q3OJb3=W|FP~3a}TJ3yP+AN z6ZkVD3)WC-ZGm+L;G1F1fpvXqZG=?^crC2iusUJQgw+Zwy!Oa^SmBopF~bVuniRmQ zhc*4t01kg-44&geM}p)$0JvcQ31&j@osKv<0#{ox4DuuabTs@X%E8Wkup<9CSk18R zgw+LW`V&&*G8)Z5Kv+#O8j*)^UJ7oh4x%!(!e~Ju{dG87uTtn+fF2@ZBZ1@mFBqfb z%DBykG8j46OwfZc?9BpW=!Cmwg`)3nZ)4-?RfIG&RyVH5UPj3BHLJZI(!G6NNYkCS z@E*15wy1aUoxv)n+j+0E-ua;O$4=h)h%?{}IiGTNI$v<^b?$e*=KQVmL+4TFDd!i? zubgAf2`6=Cax=LiZVtDQvvPNG%egwPfm_RM;=N4cy@ zePvnCDxGjS!`UxU`$~Jg{eJr<`=j>9?IC-_9<{$@kJ%5{U$=ML|7h>Ce`^2QK4w=l*-UUI zQ^G7{7^a-5V%*Fs#>YIsY+!ii5hlPq!R%z7V}8!O%)H9H&AiJbm_Fvu%o*lO<^nUq zTwzoWy`$Js>R9aH9LpSyj{6-CJGMG@ICeVrI^vEl$J>sN9iKP`9iKbCa_HH7*1|4i zm$H@Ya@NB(v+LQX*iH-kBKtCXfPI5~kNt!lV8385vVUhM*xV(>OXe delta 4789 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