diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 18:52:16 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 18:52:16 +0000 |
| commit | 58973a21a30bf95427fd43c456e41e35c386218c (patch) | |
| tree | 1413fba069ecd351b2c99fa5a53e52c68d8a662c /plugins/Popup/src/common.h | |
| parent | 55b5cf8a5506f03350e5c80ac86f5717425e4d10 (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@434 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Popup/src/common.h')
| -rw-r--r-- | plugins/Popup/src/common.h | 45 |
1 files changed, 3 insertions, 42 deletions
diff --git a/plugins/Popup/src/common.h b/plugins/Popup/src/common.h index 3b5ecae721..5319bc236d 100644 --- a/plugins/Popup/src/common.h +++ b/plugins/Popup/src/common.h @@ -143,7 +143,7 @@ inline INT_PTR DBGetContactSettingStringX(HANDLE hContact, const char *ModuleNam }
/* not used
-#if !defined(_UNICODE)
+
inline void SetWindowTextTraslated(HWND hwnd, const char *text)
{
if (!(hwnd && text)) return;
@@ -160,7 +160,7 @@ inline void SetWindowTextTraslated(HWND hwnd, const char *text) SetWindowTextA(hwnd, Translate(text));
}
}
-#endif
+
*/
/*/dedrecatet (tricky thing to minimize memory fragmentation)
inline wchar_t* a2u( char* src )
@@ -204,7 +204,7 @@ inline wchar_t* a2u( char* src ) inline void AddTooltipTranslated(HWND hwndToolTip, HWND hwnd, int id, RECT rc, char *text)
{
-#if defined(_UNICODE)
+
TOOLINFO ti = {0};
ti.cbSize = sizeof(TOOLINFO);
@@ -224,45 +224,6 @@ inline void AddTooltipTranslated(HWND hwndToolTip, HWND hwnd, int id, RECT rc, c mir_free(wtext);
-#else
- if (g_popup.isOsUnicode && MySendMessageW)
- {
- TOOLINFOW ti = {0};
- ti.cbSize = sizeof(TOOLINFO);
-
- ti.hwnd = hwnd;
- ti.uId = id;
- MySendMessageW(hwndToolTip, TTM_DELTOOLW, 0, (LPARAM) (LPTOOLINFOW) &ti);
-
- LPWSTR wtext = mir_a2u(text);
-
- ti.uFlags = TTF_SUBCLASS;
- ti.hwnd = hwnd;
- ti.uId = id;
- ti.hinst = hInst;
- ti.lpszText = TranslateW(wtext);
- ti.rect = rc;
- MySendMessageW(hwndToolTip, TTM_ADDTOOLW, 0, (LPARAM) (LPTOOLINFOW) &ti);
-
- mir_free(wtext);
- } else
- {
- TOOLINFOA ti = {0};
- ti.cbSize = sizeof(TOOLINFO);
-
- ti.hwnd = hwnd;
- ti.uId = id;
- SendMessage(hwndToolTip, TTM_DELTOOLA, 0, (LPARAM) (LPTOOLINFOA) &ti);
-
- ti.uFlags = TTF_SUBCLASS;
- ti.hwnd = hwnd;
- ti.uId = id;
- ti.hinst = hInst;
- ti.lpszText = Translate(text);
- ti.rect = rc;
- SendMessage(hwndToolTip, TTM_ADDTOOLA, 0, (LPARAM) (LPTOOLINFOA) &ti);
- }
-#endif
}
/* not used
|