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

4 files changed, 9 insertions, 9 deletions

diff --git a/plugins/TopToolBar/src/stdafx.h b/plugins/TopToolBar/src/stdafx.h
index babf433470..57e4e39329 100644
--- a/plugins/TopToolBar/src/stdafx.h
+++ b/plugins/TopToolBar/src/stdafx.h
@@ -68,9 +68,9 @@ struct TopButtonInt : public MZeroedObject
 	HANDLE hIconHandleUp, hIconHandleDn;

 

 	char  *pszService;

-	TCHAR *ptszProgram;

+	wchar_t *ptszProgram;

 	char  *pszName;

-	TCHAR *ptszTooltip;

+	wchar_t *ptszTooltip;

 

 	LPARAM lParamUp;

 	WPARAM wParamUp;

@@ -78,7 +78,7 @@ struct TopButtonInt : public MZeroedObject
 	WPARAM wParamDown;

 

 	int    hLangpack;

-	TCHAR *ptszTooltipUp, *ptszTooltipDn;

+	wchar_t *ptszTooltipUp, *ptszTooltipDn;

 };

 

 ///////////////////////////////////////////////////////////////////////////////

diff --git a/plugins/TopToolBar/src/toolbarwnd.cpp b/plugins/TopToolBar/src/toolbarwnd.cpp
index 56577b4703..73661085dd 100644
--- a/plugins/TopToolBar/src/toolbarwnd.cpp
+++ b/plugins/TopToolBar/src/toolbarwnd.cpp
@@ -5,7 +5,7 @@ COLORREF bkColour;
 HBITMAP hBmpBackground, hBmpSeparator;

 int backgroundBmpUse;

 

-static TCHAR pluginname[] = L"TopToolBar";

+static wchar_t pluginname[] = L"TopToolBar";

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // Toolbar window procedure

diff --git a/plugins/TopToolBar/src/topbutton.cpp b/plugins/TopToolBar/src/topbutton.cpp
index 1fe3eb2488..4be939ba8b 100644
--- a/plugins/TopToolBar/src/topbutton.cpp
+++ b/plugins/TopToolBar/src/topbutton.cpp
@@ -159,7 +159,7 @@ void TopButtonInt::SetBitmap()
 		if (GetWindowLongPtr(hwnd, GWL_STYLE) & SS_ICON)

 			SetWindowLongPtr(hwnd, GWL_STYLE, curstyle | SS_ICON);

 

-		TCHAR *pTooltip;

+		wchar_t *pTooltip;

 		if (bPushed) {

 			SendMessage(hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)(hIconDn ? hIconDn : hIconUp));

 			SendMessage(hwnd, BM_SETCHECK, BST_CHECKED, 0);

diff --git a/plugins/TopToolBar/src/ttbopt.cpp b/plugins/TopToolBar/src/ttbopt.cpp
index f048adfda3..b78101a566 100644
--- a/plugins/TopToolBar/src/ttbopt.cpp
+++ b/plugins/TopToolBar/src/ttbopt.cpp
@@ -18,7 +18,7 @@ static HTREEITEM AddLine(HWND hTree,TopButtonInt *b, HTREEITEM hItem, HIMAGELIST
 	tvis.item.mask = TVIF_PARAM | TVIF_TEXT | TVIF_STATE | TVIF_IMAGE | TVIF_SELECTEDIMAGE;

 

 	int index;

-	TCHAR* tmp;

+	wchar_t* tmp;

 

 	if (b->dwFlags & TTBBF_ISSEPARATOR) {

 		tvis.item.pszText = L"------------------";

@@ -239,7 +239,7 @@ static INT_PTR CALLBACK ButOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			//----- Launch buttons -----

 

 			if (ctrlid == IDC_BROWSE) {

-				TCHAR str[MAX_PATH];

+				wchar_t str[MAX_PATH];

 				OPENFILENAME ofn = {0};

 

 				GetDlgItemText(hwndDlg, IDC_EPATH, str, _countof(str));

@@ -272,7 +272,7 @@ static INT_PTR CALLBACK ButOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				TreeView_GetItem(hTree, &tvi);

 

 				TopButtonInt* btn = (TopButtonInt*)tvi.lParam;

-				TCHAR buf [256];

+				wchar_t buf [256];

 				// probably, condition not needs

 				if (btn->dwFlags & TTBBF_ISLBUTTON) {

 					if (!(btn->dwFlags & TTBBF_OPTIONAL)) {

@@ -509,7 +509,7 @@ static INT_PTR CALLBACK ButOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			TreeView_GetItem(hTree, &tvi);

 			if ( (hti.flags & (TVHT_ONITEM | TVHT_ONITEMRIGHT)) || (hti.hItem==TVI_FIRST)) {

 				TVINSERTSTRUCT tvis;

-				TCHAR name[128];

+				wchar_t name[128];

 				tvis.item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_STATE;

 				tvis.item.stateMask = 0xFFFFFFFF;

 				tvis.item.pszText = name;