From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that improperly used _t functions; - TCHAR *t removed from MAllStrings; - ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz* git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Folders/src/dlg_handlers.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/Folders/src/dlg_handlers.cpp') diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp index d14722300f..82a1b38d04 100644 --- a/plugins/Folders/src/dlg_handlers.cpp +++ b/plugins/Folders/src/dlg_handlers.cpp @@ -13,19 +13,19 @@ static PFolderItem GetSelectedItem(HWND hWnd) return (PFolderItem)SendDlgItemMessage(hWnd, IDC_FOLDERS_ITEMS_LIST, LB_GETITEMDATA, index, 0); } -static void GetEditText(HWND hWnd, TCHAR *buffer, int size) +static void GetEditText(HWND hWnd, wchar_t *buffer, int size) { GetWindowText(GetDlgItem(hWnd, IDC_FOLDER_EDIT), buffer, size); } -static void SetEditText(HWND hWnd, const TCHAR *buffer) +static void SetEditText(HWND hWnd, const wchar_t *buffer) { bInitializing = 1; SetDlgItemText(hWnd, IDC_FOLDER_EDIT, buffer); bInitializing = 0; } -static int ContainsSection(HWND hWnd, const TCHAR *section) +static int ContainsSection(HWND hWnd, const wchar_t *section) { int index = SendDlgItemMessage(hWnd, IDC_FOLDERS_SECTIONS_LIST, LB_FINDSTRINGEXACT, -1, (LPARAM)section); return (index != LB_ERR); @@ -37,7 +37,7 @@ static void LoadRegisteredFolderSections(HWND hWnd) for (int i = 0; i < lstRegisteredFolders.getCount(); i++) { CFolderItem &tmp = lstRegisteredFolders[i]; - TCHAR *translated = mir_a2t(tmp.GetSection()); + wchar_t *translated = mir_a2t(tmp.GetSection()); if (!ContainsSection(hWnd, TranslateTS(translated))) { int idx = SendMessage(hwndList, LB_ADDSTRING, 0, (LPARAM)TranslateTS(translated)); SendMessage(hwndList, LB_SETITEMDATA, idx, (LPARAM)tmp.GetSection()); @@ -71,7 +71,7 @@ static void LoadRegisteredFolderItems(HWND hWnd) static void RefreshPreview(HWND hWnd) { - TCHAR tmp[MAX_FOLDER_SIZE]; + wchar_t tmp[MAX_FOLDER_SIZE]; GetEditText(hWnd, tmp, MAX_FOLDER_SIZE); SetDlgItemText(hWnd, IDC_PREVIEW_EDIT, ExpandPath(tmp)); } @@ -90,7 +90,7 @@ static void SaveItem(HWND hWnd, PFolderItem item, int bEnableApply) if (!item) return; - TCHAR buffer[MAX_FOLDER_SIZE]; + wchar_t buffer[MAX_FOLDER_SIZE]; GetEditText(hWnd, buffer, _countof(buffer)); item->SetFormat(buffer); @@ -103,7 +103,7 @@ static int ChangesNotSaved(HWND hWnd, PFolderItem item) if (!item) return 0; - TCHAR buffer[MAX_FOLDER_SIZE]; + wchar_t buffer[MAX_FOLDER_SIZE]; GetEditText(hWnd, buffer, MAX_FOLDER_SIZE); return mir_tstrcmp(item->GetFormat(), buffer) != 0; } @@ -119,7 +119,7 @@ static void CheckForChanges(HWND hWnd, int bNeedConfirmation = 1) static INT_PTR CALLBACK DlgProcVariables(HWND hWnd, UINT msg, WPARAM wParam, LPARAM) { - TCHAR tszMessage[2048]; + wchar_t tszMessage[2048]; switch (msg) { case WM_INITDIALOG: -- cgit v1.2.3