From 5b3b0020dd6b3797a5808c7362e358df48bd4e49 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 23 Jun 2012 21:06:11 +0000 Subject: Scriver: plusified git-svn-id: http://svn.miranda-ng.org/main/trunk@591 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/msgwindow.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'plugins/Scriver/msgwindow.cpp') diff --git a/plugins/Scriver/msgwindow.cpp b/plugins/Scriver/msgwindow.cpp index 1bda12f9db..37a1bd6c3d 100644 --- a/plugins/Scriver/msgwindow.cpp +++ b/plugins/Scriver/msgwindow.cpp @@ -25,13 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "statusicon.h" #include "chat/chat.h" -#ifndef __MINGW32__ -#if (_MSC_VER < 1300) -#include "multimon.h" -#endif -#endif - -extern HINSTANCE g_hInst; extern HCURSOR hDragCursor; extern ITaskbarList3 * pTaskbarInterface; @@ -1055,7 +1048,7 @@ INT_PTR CALLBACK DlgProcParentWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM) tbd->hIconBig); } if (pTaskbarInterface) - pTaskbarInterface->lpVtbl->SetOverlayIcon(pTaskbarInterface, hwndDlg, tbd->hIconNot, L""); + pTaskbarInterface->SetOverlayIcon(hwndDlg, tbd->hIconNot, L""); } } break; @@ -1490,7 +1483,7 @@ BOOL CALLBACK TabCtrlProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) pt.x -= rect.left; pt.y -= rect.top; hBmp = CreateCompatibleBitmap(hdc, info.rcImage.right - info.rcImage.left + 1, info.rcImage.bottom - info.rcImage.top + 1); - hOldBitmap = SelectObject(hdcMem, hBmp); + hOldBitmap = (HBITMAP)SelectObject(hdcMem, hBmp); SetPixel(hdcMem, pt.x, pt.y, 0x000000); ImageList_DrawEx(g_dat->hButtonIconList, 0, hdcMem, 0, 0, 0, 0, CLR_NONE, CLR_NONE, ILD_NORMAL); color1 = GetPixel(hdcMem, pt.x, pt.y); @@ -1546,7 +1539,7 @@ BOOL CALLBACK TabCtrlProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) hDC = GetDC(hwnd); hMemDC = CreateCompatibleDC(hDC); hBitmap = CreateCompatibleBitmap(hDC, rect.right, rect.bottom); - hOldBitmap = SelectObject(hMemDC, hBitmap); + hOldBitmap = (HBITMAP)SelectObject(hMemDC, hBitmap); FillRect(hMemDC, &rect2, hBrush); SetWindowOrgEx (hMemDC, rect.left, rect.top, NULL); SendMessage(hwnd, WM_PRINTCLIENT, (WPARAM)hMemDC, PRF_CLIENT); -- cgit v1.2.3