diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-03-13 08:00:41 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-03-13 08:00:41 +0000 |
| commit | 11fcecff7c310c2cc10bda2ab2fa2daf525be571 (patch) | |
| tree | 86fb20fc1ce5e243dd9a973f84b9f1ae6a85c1b4 /plugins/MirOTR | |
| parent | cb68918922e0d297cc57c4b00fcc42ceaf141965 (diff) | |
- another portion of '#ifdef UNICODE' clean up
git-svn-id: http://svn.miranda-ng.org/main/trunk@3993 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR')
| -rw-r--r-- | plugins/MirOTR/MirOTR/src/svcs_srmm.cpp | 4 | ||||
| -rw-r--r-- | plugins/MirOTR/MirOTR/src/utils.cpp | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp index d07a47c627..ed17aa29ab 100644 --- a/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp +++ b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp @@ -268,11 +268,7 @@ void InitSRMM() { OTRButton.dwButtonID = 0;
OTRButton.pszModuleName = MODULENAME;
OTRButton.dwDefPos = 200;
-#ifdef _UNICODE
OTRButton.bbbFlags = BBBF_ISRSIDEBUTTON|BBBF_CANBEHIDDEN|BBBF_ISIMBUTTON;
-#else
- OTRButton.bbbFlags = BBBF_ISRSIDEBUTTON|BBBF_CANBEHIDDEN|BBBF_ISIMBUTTON|BBBF_ANSITOOLTIP;
-#endif
OTRButton.ptszTooltip = TranslateT(LANG_OTR_TOOLTIP);
OTRButton.hIcon = GetIconHandle(ICON_NOT_PRIVATE);
HookEvent(ME_MSG_TOOLBARLOADED, SVC_ButtonsBarLoaded);
diff --git a/plugins/MirOTR/MirOTR/src/utils.cpp b/plugins/MirOTR/MirOTR/src/utils.cpp index af8d43673b..fcd18ba98e 100644 --- a/plugins/MirOTR/MirOTR/src/utils.cpp +++ b/plugins/MirOTR/MirOTR/src/utils.cpp @@ -230,11 +230,9 @@ void ShowWarning(TCHAR *msg) { sn.szProto= MODULENAME;
sn.tszInfoTitle = buffer;
sn.tszInfo = msg;
-#ifdef _UNICODE
+
sn.dwInfoFlags = NIIF_WARNING | NIIF_INTERN_UNICODE;
-#else
- sn.dwInfoFlags = NIIF_WARNING;
-#endif
+
sn.uTimeout = 10;
CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&sn);
@@ -276,11 +274,9 @@ void ShowError(TCHAR *msg) { sn.szProto = MODULENAME;
sn.tszInfoTitle = buffer;
sn.tszInfo = msg;
-#ifdef _UNICODE
+
sn.dwInfoFlags = NIIF_ERROR | NIIF_INTERN_UNICODE;
-#else
- sn.dwInfoFlags = NIIF_ERROR;
-#endif
+
sn.uTimeout = 10;
CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&sn);
|