From c12d20910be56470a5e8d4600ef1816f7eda22bb Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 27 Jan 2003 16:15:00 +0000
Subject: [PATCH] + New browse dialog style (modern) + Word wrapping for check
 boxes and radio buttons + No ugly border for edit fields under XP + Scroll
 bar for list boxes + Only labels can have \r\n - fixed in docs

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2084 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/InstallOptions/InstallerOptions.cpp |  17 ++++++++++-------
 Contrib/InstallOptions/Readme.html          |   2 +-
 Plugins/InstallOptions.dll                  | Bin 12800 -> 12800 bytes
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index d848d789..096208b2 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -272,7 +272,10 @@ bool BrowseForFolder(int nControlIdx) {
   bi.pidlRoot = NULL;
   bi.pszDisplayName = (char*)MALLOC(MAX_PATH);
   bi.lpszTitle = pFields[nControlIdx].pszText;
-  bi.ulFlags = BIF_STATUSTEXT;
+#ifndef BIF_NEWDIALOGSTYLE
+#define BIF_NEWDIALOGSTYLE 0x0040
+#endif
+  bi.ulFlags = BIF_STATUSTEXT | BIF_RETURNONLYFSDIRS| BIF_NEWDIALOGSTYLE;
   bi.lpfn = BrowseCallbackProc;
   bi.lParam = nControlIdx;
   bi.iImage = 0;
@@ -852,25 +855,25 @@ int createCfgDlg()
         DEFAULT_STYLES | WS_TABSTOP,
         0 },
       { "BUTTON",       // FIELD_CHECKBOX
-        DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX,
+        DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX | BS_MULTILINE,
         0 },
       { "BUTTON",       // FIELD_RADIOBUTTON
-        DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON,
+        DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON | BS_MULTILINE,
         0 },
       { "EDIT",         // FIELD_TEXT
-        DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
+        DEFAULT_STYLES | WS_TABSTOP | ES_AUTOHSCROLL,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "EDIT",         // FIELD_FILEREQUEST
-        DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
+        DEFAULT_STYLES | WS_TABSTOP | ES_AUTOHSCROLL,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "EDIT",         // FIELD_DIRREQUEST
-        DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
+        DEFAULT_STYLES | WS_TABSTOP | ES_AUTOHSCROLL,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "COMBOBOX",     // FIELD_COMBOBOX
         DEFAULT_STYLES | WS_TABSTOP | WS_VSCROLL | WS_CLIPCHILDREN | CBS_AUTOHSCROLL | CBS_HASSTRINGS,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "LISTBOX",      // FIELD_LISTBOX
-        DEFAULT_STYLES | WS_TABSTOP | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT,
+        DEFAULT_STYLES | WS_TABSTOP | WS_VSCROLL | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT,
         WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
       { "BUTTON",       // FIELD_GROUPBOX
         DEFAULT_STYLES | BS_GROUPBOX,
diff --git a/Contrib/InstallOptions/Readme.html b/Contrib/InstallOptions/Readme.html
index e9aef2ab..e513d303 100644
--- a/Contrib/InstallOptions/Readme.html
+++ b/Contrib/InstallOptions/Readme.html
@@ -235,7 +235,7 @@ numbers from 1 to NumFields. Each Field section can contain the following values
       <td class="lefttable"><span class="italic">(optional)</span></td>
       <td class="righttable">Specifies the caption of a label, checkbox, or radio button control.
       For icon and bitmaps control this specifies the path to the image.<br /><br />
-      <span class="bold">Note:</span> \r\n will be replaced by a newline.
+      <span class="bold">Note:</span> \r\n will be replaced by a newline for labels.
       </td></tr>
     <tr>
       <td class="lefttable"><span class="bold">State</span></td>
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index 137d91369d3158e3aef36a072d1073731b38fd81..8e3f6f6631ab0ddd5d391cb5de7e5abd0e976872 100644
GIT binary patch
delta 110
zcmZojX-Jvyfte@DbmQl27Dm_2@vK{AK-|sZN_@;-I*cI<K+xgHAixP_HvriU3_x*a
c1_oU0DNYOm4or$+AT<j>Y(d4%`Kl9n0Cor!)&Kwi

delta 110
zcmZojX-JvyfqAj7(Z<i&EQ~Ch<5{=LfVi8*mH3#wco;(%fS|*XL4Xs=ZUC|y7#c$u
em>C#wv8OmO2skh)hJn;90I>xbH|MKP<N*Ng$QQ!^