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/icolib/skin2icons.cpp | |
| 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/icolib/skin2icons.cpp')
| -rw-r--r-- | src/modules/icolib/skin2icons.cpp | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp index 29d69ad8f4..89fec8abf0 100644 --- a/src/modules/icolib/skin2icons.cpp +++ b/src/modules/icolib/skin2icons.cpp @@ -564,24 +564,13 @@ HANDLE IcoLib_AddNewIcon( SKINICONDESC* sid ) item->name = mir_strdup( sid->pszName );
if ( utf ) {
item->description = mir_u2t( sid->pwszDescription );
- #ifdef _UNICODE
- item->section = IcoLib_AddSection( sid->pwszSection, TRUE );
- #else
- char* pszSection = sid->pwszSection ? mir_u2a( sid->pwszSection ) : NULL;
- item->section = IcoLib_AddSection( pszSection, TRUE );
- SAFE_FREE(( void** )&pszSection );
- #endif
+ item->section = IcoLib_AddSection( sid->pwszSection, TRUE );
}
else {
item->description = mir_a2t( sid->pszDescription );
- #ifdef _UNICODE
- WCHAR* pwszSection = sid->pszSection ? mir_a2u( sid->pszSection ) : NULL;
-
- item->section = IcoLib_AddSection( pwszSection, TRUE );
- SAFE_FREE(( void** )&pwszSection );
- #else
- item->section = IcoLib_AddSection( sid->pszSection, TRUE );
- #endif
+ WCHAR* pwszSection = sid->pszSection ? mir_a2u( sid->pszSection ) : NULL;
+ item->section = IcoLib_AddSection( pwszSection, TRUE );
+ SAFE_FREE(( void** )&pwszSection );
}
if ( item->section ) {
item->section->ref_count++;
@@ -607,19 +596,11 @@ HANDLE IcoLib_AddNewIcon( SKINICONDESC* sid ) #endif
}
else {
- #ifdef _UNICODE
- WCHAR *file = mir_a2u( sid->pszDefaultFile );
- WCHAR fileFull[ MAX_PATH ];
-
- pathToAbsoluteW( file, fileFull, NULL );
- SAFE_FREE(( void** )&file );
- item->default_file = mir_wstrdup( fileFull );
- #else
- char fileFull[ MAX_PATH ];
-
- pathToAbsolute( sid->pszDefaultFile, fileFull, NULL );
- item->default_file = mir_strdup( fileFull );
- #endif
+ WCHAR *file = mir_a2u( sid->pszDefaultFile );
+ WCHAR fileFull[ MAX_PATH ];
+ pathToAbsoluteW( file, fileFull, NULL );
+ SAFE_FREE(( void** )&file );
+ item->default_file = mir_wstrdup( fileFull );
} }
item->default_indx = sid->iDefaultIndex;
|