From d0b1cc30f7eac228caddadb2bc675865a4124b1b Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Sun, 18 Apr 2010 06:57:37 +0000 Subject: Removed multiple inheritance: back to r. 7519 exactly. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7522 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Double_Window.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/Fl_Double_Window.cxx') diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx index 70462a2ab..89f838844 100644 --- a/src/Fl_Double_Window.cxx +++ b/src/Fl_Double_Window.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -149,9 +148,8 @@ void fl_copy_offscreen_with_alpha(int x,int y,int w,int h,HBITMAP bitmap,int src SelectObject(new_gc, bitmap); BOOL alpha_ok = 0; // first try to alpha blend - // if to printer, always try alpha_blend - int to_display = Fl_Device::current()->type() == Fl_Display_Device::device_type; // true iff display output - if ( (to_display && fl_can_do_alpha_blending()) || Fl_Device::current()->type() == Fl_Printer::device_type) + int to_display = Fl_Device::current()->type() < 256; // true iff display output + if ( (!to_display) || fl_can_do_alpha_blending()) // if not on display, always try alpha_blend alpha_ok = fl_alpha_blend(fl_gc, x, y, w, h, new_gc, srcx, srcy, w, h, blendfunc); // if that failed (it shouldn't), still copy the bitmap over, but now alpha is 1 if (!alpha_ok) -- cgit v1.2.3