From 2b6586f64d4c49a3a3858ce52182610d5b77fbd0 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Mon, 12 Sep 2005 23:03:34 +0000 Subject: STR #1007: Applied second patch by hand. OP: could you please check if all changes were made correctly? Thanks! git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4563 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Image.cxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/Fl_Image.cxx') diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index fc398a6fa..01f7bcbbc 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -33,6 +33,9 @@ #include #include "flstring.h" +#ifdef WIN32 +void fl_release_dc(HWND, HDC); // from Fl_win32.cxx +#endif void fl_restore_clip(); // from fl_rect.cxx @@ -347,10 +350,12 @@ void Fl_RGB_Image::draw(int XP, int YP, int WP, int HP, int cx, int cy) { #ifdef WIN32 if (mask) { HDC new_gc = CreateCompatibleDC(fl_gc); + int save = SaveDC(new_gc); SelectObject(new_gc, (void*)mask); BitBlt(fl_gc, X, Y, W, H, new_gc, cx, cy, SRCAND); SelectObject(new_gc, (void*)id); BitBlt(fl_gc, X, Y, W, H, new_gc, cx, cy, SRCPAINT); + RestoreDC(new_gc,save); DeleteDC(new_gc); } else { fl_copy_offscreen(X, Y, W, H, (Fl_Offscreen)id, cx, cy); -- cgit v1.2.3