dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Easier to read

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1705 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-11-14 21:21:45 +00:00
parent be7192efb7
commit 6f447ca9ee
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Contrib/InstallOptions/InstallerOptions.cpp
View file

@ -771,6 +771,8 @@ int createCfgDlg()
// by ORTIM: 14-August-2002 // by ORTIM: 14-August-2002
DWORD dwBaseUnits = GetDialogBaseUnits(); DWORD dwBaseUnits = GetDialogBaseUnits();
#define DEFAULT_STYLES (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS)
for (nIdx = 0; nIdx < nNumFields; nIdx++) { for (nIdx = 0; nIdx < nNumFields; nIdx++) {
static struct { static struct {
char* pszClass; char* pszClass;
@ -778,40 +780,42 @@ int createCfgDlg()
DWORD dwExStyle; DWORD dwExStyle;
} ClassTable[] = { } ClassTable[] = {
{ "STATIC", // FIELD_LABEL { "STATIC", // FIELD_LABEL
WS_GROUP | WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS /*| WS_TABSTOP*/, DEFAULT_STYLES | WS_GROUP /*| WS_TABSTOP*/,
WS_EX_TRANSPARENT }, WS_EX_TRANSPARENT },
{ "STATIC", // FIELD_ICON { "STATIC", // FIELD_ICON
WS_GROUP | WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS /*| WS_TABSTOP*/ | SS_ICON, DEFAULT_STYLES | WS_GROUP /*| WS_TABSTOP*/ | SS_ICON,
0 }, 0 },
{ "STATIC", // FIELD_BITMAP { "STATIC", // FIELD_BITMAP
WS_GROUP | WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS /*| WS_TABSTOP*/ | SS_BITMAP, DEFAULT_STYLES | WS_GROUP /*| WS_TABSTOP*/ | SS_BITMAP,
0 }, 0 },
{ "BUTTON", // FIELD_BROWSEBUTTON { "BUTTON", // FIELD_BROWSEBUTTON
WS_GROUP | WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP, DEFAULT_STYLES | WS_GROUP | WS_TABSTOP,
0 }, 0 },
{ "BUTTON", // FIELD_CHECKBOX { "BUTTON", // FIELD_CHECKBOX
WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX, DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTOCHECKBOX,
0 }, 0 },
{ "BUTTON", // FIELD_RADIOBUTTON { "BUTTON", // FIELD_RADIOBUTTON
WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON, DEFAULT_STYLES | WS_TABSTOP | BS_TEXT | BS_VCENTER | BS_AUTORADIOBUTTON,
0 }, 0 },
{ "EDIT", // FIELD_TEXT { "EDIT", // FIELD_TEXT
WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL, DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE }, WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
{ "EDIT", // FIELD_FILEREQUEST { "EDIT", // FIELD_FILEREQUEST
WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL, DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE }, WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
{ "EDIT", // FIELD_DIRREQUEST { "EDIT", // FIELD_DIRREQUEST
WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL, DEFAULT_STYLES | WS_TABSTOP | WS_BORDER | ES_AUTOHSCROLL,
WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE }, WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
{ "COMBOBOX", // FIELD_COMBOBOX { "COMBOBOX", // FIELD_COMBOBOX
WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | WS_VSCROLL | WS_CLIPCHILDREN | CBS_AUTOHSCROLL | CBS_HASSTRINGS, DEFAULT_STYLES | WS_TABSTOP | WS_VSCROLL | WS_CLIPCHILDREN | CBS_AUTOHSCROLL | CBS_HASSTRINGS,
WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE }, WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE },
{ "LISTBOX", // FIELD_LISTBOX { "LISTBOX", // FIELD_LISTBOX
WS_GROUP | WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_TABSTOP | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT, DEFAULT_STYLES | WS_GROUP | WS_TABSTOP | LBS_DISABLENOSCROLL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT,
WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE } WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE }
}; };
#undef DEFAULT_STYLES
if (pFields[nIdx].nType < 1 || pFields[nIdx].nType > (sizeof(ClassTable) / sizeof(ClassTable[0]))) if (pFields[nIdx].nType < 1 || pFields[nIdx].nType > (sizeof(ClassTable) / sizeof(ClassTable[0])))
continue; continue;