- atavism named MS_UTILS_LOADBITMAP removed;

- bmpfilter.cpp also removed;
- Bitmap_Load() function added instead;
- various bitmap related crap fixed;

git-svn-id: http://svn.miranda-ng.org/main/trunk@13966 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 12 insertions, 13 deletions

diff --git a/plugins/SimpleStatusMsg/src/msgbox.cpp b/plugins/SimpleStatusMsg/src/msgbox.cpp
index 87bac02d81..3ce328a87a 100644
--- a/plugins/SimpleStatusMsg/src/msgbox.cpp
+++ b/plugins/SimpleStatusMsg/src/msgbox.cpp
@@ -453,26 +453,26 @@ VOID APIENTRY HandlePopupMenu(HWND hwnd, POINT pt, HWND edit_control)
 			break;
 
 		case ID__VARIABLES_MOREVARIABLES:
-		{
-			VARHELPINFO vhi = {0};
-			vhi.cbSize = sizeof(vhi);
-			vhi.flags = VHF_FULLDLG | VHF_SETLASTSUBJECT;
-			vhi.hwndCtrl = edit_control;
-			vhi.szSubjectDesc = NULL;
-			vhi.szExtraTextDesc = NULL;
-			CallService(MS_VARS_SHOWHELPEX, (WPARAM)hwnd, (LPARAM)&vhi);
+			{
+				VARHELPINFO vhi = {0};
+				vhi.cbSize = sizeof(vhi);
+				vhi.flags = VHF_FULLDLG | VHF_SETLASTSUBJECT;
+				vhi.hwndCtrl = edit_control;
+				vhi.szSubjectDesc = NULL;
+				vhi.szExtraTextDesc = NULL;
+				CallService(MS_VARS_SHOWHELPEX, (WPARAM)hwnd, (LPARAM)&vhi);
+			}
 			break;
-		}
 
 		default:
 			if (!OpenClipboard(GetParent(hwnd)))
 				break;
+
 			if (EmptyClipboard()) {
 				TCHAR item_string[128];
-				int len;
-
 				GetMenuString(hmenu, m_selection, (LPTSTR)&item_string, 128, MF_BYCOMMAND);
-				len = mir_tstrlen(item_string);
+
+				int len = (int)mir_tstrlen(item_string);
 				if (len) {
 					LPTSTR lptstrCopy;
 					HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(TCHAR));
@@ -486,7 +486,6 @@ VOID APIENTRY HandlePopupMenu(HWND hwnd, POINT pt, HWND edit_control)
 					GlobalUnlock(hglbCopy);
 
 					SetClipboardData(CF_UNICODETEXT, hglbCopy);
-
 				}
 			}
 			CloseClipboard();