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 --- src/core/stdchat/src/options.cpp | 2 +- src/core/stdmsg/src/msgoptions.cpp | 2 +- src/modules/metacontacts/meta_edit.cpp | 4 ++-- src/modules/options/options.cpp | 2 +- src/modules/protocols/protoopts.cpp | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp index 52eb9b43e4..6f080ee60d 100644 --- a/src/core/stdchat/src/options.cpp +++ b/src/core/stdchat/src/options.cpp @@ -478,7 +478,7 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA { TCHAR* pszGroup = NULL; InitSetting(&pszGroup, "AddToGroup", _T("Chat rooms")); - SetWindowText(GetDlgItem(hwndDlg, IDC_GROUP), pszGroup); + SetDlgItemText(hwndDlg, IDC_GROUP, pszGroup); mir_free(pszGroup); } { diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 0f71cb085b..9d539bbf4d 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -489,7 +489,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/src/modules/metacontacts/meta_edit.cpp b/src/modules/metacontacts/meta_edit.cpp index 0dc9a2e6e4..2a6de57602 100644 --- a/src/modules/metacontacts/meta_edit.cpp +++ b/src/modules/metacontacts/meta_edit.cpp @@ -365,11 +365,11 @@ static INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wPara if (g_data.hDefaultContact == g_data.hContact[sel]) { if (g_data.num_contacts > 0) { g_data.hDefaultContact = g_data.hContact[0]; - SetWindowText(GetDlgItem(hwndDlg, IDC_ED_DEFAULT), cli.pfnGetContactDisplayName(g_data.hDefaultContact, 0)); + SetDlgItemText(hwndDlg, IDC_ED_DEFAULT, cli.pfnGetContactDisplayName(g_data.hDefaultContact, 0)); } else { g_data.hDefaultContact = 0; - SetWindowText(GetDlgItem(hwndDlg, IDC_ED_DEFAULT), _T("None")); + SetDlgItemText(hwndDlg, IDC_ED_DEFAULT, _T("None")); } } diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp index 7d5f72ba0e..6beda3336a 100644 --- a/src/modules/options/options.cpp +++ b/src/modules/options/options.cpp @@ -669,7 +669,7 @@ static void RebuildPageTree(HWND hdlg, OptionsDlgData *dat) } if (dat->szFilterString[0] == 0) // Clear the keyword combo box - SetWindowText(GetDlgItem(hdlg, IDC_KEYWORD_FILTER), _T("")); + SetDlgItemText(hdlg, IDC_KEYWORD_FILTER, _T("")); if (!bRemoveFocusFromFilter) SetFocus(GetDlgItem(hdlg, IDC_KEYWORD_FILTER)); //set the focus back to the combo box diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp index 9114486fa2..1efc05c0a1 100644 --- a/src/modules/protocols/protoopts.cpp +++ b/src/modules/protocols/protoopts.cpp @@ -438,7 +438,7 @@ static void sttUpdateAccountInfo(HWND hwndDlg, struct TAccMgrData *dat) } else if (!pa->ppro) { ShowWindow(GetDlgItem(hwndDlg, IDC_TXT_INFO), SW_SHOW); - SetWindowText(GetDlgItem(hwndDlg, IDC_TXT_INFO), TranslateT("Account is disabled. Please activate it to access options.")); + SetDlgItemText(hwndDlg, IDC_TXT_INFO, TranslateT("Account is disabled. Please activate it to access options.")); } else { HWND hwnd = (HWND)ProtoCallService(pa->szModuleName, PS_CREATEACCMGRUI, 0, (LPARAM)hwndDlg); @@ -455,7 +455,7 @@ static void sttUpdateAccountInfo(HWND hwndDlg, struct TAccMgrData *dat) } else { ShowWindow(GetDlgItem(hwndDlg, IDC_TXT_INFO), SW_SHOW); - SetWindowText(GetDlgItem(hwndDlg, IDC_TXT_INFO), legacyMsg); + SetDlgItemText(hwndDlg, IDC_TXT_INFO, legacyMsg); } } return; @@ -468,7 +468,7 @@ static void sttUpdateAccountInfo(HWND hwndDlg, struct TAccMgrData *dat) EnableWindow(GetDlgItem(hwndDlg, IDC_OPTIONS), FALSE); ShowWindow(GetDlgItem(hwndDlg, IDC_TXT_INFO), SW_SHOW); - SetWindowText(GetDlgItem(hwndDlg, IDC_TXT_INFO), welcomeMsg); + SetDlgItemText(hwndDlg, IDC_TXT_INFO, welcomeMsg); } INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) -- cgit v1.2.3