From 52dbb25cfa5c9ecc19995d761b5d813b8f0b461a Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 4 Jan 2003 13:02:17 +0000 Subject: [PATCH] - No more group by default - Added NoTabStop flag git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2028 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 22 ++++++++++---------- Plugins/InstallOptions.dll | Bin 12800 -> 12800 bytes 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 7f499ea3..518646e9 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -116,21 +116,20 @@ char *STRDUP(const char *c) #define FLAG_BOLD (1) #define FLAG_RIGHT (2) #define FLAG_DISABLED (4) +#define FLAG_GROUP (8) +#define FLAG_NOTABSTOP (16) // text box flags -#define FLAG_PASSWORD (8) +#define FLAG_PASSWORD (32) // listbox flags -#define FLAG_MULTISELECT (16) +#define FLAG_MULTISELECT (64) // combobox flags -#define FLAG_DROPLIST (32) +#define FLAG_DROPLIST (128) // bitmap flags -#define FLAG_RESIZETOFIT (64) - -// radio button flags -#define FLAG_GROUP (128) +#define FLAG_RESIZETOFIT (256) struct TableEntry { char *pszName; @@ -521,6 +520,7 @@ bool ReadSettings(void) { { "RESIZETOFIT", FLAG_RESIZETOFIT }, { "GROUP", FLAG_GROUP }, { "DISABLED", FLAG_DISABLED }, + { "NOTABSTOP", FLAG_NOTABSTOP }, /* { "NO_ALPHA", 0 }, { "NO_NUMBERS", 0 }, @@ -834,7 +834,7 @@ int createCfgDlg() DeleteDC(memDC); -#define DEFAULT_STYLES (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_GROUP) +#define DEFAULT_STYLES (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS) for (nIdx = 0; nIdx < nNumFields; nIdx++) { static struct { @@ -858,7 +858,7 @@ int createCfgDlg() DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX, 0 }, { "BUTTON", // FIELD_RADIOBUTTON - (DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON) & ~WS_GROUP, + DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON, 0 }, { "EDIT", // FIELD_TEXT DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL, @@ -914,8 +914,6 @@ 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: @@ -935,6 +933,8 @@ int createCfgDlg() } if (pFields[nIdx].nFlags & FLAG_DISABLED) dwStyle |= WS_DISABLED; + if (pFields[nIdx].nFlags & FLAG_GROUP) dwStyle |= WS_GROUP; + if (pFields[nIdx].nFlags & FLAG_NOTABSTOP) dwStyle &= ~WS_TABSTOP; HWND hwCtrl = pFields[nIdx].hwnd = CreateWindowEx( dwExStyle, diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index e5381a55a27a5650c7f8cb76468a2d2802d98352..c1e6fbc6681127add17d98c441594116f841834b 100644 GIT binary patch delta 4282 zcmb7HeQ*@z8GrY3xm?Iya=@J?G?4?33KGlh?QTj;(p=yoiKTFO`7l*MD|WUSMnv~2 zjv4OslES&U2(wtJWf*RbQEb&wV=J9fypYIOGXs7lNS!uQ!LBBqqNXXt==S&S-X(E{ z{?TKy&*%F*&pz+-{`MuhIl6iG$fDyHuKNMW{6yDMLkb4gvd4L zppOSUPS~K8o4}Q&q4UdI=2Qp8_g4{zc&JhLDc9ahB6Hqe=A80zUL!N8++tm0E5))F zaX|M|qE;ueK4Wz+pgCF++qABUqV7F-=Y(^jweRmaa!s{z*6NGs$=1$s#~a+SzR%+g z#hLtT=Xl}`o@t>p-cTz0Gsc*j6A#RB%XS*OF0PYxvCkTiBJrrEX`43oYXU7Ny5w+x zIEbj`5F%1mY=BmiJjME-YpGX>=3gJ77Bw=dX>Fq>E`8ieVq>;YOY5=otFhu79xdug zgcXlcHswYL^-U_jq{|*Ezd+^vy1bOi&q6k8kZU|%;z*T4+fKyY)I}RMOetEwI2obU z?V4@)BO#iW^1~VuJ7ybFUR}54TRL9X-D~JlDLW#jw6z&K6%Q0TlQc)H!{Q`GogbQzK->vvq5EagRnO%X{;LUz3EpeHymK{Qd8CfN8n=m6r>p2;KLV)_55;$IGZCJTIi40X|~4w_pfA zeHDE23Jg{KMV-HdAQQ@UgNvojRsAX2>Y~mL$kCM;w@1LJ7ve`LI{bQ5htVx zG?(Vu<;7$Ro%Cty=IVg9-IR^c&ZKNeF)ik#9J55ZCbFHnGnzovDJQiJA0xox)b0i}Mm+T+ zx>yh48iZ?-0!>xFWDjPwr=V>S$$ILi$2R;Z0A>6Pt>L#1Q8hu&qx(gY6q7QJhMGDi zz0e+`0918C%117vvLsKPPe}8#*@ypg{yS-ZY7B3lq?iL+301{LtXUVmA*lhphw*s{ zh1%InJBCBz9nA}9LHg;hA8CI;6N(W=bDj6ns#0bM*mR&$qW&Br8ZCYZMp@W`r=ivN zbtqAP9v;@9vUP4*8C|HkB)Fit;gNQ)Cg>`FE&938_m zUO%o4Ww4|EVvXXWf)6mjHC%g6ffgRuTrbf!>J?|3c{(0AQ?0)jG|IX8-_4`%L;0`gFQ4XD zIDg{M^}}nPDgykSqYg>uz1Is&*eY-EEZSS z-Oo*FTC9eCq=~dtB$yvDjboabJALvsfts@#I`qbfBJ}h$0emvu4`_YV0D1n<^2)Xw`2i_LUEF11h zhnHs*I8PJTc_MUy^h%`x(79^wzcejL(*rpQf-^-mXA^fLWMvt}F!>e=aZ)}2QU{_B zWPvt&HnI)PhOZ%U7Df%dMKP$dCPINnD%1puG#TXkpt6QS&OK5|lA_DCV5hQ-?y+Q_ zz4=3xWjbOP(k{(FwlNOsSEKaG=D{lUvd&T*RWC(!omlyIff|GjKgSF&DyQ_XJ?%ru5Op)i9+GKISGhgF4`=8>&;rPNLFa((%Fqr_ z;4OIwG#_*`XfEiTptvoNASkZEqyZEk5K;|l1I_-*A>$t@rPN9y#0G{gn8MwTxCxY5r?6S8i7Q{Adi)A}Ik?OC$L+*^3_1jD#{bIbEgk*?ZjYkyaJ ztahOGOzlwZN44X%2;e6A9_D!Sy@I#Od%*j$w}M^8HnLmUpRI(dG;mt zb@m9GW>2yg*)Lg(Z=r9A&+Du8t?@Pae(Y=aZS`&U?eryl&-f1be(QV9_XpowzPEjU z_Pyg9_FeK__AwD|9=C|QiCe){aShxCu9droyPw;_N!(*xg!={8%_-ckxaYZ7xHq_? z+yM73cb@wzcZnP2zU02WBfROl_$c@f>&52Gzcxi-NFOHgTnGhg&o2n;Wt9Ba8!6(7!*Df#)L0~uLN^N zK}B)J@`_t4{1x|C5I+V|5mtPE!HD;=cgkyJovfQJXIHWTHpt%1imb%;?pd+bw8vZU EUu@}k%m4rY delta 4267 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