diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 20:04:13 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 20:04:13 +0000 |
| commit | e521b812384a0e93f48e078c6cb248913dcc893a (patch) | |
| tree | 13b1de3e9bef13a48af0318f1fd338915dd69e9a /plugins/SmileyAdd/services.cpp | |
| parent | ae481600939fb5420b80a8a7ef84f0ce9d6b3356 (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@437 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SmileyAdd/services.cpp')
| -rw-r--r-- | plugins/SmileyAdd/services.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/plugins/SmileyAdd/services.cpp b/plugins/SmileyAdd/services.cpp index 1993e7e733..fed1b4c7ad 100644 --- a/plugins/SmileyAdd/services.cpp +++ b/plugins/SmileyAdd/services.cpp @@ -253,7 +253,7 @@ INT_PTR ParseText(WPARAM, LPARAM lParam) return TRUE;
}
-#if defined(UNICODE) | defined(_UNICODE)
+
INT_PTR ParseTextW(WPARAM, LPARAM lParam)
{
SMADD_PARSEW* smre = (SMADD_PARSEW*) lParam;
@@ -294,7 +294,7 @@ INT_PTR ParseTextW(WPARAM, LPARAM lParam) return TRUE;
}
-#endif
+
INT_PTR ParseTextBatch(WPARAM, LPARAM lParam)
{
@@ -341,11 +341,8 @@ INT_PTR ParseTextBatch(WPARAM, LPARAM lParam) }
smre->numSmileys = smllist.getCount();
-#if defined(UNICODE) | defined(_UNICODE)
+
smre->oflag = smre->flag | SAFL_UNICODE;
-#else
- smre->oflag = smre->flag & ~SAFL_UNICODE;
-#endif
return (INT_PTR)res;
}
@@ -363,16 +360,14 @@ INT_PTR RegisterPack(WPARAM, LPARAM lParam) if (smre == NULL || smre->cbSize < sizeof(SMADD_REGCAT)) return FALSE;
if (IsBadStringPtrA(smre->name, 50) || IsBadStringPtrA(smre->dispname, 50)) return FALSE;
-#if (defined _UNICODE || defined UNICODE)
+
unsigned lpcp = (unsigned)CallService(MS_LANGPACK_GETCODEPAGE, 0, 0);
if (lpcp == CALLSERVICE_NOTFOUND) lpcp = CP_ACP;
-#endif
-#if (defined _UNICODE || defined UNICODE)
+
+
bkstring nmd(A2W_SM(smre->dispname, lpcp));
-#else
- bkstring nmd(smre->dispname);
-#endif
+
bkstring nm(A2T_SM(smre->name));
g_SmileyCategories.AddAndLoad(nm, nmd);
|