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

Updated RichEdit usage to hopefully be better (still somewhat untested)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@892 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
justin1014 2002-09-03 18:49:24 +00:00
parent 2c5e3daf0e
commit f3bca60d70
6 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Contrib/UIs/UI Holder/resource.rc
View file

@ -56,12 +56,10 @@ IDD_LICENSE DIALOG DISCARDABLE 0, 0, 266, 130
STYLE DS_CONTROL | WS_CHILD
FONT 8, "MS Sans Serif"
BEGIN
ICON IDI_ICON2,IDC_ULICON,0,0,20,20
ICON 103,IDC_ULICON,0,0,20,20
LTEXT "",IDC_INTROTEXT,25,0,241,23
CONTROL "",IDC_EDIT1,"RICHEDIT",ES_MULTILINE | ES_READONLY |
WS_BORDER | WS_VSCROLL | NOT WS_VISIBLE,0,24,266,105
CONTROL "",IDC_EDIT2,"RichEdit20A",ES_MULTILINE | ES_READONLY |
WS_BORDER | WS_VSCROLL | NOT WS_VISIBLE,0,24,266,105
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
0x804,0,24,266,105
END
IDD_DIR DIALOG DISCARDABLE 0, 0, 266, 130
@ -70,7 +68,7 @@ FONT 8, "MS Sans Serif"
BEGIN
EDITTEXT IDC_DIR,11,49,188,12,ES_AUTOHSCROLL
PUSHBUTTON "",IDC_BROWSE,203,48,50,14
ICON IDI_ICON2,IDC_ULICON,0,0,20,20
ICON 103,IDC_ULICON,0,0,20,20
CONTROL "",IDC_SELDIRTEXT,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,
0,36,265,8
CONTROL "",IDC_SPACEAVAILABLE,"Static",SS_LEFTNOWORDWRAP |
@ -88,7 +86,7 @@ FONT 8, "MS Sans Serif"
BEGIN
COMBOBOX IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
ICON IDI_ICON2,IDC_ULICON,0,0,21,20
ICON 103,IDC_ULICON,0,0,21,20
LTEXT "",IDC_TEXT2,0,40,108,21
CONTROL "",IDC_TEXT1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,0,27,
108,8
@ -126,7 +124,7 @@ BEGIN
CONTROL "",IDC_LIST1,"SysListView32",LVS_REPORT | LVS_SINGLESEL |
LVS_NOCOLUMNHEADER | NOT WS_VISIBLE | WS_BORDER |
WS_TABSTOP,0,25,265,104
ICON IDI_ICON2,IDC_ULICON,0,0,20,20
ICON 103,IDC_ULICON,0,0,20,20
PUSHBUTTON "",IDC_SHOWDETAILS,0,28,50,14,NOT WS_TABSTOP
END
@ -134,7 +132,7 @@ IDD_UNINST DIALOG DISCARDABLE 0, 0, 266, 130
STYLE DS_CONTROL | WS_CHILD
FONT 8, "MS Sans Serif"
BEGIN
ICON IDI_ICON2,IDC_ULICON,0,1,20,20
ICON 103,IDC_ULICON,0,1,20,20
LTEXT "",IDC_UNINSTFROM,0,45,55,8
EDITTEXT IDC_EDIT1,56,43,209,12,ES_AUTOHSCROLL | ES_READONLY
LTEXT "",IDC_INTROTEXT,25,0,241,34

BIN
Contrib/UIs/default.exe
View file

Binary file not shown.

BIN
Contrib/UIs/modern.exe
View file

Binary file not shown.

BIN
Contrib/UIs/modern2.exe
View file

Binary file not shown.

30
Source/exehead/Ui.c
View file

@ -391,6 +391,22 @@ int NSISCALL ui_doinstall(void)
g_hwnd=NULL;
ShowWindow(m_bgwnd, SW_SHOW);
#endif//NSIS_SUPPORT_CODECALLBACKS
#ifdef NSIS_CONFIG_LICENSEPAGE
{ // load richedit DLL
WNDCLASS wc={0,};
if (!LoadLibrary("RichEd20.dll")) LoadLibrary("RichEd32.dll");
// make richedit20a point to RICHEDIT
if (!GetClassInfo(NULL,"RichEdit20A",&wc))
{
GetClassInfo(NULL,"RICHEDIT",&wc);
wc.lpszClassName = "RichEdit20A";
RegisterClass(&wc);
}
}
#endif
return DialogBox(g_hInstance,MAKEINTRESOURCE(IDD_INST),m_bgwnd,DialogProc);
}
#endif//NSIS_CONFIG_VISIBLE_SUPPORT
@ -645,22 +661,10 @@ DWORD CALLBACK StreamLicense(DWORD dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb)
static BOOL CALLBACK LicenseProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
static HWND hwLicense;
static HINSTANCE hRichEditDLL, hRichEdit2DLL;
static int new_richedit;
if (uMsg == WM_INITDIALOG)
{
EDITSTREAM es={(DWORD)STR(LANG_LICENSE_DATA),0,StreamLicense};
if (!hRichEdit2DLL) hRichEdit2DLL=LoadLibrary("RichEd20.dll");
if (!hRichEditDLL) hRichEditDLL=LoadLibrary("RichEd32.dll");
if (!hRichEdit2DLL) {
// fake richedit2
WNDCLASS phony_richedit2 = {0,};
phony_richedit2.lpszClassName = "RichEdit20A";
RegisterClass(&phony_richedit2);
}
else new_richedit=10; // edit2 is 1010 while edit1 is 1000
hwLicense=GetDlgItem(hwndDlg,IDC_EDIT1+new_richedit);
ShowWindow(hwLicense, SW_SHOW);
hwLicense=GetDlgItem(hwndDlg,IDC_EDIT1);
SendMessage(hwLicense,EM_AUTOURLDETECT,TRUE,0);
SendMessage(hwLicense,EM_SETBKGNDCOLOR,0,g_inst_header->license_bg>=0?g_inst_header->license_bg:GetSysColor(COLOR_BTNFACE));
SendMessage(hwLicense,EM_SETEVENTMASK,0,ENM_LINK);

6
Source/exehead/resource.rc
View file

@ -37,10 +37,8 @@ FONT 8, "MS Sans Serif"
BEGIN
ICON IDI_ICON2,IDC_ULICON,0,0,20,20
LTEXT "",IDC_INTROTEXT,25,0,241,23
CONTROL "",IDC_EDIT1,"RICHEDIT",ES_MULTILINE | ES_READONLY |
WS_BORDER | WS_VSCROLL | NOT WS_VISIBLE,0,24,266,105
CONTROL "",IDC_EDIT2,"RichEdit20A",ES_MULTILINE | ES_READONLY |
WS_BORDER | WS_VSCROLL | NOT WS_VISIBLE,0,24,266,105
CONTROL "",IDC_EDIT1,"RichEdit20A",WS_BORDER | WS_VSCROLL |
0x804,0,24,266,105
END
#endif