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

No more GetMenu calls.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1350 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
rainwater 2002-10-09 12:51:45 +00:00
parent c6c47ecf14
commit b6ff897788
1 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Contrib/Makensisw/utils.cpp
View file

@ -30,13 +30,13 @@ char *g_input_script;
HWND g_tip; HWND g_tip;
HWND g_tip_p; HWND g_tip_p;
HHOOK g_hook; HHOOK g_hook;
DWORD g_dwLength;
LRESULT CALLBACK TipHookProc(int nCode, WPARAM wParam, LPARAM lParam); LRESULT CALLBACK TipHookProc(int nCode, WPARAM wParam, LPARAM lParam);
extern BOOL g_warnings; extern BOOL g_warnings;
extern HANDLE g_hThread; extern HANDLE g_hThread;
extern int g_retcode; extern int g_retcode;
extern HMENU g_mnu;
DWORD g_dwLength;
static BOOL g_appended = FALSE; static BOOL g_appended = FALSE;
@ -87,16 +87,15 @@ void ErrorMessage(HWND hwnd,const char *str) {
void DisableItems(HWND hwnd) { void DisableItems(HWND hwnd) {
EnableWindow(GetDlgItem(hwnd,IDC_CLOSE),0); EnableWindow(GetDlgItem(hwnd,IDC_CLOSE),0);
EnableWindow(GetDlgItem(hwnd,IDC_TEST),0); EnableWindow(GetDlgItem(hwnd,IDC_TEST),0);
HMENU m = GetMenu(hwnd); EnableMenuItem(g_mnu,IDM_SAVE,MF_GRAYED);
EnableMenuItem(m,IDM_SAVE,MF_GRAYED); EnableMenuItem(g_mnu,IDM_TEST,MF_GRAYED);
EnableMenuItem(m,IDM_TEST,MF_GRAYED); EnableMenuItem(g_mnu,IDM_EXIT,MF_GRAYED);
EnableMenuItem(m,IDM_EXIT,MF_GRAYED); EnableMenuItem(g_mnu,IDM_LOADSCRIPT,MF_GRAYED);
EnableMenuItem(m,IDM_LOADSCRIPT,MF_GRAYED); EnableMenuItem(g_mnu,IDM_RECOMPILE,MF_GRAYED);
EnableMenuItem(m,IDM_RECOMPILE,MF_GRAYED); EnableMenuItem(g_mnu,IDM_COPY,MF_GRAYED);
EnableMenuItem(m,IDM_COPY,MF_GRAYED); EnableMenuItem(g_mnu,IDM_COPYSELECTED,MF_GRAYED);
EnableMenuItem(m,IDM_COPYSELECTED,MF_GRAYED); EnableMenuItem(g_mnu,IDM_EDITSCRIPT,MF_GRAYED);
EnableMenuItem(m,IDM_EDITSCRIPT,MF_GRAYED); EnableMenuItem(g_mnu,IDM_CLEARLOG,MF_ENABLED);
EnableMenuItem(m,IDM_CLEARLOG,MF_ENABLED);
} }
void EnableItems(HWND hwnd) { void EnableItems(HWND hwnd) {
@ -143,20 +142,19 @@ void EnableItems(HWND hwnd) {
ft.lpstrText = "warnings:"; ft.lpstrText = "warnings:";
if (MSG2(EM_FINDTEXT, 0, (LPARAM)&ft) != -1) g_warnings++; if (MSG2(EM_FINDTEXT, 0, (LPARAM)&ft) != -1) g_warnings++;
HMENU m = GetMenu(hwnd);
if (g_output_exe && !g_retcode) { if (g_output_exe && !g_retcode) {
EnableWindow(GetDlgItem(hwnd,IDC_TEST),1); EnableWindow(GetDlgItem(hwnd,IDC_TEST),1);
EnableMenuItem(m,IDM_TEST,MF_ENABLED); EnableMenuItem(g_mnu,IDM_TEST,MF_ENABLED);
} }
EnableWindow(GetDlgItem(hwnd,IDC_CLOSE),1); EnableWindow(GetDlgItem(hwnd,IDC_CLOSE),1);
EnableMenuItem(m,IDM_SAVE,MF_ENABLED); EnableMenuItem(g_mnu,IDM_SAVE,MF_ENABLED);
EnableMenuItem(m,IDM_EXIT,MF_ENABLED); EnableMenuItem(g_mnu,IDM_EXIT,MF_ENABLED);
EnableMenuItem(m,IDM_LOADSCRIPT,MF_ENABLED); EnableMenuItem(g_mnu,IDM_LOADSCRIPT,MF_ENABLED);
EnableMenuItem(m,IDM_RECOMPILE,MF_ENABLED); EnableMenuItem(g_mnu,IDM_RECOMPILE,MF_ENABLED);
EnableMenuItem(m,IDM_COPY,MF_ENABLED); EnableMenuItem(g_mnu,IDM_COPY,MF_ENABLED);
EnableMenuItem(m,IDM_COPYSELECTED,MF_ENABLED); EnableMenuItem(g_mnu,IDM_COPYSELECTED,MF_ENABLED);
EnableMenuItem(m,IDM_EDITSCRIPT,MF_ENABLED); EnableMenuItem(g_mnu,IDM_EDITSCRIPT,MF_ENABLED);
EnableMenuItem(m,IDM_CLEARLOG,MF_ENABLED); EnableMenuItem(g_mnu,IDM_CLEARLOG,MF_ENABLED);
} }
void CompileNSISScript() { void CompileNSISScript() {
@ -165,11 +163,10 @@ void CompileNSISScript() {
ClearLog(g_hwnd); ClearLog(g_hwnd);
SetTitle(g_hwnd,NULL); SetTitle(g_hwnd,NULL);
if (lstrlen(g_script)==0) { if (lstrlen(g_script)==0) {
HMENU m = GetMenu(g_hwnd);
LogMessage(g_hwnd,USAGE); LogMessage(g_hwnd,USAGE);
EnableMenuItem(m,IDM_RECOMPILE,MF_GRAYED); EnableMenuItem(g_mnu,IDM_RECOMPILE,MF_GRAYED);
EnableMenuItem(m,IDM_EDITSCRIPT,MF_GRAYED); EnableMenuItem(g_mnu,IDM_EDITSCRIPT,MF_GRAYED);
EnableMenuItem(m,IDM_TEST,MF_GRAYED); EnableMenuItem(g_mnu,IDM_TEST,MF_GRAYED);
EnableWindow(GetDlgItem(g_hwnd,IDC_TEST),0); EnableWindow(GetDlgItem(g_hwnd,IDC_TEST),0);
DragAcceptFiles(g_hwnd,TRUE); DragAcceptFiles(g_hwnd,TRUE);
return; return;