Index: src/plugin/PluginClass.cpp |
=================================================================== |
--- a/src/plugin/PluginClass.cpp |
+++ b/src/plugin/PluginClass.cpp |
@@ -784,7 +784,7 @@ |
{ |
if (!s_hUxtheme) |
{ |
- s_hUxtheme = ::GetModuleHandle(_T("uxtheme.dll")); |
+ s_hUxtheme = ::GetModuleHandle(L"uxtheme.dll"); |
if (s_hUxtheme) |
{ |
pfnClose = (CLOSETHEMEDATA)::GetProcAddress(s_hUxtheme, "CloseThemeData"); |
@@ -828,7 +828,7 @@ |
wcex.hCursor = NULL; |
wcex.hbrBackground = NULL; |
wcex.lpszMenuName = NULL; |
- wcex.lpszClassName = _T(STATUSBAR_PANE_NAME); |
+ wcex.lpszClassName = STATUSBAR_PANE_NAME; |
wcex.hIconSm = NULL; |
s_criticalSectionLocal.Lock(); |
@@ -877,7 +877,7 @@ |
CPluginClient* client = CPluginClient::GetInstance(); |
- TCHAR szClassName[MAX_PATH]; |
+ wchar_t szClassName[MAX_PATH]; |
// Get browser window and url |
HWND hBrowserWnd = GetBrowserHWND(); |
if (!hBrowserWnd) |
@@ -898,13 +898,13 @@ |
memset(szClassName, 0, MAX_PATH); |
GetClassName(hTabWnd, szClassName, MAX_PATH); |
- if (_tcscmp(szClassName, _T("TabWindowClass")) == 0 || _tcscmp(szClassName,_T("Frame Tab")) == 0) |
+ if (wcscmp(szClassName, L"TabWindowClass") == 0 || wcscmp(szClassName,L"Frame Tab") == 0) |
{ |
// IE8 support |
HWND hTabWnd2 = hTabWnd; |
- if (_tcscmp(szClassName,_T("Frame Tab")) == 0) |
+ if (wcscmp(szClassName,L"Frame Tab") == 0) |
{ |
- hTabWnd2 = ::FindWindowEx(hTabWnd2, NULL, _T("TabWindowClass"), NULL); |
+ hTabWnd2 = ::FindWindowEx(hTabWnd2, NULL, L"TabWindowClass", NULL); |
} |
if (hTabWnd2) |
@@ -952,7 +952,7 @@ |
memset(szClassName, 0, MAX_PATH); |
::GetClassName(hWnd, szClassName, MAX_PATH); |
- if (_tcscmp(szClassName,_T("msctls_statusbar32")) == 0) |
+ if (wcscmp(szClassName,L"msctls_statusbar32") == 0) |
{ |
hWndStatusBar = hWnd; |
break; |
@@ -991,7 +991,7 @@ |
HWND hWndNewPane = ::CreateWindowEx( |
NULL, |
MAKEINTATOM(GetAtomPaneClass()), |
- _T(""), |
+ L"", |
WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, |
rcStatusBar.Width() - 500,0,m_nPaneWidth,rcStatusBar.Height(), |
hWndStatusBar, |
@@ -1269,7 +1269,7 @@ |
HWND hMenuWnd = ::CreateWindowEx( |
NULL, |
MAKEINTATOM(GetAtomPaneClass()), |
- _T(""), |
+ L"", |
0, |
0,0,0,0, |
NULL, |
@@ -1932,8 +1932,7 @@ |
HWND CPluginClass::GetTabHWND() const |
{ |
- |
- TCHAR szClassName[MAX_PATH]; |
+ wchar_t szClassName[MAX_PATH]; |
// Get browser window and url |
HWND hBrowserWnd = GetBrowserHWND(); |
if (!hBrowserWnd) |
@@ -1952,13 +1951,13 @@ |
memset(szClassName, 0, MAX_PATH); |
GetClassName(hTabWnd, szClassName, MAX_PATH); |
- if (_tcscmp(szClassName, _T("TabWindowClass")) == 0 || _tcscmp(szClassName,_T("Frame Tab")) == 0) |
+ if (wcscmp(szClassName, L"TabWindowClass") == 0 || wcscmp(szClassName, L"Frame Tab") == 0) |
{ |
// IE8 support |
HWND hTabWnd2 = hTabWnd; |
- if (_tcscmp(szClassName,_T("Frame Tab")) == 0) |
+ if (wcscmp(szClassName, L"Frame Tab") == 0) |
{ |
- hTabWnd2 = ::FindWindowEx(hTabWnd2, NULL, _T("TabWindowClass"), NULL); |
+ hTabWnd2 = ::FindWindowEx(hTabWnd2, NULL, L"TabWindowClass", NULL); |
} |
if (hTabWnd2) |