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_rect.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/fl_rect.cxx') diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx index c9bdf6c47..df8cbef9a 100644 --- a/src/fl_rect.cxx +++ b/src/fl_rect.cxx @@ -38,13 +38,12 @@ #include #include #include -#include #include #include #ifdef __APPLE_QUARTZ__ extern float fl_quartz_line_width_; -#define USINGQUARTZPRINTER (Fl_Device::current()->type() == Fl_Printer::device_type) +#define USINGQUARTZPRINTER (Fl_Device::current()->type() == quartz_printer) #endif void Fl_Device::rect(int x, int y, int w, int h) { @@ -511,7 +510,7 @@ int Fl_Device::not_clipped(int x, int y, int w, int h) { #elif defined(WIN32) if (!r) return 1; RECT rect; - if (Fl_Device::current()->type() == Fl_Printer::device_type) { // in case of print context, convert coords from logical to device + if (Fl_Device::current()->type() == Fl_Device::gdi_printer) { // in case of print context, convert coords from logical to device POINT pt[2] = { {x, y}, {x + w, y + h} }; LPtoDP(fl_gc, pt, 2); rect.left = pt[0].x; rect.top = pt[0].y; rect.right = pt[1].x; rect.bottom = pt[1].y; @@ -573,7 +572,7 @@ int Fl_Device::clip_box(int x, int y, int w, int h, int& X, int& Y, int& W, int& } else { // partial intersection RECT rect; GetRgnBox(temp, &rect); - if(Fl_Device::current()->type() == Fl_Printer::device_type) { // if print context, convert coords from device to logical + if(Fl_Device::current()->type() == Fl_Device::gdi_printer) { // if print context, convert coords from device to logical POINT pt[2] = { {rect.left, rect.top}, {rect.right, rect.bottom} }; DPtoLP(fl_gc, pt, 2); X = pt[0].x; Y = pt[0].y; W = pt[1].x - X; H = pt[1].y - Y; -- cgit v1.2.3