From 0ff28f7c5ffaa46ed5b21bee965e66bb9108dfe2 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Sun, 14 Dec 2014 04:44:35 +0000 Subject: GetWindowText(GetDlgItem(...)) -> GetDlgItemText(...) git-svn-id: http://svn.miranda-ng.org/main/trunk@11390 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IRCG/src/options.cpp | 4 ++-- protocols/JabberG/src/jabber_console.cpp | 4 ++-- protocols/JabberG/src/jabber_groupchat.cpp | 4 ++-- protocols/JabberG/src/jabber_privacy.cpp | 2 +- protocols/Sametime/src/session_announce_win.cpp | 2 +- protocols/SkypeClassic/src/skypeopt.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'protocols') diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 5fa543c8d1..f07846f49f 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -1247,8 +1247,8 @@ void CAddIgnoreDlg::OnOk(CCtrlButton*) if (IsDlgButtonChecked(m_hwnd, IDC_C) == BST_CHECKED) flags += 'c'; if (IsDlgButtonChecked(m_hwnd, IDC_M) == BST_CHECKED) flags += 'm'; - GetWindowText(GetDlgItem(m_hwnd, IDC_MASK), szMask, SIZEOF(szMask)); - GetWindowText(GetDlgItem(m_hwnd, IDC_NETWORK), szNetwork, SIZEOF(szNetwork)); + GetDlgItemText(m_hwnd, IDC_MASK, szMask, SIZEOF(szMask)); + GetDlgItemText(m_hwnd, IDC_NETWORK, szNetwork, SIZEOF(szNetwork)); CMString Mask = GetWord(szMask, 0); if (Mask.GetLength() != 0) { diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp index 8223d8d0cd..08336c73fe 100644 --- a/protocols/JabberG/src/jabber_console.cpp +++ b/protocols/JabberG/src/jabber_console.cpp @@ -506,7 +506,7 @@ INT_PTR CJabberDlgConsole::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) else { int length = GetWindowTextLength(GetDlgItem(m_hwnd, IDC_CONSOLEIN)) + 1; TCHAR *textToSend = (TCHAR *)mir_alloc(length * sizeof(TCHAR)); - GetWindowText(GetDlgItem(m_hwnd, IDC_CONSOLEIN), textToSend, length); + GetDlgItemText(m_hwnd, IDC_CONSOLEIN, textToSend, length); int bytesProcessed = 0; XmlNode xmlTmp(textToSend, &bytesProcessed, NULL); @@ -562,7 +562,7 @@ INT_PTR CJabberDlgConsole::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) } else if (HIWORD(wParam) == CBN_EDITCHANGE) { mir_cslock lck(m_proto->m_filterInfo.csPatternLock); - GetWindowText(GetDlgItem(m_hwnd, IDC_CB_FILTER), m_proto->m_filterInfo.pattern, SIZEOF(m_proto->m_filterInfo.pattern)); + GetDlgItemText(m_hwnd, IDC_CB_FILTER, m_proto->m_filterInfo.pattern, SIZEOF(m_proto->m_filterInfo.pattern)); } break; diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index 99a24ee972..4ea03e05a0 100644 --- a/protocols/JabberG/src/jabber_groupchat.cpp +++ b/protocols/JabberG/src/jabber_groupchat.cpp @@ -600,8 +600,8 @@ INT_PTR CJabberDlgGcJoin::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) SendDlgItemMessage(m_hwnd, IDC_ROOM, CB_RESETCONTENT, 0, 0); int len = GetWindowTextLength(GetDlgItem(m_hwnd, IDC_SERVER)) + 1; - TCHAR *server = (TCHAR *)_alloca(len * sizeof(TCHAR)); - GetWindowText(GetDlgItem(m_hwnd, IDC_SERVER), server, len); + TCHAR *server = (TCHAR*)_alloca(len * sizeof(TCHAR)); + GetDlgItemText(m_hwnd, IDC_SERVER, server, len); if (*server) { sttRoomListAppend(GetDlgItem(m_hwnd, IDC_ROOM), RoomInfo::ROOM_WAIT, TranslateT("Loading..."), TranslateT("Please wait for room list to download."), _T("")); diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index 3042db1b4e..5724a4c0a7 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -1632,7 +1632,7 @@ void CJabberDlgPrivacyLists::btnAddJid_OnClick(CCtrlButton *) { int len = GetWindowTextLength(GetDlgItem(m_hwnd, IDC_NEWJID))+1; TCHAR *buf = (TCHAR *)_alloca(sizeof(TCHAR) * len); - GetWindowText(GetDlgItem(m_hwnd, IDC_NEWJID), buf, len); + GetDlgItemText(m_hwnd, IDC_NEWJID, buf, len); SetWindowText(GetDlgItem(m_hwnd, IDC_NEWJID), _T("")); CListAddContact(GetDlgItem(m_hwnd, IDC_CLIST), buf); } diff --git a/protocols/Sametime/src/session_announce_win.cpp b/protocols/Sametime/src/session_announce_win.cpp index 77c82c58ad..7e36cc65e8 100644 --- a/protocols/Sametime/src/session_announce_win.cpp +++ b/protocols/Sametime/src/session_announce_win.cpp @@ -113,7 +113,7 @@ INT_PTR CALLBACK SessionAnnounceDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wPara } if (send_count > 0) { - GetWindowText(GetDlgItem(hwndDlg, IDC_ED_ANMSG), safArg->msg, MAX_MESSAGE_SIZE); + GetDlgItemText(hwndDlg, IDC_ED_ANMSG, safArg->msg, MAX_MESSAGE_SIZE); safArg->proto = proto; SendAnnouncementFunc sendAnnouncementFunc = arg->sendAnnouncementFunc; sendAnnouncementFunc(safArg); diff --git a/protocols/SkypeClassic/src/skypeopt.cpp b/protocols/SkypeClassic/src/skypeopt.cpp index 8c598c3efe..74957b8907 100644 --- a/protocols/SkypeClassic/src/skypeopt.cpp +++ b/protocols/SkypeClassic/src/skypeopt.cpp @@ -935,8 +935,8 @@ void DoAutoDetect(HWND dlg) { if (acc = ezxml_get(f1, "Lib", 0, "Account", 0, "Default", -1)) { - if (GetWindowTextA(GetDlgItem(dlg,IDC_USERNAME),tmpUser,sizeof(tmpUser))) - SetWindowTextA(GetDlgItem(dlg,IDC_USERNAME),acc->txt); + if (GetDlgItemTextA(dlg, IDC_USERNAME, tmpUser, sizeof(tmpUser))) + SetWindowTextA(GetDlgItem(dlg, IDC_USERNAME), acc->txt); /* Can't find this stuff in current Skype verions?? sprintf (fileName, "%s\\%s\\config.xml", basePath, acc->txt); if ((acc = ezxml_get(f1, "UI", 0, "Messages", 0, "OpenWindowInCompactMode", -1)) && *acc->txt!='0') -- cgit v1.2.3