diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 16:02:14 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 16:02:14 +0000 |
| commit | 67f1c36da9aca19e37803110aa243280e5cf053b (patch) | |
| tree | 2ded9275bfcbcea8151a4b32deb6c14c95de0e78 /src/modules | |
| parent | 4aa6229698b946e52ce19018aaf13f8b92fb168e (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@427 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/fonts/services.cpp | 4 | ||||
| -rw-r--r-- | src/modules/icolib/skin2icons.cpp | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/modules/fonts/services.cpp b/src/modules/fonts/services.cpp index e53c0f0b43..b19fd59144 100644 --- a/src/modules/fonts/services.cpp +++ b/src/modules/fonts/services.cpp @@ -341,7 +341,6 @@ INT_PTR GetFontW(WPARAM wParam, LPARAM lParam) INT_PTR GetFont(WPARAM wParam, LPARAM lParam)
{
- #if defined( _UNICODE )
TFontID temp;
LOGFONT lftemp;
ConvertFontID((FontID *)wParam, &temp);
@@ -349,9 +348,6 @@ INT_PTR GetFont(WPARAM wParam, LPARAM lParam) ConvertLOGFONT( &lftemp, ( LOGFONTA* )lParam );
return ret;
}
- #else
- return sttGetFontWorker(( TFontID* )wParam, ( LOGFONT* )lParam );
- #endif
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp index 89fec8abf0..2e328bbb89 100644 --- a/src/modules/icolib/skin2icons.cpp +++ b/src/modules/icolib/skin2icons.cpp @@ -581,19 +581,11 @@ HANDLE IcoLib_AddNewIcon( SKINICONDESC* sid ) if ( sid->pszDefaultFile ) {
if ( utf_path ) {
- #ifdef _UNICODE
+
WCHAR fileFull[ MAX_PATH ];
pathToAbsoluteW( sid->pwszDefaultFile, fileFull, NULL );
item->default_file = mir_wstrdup( fileFull );
- #else
- char* file = mir_u2a( sid->pwszDefaultFile );
- char fileFull[ MAX_PATH ];
-
- pathToAbsolute( file, fileFull, NULL );
- SAFE_FREE(( void** )&file );
- item->default_file = mir_strdup( fileFull );
- #endif
}
else {
WCHAR *file = mir_a2u( sid->pszDefaultFile );
|