From 4aa6229698b946e52ce19018aaf13f8b92fb168e Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 15 Jun 2012 14:13:45 +0000 Subject: another portion of "#ifsef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@426 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/clist/clcmsgs.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/modules/clist/clcmsgs.cpp') diff --git a/src/modules/clist/clcmsgs.cpp b/src/modules/clist/clcmsgs.cpp index 116beb3486..6757f7ae41 100644 --- a/src/modules/clist/clcmsgs.cpp +++ b/src/modules/clist/clcmsgs.cpp @@ -61,16 +61,12 @@ LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPAR return (LRESULT) (HANDLE) NULL; group = groupContact->group; } - #if defined( _UNICODE ) - if ( msg == CLM_ADDINFOITEMA ) - { WCHAR* wszText = mir_a2u(( char* )cii->pszText ); - i = cli.pfnAddInfoItemToGroup(group, cii->flags, wszText); - mir_free( wszText ); - } - else i = cli.pfnAddInfoItemToGroup(group, cii->flags, cii->pszText); - #else - i = cli.pfnAddInfoItemToGroup(group, cii->flags, cii->pszText); - #endif + if ( msg == CLM_ADDINFOITEMA ) + { WCHAR* wszText = mir_a2u(( char* )cii->pszText ); + i = cli.pfnAddInfoItemToGroup(group, cii->flags, wszText); + mir_free( wszText ); + } + else i = cli.pfnAddInfoItemToGroup(group, cii->flags, cii->pszText); cli.pfnRecalcScrollBar(hwnd, dat); return (LRESULT) group->cl.items[i]->hContact | HCONTACT_ISINFO; } -- cgit v1.2.3