From bc7df32e3b5a264c0eeb6a20b723cdab02cf7688 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Sun, 14 Dec 2014 05:13:25 +0000 Subject: SetWindowText(GetDlgItem(...)) -> SetDlgItemText(...) git-svn-id: http://svn.miranda-ng.org/main/trunk@11391 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AVS/src/options.cpp | 2 +- plugins/AVS/src/services.cpp | 4 ++-- plugins/Alarms/src/alarm_win.cpp | 2 +- plugins/BuddyPounce/src/dialog.cpp | 6 +++--- plugins/Clist_modern/src/modern_clistopts.cpp | 4 ++-- plugins/Clist_modern/src/modern_skinopt.cpp | 2 +- plugins/Clist_modern/src/modern_viewmodebar.cpp | 6 +++--- plugins/Clist_nicer/src/viewmodes.cpp | 6 +++--- plugins/Db3x_mmap/src/ui.cpp | 10 +++++----- plugins/DbEditorPP/src/addeditsettingsdlg.cpp | 2 +- plugins/DbEditorPP/src/findwindow.cpp | 8 ++++---- plugins/Exchange/src/dlg_handlers.cpp | 8 ++++---- plugins/Folders/src/dlg_handlers.cpp | 4 ++-- plugins/IEHistory/src/dlgHandlers.cpp | 2 +- plugins/New_GPG/src/main.cpp | 4 ++-- plugins/PackUpdater/Src/Notifications.cpp | 2 +- plugins/PasteIt/src/Options.cpp | 2 +- plugins/QuickMessages/src/options.cpp | 22 +++++++++++----------- plugins/Scriver/src/chat/options.cpp | 4 ++-- plugins/Scriver/src/msgoptions.cpp | 2 +- plugins/Sessions/Src/Options.cpp | 4 ++-- plugins/ShellExt/src/options.cpp | 2 +- plugins/SplashScreen/src/options.cpp | 10 +++++----- plugins/TabSRMM/src/chat/options.cpp | 4 ++-- plugins/TabSRMM/src/msgdialog.cpp | 8 ++++---- plugins/TabSRMM/src/msgoptions.cpp | 4 ++-- plugins/TabSRMM/src/templates.cpp | 2 +- plugins/TrafficCounter/src/options.cpp | 4 ++-- plugins/Variables/src/help.cpp | 4 ++-- plugins/WhenWasIt/src/dlg_handlers.cpp | 14 +++++++------- 30 files changed, 79 insertions(+), 79 deletions(-) (limited to 'plugins') diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index cf79a909f2..c14a5f857a 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -400,7 +400,7 @@ static INT_PTR CALLBACK DlgProcOptionsProtos(HWND hwndDlg, UINT msg, WPARAM wPar db_free(&dbv); } else { - SetWindowText(GetDlgItem(hwndDlg, IDC_PROTOAVATARNAME), _T("")); + SetDlgItemText(hwndDlg, IDC_PROTOAVATARNAME, _T("")); InvalidateRect(GetDlgItem(hwndDlg, IDC_PROTOPIC), NULL, TRUE); } } diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp index 750a2098a7..e6abe62f98 100644 --- a/plugins/AVS/src/services.cpp +++ b/plugins/AVS/src/services.cpp @@ -298,8 +298,8 @@ static UINT_PTR CALLBACK SetMyAvatarHookProc(HWND hwnd, UINT msg, WPARAM, LPARAM data = (SetMyAvatarHookData *)ofn->lCustData; data->thumbnail = TRUE; - SetWindowText(GetDlgItem(hwnd, IDC_MAKE_SQUARE), TranslateT("Make the avatar square")); - SetWindowText(GetDlgItem(hwnd, IDC_GROW), TranslateT("Grow avatar to fit max allowed protocol size")); + SetDlgItemText(hwnd, IDC_MAKE_SQUARE, TranslateT("Make the avatar square")); + SetDlgItemText(hwnd, IDC_GROW, TranslateT("Grow avatar to fit max allowed protocol size")); CheckDlgButton(hwnd, IDC_MAKE_SQUARE, data->square ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwnd, IDC_GROW, data->grow ? BST_CHECKED : BST_UNCHECKED); diff --git a/plugins/Alarms/src/alarm_win.cpp b/plugins/Alarms/src/alarm_win.cpp index 9a66894155..4c0231d316 100644 --- a/plugins/Alarms/src/alarm_win.cpp +++ b/plugins/Alarms/src/alarm_win.cpp @@ -168,7 +168,7 @@ INT_PTR CALLBACK DlgProcAlarm(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar case WMU_FAKEALARM: { SetWindowText(hwndDlg, TranslateT("Example alarm")); - SetWindowText(GetDlgItem(hwndDlg, IDC_TITLE), TranslateT("Example alarm")); + SetDlgItemText(hwndDlg, IDC_TITLE, TranslateT("Example alarm")); SetDlgItemText(hwndDlg, IDC_ED_DESC, TranslateT("Some example text. Example, example, example.")); } return TRUE; diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp index de7e487105..e9be19366a 100644 --- a/plugins/BuddyPounce/src/dialog.cpp +++ b/plugins/BuddyPounce/src/dialog.cpp @@ -614,13 +614,13 @@ void CreateMessageAcknowlegedWindow(MCONTACT hContact, int SentSuccess) TCHAR msg[256]; if (SentSuccess) { mir_sntprintf(msg, SIZEOF(msg), TranslateT("Message successfully sent to %s"), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR)); - SetWindowText(GetDlgItem(hwnd, IDOK), TranslateT("OK")); + SetDlgItemText(hwnd, IDOK, TranslateT("OK")); ShowWindow(GetDlgItem(hwnd, IDCANCEL), 0); } else { mir_sntprintf(msg, SIZEOF(msg), TranslateT("Message failed to send to %s"), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR)); - SetWindowText(GetDlgItem(hwnd, IDOK), TranslateT("Retry")); + SetDlgItemText(hwnd, IDOK, TranslateT("Retry")); } - SetWindowText(GetDlgItem(hwnd, LBL_CONTACT), msg); + SetDlgItemText(hwnd, LBL_CONTACT, msg); SetWindowText(hwnd, TranslateT(modFullname)); } diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp index 10d0b1670a..45f45a953e 100644 --- a/plugins/Clist_modern/src/modern_clistopts.cpp +++ b/plugins/Clist_modern/src/modern_clistopts.cpp @@ -596,7 +596,7 @@ static INT_PTR CALLBACK DlgProcItemSecondLineOpts(HWND hwndDlg, UINT msg, WPARAM { ptrT tszText(db_get_tsa(NULL, "CList", "SecondLineText")); if (tszText) - SetWindowText(GetDlgItem(hwndDlg, IDC_VARIABLE_TEXT), tszText); + SetDlgItemText(hwndDlg, IDC_VARIABLE_TEXT, tszText); } SendDlgItemMessage(hwndDlg, IDC_VARIABLE_TEXT, EM_SETLIMITTEXT, TEXT_TEXT_MAX_LENGTH, 0); { @@ -761,7 +761,7 @@ static INT_PTR CALLBACK DlgProcItemThirdLineOpts(HWND hwndDlg, UINT msg, WPARAM { DBVARIANT dbv; if (!db_get_ts(NULL, "CList", "ThirdLineText", &dbv)) { - SetWindowText(GetDlgItem(hwndDlg, IDC_VARIABLE_TEXT), dbv.ptszVal); + SetDlgItemText(hwndDlg, IDC_VARIABLE_TEXT, dbv.ptszVal); db_free(&dbv); } } diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp index 757882a031..670f4914f4 100644 --- a/plugins/Clist_modern/src/modern_skinopt.cpp +++ b/plugins/Clist_modern/src/modern_skinopt.cpp @@ -90,7 +90,7 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara case WM_INITDIALOG: { TranslateDialogDefault(hwndDlg); - SetWindowText(GetDlgItem(hwndDlg, IDC_SKINFOLDERLABEL), SkinsFolder); + SetDlgItemText(hwndDlg, IDC_SKINFOLDERLABEL, SkinsFolder); HTREEITEM it = FillAvailableSkinList(hwndDlg); HWND wnd = GetDlgItem(hwndDlg, IDC_TREE1); TreeView_SelectItem(wnd, it); diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index 5249849e46..6d075bb8eb 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -1027,9 +1027,9 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM } if (g_CluiData.bFilterEffective) - SetWindowText(GetDlgItem(hwnd, IDC_SELECTMODE), ptrT(mir_utf8decodeT(g_CluiData.current_viewmode))); + SetDlgItemText(hwnd, IDC_SELECTMODE, ptrT(mir_utf8decodeT(g_CluiData.current_viewmode))); else - SetWindowText(GetDlgItem(hwnd, IDC_SELECTMODE), TranslateT("All contacts")); + SetDlgItemText(hwnd, IDC_SELECTMODE, TranslateT("All contacts")); break; case WM_ERASEBKGND: @@ -1291,7 +1291,7 @@ void ApplyViewMode(const char *Name, bool onlySelector ) pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); KillTimer(g_hwndViewModeFrame, TIMERID_VIEWMODEEXPIRE); - SetWindowText(GetDlgItem(g_hwndViewModeFrame, IDC_SELECTMODE), TranslateT("All contacts")); + SetDlgItemText(g_hwndViewModeFrame, IDC_SELECTMODE, TranslateT("All contacts")); if (g_CluiData.boldHideOffline != (BYTE)-1) CallService(MS_CLIST_SETHIDEOFFLINE, (WPARAM)g_CluiData.boldHideOffline, 0); if (g_CluiData.bOldUseGroups != (BYTE)-1) diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index bc6b00ca2e..961a617292 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -891,9 +891,9 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM } if (cfg::dat.bFilterEffective) - SetWindowTextA(GetDlgItem(hwnd, IDC_SELECTMODE), cfg::dat.current_viewmode); + SetDlgItemTextA(hwnd, IDC_SELECTMODE, cfg::dat.current_viewmode); else - SetWindowText(GetDlgItem(hwnd, IDC_SELECTMODE), TranslateT("No view mode")); + SetDlgItemText(hwnd, IDC_SELECTMODE, TranslateT("No view mode")); break; case WM_ERASEBKGND: @@ -981,7 +981,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM clvm_reset_command: cfg::dat.bFilterEffective = 0; pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); - SetWindowTextA(GetDlgItem(hwnd, IDC_SELECTMODE), Translate("No view mode")); + SetDlgItemTextA(hwnd, IDC_SELECTMODE, Translate("No view mode")); CallService(MS_CLIST_SETHIDEOFFLINE, (WPARAM)cfg::dat.boldHideOffline, 0); cfg::dat.boldHideOffline = (BYTE)-1; SetButtonStates(); diff --git a/plugins/Db3x_mmap/src/ui.cpp b/plugins/Db3x_mmap/src/ui.cpp index 34d7efefd4..a591c35268 100644 --- a/plugins/Db3x_mmap/src/ui.cpp +++ b/plugins/Db3x_mmap/src/ui.cpp @@ -74,11 +74,11 @@ static INT_PTR CALLBACK sttEnterPassword(HWND hwndDlg, UINT uMsg, WPARAM wParam, EnableWindow(hwndCtrl, FALSE); hwndCtrl = GetDlgItem(hwndDlg, IDOK); EnableWindow(hwndCtrl, FALSE); - SetWindowText(GetDlgItem(hwndDlg, IDC_HEADERBAR), TranslateT("Too many errors!")); + SetDlgItemText(hwndDlg, IDC_HEADERBAR, TranslateT("Too many errors!")); } - else SetWindowText(GetDlgItem(hwndDlg, IDC_HEADERBAR), TranslateT("Password is not correct!")); + else SetDlgItemText(hwndDlg, IDC_HEADERBAR, TranslateT("Password is not correct!")); } - else SetWindowText(GetDlgItem(hwndDlg, IDC_HEADERBAR), TranslateT("Please type in your password")); + else SetDlgItemText(hwndDlg, IDC_HEADERBAR, TranslateT("Please type in your password")); oldLangID = 0; SetTimer(hwndDlg, 1, 200, NULL); @@ -145,7 +145,7 @@ static bool CheckOldPassword(HWND hwndDlg, CDb3Mmap *db) GetDlgItemText(hwndDlg, IDC_OLDPASS, buf, SIZEOF(buf)); ptrA oldPass(mir_utf8encodeT(buf)); if (!db->m_crypto->checkPassword(oldPass)) { - SetWindowText(GetDlgItem(hwndDlg, IDC_HEADERBAR), TranslateT("Wrong old password entered!")); + SetDlgItemText(hwndDlg, IDC_HEADERBAR, TranslateT("Wrong old password entered!")); return false; } } @@ -209,7 +209,7 @@ LBL_Error: GetDlgItemText(hwndDlg, IDC_USERPASS2, buf, SIZEOF(buf)); if (_tcscmp(buf2, buf)) { - SetWindowText(GetDlgItem(hwndDlg, IDC_HEADERBAR), TranslateT("Passwords do not match!")); + SetDlgItemText(hwndDlg, IDC_HEADERBAR, TranslateT("Passwords do not match!")); goto LBL_Error; } diff --git a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp index 53c6d1b9f9..15e880e93a 100644 --- a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp +++ b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp @@ -294,7 +294,7 @@ INT_PTR CALLBACK EditSettingDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l sscanf(setting, "%d", &tmp); mir_snprintf(temp, SIZEOF(temp), "%X", tmp); } - SetWindowText(GetDlgItem(hwnd, IDC_SETTINGVALUE), temp); + SetDlgItemText(hwnd, IDC_SETTINGVALUE, temp); } } } diff --git a/plugins/DbEditorPP/src/findwindow.cpp b/plugins/DbEditorPP/src/findwindow.cpp index 5866528233..9cb1ae78aa 100644 --- a/plugins/DbEditorPP/src/findwindow.cpp +++ b/plugins/DbEditorPP/src/findwindow.cpp @@ -117,14 +117,14 @@ INT_PTR CALLBACK FindWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP fi->replace = mir_tstrdup(replace); - SetWindowText(GetDlgItem(hwnd, IDOK), Translate("Stop")); + SetDlgItemText(hwnd, IDOK, Translate("Stop")); EnableWindow(GetDlgItem(hwnd, IDC_SEARCH), 0); if (IsDlgButtonChecked(hwnd, IDC_CASESENSITIVE)) fi->mode |= RW_CASE; } else { - SetWindowText(GetDlgItem(hwnd, IDC_SEARCH), Translate("Stop")); + SetDlgItemText(hwnd, IDC_SEARCH, Translate("Stop")); EnableWindow(GetDlgItem(hwnd, IDOK), 0); } @@ -625,10 +625,10 @@ void __cdecl FindSettings(LPVOID di) if (GetWindowLongPtr(GetDlgItem(prnthwnd, IDC_REPLACE), GWLP_USERDATA)) { SetWindowLongPtr(GetDlgItem(prnthwnd, IDC_REPLACE), GWLP_USERDATA, 0); EnableWindow(GetDlgItem(prnthwnd, IDC_SEARCH), 1); - SetWindowText(GetDlgItem(prnthwnd, IDOK), Translate("&Replace")); + SetDlgItemText(prnthwnd, IDOK, Translate("&Replace")); } else { - SetWindowText(GetDlgItem(prnthwnd, IDC_SEARCH), Translate("&Search")); + SetDlgItemText(prnthwnd, IDC_SEARCH, Translate("&Search")); EnableWindow(GetDlgItem(prnthwnd, IDOK), 1); } diff --git a/plugins/Exchange/src/dlg_handlers.cpp b/plugins/Exchange/src/dlg_handlers.cpp index 52b11dabd9..185d93aeeb 100644 --- a/plugins/Exchange/src/dlg_handlers.cpp +++ b/plugins/Exchange/src/dlg_handlers.cpp @@ -42,13 +42,13 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara TCHAR buffer[4096]; GetStringFromDatabase("Username", _T(""), buffer, SIZEOF(buffer)); - SetWindowText(GetDlgItem(hWnd, IDC_USER_EDIT), buffer); + SetDlgItemText(hWnd, IDC_USER_EDIT, buffer); GetStringFromDatabase("Password", _T(""), buffer, SIZEOF(buffer)); - SetWindowText(GetDlgItem(hWnd, IDC_PASSWORD_EDIT), buffer); + SetDlgItemText(hWnd, IDC_PASSWORD_EDIT, buffer); - GetStringFromDatabase("Server", _T(""), buffer, sizeof(buffer)); - SetWindowText(GetDlgItem(hWnd, IDC_SERVER_EDIT), buffer); + GetStringFromDatabase("Server", _T(""), buffer, SIZEOF(buffer)); + SetDlgItemText(hWnd, IDC_SERVER_EDIT, buffer); SetDlgItemInt(hWnd, IDC_PORT_EDIT, db_get_dw(NULL, ModuleName, "Port", EXCHANGE_PORT), FALSE); diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp index 160bb89e73..2b09a442aa 100644 --- a/plugins/Folders/src/dlg_handlers.cpp +++ b/plugins/Folders/src/dlg_handlers.cpp @@ -21,7 +21,7 @@ static void GetEditText(HWND hWnd, TCHAR *buffer, int size) static void SetEditText(HWND hWnd, const TCHAR *buffer) { bInitializing = 1; - SetWindowText(GetDlgItem(hWnd, IDC_FOLDER_EDIT), buffer); + SetDlgItemText(hWnd, IDC_FOLDER_EDIT, buffer); bInitializing = 0; } @@ -74,7 +74,7 @@ static void RefreshPreview(HWND hWnd) TCHAR tmp[MAX_FOLDER_SIZE], res[MAX_FOLDER_SIZE]; GetEditText(hWnd, tmp, MAX_FOLDER_SIZE); ExpandPath(res, tmp, MAX_FOLDER_SIZE); - SetWindowText(GetDlgItem(hWnd, IDC_PREVIEW_EDIT), res); + SetDlgItemText(hWnd, IDC_PREVIEW_EDIT, res); } static void LoadItem(HWND hWnd, PFolderItem item) diff --git a/plugins/IEHistory/src/dlgHandlers.cpp b/plugins/IEHistory/src/dlgHandlers.cpp index b0cb481747..df09f1ecf2 100644 --- a/plugins/IEHistory/src/dlgHandlers.cpp +++ b/plugins/IEHistory/src/dlgHandlers.cpp @@ -513,7 +513,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara TCHAR buffer[40]; _itot_s(count, buffer, 10); - SetWindowText(GetDlgItem(hWnd, IDC_EVENTS_COUNT), buffer); + SetDlgItemText(hWnd, IDC_EVENTS_COUNT, buffer); } break; diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp index 22929e46bf..cf37f2482c 100755 --- a/plugins/New_GPG/src/main.cpp +++ b/plugins/New_GPG/src/main.cpp @@ -577,7 +577,7 @@ static INT_PTR CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR params.result = &result; extern HFONT bold_font; SendDlgItemMessage(hwndDlg, IDC_GENERATING_KEY, WM_SETFONT, (WPARAM)bold_font, TRUE); - SetWindowText(GetDlgItem(hwndDlg, IDC_GENERATING_KEY), TranslateT("Generating new random key, please wait")); + SetDlgItemText(hwndDlg, IDC_GENERATING_KEY, TranslateT("Generating new random key, please wait")); EnableWindow(GetDlgItem(hwndDlg, IDC_GENERATE_KEY), 0); EnableWindow(GetDlgItem(hwndDlg, IDC_OTHER), 0); EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE_KEY), 0); @@ -1524,7 +1524,7 @@ static INT_PTR CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wPara params.code = &code; params.result = &result; SendDlgItemMessage(hwndDlg, IDC_GENERATING_TEXT, WM_SETFONT, (WPARAM)bold_font, TRUE); - SetWindowText(GetDlgItem(hwndDlg, IDC_GENERATING_TEXT), TranslateT("Generating new key, please wait...")); + SetDlgItemText(hwndDlg, IDC_GENERATING_TEXT, TranslateT("Generating new key, please wait...")); EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), 0); EnableWindow(GetDlgItem(hwndDlg, IDOK), 0); EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_TYPE), 0); diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp index 5205531ade..7ce57a78ce 100644 --- a/plugins/PackUpdater/Src/Notifications.cpp +++ b/plugins/PackUpdater/Src/Notifications.cpp @@ -155,7 +155,7 @@ INT_PTR CALLBACK DlgDownload(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPar { switch (message) { case WM_INITDIALOG: - SetWindowText(GetDlgItem(hDlg, IDC_LABEL), tszDialogMsg); + SetDlgItemText(hDlg, IDC_LABEL, tszDialogMsg); SetWindowLongPtr(GetDlgItem(hDlg, IDC_PB), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hDlg, IDC_PB), GWL_STYLE) | PBS_MARQUEE); SendDlgItemMessage(hDlg, IDC_PB, PBM_SETMARQUEE, 1, 50); return TRUE; diff --git a/plugins/PasteIt/src/Options.cpp b/plugins/PasteIt/src/Options.cpp index 3c27533552..0fc63c36b6 100644 --- a/plugins/PasteIt/src/Options.cpp +++ b/plugins/PasteIt/src/Options.cpp @@ -391,7 +391,7 @@ INT_PTR CALLBACK Options::DlgProcOptsPages(HWND hwndDlg, UINT msg, WPARAM wParam ++i; } ComboBox_SetCurSel(cb, sel); - SetWindowText(GetDlgItem(hwndDlg,IDC_COMBO1_DESC), optsPagesData->webOptions[optsPagesData->lastPage]->combo1Desc.c_str()); + SetDlgItemText(hwndDlg, IDC_COMBO1_DESC, optsPagesData->webOptions[optsPagesData->lastPage]->combo1Desc.c_str()); } else { diff --git a/plugins/QuickMessages/src/options.cpp b/plugins/QuickMessages/src/options.cpp index 0753b48b17..529abd545a 100644 --- a/plugins/QuickMessages/src/options.cpp +++ b/plugins/QuickMessages/src/options.cpp @@ -784,14 +784,14 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) bd->fEntryOpType=QMF_EX_SEPARATOR; EnableWindow(GetDlgItem(hdlg,IDC_MENUVALUE),FALSE); EnableWindow(GetDlgItem(hdlg,IDC_ISSERVNAME),FALSE); - SetWindowText(GetDlgItem(hdlg,IDC_MENUVALUE),_T("")); + SetDlgItemText(hdlg, IDC_MENUVALUE, _T("")); } } else { bd->fEntryOpType&=~QMF_EX_SEPARATOR; EnableWindow(GetDlgItem(hdlg,IDC_MENUVALUE),TRUE); EnableWindow(GetDlgItem(hdlg,IDC_ISSERVNAME),TRUE); - SetWindowText(GetDlgItem(hdlg,IDC_MENUVALUE),bd->pszOpValue/*?bd->pszOpValue:bd->pszValue*/); + SetDlgItemText(hdlg, IDC_MENUVALUE, bd->pszOpValue/*?bd->pszOpValue:bd->pszValue*/); } bd->pszOpName=mir_tstrdup(szLabel); @@ -872,7 +872,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) EnableWindow(GetDlgItem(hdlg,IDC_MENUVALUE),TRUE); EnableWindow(GetDlgItem(hdlg,IDC_ISSERVNAME),TRUE); EnableWindow(GetDlgItem(hdlg,IDC_INQMENU),TRUE); - SetWindowText(GetDlgItem(hdlg,IDC_MENUVALUE),bd->pszOpValue/*?bd->pszOpValue:bd->pszValue*/); + SetDlgItemText(hdlg, IDC_MENUVALUE, bd->pszOpValue/*?bd->pszOpValue:bd->pszValue*/); } else { @@ -880,7 +880,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) EnableWindow(GetDlgItem(hdlg,IDC_ISSERVNAME),FALSE); if (!(bd->fEntryOpType&QMF_EX_SEPARATOR)) EnableWindow(GetDlgItem(hdlg,IDC_INQMENU),FALSE); - SetWindowText(GetDlgItem(hdlg,IDC_MENUVALUE),_T("")); + SetDlgItemText(hdlg, IDC_MENUVALUE, _T("")); } CheckDlgButton(hdlg,IDC_INQMENU,bd->bOpInQMenu ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hdlg,IDC_ISSERVNAME,bd->bIsOpServName ? BST_CHECKED : BST_UNCHECKED); @@ -946,7 +946,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) EnableWindow(GetDlgItem(hdlg,IDC_ISSERVNAME),FALSE); EnableWindow(GetDlgItem(hdlg,IDC_INQMENU),FALSE); EnableWindow(GetDlgItem(hdlg,IDC_ISSERVNAME2),FALSE); - SetWindowText(GetDlgItem(hdlg,IDC_MENUVALUE),_T("")); + SetDlgItemText(hdlg, IDC_MENUVALUE, _T("")); break; } @@ -958,15 +958,15 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) BuildMenuTree(hMenuTree,(SortedList *)((ListData*)tvi.lParam)->sl); - SetWindowText(GetDlgItem(hdlg,IDC_MENUVALUE),_T("")); + SetDlgItemText(hdlg, IDC_MENUVALUE, _T("")); EnableWindow(GetDlgItem(hdlg,IDC_RCLICKVALUE),TRUE); EnableWindow(GetDlgItem(hdlg,IDC_ISSERVNAME2),TRUE); CheckDlgButton(hdlg,IDC_ISSERVNAME2,((ListData*)tvi.lParam)->bIsOpServName ? BST_CHECKED : BST_UNCHECKED); if (((ListData*)tvi.lParam)->ptszOPQValue) - SetWindowText(GetDlgItem(hdlg,IDC_RCLICKVALUE),((ListData*)tvi.lParam)->ptszOPQValue); + SetDlgItemText(hdlg, IDC_RCLICKVALUE, ((ListData*)tvi.lParam)->ptszOPQValue); else - SetWindowText(GetDlgItem(hdlg,IDC_RCLICKVALUE),_T("")); + SetDlgItemText(hdlg, IDC_RCLICKVALUE, _T("")); }break; }break; } @@ -1036,8 +1036,8 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) EnableWindow(GetDlgItem(hdlg,IDC_ISSERVNAME),FALSE); EnableWindow(GetDlgItem(hdlg,IDC_INQMENU),FALSE); EnableWindow(GetDlgItem(hdlg,IDC_ISSERVNAME2),FALSE); - SetWindowText(GetDlgItem(hdlg,IDC_MENUVALUE),_T("")); - SetWindowText(GetDlgItem(hdlg,IDC_RCLICKVALUE),_T("")); + SetDlgItemText(hdlg, IDC_MENUVALUE, _T("")); + SetDlgItemText(hdlg, IDC_RCLICKVALUE, _T("")); } }break; @@ -1118,7 +1118,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) EnableWindow(GetDlgItem(hdlg,IDC_MENUVALUE),FALSE); EnableWindow(GetDlgItem(hdlg,IDC_ISSERVNAME),FALSE); EnableWindow(GetDlgItem(hdlg,IDC_INQMENU),FALSE); - SetWindowText(GetDlgItem(hdlg,IDC_MENUVALUE),_T("")); + SetDlgItemText(hdlg, IDC_MENUVALUE, _T("")); } }break; } diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp index 67d4068dd2..a10615886b 100644 --- a/plugins/Scriver/src/chat/options.cpp +++ b/plugins/Scriver/src/chat/options.cpp @@ -252,7 +252,7 @@ INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa { TCHAR* pszGroup = NULL; InitSetting(&pszGroup, "AddToGroup", _T("Chat rooms")); - SetWindowText(GetDlgItem(hwndDlg, IDC_CHAT_GROUP), pszGroup); + SetDlgItemText(hwndDlg, IDC_CHAT_GROUP, pszGroup); mir_free(pszGroup); } break; @@ -467,7 +467,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa SHGetPathFromIDList(idList, tszDirectory); mir_tstrcat(tszDirectory, _T("\\")); PathToRelativeT(tszDirectory, tszTemp); - SetWindowText(GetDlgItem(hwndDlg, IDC_CHAT_LOGDIRECTORY), mir_tstrlen(tszTemp) > 1 ? tszTemp : DEFLOGFILENAME); + SetDlgItemText(hwndDlg, IDC_CHAT_LOGDIRECTORY, mir_tstrlen(tszTemp) > 1 ? tszTemp : DEFLOGFILENAME); } psMalloc->Free(idList); psMalloc->Release(); diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index e8d326cebe..e476d5a419 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -884,7 +884,7 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam if (!ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) { EnableWindow(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), FALSE); CheckDlgButton(hwndDlg, IDC_NOTIFYTRAY, BST_CHECKED); - SetWindowText(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), TranslateT("Show balloon popup (unsupported system)")); + SetDlgItemText(hwndDlg, IDC_NOTIFYBALLOON, TranslateT("Show balloon popup (unsupported system)")); } break; diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp index 633f5f1737..744bded037 100644 --- a/plugins/Sessions/Src/Options.cpp +++ b/plugins/Sessions/Src/Options.cpp @@ -333,7 +333,7 @@ static INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM l ShowWindow(GetDlgItem(hdlg, IDC_OPCLIST), SW_HIDE); EnableWindow(GetDlgItem(hdlg, IDC_DEL), FALSE); //EnableWindow(GetDlgItem(hdlg,IDC_SAVE),TRUE); - SetWindowText(GetDlgItem(hdlg, IDC_EDIT), TranslateT("View")); + SetDlgItemText(hdlg, IDC_EDIT, TranslateT("View")); hOpClistControl = CreateWindowEx(WS_EX_STATICEDGE, _T(CLISTCONTROL_CLASS), _T(""), WS_TABSTOP | WS_VISIBLE | WS_CHILD, 14, 198, 161, 163, hdlg, (HMENU)IDC_EMCLIST, g_hInst, 0); @@ -353,7 +353,7 @@ static INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM l ShowWindow(GetDlgItem(hdlg, IDC_OPCLIST), SW_SHOWNA); EnableWindow(GetDlgItem(hdlg, IDC_DEL), TRUE); EnableWindow(GetDlgItem(hdlg, IDC_SAVE), FALSE); - SetWindowText(GetDlgItem(hdlg, IDC_EDIT), TranslateT("Edit")); + SetDlgItemText(hdlg, IDC_EDIT, TranslateT("Edit")); DestroyWindow(hOpClistControl); hOpClistControl = NULL; } diff --git a/plugins/ShellExt/src/options.cpp b/plugins/ShellExt/src/options.cpp index a793ef6b78..d2b5f1cf7d 100644 --- a/plugins/ShellExt/src/options.cpp +++ b/plugins/ShellExt/src/options.cpp @@ -37,7 +37,7 @@ static INT_PTR CALLBACK OptDialogProc(HWND hwndDlg, UINT wMsg, WPARAM wParam, LP mir_sntprintf(szBuf, SIZEOF(szBuf), _T("%s (%s)"), TranslateTS(COM_OKSTR[ (comReg & COMREG_OK) != 0 ]), TranslateTS(COM_APPROVEDSTR[ (comReg & COMREG_APPROVED) != 0 ])); - SetWindowText(GetDlgItem(hwndDlg, IDC_STATUS), szBuf); + SetDlgItemText(hwndDlg, IDC_STATUS, szBuf); // auto size the static windows to fit their text // they're rendering in a font not selected into the DC. AutoSize(GetDlgItem(hwndDlg, IDC_CAPMENUS)); diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp index 1e1d955907..762ea4d531 100644 --- a/plugins/SplashScreen/src/options.cpp +++ b/plugins/SplashScreen/src/options.cpp @@ -111,9 +111,9 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if (options.showversion) CheckDlgButton(hwndDlg, IDC_SHOWVERSION, BST_CHECKED); - SetWindowText(GetDlgItem(hwndDlg, IDC_SHOWTIME), _itot(options.showtime, inBuf, 10)); - SetWindowText(GetDlgItem(hwndDlg, IDC_FISTEP), _itot(options.fisteps, inBuf, 10)); - SetWindowText(GetDlgItem(hwndDlg, IDC_FOSTEP), _itot(options.fosteps, inBuf, 10)); + SetDlgItemText(hwndDlg, IDC_SHOWTIME, _itot(options.showtime, inBuf, 10)); + SetDlgItemText(hwndDlg, IDC_FISTEP, _itot(options.fisteps, inBuf, 10)); + SetDlgItemText(hwndDlg, IDC_FOSTEP, _itot(options.fosteps, inBuf, 10)); SendDlgItemMessage(hwndDlg, IDC_SHOWTIME, EM_LIMITTEXT, 5, 0); } @@ -227,7 +227,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } } - SetWindowText(GetDlgItem(hwndDlg, IDC_SPLASHPATH), szPath2Spash); + SetDlgItemText(hwndDlg, IDC_SPLASHPATH, szPath2Spash); } SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); @@ -279,7 +279,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP // Make path relative int result = PathToRelativeT(szTempPath, szSoundFilePath); if(result && mir_tstrlen(szSoundFile) > 0) - SetWindowText(GetDlgItem(hwndDlg, IDC_SNDPATH),szSoundFilePath); + SetDlgItemText(hwndDlg, IDC_SNDPATH, szSoundFilePath); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); } diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp index 50e3d5ea41..86e9645505 100644 --- a/plugins/TabSRMM/src/chat/options.cpp +++ b/plugins/TabSRMM/src/chat/options.cpp @@ -412,7 +412,7 @@ INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM TCHAR* pszGroup = NULL; InitSetting(pszGroup, "AddToGroup", _T("Chat rooms")); - SetWindowText(GetDlgItem(hwndDlg, IDC_GROUP), pszGroup); + SetDlgItemText(hwndDlg, IDC_GROUP, pszGroup); mir_free(pszGroup); Utils::showDlgControl(hwndDlg, IDC_STATIC_MESSAGE, SW_HIDE); } @@ -834,7 +834,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM TCHAR tszTemp[MAX_PATH]; PathToRelativeT(tszDirectory, tszTemp, szUserDir); - SetWindowText(GetDlgItem(hwndDlg, IDC_LOGDIRECTORY), mir_tstrlen(tszTemp) > 1 ? tszTemp : DEFLOGFILENAME); + SetDlgItemText(hwndDlg, IDC_LOGDIRECTORY, mir_tstrlen(tszTemp) > 1 ? tszTemp : DEFLOGFILENAME); } psMalloc->Free(idList); psMalloc->Release(); diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index b429c066af..ae63a18268 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -417,7 +417,7 @@ void TSAPI SetDialogToType(HWND hwndDlg) dat->bNotOnList = TRUE; ShowMultipleControls(hwndDlg, addControls, 2, SW_SHOW); Utils::showDlgControl(hwndDlg, IDC_LOGFROZENTEXT, SW_SHOW); - SetWindowText(GetDlgItem(hwndDlg, IDC_LOGFROZENTEXT), TranslateT("Contact not on list. You may add it...")); + SetDlgItemText(hwndDlg, IDC_LOGFROZENTEXT, TranslateT("Contact not on list. You may add it...")); } else { ShowMultipleControls(hwndDlg, addControls, 2, SW_HIDE); @@ -1328,7 +1328,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SendDlgItemMessage(hwndDlg, IDC_SAVE, BUTTONADDTOOLTIP, (WPARAM)pszIDCSAVE_close, BATF_TCHAR); SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Click for contact menu\nClick dropdown for window settings"), BATF_TCHAR); - SetWindowText(GetDlgItem(hwndDlg, IDC_RETRY), TranslateT("Retry")); + SetDlgItemText(hwndDlg, IDC_RETRY, TranslateT("Retry")); UINT _ctrls[] = { IDC_RETRY, IDC_CANCELSEND, IDC_MSGSENDLATER }; for (int i = 0; i < SIZEOF(_ctrls); i++) { @@ -1337,8 +1337,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SendDlgItemMessage(hwndDlg, _ctrls[i], BUTTONSETASTHEMEDBTN, TRUE, 0); } - SetWindowText(GetDlgItem(hwndDlg, IDC_CANCELSEND), TranslateT("Cancel")); - SetWindowText(GetDlgItem(hwndDlg, IDC_MSGSENDLATER), TranslateT("Send later")); + SetDlgItemText(hwndDlg, IDC_CANCELSEND, TranslateT("Cancel")); + SetDlgItemText(hwndDlg, IDC_MSGSENDLATER, TranslateT("Send later")); SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETUNDOLIMIT, 0, 0); SendDlgItemMessage(hwndDlg, IDC_LOG, EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS | ENM_KEYEVENTS | ENM_LINK); diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index 3bad332acb..01530d517a 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -869,7 +869,7 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam if (!ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) { Utils::enableDlgControl(hwndDlg, IDC_NOTIFYBALLOON, FALSE); - SetWindowText(GetDlgItem(hwndDlg, IDC_NOTIFYBALLOON), TranslateT("Show balloon popup (unsupported system)")); + SetDlgItemText(hwndDlg, IDC_NOTIFYBALLOON, TranslateT("Show balloon popup (unsupported system)")); } SendDlgItemMessage(hwndDlg, IDC_MTN_POPUPMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Always")); @@ -1611,7 +1611,7 @@ INT_PTR CALLBACK DlgProcSetupStatusModes(HWND hwndDlg, UINT msg, WPARAM wParam, SetWindowText(hwndDlg, TranslateT("Choose status modes")); { for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) { - SetWindowText(GetDlgItem(hwndDlg, i), pcli->pfnGetStatusModeDescription(i, GSMDF_TCHAR)); + SetDlgItemText(hwndDlg, i, pcli->pfnGetStatusModeDescription(i, GSMDF_TCHAR)); if (dwStatusMask != -1 && (dwStatusMask & (1 << (i - ID_STATUS_ONLINE)))) CheckDlgButton(hwndDlg, i, BST_CHECKED); Utils::enableDlgControl(hwndDlg, i, dwStatusMask != -1); diff --git a/plugins/TabSRMM/src/templates.cpp b/plugins/TabSRMM/src/templates.cpp index 20aa4eb8f9..4137e10cf4 100644 --- a/plugins/TabSRMM/src/templates.cpp +++ b/plugins/TabSRMM/src/templates.cpp @@ -357,7 +357,7 @@ INT_PTR CALLBACK DlgProcTemplateEditor(HWND hwndDlg, UINT msg, WPARAM wParam, LP dbei.flags |= (teInfo->rtl ? DBEF_RTL : 0); dat->lastEventTime = (iIndex == 4 || iIndex == 5) ? time(NULL) - 1 : 0; dat->iLastEventType = MAKELONG(dbei.flags, dbei.eventType); - SetWindowText(GetDlgItem(hwndDlg, IDC_PREVIEW), _T("")); + SetDlgItemText(hwndDlg, IDC_PREVIEW, _T("")); dat->dwFlags = MWF_LOG_ALL; dat->dwFlags = (teInfo->rtl ? dat->dwFlags | MWF_LOG_RTL : dat->dwFlags & ~MWF_LOG_RTL); dat->dwFlags = (iIndex == 0 || iIndex == 1) ? dat->dwFlags & ~MWF_LOG_GROUPMODE : dat->dwFlags | MWF_LOG_GROUPMODE; diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp index 3ac48c1f39..1ce4742b12 100644 --- a/plugins/TrafficCounter/src/options.cpp +++ b/plugins/TrafficCounter/src/options.cpp @@ -217,11 +217,11 @@ static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, // Строки формата для счётчиков EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_COUNTER_FORMAT), bVariablesExists); - SetWindowText(GetDlgItem(hwndDlg, IDC_EDIT_COUNTER_FORMAT), Traffic_CounterFormat); + SetDlgItemText(hwndDlg, IDC_EDIT_COUNTER_FORMAT, Traffic_CounterFormat); // Формат всплывающей подсказки EnableWindow(GetDlgItem(hwndDlg,IDC_EDIT_TOOLTIP_FORMAT), bTooltipExists); - SetWindowText(GetDlgItem(hwndDlg, IDC_EDIT_TOOLTIP_FORMAT), Traffic_TooltipFormat); + SetDlgItemText(hwndDlg, IDC_EDIT_TOOLTIP_FORMAT, Traffic_TooltipFormat); // Display traffic for current... SendDlgItemMessage(hwndDlg, IDC_COMBO_AUTO_CLEAR, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Day")); diff --git a/plugins/Variables/src/help.cpp b/plugins/Variables/src/help.cpp index 89986aedb5..fcc86aa69f 100644 --- a/plugins/Variables/src/help.cpp +++ b/plugins/Variables/src/help.cpp @@ -724,7 +724,7 @@ static INT_PTR CALLBACK inputDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM if (newString != NULL) { TCHAR *oldString = Hlp_GetDlgItemText(hwndDlg, IDC_RESULT); if (oldString == NULL || _tcscmp(oldString, newString)) - SetWindowText(GetDlgItem(hwndDlg, IDC_RESULT), newString); + SetDlgItemText(hwndDlg, IDC_RESULT, newString); mir_free(newString); if (oldString != NULL) @@ -873,7 +873,7 @@ static INT_PTR CALLBACK helpDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM l } } if (dat->vhs->fi != NULL || dat->vhs->hwndCtrl != NULL) { - SetWindowText(GetDlgItem(hwndDlg, IDC_CANCEL), TranslateT("Cancel")); + SetDlgItemText(hwndDlg, IDC_CANCEL, TranslateT("Cancel")); ShowWindow(GetDlgItem(hwndDlg, IDC_OK), SW_SHOW); } } diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp index a2a8083483..b69891d543 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.cpp +++ b/plugins/WhenWasIt/src/dlg_handlers.cpp @@ -192,17 +192,17 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara TCHAR buffer[1024]; _itot(commonData.daysInAdvance, buffer, 10); - SetWindowText(GetDlgItem(hWnd, IDC_DAYS_IN_ADVANCE), buffer); + SetDlgItemText(hWnd, IDC_DAYS_IN_ADVANCE, buffer); _itot(commonData.checkInterval, buffer, 10); - SetWindowText(GetDlgItem(hWnd, IDC_CHECK_INTERVAL), buffer); + SetDlgItemText(hWnd, IDC_CHECK_INTERVAL, buffer); mir_sntprintf(buffer, SIZEOF(buffer), _T("%d|%d"), commonData.popupTimeout, commonData.popupTimeoutToday); - SetWindowText(GetDlgItem(hWnd, IDC_POPUP_TIMEOUT), buffer); + SetDlgItemText(hWnd, IDC_POPUP_TIMEOUT, buffer); _itot(commonData.cSoundNearDays, buffer, 10); - SetWindowText(GetDlgItem(hWnd, IDC_SOUND_NEAR_DAYS_EDIT), buffer); + SetDlgItemText(hWnd, IDC_SOUND_NEAR_DAYS_EDIT, buffer); _itot(commonData.cDlgTimeout, buffer, 10); - SetWindowText(GetDlgItem(hWnd, IDC_DLG_TIMEOUT), buffer); + SetDlgItemText(hWnd, IDC_DLG_TIMEOUT, buffer); _itot(commonData.daysAfter, buffer, 10); - SetWindowText(GetDlgItem(hWnd, IDC_DAYS_AFTER), buffer); + SetDlgItemText(hWnd, IDC_DAYS_AFTER, buffer); CheckDlgButton(hWnd, IDC_OPENINBACKGROUND, (commonData.bOpenInBackground) ? BST_CHECKED : BST_UNCHECKED); @@ -881,7 +881,7 @@ INT_PTR CALLBACK DlgProcUpcoming(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar const int MAX_SIZE = 512; TCHAR buffer[MAX_SIZE]; mir_sntprintf(buffer, SIZEOF(buffer), (timeout != 2) ? TranslateT("Closing in %d seconds") : TranslateT("Closing in %d second"), --timeout); - SetWindowText(GetDlgItem(hWnd, IDC_CLOSE), buffer); + SetDlgItemText(hWnd, IDC_CLOSE, buffer); if (timeout <= 0) SendMessage(hWnd, WM_CLOSE, 0, 0); -- cgit v1.2.3