From d5d023f683b23fe26ddea93738cb721d532804f0 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Thu, 14 Jun 2012 16:22:13 +0000 Subject: another portion of "#ifsef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@411 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/button/button.cpp | 16 +++++----------- src/modules/clist/clc.cpp | 23 +++++++---------------- 2 files changed, 12 insertions(+), 27 deletions(-) (limited to 'src/modules') diff --git a/src/modules/button/button.cpp b/src/modules/button/button.cpp index 86282fe47f..7395f2122a 100644 --- a/src/modules/button/button.cpp +++ b/src/modules/button/button.cpp @@ -489,14 +489,10 @@ static LRESULT CALLBACK MButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L SendMessage(bct->hwndToolTips, TTM_DELTOOL, 0, (LPARAM)&ti); ti.uFlags = TTF_IDISHWND|TTF_SUBCLASS; ti.uId = (UINT_PTR)bct->hwnd; - #if defined( _UNICODE ) - if ( lParam & BATF_UNICODE ) - ti.lpszText = mir_wstrdup( TranslateW(( WCHAR* )wParam )); - else - ti.lpszText = LangPackPcharToTchar(( char* )wParam ); - #else - ti.lpszText = Translate(( char* )wParam ); - #endif + if ( lParam & BATF_UNICODE ) + ti.lpszText = mir_wstrdup( TranslateW(( WCHAR* )wParam )); + else + ti.lpszText = LangPackPcharToTchar(( char* )wParam ); if (bct->pAccPropServices) { wchar_t *tmpstr = mir_t2u(ti.lpszText); bct->pAccPropServices->SetHwndPropStr(bct->hwnd, OBJID_CLIENT, @@ -504,9 +500,7 @@ static LRESULT CALLBACK MButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L mir_free(tmpstr); } SendMessage( bct->hwndToolTips, TTM_ADDTOOL, 0, (LPARAM)&ti); - #if defined( _UNICODE ) - mir_free( ti.lpszText ); - #endif + mir_free( ti.lpszText ); } break; case WM_SETFOCUS: // set keybord focus and redraw diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp index 1a9e32617f..982ede3406 100644 --- a/src/modules/clist/clc.cpp +++ b/src/modules/clist/clc.cpp @@ -422,25 +422,16 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, } if ( dbcws->value.type == DBVT_ASCIIZ ) { - #if defined( UNICODE ) - WCHAR* wszGrpName = mir_a2u(dbcws->value.pszVal+1); - eq = !lstrcmp( szFullName, wszGrpName ); - mir_free( wszGrpName ); - #else - eq = !lstrcmp( szFullName, dbcws->value.pszVal+1 ); - #endif + WCHAR* wszGrpName = mir_a2u(dbcws->value.pszVal+1); + eq = !lstrcmp( szFullName, wszGrpName ); + mir_free( wszGrpName ); } else { char* szGrpName = NEWSTR_ALLOCA(dbcws->value.pszVal+1); - #if defined( UNICODE ) - WCHAR* wszGrpName; - Utf8Decode(szGrpName, &wszGrpName ); - eq = !lstrcmp( szFullName, wszGrpName ); - mir_free( wszGrpName ); - #else - Utf8Decode(szGrpName, NULL); - eq = !lstrcmp( szFullName, szGrpName ); - #endif + WCHAR* wszGrpName; + Utf8Decode(szGrpName, &wszGrpName ); + eq = !lstrcmp( szFullName, wszGrpName ); + mir_free( wszGrpName ); } if ( eq && (contact->group->hideOffline != 0) == ((dbcws->value.pszVal[0] & GROUPF_HIDEOFFLINE) != 0)) break; //only expanded has changed: no action reqd -- cgit v1.2.3