diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-07-29 12:36:34 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-07-29 12:36:34 +0000 |
| commit | 428bf0cbd77813a43094cb5c984436deff251936 (patch) | |
| tree | d7dfa8971153d53a849e45c942be97fe5b90b7ec /plugins/Toaster | |
| parent | 82ef17ca5286f58ae7af604fb9518e8dc496b7c3 (diff) | |
no more TCHARs
git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Toaster')
| -rw-r--r-- | plugins/Toaster/src/main.cpp | 2 | ||||
| -rw-r--r-- | plugins/Toaster/src/options.cpp | 2 | ||||
| -rw-r--r-- | plugins/Toaster/src/toast_notification.cpp | 2 | ||||
| -rw-r--r-- | plugins/Toaster/src/utils.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Toaster/src/main.cpp b/plugins/Toaster/src/main.cpp index 3aa449ad98..d97bd34b37 100644 --- a/plugins/Toaster/src/main.cpp +++ b/plugins/Toaster/src/main.cpp @@ -50,7 +50,7 @@ extern "C" int __declspec(dllexport) Load(void) DWORD dwAttributes = GetFileAttributes(wszTempDir);
if (dwAttributes == 0xffffffff || (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
- CreateDirectoryTreeT(wszTempDir);
+ CreateDirectoryTreeW(wszTempDir);
}
else
{
diff --git a/plugins/Toaster/src/options.cpp b/plugins/Toaster/src/options.cpp index 0dcfe12f64..4fb6b54868 100644 --- a/plugins/Toaster/src/options.cpp +++ b/plugins/Toaster/src/options.cpp @@ -47,7 +47,7 @@ int OnOptionsInitialized(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.pwszTitle = L"Popups"; //_T(MODULE);
- odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
+ odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.position = -790000000;
odp.pwszTab = _T(MODULE);
odp.pDialog = new COptions();
diff --git a/plugins/Toaster/src/toast_notification.cpp b/plugins/Toaster/src/toast_notification.cpp index 0ade7ce217..b815fd9e68 100644 --- a/plugins/Toaster/src/toast_notification.cpp +++ b/plugins/Toaster/src/toast_notification.cpp @@ -52,7 +52,7 @@ HRESULT ToastNotification::CreateXml(_Outptr_ ABI::Windows::Data::Xml::Dom::IXml {
HXML xmlImageNode = xmlAddChild(xmlBindingNode, L"image", NULL);
xmlAddAttr(xmlImageNode, L"id", L"1");
- xmlAddAttr(xmlImageNode, L"src", CMString(FORMAT, L"file:///%s", _imagePath));
+ xmlAddAttr(xmlImageNode, L"src", CMStringW(FORMAT, L"file:///%s", _imagePath));
}
HXML xmlTitleNode = xmlAddChild(xmlBindingNode, L"text", _caption != NULL ? _caption : L"Miranda NG");
diff --git a/plugins/Toaster/src/utils.h b/plugins/Toaster/src/utils.h index fe9e5998bd..2aa4802b8c 100644 --- a/plugins/Toaster/src/utils.h +++ b/plugins/Toaster/src/utils.h @@ -11,7 +11,7 @@ class ToasterImage ptrW tszId;
public:
- __inline explicit ToasterImage(HICON hIcon) : _hBitmap(NULL), tszId(CMString(FORMAT, L"%p", hIcon).Detach())
+ __inline explicit ToasterImage(HICON hIcon) : _hBitmap(NULL), tszId(CMStringW(FORMAT, L"%p", hIcon).Detach())
{
ICONINFO icon = { 0 };
if (GetIconInfo(hIcon, &icon))
@@ -21,7 +21,7 @@ public: }
}
- __inline explicit ToasterImage(HBITMAP bmp) : _hBitmap(bmp), tszId(CMString(FORMAT, L"%p", bmp).Detach())
+ __inline explicit ToasterImage(HBITMAP bmp) : _hBitmap(bmp), tszId(CMStringW(FORMAT, L"%p", bmp).Detach())
{
}
|