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

implemeneted RFE #1666501 - MakeNSISw: esc -> close

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4951 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-02-23 12:42:21 +00:00
parent cb30b6ed2f
commit 28a3b53b05
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Contrib/Makensisw/makensisw.cpp
View file

@ -570,7 +570,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
} }
return TRUE; return TRUE;
} }
case IDC_CLOSE: case IDCANCEL:
case IDM_EXIT: case IDM_EXIT:
{ {
if (!g_sdata.thread) { if (!g_sdata.thread) {
@ -752,7 +752,7 @@ BOOL CALLBACK DialogResize(HWND hWnd, LPARAM /* unused */)
SetWindowPos(hWnd, 0, r.left, r.top,r.right - r.left + g_resize.dx, r.bottom - r.top + g_resize.dy, SWP_NOZORDER|SWP_NOMOVE); SetWindowPos(hWnd, 0, r.left, r.top,r.right - r.left + g_resize.dx, r.bottom - r.top + g_resize.dy, SWP_NOZORDER|SWP_NOMOVE);
break; break;
case IDC_TEST: case IDC_TEST:
case IDC_CLOSE: case IDCANCEL:
SetWindowPos(hWnd, 0, r.left + g_resize.dx, r.top + g_resize.dy, 0, 0, SWP_NOZORDER|SWP_NOSIZE); SetWindowPos(hWnd, 0, r.left + g_resize.dx, r.top + g_resize.dy, 0, 0, SWP_NOZORDER|SWP_NOSIZE);
break; break;
default: default:

1
Contrib/Makensisw/resource.h
View file

@ -48,7 +48,6 @@
#define IDB_TOOLBAR24H 132 #define IDB_TOOLBAR24H 132
#define IDC_LOGWIN 402 #define IDC_LOGWIN 402
#define IDC_VERSION 405 #define IDC_VERSION 405
#define IDC_CLOSE 406
#define IDM_ABOUT 501 #define IDM_ABOUT 501
#define IDM_EXIT 502 #define IDM_EXIT 502
#define IDM_SAVE 503 #define IDM_SAVE 503

2
Contrib/Makensisw/resource.rc
View file

@ -165,7 +165,7 @@ BEGIN
WS_BORDER | WS_VSCROLL,7,22,345,186 WS_BORDER | WS_VSCROLL,7,22,345,186
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,220,346,1 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,220,346,1
LTEXT "",IDC_VERSION,7,230,200,12,WS_DISABLED LTEXT "",IDC_VERSION,7,230,200,12,WS_DISABLED
DEFPUSHBUTTON "&Close",IDC_CLOSE,296,226,49,15 DEFPUSHBUTTON "&Close",IDCANCEL,296,226,49,15
PUSHBUTTON "Test &Installer",IDC_TEST,230,226,60,15,WS_DISABLED PUSHBUTTON "Test &Installer",IDC_TEST,230,226,60,15,WS_DISABLED
END END

6
Contrib/Makensisw/utils.cpp
View file

@ -168,9 +168,9 @@ void Items(HWND hwnd, int on){
g_sdata.focused_hwnd = GetFocus(); g_sdata.focused_hwnd = GetFocus();
// Altered by Darren Owen (DrO) on 6/10/2003 // Altered by Darren Owen (DrO) on 6/10/2003
else else
EnableWindow(GetDlgItem(hwnd,IDC_CLOSE),1); EnableWindow(GetDlgItem(hwnd,IDCANCEL),1);
EnableWindow(GetDlgItem(hwnd,IDC_CLOSE),on); EnableWindow(GetDlgItem(hwnd,IDCANCEL),on);
// Altered by Darren Owen (DrO) on 6/10/2003 // Altered by Darren Owen (DrO) on 6/10/2003
if((!g_sdata.retcode && on) || !on) if((!g_sdata.retcode && on) || !on)
EnableWindow(GetDlgItem(hwnd,IDC_TEST),on); EnableWindow(GetDlgItem(hwnd,IDC_TEST),on);
@ -592,7 +592,7 @@ void InitTooltips(HWND h) {
g_tip.tip = CreateWindowEx(dwExStyle,TOOLTIPS_CLASS,NULL,dwStyle,0,0,0,0,h,NULL,GetModuleHandle(NULL),NULL); g_tip.tip = CreateWindowEx(dwExStyle,TOOLTIPS_CLASS,NULL,dwStyle,0,0,0,0,h,NULL,GetModuleHandle(NULL),NULL);
if (!g_tip.tip) return; if (!g_tip.tip) return;
g_tip.hook = SetWindowsHookEx(WH_GETMESSAGE,TipHookProc,NULL, GetCurrentThreadId()); g_tip.hook = SetWindowsHookEx(WH_GETMESSAGE,TipHookProc,NULL, GetCurrentThreadId());
AddTip(GetDlgItem(h,IDC_CLOSE),TEXT("Close MakeNSISW")); AddTip(GetDlgItem(h,IDCANCEL),TEXT("Close MakeNSISW"));
AddTip(GetDlgItem(h,IDC_TEST),TEXT("Test the installer generated by MakeNSISW")); AddTip(GetDlgItem(h,IDC_TEST),TEXT("Test the installer generated by MakeNSISW"));
AddToolBarTooltips(); AddToolBarTooltips();
} }