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/langpack | |
| 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/langpack')
| -rw-r--r-- | src/modules/langpack/langpack.cpp | 4 | ||||
| -rw-r--r-- | src/modules/langpack/lpservices.cpp | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/modules/langpack/langpack.cpp b/src/modules/langpack/langpack.cpp index 71b0dddaf9..aaa02ec52c 100644 --- a/src/modules/langpack/langpack.cpp +++ b/src/modules/langpack/langpack.cpp @@ -449,16 +449,12 @@ TCHAR* LangPackPcharToTchar( const char* pszStr ) if ( pszStr == NULL )
return NULL;
- #if defined( _UNICODE )
{ int len = (int)strlen( pszStr );
TCHAR* result = ( TCHAR* )alloca(( len+1 )*sizeof( TCHAR ));
MultiByteToWideChar( LangPackGetDefaultCodePage(), 0, pszStr, -1, result, len );
result[len] = 0;
return mir_wstrdup( TranslateW( result ));
}
- #else
- return mir_strdup( Translate( pszStr ));
- #endif
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/modules/langpack/lpservices.cpp b/src/modules/langpack/lpservices.cpp index 4cb0c597bb..88e94b8cfc 100644 --- a/src/modules/langpack/lpservices.cpp +++ b/src/modules/langpack/lpservices.cpp @@ -22,11 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "..\..\core\commonheaders.h"
-#if defined( _UNICODE )
- #define FLAGS LANG_UNICODE
-#else
- #define FLAGS 0
-#endif
+#define FLAGS LANG_UNICODE
LangPackMuuid* __fastcall LangPackLookupUuid( WPARAM );
int LangPackMarkPluginLoaded( PLUGININFOEX* pInfo );
@@ -153,16 +149,12 @@ static INT_PTR PcharToTchar(WPARAM wParam, LPARAM lParam) LangPackMuuid* uuid = LangPackLookupUuid( wParam );
- #if defined( _UNICODE )
{ int len = (int)strlen( pszStr );
TCHAR* result = ( TCHAR* )alloca(( len+1 )*sizeof( TCHAR ));
MultiByteToWideChar( LangPackGetDefaultCodePage(), 0, pszStr, -1, result, len );
result[len] = 0;
return ( INT_PTR )mir_wstrdup(( wchar_t* )LangPackTranslateString( uuid, ( char* )result, 1 ));
}
- #else
- return ( INT_PTR )mir_strdup( LangPackTranslateString( uuid, pszStr, 0 ));
- #endif
}
/////////////////////////////////////////////////////////////////////////////////////////
|