diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 14:13:45 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 14:13:45 +0000 |
| commit | 4aa6229698b946e52ce19018aaf13f8b92fb168e (patch) | |
| tree | 29334e8c5ee492a80f11a97fedab2373b8fbb392 /src/modules/userinfo | |
| parent | 5e8e561a80d1ac9ca1c2f1c3d388105733ed4e4e (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@426 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/userinfo')
| -rw-r--r-- | src/modules/userinfo/stdinfo.cpp | 7 | ||||
| -rw-r--r-- | src/modules/userinfo/userinfo.cpp | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/modules/userinfo/stdinfo.cpp b/src/modules/userinfo/stdinfo.cpp index be7863f358..7cc4e348ac 100644 --- a/src/modules/userinfo/stdinfo.cpp +++ b/src/modules/userinfo/stdinfo.cpp @@ -139,7 +139,6 @@ static void SetValue(HWND hwndDlg, int idCtrl, HANDLE hContact, char *szModule, break;
case DBVT_UTF8:
unspecified=(special == SVS_ZEROISUNSPEC && dbv.pszVal[0] == '\0');
- #if defined( _UNICODE )
if ( !unspecified )
{ WCHAR* wszStr;
Utf8Decode( dbv.pszVal, &wszStr );
@@ -147,7 +146,7 @@ static void SetValue(HWND hwndDlg, int idCtrl, HANDLE hContact, char *szModule, mir_free( wszStr );
goto LBL_Exit;
}
- #endif
+
pstr=dbv.pszVal;
Utf8Decode( dbv.pszVal, NULL );
break;
@@ -161,9 +160,9 @@ static void SetValue(HWND hwndDlg, int idCtrl, HANDLE hContact, char *szModule, else
SetDlgItemTextA(hwndDlg, idCtrl, pstr);
-#if defined( _UNICODE )
+
LBL_Exit:
-#endif
+
EnableWindow(GetDlgItem(hwndDlg, idCtrl), !unspecified);
if (proto_service)
Proto_FreeInfoVariant(&dbv);
diff --git a/src/modules/userinfo/userinfo.cpp b/src/modules/userinfo/userinfo.cpp index 0f07ea5ba3..7fb79822d5 100644 --- a/src/modules/userinfo/userinfo.cpp +++ b/src/modules/userinfo/userinfo.cpp @@ -132,14 +132,14 @@ static INT_PTR AddDetailsPage(WPARAM wParam, LPARAM lParam) if ((DWORD_PTR)odp->pszTemplate&0xFFFF0000) dst->pszTemplate = mir_strdup(odp->pszTemplate);
else dst->pszTemplate = odp->pszTemplate;
- #if defined(_UNICODE)
+
if ( odp->flags & ODPF_UNICODE )
{
dst->ptszTitle = (odp->ptszTitle == 0) ? NULL : mir_wstrdup(odp->ptszTitle);
dst->ptszTab = (!(odp->flags & ODPF_USERINFOTAB) || !odp->ptszTab) ? NULL : mir_wstrdup(odp->ptszTab);
}
else
- #endif
+
{
if ( odp->flags & ODPF_DONTTRANSLATE )
dst->ptszTitle = (odp->pszTitle == 0) ? NULL : mir_a2t(odp->pszTitle);
|