diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-14 08:19:18 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-14 08:19:18 +0000 |
| commit | 1784cdf49b8196219563795cf3b11b7c4c2a6746 (patch) | |
| tree | 2709ee261bcfe10ce6cdbf8b709b6dbb6601fd93 /plugins/AVS/image_utils.cpp | |
| parent | 56f5e6a1ccee8e4b1c800ee1577ee59486940f3a (diff) | |
"#ifsef Unicode" removal - first commit
git-svn-id: http://svn.miranda-ng.org/main/trunk@408 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/AVS/image_utils.cpp')
| -rw-r--r-- | plugins/AVS/image_utils.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/plugins/AVS/image_utils.cpp b/plugins/AVS/image_utils.cpp index f6b6c7a98b..3a7c43a707 100644 --- a/plugins/AVS/image_utils.cpp +++ b/plugins/AVS/image_utils.cpp @@ -317,7 +317,6 @@ INT_PTR BmpFilterSaveBitmap(WPARAM wParam,LPARAM lParam) return -1;
}
-#if defined(_UNICODE)
INT_PTR BmpFilterSaveBitmapW(WPARAM wParam,LPARAM lParam)
{
if ( fei == NULL )
@@ -334,7 +333,6 @@ INT_PTR BmpFilterSaveBitmapW(WPARAM wParam,LPARAM lParam) return -1;
}
-#endif
// Returns != 0 if can save that type of image, = 0 if cant
// wParam = 0
@@ -742,16 +740,14 @@ BOOL MakeTransparentBkg(HANDLE hContact, HBITMAP *hBitmap) int SaveAvatar( const char* protocol, const TCHAR* tszFileName )
{
int result = CallProtoService(protocol, PS_SETMYAVATART, 0, ( LPARAM )tszFileName);
- #if defined( _UNICODE )
- if ( result == CALLSERVICE_NOTFOUND ) {
- if ( tszFileName != NULL ) {
- char szFileName[ MAX_PATH ];
- WideCharToMultiByte( CP_ACP, 0, tszFileName, -1, szFileName, SIZEOF(szFileName), 0, 0 );
- result = CallProtoService(protocol, PS_SETMYAVATAR, 0, ( LPARAM )szFileName);
- }
- else result = CallProtoService(protocol, PS_SETMYAVATAR, 0, 0);
+ if ( result == CALLSERVICE_NOTFOUND ) {
+ if ( tszFileName != NULL ) {
+ char szFileName[ MAX_PATH ];
+ WideCharToMultiByte( CP_ACP, 0, tszFileName, -1, szFileName, SIZEOF(szFileName), 0, 0 );
+ result = CallProtoService(protocol, PS_SETMYAVATAR, 0, ( LPARAM )szFileName);
}
- #endif
-
+ else result = CallProtoService(protocol, PS_SETMYAVATAR, 0, 0);
+ }
+
return result;
}
|