diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp index 9437d41e..6d7ae4bf 100644 --- a/Contrib/Makensisw/makensisw.cpp +++ b/Contrib/Makensisw/makensisw.cpp @@ -61,8 +61,8 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, char *cmdParam, int cmd if (!IsDialogMessage(g_find.hwndFind, &msg)) { if (!TranslateAccelerator(hDialog,haccel,&msg)) { if (!IsDialogMessage(hDialog,&msg)) { - TranslateMessage(&msg); - DispatchMessage(&msg); + TranslateMessage(&msg); + DispatchMessage(&msg); } } } @@ -85,7 +85,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { DragAcceptFiles(g_sdata.hwnd,FALSE); g_sdata.menu = GetMenu(g_sdata.hwnd); g_sdata.submenu = GetSubMenu(g_sdata.menu,1); - CreateToolBar(); + CreateToolBar(); InitTooltips(g_sdata.hwnd); #ifdef COMPRESSOR_OPTION SetCompressor(IDM_DEFAULT); @@ -204,27 +204,26 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { switch (((NMHDR*)lParam)->code ) { case EN_SELCHANGE: SendDlgItemMessage(hwndDlg,IDC_LOGWIN, EM_EXGETSEL, 0, (LPARAM) &g_sdata.textrange); - { - BOOL enabled = (g_sdata.textrange.cpMax-g_sdata.textrange.cpMin<=0?FALSE:TRUE); - EnableMenuItem(g_sdata.menu,IDM_COPYSELECTED,(enabled?MF_ENABLED:MF_GRAYED)); - EnableToolBarButton(IDM_COPY,enabled); - } + { + BOOL enabled = (g_sdata.textrange.cpMax-g_sdata.textrange.cpMin<=0?FALSE:TRUE); + EnableMenuItem(g_sdata.menu,IDM_COPYSELECTED,(enabled?MF_ENABLED:MF_GRAYED)); + EnableToolBarButton(IDM_COPY,enabled); + } #ifdef COMPRESSOR_OPTION case TBN_DROPDOWN: { - LPNMTOOLBAR pToolBar = (LPNMTOOLBAR) lParam; - if(pToolBar->hdr.hwndFrom == g_toolbar.hwnd && - pToolBar->iItem == IDM_COMPRESSOR) { - ShowToolbarDropdownMenu(); - return TBDDRET_DEFAULT; - } - else { - return TBDDRET_NODEFAULT; - } + LPNMTOOLBAR pToolBar = (LPNMTOOLBAR) lParam; + if(pToolBar->hdr.hwndFrom == g_toolbar.hwnd && pToolBar->iItem == IDM_COMPRESSOR) { + ShowToolbarDropdownMenu(); + return TBDDRET_DEFAULT; + } + else { + return TBDDRET_NODEFAULT; + } } #endif } - return TRUE; + return TRUE; case WM_COPYDATA: { PCOPYDATASTRUCT cds = PCOPYDATASTRUCT(lParam); @@ -285,13 +284,13 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { int rv; rv = MessageBox(g_sdata.hwnd,NSISUPDATEPROMPT,"Question",MB_YESNO|MB_ICONQUESTION); if(rv == IDYES) { - char pathf[MAX_PATH],*path; - GetModuleFileName(NULL,pathf,sizeof(pathf)); - path=my_strrchr(pathf,'\\'); - if(path!=NULL) *path=0; - lstrcat(pathf,NSIS_UPDATE); - ShellExecute(g_sdata.hwnd,"open",pathf,NULL,NULL,SW_SHOWNORMAL); - PostMessage(g_sdata.hwnd,WM_COMMAND, IDM_EXIT, 0); + char pathf[MAX_PATH],*path; + GetModuleFileName(NULL,pathf,sizeof(pathf)); + path=my_strrchr(pathf,'\\'); + if(path!=NULL) *path=0; + lstrcat(pathf,NSIS_UPDATE); + ShellExecute(g_sdata.hwnd,"open",pathf,NULL,NULL,SW_SHOWNORMAL); + PostMessage(g_sdata.hwnd,WM_COMMAND, IDM_EXIT, 0); } return TRUE; } @@ -332,18 +331,18 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { #ifdef COMPRESSOR_OPTION case IDM_COMPRESSOR: { - switch(g_sdata.compressor) { - case COMPRESSOR_DEFAULT: - SetCompressor(IDM_ZLIB); - break; - case COMPRESSOR_ZLIB: - SetCompressor(IDM_GZIP); - break; - case COMPRESSOR_GZIP: - SetCompressor(IDM_DEFAULT); - break; - } - return TRUE; + switch(g_sdata.compressor) { + case COMPRESSOR_DEFAULT: + SetCompressor(IDM_ZLIB); + break; + case COMPRESSOR_ZLIB: + SetCompressor(IDM_GZIP); + break; + case COMPRESSOR_GZIP: + SetCompressor(IDM_DEFAULT); + break; + } + return TRUE; } #endif case IDM_CLEARLOG: @@ -447,7 +446,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { case IDM_DEFAULT: case IDM_ZLIB: case IDM_GZIP: - return SetCompressor(LOWORD(wParam)); + return SetCompressor(LOWORD(wParam)); #endif } } @@ -564,7 +563,7 @@ BOOL CALLBACK AboutProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { HFONT bfont = CreateFont(13,0,0,0,FW_NORMAL,FALSE,FALSE,FALSE,DEFAULT_CHARSET, OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FIXED_PITCH|FF_DONTCARE, "Tahoma"); - HFONT bfontb = CreateFont(13,0,0,0,FW_BOLD,FALSE,FALSE,FALSE,DEFAULT_CHARSET, + HFONT bfontb = CreateFont(13,0,0,0,FW_BOLD,FALSE,FALSE,FALSE,DEFAULT_CHARSET, OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FIXED_PITCH|FF_DONTCARE, "Tahoma"); HFONT rfont = CreateFont(12,0,0,0,FW_NORMAL,FALSE,FALSE,FALSE,DEFAULT_CHARSET, @@ -626,7 +625,7 @@ BOOL CALLBACK DefinesProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) switch (LOWORD(wParam)) { case IDOK: { - ResetObjects(); + ResetObjects(); ResetDefines(); if(g_sdata.input_script) { g_sdata.script_alloced = true; @@ -734,19 +733,19 @@ BOOL CALLBACK DefinesProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) BOOL SetCompressor(WORD command) { switch(command) { - case IDM_DEFAULT: - g_sdata.compressor = COMPRESSOR_DEFAULT; - break; - case IDM_ZLIB: - g_sdata.compressor = COMPRESSOR_ZLIB; - break; - case IDM_GZIP: - g_sdata.compressor = COMPRESSOR_GZIP; - break; - default: - return FALSE; + case IDM_DEFAULT: + g_sdata.compressor = COMPRESSOR_DEFAULT; + break; + case IDM_ZLIB: + g_sdata.compressor = COMPRESSOR_ZLIB; + break; + case IDM_GZIP: + g_sdata.compressor = COMPRESSOR_GZIP; + break; + default: + return FALSE; } - UpdateToolBarCompressorButton(); + UpdateToolBarCompressorButton(); CheckMenuItem(g_sdata.menu, IDM_DEFAULT, MF_BYCOMMAND | MF_UNCHECKED); CheckMenuItem(g_sdata.menu, IDM_ZLIB, MF_BYCOMMAND | MF_UNCHECKED); CheckMenuItem(g_sdata.menu, IDM_GZIP, MF_BYCOMMAND | MF_UNCHECKED); diff --git a/Contrib/Makensisw/toolbar.cpp b/Contrib/Makensisw/toolbar.cpp index a3e09bea..5b559236 100644 --- a/Contrib/Makensisw/toolbar.cpp +++ b/Contrib/Makensisw/toolbar.cpp @@ -30,192 +30,192 @@ extern NTOOLTIP g_tip; TBBUTTON CreateToolBarButton(int iBitmap, int idCommand, BYTE fsState, BYTE fsStyle, DWORD dwData, int iString) { - TBBUTTON tbButton; - tbButton.iBitmap = iBitmap; - tbButton.idCommand = idCommand; - tbButton.fsState = fsState; - tbButton.fsStyle = fsStyle; - tbButton.dwData = dwData; - tbButton.iString = iString; + TBBUTTON tbButton; + tbButton.iBitmap = iBitmap; + tbButton.idCommand = idCommand; + tbButton.fsState = fsState; + tbButton.fsStyle = fsStyle; + tbButton.dwData = dwData; + tbButton.iString = iString; - return tbButton; + return tbButton; } void CreateToolBar() { - static TBBUTTON tbButton[BUTTONCOUNT]; - tbButton[TBB_LOADSCRIPT] = CreateToolBarButton(IDB_LOADSCRIPT, IDM_LOADSCRIPT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_SAVE] = CreateToolBarButton(IDB_SAVE, IDM_SAVE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_EXIT] = CreateToolBarButton(IDB_EXIT, IDM_EXIT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_SEP1] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); - tbButton[TBB_COPY] = CreateToolBarButton(IDB_COPY, IDM_COPY, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_FIND] = CreateToolBarButton(IDB_FIND, IDM_FIND, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_SEP2] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); - tbButton[TBB_RECOMPILE] = CreateToolBarButton(IDB_RECOMPILE, IDM_RECOMPILE, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_DEFINES] = CreateToolBarButton(IDB_DEFINES, IDM_DEFINES, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); + static TBBUTTON tbButton[BUTTONCOUNT]; + tbButton[TBB_LOADSCRIPT] = CreateToolBarButton(IDB_LOADSCRIPT, IDM_LOADSCRIPT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_SAVE] = CreateToolBarButton(IDB_SAVE, IDM_SAVE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_EXIT] = CreateToolBarButton(IDB_EXIT, IDM_EXIT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_SEP1] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); + tbButton[TBB_COPY] = CreateToolBarButton(IDB_COPY, IDM_COPY, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_FIND] = CreateToolBarButton(IDB_FIND, IDM_FIND, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_SEP2] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); + tbButton[TBB_RECOMPILE] = CreateToolBarButton(IDB_RECOMPILE, IDM_RECOMPILE, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_DEFINES] = CreateToolBarButton(IDB_DEFINES, IDM_DEFINES, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); #ifdef COMPRESSOR_OPTION - tbButton[TBB_COMPRESSOR] = CreateToolBarButton(IDB_COMPRESSOR, IDM_COMPRESSOR, TBSTATE_ENABLED, TBSTYLE_DROPDOWN, 0, 0); + tbButton[TBB_COMPRESSOR] = CreateToolBarButton(IDB_COMPRESSOR, IDM_COMPRESSOR, TBSTATE_ENABLED, TBSTYLE_DROPDOWN, 0, 0); #endif - tbButton[TBB_TEST] = CreateToolBarButton(IDB_TEST, IDM_TEST, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_EDITSCRIPT] = CreateToolBarButton(IDB_EDITSCRIPT, IDM_EDITSCRIPT, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_BROWSESCR] = CreateToolBarButton(IDB_BROWSESCR, IDM_BROWSESCR, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_CLEARLOG] = CreateToolBarButton(IDB_CLEARLOG, IDM_CLEARLOG, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_SEP3] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); - tbButton[TBB_NSISHOME] = CreateToolBarButton(IDB_NSISHOME, IDM_NSISHOME, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_NSISDEV] = CreateToolBarButton(IDB_NSISDEV, IDM_NSISDEV, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_FORUM] = CreateToolBarButton(IDB_FORUM, IDM_FORUM, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_NSISUPDATE] = CreateToolBarButton(IDB_NSISUPDATE, IDM_NSISUPDATE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - tbButton[TBB_SEP4] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); - tbButton[TBB_DOCS] = CreateToolBarButton(IDB_DOCS, IDM_DOCS, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_TEST] = CreateToolBarButton(IDB_TEST, IDM_TEST, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_EDITSCRIPT] = CreateToolBarButton(IDB_EDITSCRIPT, IDM_EDITSCRIPT, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_BROWSESCR] = CreateToolBarButton(IDB_BROWSESCR, IDM_BROWSESCR, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_CLEARLOG] = CreateToolBarButton(IDB_CLEARLOG, IDM_CLEARLOG, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_SEP3] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); + tbButton[TBB_NSISHOME] = CreateToolBarButton(IDB_NSISHOME, IDM_NSISHOME, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_NSISDEV] = CreateToolBarButton(IDB_NSISDEV, IDM_NSISDEV, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_FORUM] = CreateToolBarButton(IDB_FORUM, IDM_FORUM, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_NSISUPDATE] = CreateToolBarButton(IDB_NSISUPDATE, IDM_NSISUPDATE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); + tbButton[TBB_SEP4] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0); + tbButton[TBB_DOCS] = CreateToolBarButton(IDB_DOCS, IDM_DOCS, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0); - g_toolbar.hwnd = CreateToolbarEx(g_sdata.hwnd, - WS_CHILD | WS_VISIBLE | TBSTYLE_TRANSPARENT, - TOOLBAR_ID, - NUMIMAGES, - g_sdata.hInstance, - IDB_TOOLBAR, - tbButton, - BUTTONCOUNT, - BUTTONWIDTH, - BUTTONHEIGHT, - IMAGEWIDTH, - IMAGEHEIGHT, - sizeof(TBBUTTON)); + g_toolbar.hwnd = CreateToolbarEx(g_sdata.hwnd, + WS_CHILD | WS_VISIBLE | TBSTYLE_TRANSPARENT, + TOOLBAR_ID, + NUMIMAGES, + g_sdata.hInstance, + IDB_TOOLBAR, + tbButton, + BUTTONCOUNT, + BUTTONWIDTH, + BUTTONHEIGHT, + IMAGEWIDTH, + IMAGEHEIGHT, + sizeof(TBBUTTON)); #ifdef COMPRESSOR_OPTION - SendMessage(g_toolbar.hwnd, TB_SETEXTENDEDSTYLE, 0, (LPARAM) (DWORD) TBSTYLE_EX_DRAWDDARROWS); - HMENU toolmenu = GetSubMenu(g_sdata.menu, 2); - g_toolbar.dropdownmenu = GetSubMenu(toolmenu,2); - RECT rect; - SendMessage(g_toolbar.hwnd, TB_GETITEMRECT, TBB_COMPRESSOR, (LPARAM) (LPRECT) &rect); - g_toolbar.dropdownpoint.x = rect.left; - g_toolbar.dropdownpoint.y = rect.bottom+1; + SendMessage(g_toolbar.hwnd, TB_SETEXTENDEDSTYLE, 0, (LPARAM) (DWORD) TBSTYLE_EX_DRAWDDARROWS); + HMENU toolmenu = GetSubMenu(g_sdata.menu, 2); + g_toolbar.dropdownmenu = GetSubMenu(toolmenu,2); + RECT rect; + SendMessage(g_toolbar.hwnd, TB_GETITEMRECT, TBB_COMPRESSOR, (LPARAM) (LPRECT) &rect); + g_toolbar.dropdownpoint.x = rect.left; + g_toolbar.dropdownpoint.y = rect.bottom+1; #endif } #ifdef COMPRESSOR_OPTION void UpdateToolBarCompressorButton() { - int iBitmap; - int iString; - char szBuffer[64]; - char temp[32]; - TOOLINFO ti; + int iBitmap; + int iString; + char szBuffer[64]; + char temp[32]; + TOOLINFO ti; - my_memset(&ti, 0, sizeof(TOOLINFO)); + my_memset(&ti, 0, sizeof(TOOLINFO)); - switch(g_sdata.compressor) { - case COMPRESSOR_DEFAULT: - iBitmap = IDB_COMPRESSOR; - iString = IDS_DEFAULT; - break; - case COMPRESSOR_ZLIB: - iBitmap = IDB_COMPRESSOR_ZLIB; - iString = IDS_ZLIB; - break; - case COMPRESSOR_GZIP: - iBitmap = IDB_COMPRESSOR_GZIP; - iString = IDS_GZIP; - break; - default: - return; - } - LoadString(g_sdata.hInstance, - IDS_COMPRESSOR, - temp, - sizeof(temp)); - my_memset(szBuffer, 0, sizeof(szBuffer)); - lstrcat(szBuffer,temp); - lstrcat(szBuffer," ("); - LoadString(g_sdata.hInstance, - iString, - temp, - sizeof(temp)); - lstrcat(szBuffer,temp); - lstrcat(szBuffer,")"); + switch(g_sdata.compressor) { + case COMPRESSOR_DEFAULT: + iBitmap = IDB_COMPRESSOR; + iString = IDS_DEFAULT; + break; + case COMPRESSOR_ZLIB: + iBitmap = IDB_COMPRESSOR_ZLIB; + iString = IDS_ZLIB; + break; + case COMPRESSOR_GZIP: + iBitmap = IDB_COMPRESSOR_GZIP; + iString = IDS_GZIP; + break; + default: + return; + } + LoadString(g_sdata.hInstance, + IDS_COMPRESSOR, + temp, + sizeof(temp)); + my_memset(szBuffer, 0, sizeof(szBuffer)); + lstrcat(szBuffer,temp); + lstrcat(szBuffer," ("); + LoadString(g_sdata.hInstance, + iString, + temp, + sizeof(temp)); + lstrcat(szBuffer,temp); + lstrcat(szBuffer,")"); - SendMessage(g_toolbar.hwnd, TB_CHANGEBITMAP, (WPARAM) IDM_COMPRESSOR, (LPARAM) MAKELPARAM(iBitmap, 0)); + SendMessage(g_toolbar.hwnd, TB_CHANGEBITMAP, (WPARAM) IDM_COMPRESSOR, (LPARAM) MAKELPARAM(iBitmap, 0)); - ti.cbSize = sizeof(TOOLINFO); - ti.uFlags = 0; - ti.hinst = g_sdata.hInstance; - ti.hwnd = g_toolbar.hwnd; - ti.uId = (UINT)TBB_COMPRESSOR; - SendMessage(g_tip.tip, TTM_GETTOOLINFO, 0, (LPARAM) (LPTOOLINFO) &ti); - ti.lpszText = (LPSTR)szBuffer; - SendMessage(g_tip.tip, TTM_SETTOOLINFO, 0, (LPARAM) (LPTOOLINFO) &ti); + ti.cbSize = sizeof(TOOLINFO); + ti.uFlags = 0; + ti.hinst = g_sdata.hInstance; + ti.hwnd = g_toolbar.hwnd; + ti.uId = (UINT)TBB_COMPRESSOR; + SendMessage(g_tip.tip, TTM_GETTOOLINFO, 0, (LPARAM) (LPTOOLINFO) &ti); + ti.lpszText = (LPSTR)szBuffer; + SendMessage(g_tip.tip, TTM_SETTOOLINFO, 0, (LPARAM) (LPTOOLINFO) &ti); } #endif void AddToolBarButtonTooltip(int id, int iString) { - TOOLINFO ti; - char szBuffer[64]; - RECT rect; + TOOLINFO ti; + char szBuffer[64]; + RECT rect; - my_memset(&ti, 0, sizeof(TOOLINFO)); + my_memset(&ti, 0, sizeof(TOOLINFO)); - SendMessage(g_toolbar.hwnd, TB_GETITEMRECT, id, (LPARAM) (LPRECT) &rect); + SendMessage(g_toolbar.hwnd, TB_GETITEMRECT, id, (LPARAM) (LPRECT) &rect); - ti.cbSize = sizeof(TOOLINFO); - ti.uFlags = 0; - ti.hwnd = g_toolbar.hwnd; - ti.hinst = g_sdata.hInstance; - ti.uId = (UINT)id; + ti.cbSize = sizeof(TOOLINFO); + ti.uFlags = 0; + ti.hwnd = g_toolbar.hwnd; + ti.hinst = g_sdata.hInstance; + ti.uId = (UINT)id; - LoadString(g_sdata.hInstance, - iString, - szBuffer, - sizeof(szBuffer)); - ti.lpszText = (LPSTR) szBuffer; - ti.rect.left =rect.left; - ti.rect.top = rect.top; - ti.rect.right = rect.right; - ti.rect.bottom = rect.bottom; + LoadString(g_sdata.hInstance, + iString, + szBuffer, + sizeof(szBuffer)); + ti.lpszText = (LPSTR) szBuffer; + ti.rect.left =rect.left; + ti.rect.top = rect.top; + ti.rect.right = rect.right; + ti.rect.bottom = rect.bottom; - SendMessage(g_tip.tip, TTM_ADDTOOL, 0, (LPARAM) (LPTOOLINFO) &ti); + SendMessage(g_tip.tip, TTM_ADDTOOL, 0, (LPARAM) (LPTOOLINFO) &ti); } void AddToolBarTooltips() { - AddToolBarButtonTooltip(TBB_LOADSCRIPT, IDS_LOADSCRIPT); - AddToolBarButtonTooltip(TBB_SAVE, IDS_SAVE); - AddToolBarButtonTooltip(TBB_EXIT, IDS_EXIT); - AddToolBarButtonTooltip(TBB_COPY, IDS_COPY); - AddToolBarButtonTooltip(TBB_FIND, IDS_FIND); - AddToolBarButtonTooltip(TBB_RECOMPILE, IDS_RECOMPILE); - AddToolBarButtonTooltip(TBB_DEFINES, IDS_DEFINES); + AddToolBarButtonTooltip(TBB_LOADSCRIPT, IDS_LOADSCRIPT); + AddToolBarButtonTooltip(TBB_SAVE, IDS_SAVE); + AddToolBarButtonTooltip(TBB_EXIT, IDS_EXIT); + AddToolBarButtonTooltip(TBB_COPY, IDS_COPY); + AddToolBarButtonTooltip(TBB_FIND, IDS_FIND); + AddToolBarButtonTooltip(TBB_RECOMPILE, IDS_RECOMPILE); + AddToolBarButtonTooltip(TBB_DEFINES, IDS_DEFINES); #ifdef COMPRESSOR_OPTION - AddToolBarButtonTooltip(TBB_COMPRESSOR, IDS_COMPRESSOR); + AddToolBarButtonTooltip(TBB_COMPRESSOR, IDS_COMPRESSOR); #endif - AddToolBarButtonTooltip(TBB_TEST, IDS_TEST); - AddToolBarButtonTooltip(TBB_EDITSCRIPT, IDS_EDITSCRIPT); - AddToolBarButtonTooltip(TBB_BROWSESCR, IDS_BROWSESCR); - AddToolBarButtonTooltip(TBB_CLEARLOG, IDS_CLEARLOG); - AddToolBarButtonTooltip(TBB_NSISHOME, IDS_NSISHOME); - AddToolBarButtonTooltip(TBB_NSISDEV, IDS_NSISDEV); - AddToolBarButtonTooltip(TBB_FORUM, IDS_FORUM); - AddToolBarButtonTooltip(TBB_NSISUPDATE, IDS_NSISUPDATE); - AddToolBarButtonTooltip(TBB_DOCS, IDS_DOCS); + AddToolBarButtonTooltip(TBB_TEST, IDS_TEST); + AddToolBarButtonTooltip(TBB_EDITSCRIPT, IDS_EDITSCRIPT); + AddToolBarButtonTooltip(TBB_BROWSESCR, IDS_BROWSESCR); + AddToolBarButtonTooltip(TBB_CLEARLOG, IDS_CLEARLOG); + AddToolBarButtonTooltip(TBB_NSISHOME, IDS_NSISHOME); + AddToolBarButtonTooltip(TBB_NSISDEV, IDS_NSISDEV); + AddToolBarButtonTooltip(TBB_FORUM, IDS_FORUM); + AddToolBarButtonTooltip(TBB_NSISUPDATE, IDS_NSISUPDATE); + AddToolBarButtonTooltip(TBB_DOCS, IDS_DOCS); } void EnableToolBarButton(int id, BOOL enabled) { - UINT state = (enabled?TBSTATE_ENABLED:TBSTATE_INDETERMINATE); - - SendMessage(g_toolbar.hwnd, TB_SETSTATE, id, MAKELPARAM(state, 0)); + UINT state = (enabled?TBSTATE_ENABLED:TBSTATE_INDETERMINATE); + + SendMessage(g_toolbar.hwnd, TB_SETSTATE, id, MAKELPARAM(state, 0)); } #ifdef COMPRESSOR_OPTION void ShowToolbarDropdownMenu() { - RECT rect; - GetWindowRect(g_toolbar.hwnd, (LPRECT) &rect); - TrackPopupMenu(g_toolbar.dropdownmenu, - NULL, - rect.left + (int)(short)g_toolbar.dropdownpoint.x, - rect.top + (int)(short)g_toolbar.dropdownpoint.y, - 0, - g_sdata.hwnd, - 0); + RECT rect; + GetWindowRect(g_toolbar.hwnd, (LPRECT) &rect); + TrackPopupMenu(g_toolbar.dropdownmenu, + NULL, + rect.left + (int)(short)g_toolbar.dropdownpoint.x, + rect.top + (int)(short)g_toolbar.dropdownpoint.y, + 0, + g_sdata.hwnd, + 0); } #endif \ No newline at end of file