Created FL/Fl_PSfile_Device.H to reduce size of FL/Fl_Printer.H

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7306 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 28 insertions, 30 deletions

diff --git a/src/Fl_GDI_Printer.cxx b/src/Fl_GDI_Printer.cxx
index bbd83d790..7ac51389c 100644
--- a/src/Fl_GDI_Printer.cxx
+++ b/src/Fl_GDI_Printer.cxx
@@ -34,7 +34,7 @@
 
 extern HWND fl_window;
 
-Fl_GDI_Printer::Fl_GDI_Printer(void) : Fl_Abstract_Printer() {
+Fl_Printer::Fl_Printer(void) : Fl_Abstract_Printer() {
   hPr = NULL;
   type_ = gdi_printer;
 }
@@ -56,7 +56,7 @@ static void WIN_SetupPrinterDeviceContext(HDC prHDC)
 }
 
 
-int Fl_GDI_Printer::start_job (int pagecount, int *frompage, int *topage)
+int Fl_Printer::start_job (int pagecount, int *frompage, int *topage)
 // returns 0 iff OK
 {
   DWORD       commdlgerr;
@@ -109,7 +109,7 @@ int Fl_GDI_Printer::start_job (int pagecount, int *frompage, int *topage)
   return err;
 }
 
-void Fl_GDI_Printer::end_job (void)
+void Fl_Printer::end_job (void)
 {
   Fl_Device::display_device()->set_current();
   if (hPr != NULL) {
@@ -129,7 +129,7 @@ void Fl_GDI_Printer::end_job (void)
   }
 }
 
-void Fl_GDI_Printer::absolute_printable_rect(int *x, int *y, int *w, int *h)
+void Fl_Printer::absolute_printable_rect(int *x, int *y, int *w, int *h)
 {
   POINT         physPageSize;
   POINT         pixelsPerInch;
@@ -155,7 +155,7 @@ void Fl_GDI_Printer::absolute_printable_rect(int *x, int *y, int *w, int *h)
   origin(x_offset, y_offset);
 }
 
-void Fl_GDI_Printer::margins(int *left, int *top, int *right, int *bottom)
+void Fl_Printer::margins(int *left, int *top, int *right, int *bottom)
 {
   int x, y, w, h;
   absolute_printable_rect(&x, &y, &w, &h);
@@ -165,14 +165,14 @@ void Fl_GDI_Printer::margins(int *left, int *top, int *right, int *bottom)
   if (bottom) *bottom = y;
 }
 
-int Fl_GDI_Printer::printable_rect(int *w, int *h)
+int Fl_Printer::printable_rect(int *w, int *h)
 {
   int x, y;
   absolute_printable_rect(&x, &y, w, h);
   return 0;
 }
 
-int Fl_GDI_Printer::start_page (void)
+int Fl_Printer::start_page (void)
 {
   int  rsult, w, h;
   
@@ -193,14 +193,14 @@ int Fl_GDI_Printer::start_page (void)
   return rsult;
 }
 
-void Fl_GDI_Printer::origin (int deltax, int deltay)
+void Fl_Printer::origin (int deltax, int deltay)
 {
   SetWindowOrgEx(fl_gc, - left_margin - deltax, - top_margin - deltay, NULL);
   x_offset = deltax;
   y_offset = deltay;
 }
 
-void Fl_GDI_Printer::scale (float scalex, float scaley)
+void Fl_Printer::scale (float scalex, float scaley)
 {
   int w, h;
   SetWindowExtEx(fl_gc, (int)(720 / scalex + 0.5), (int)(720 / scaley + 0.5), NULL);
@@ -208,7 +208,7 @@ void Fl_GDI_Printer::scale (float scalex, float scaley)
   origin(0, 0);
 }
 
-void Fl_GDI_Printer::rotate (float rot_angle)
+void Fl_Printer::rotate (float rot_angle)
 {
   XFORM mat;
   float angle;
@@ -221,7 +221,7 @@ void Fl_GDI_Printer::rotate (float rot_angle)
   SetWorldTransform(fl_gc, &mat);
 }
 
-int Fl_GDI_Printer::end_page (void)
+int Fl_Printer::end_page (void)
 {
   int  rsult;
   
@@ -254,7 +254,7 @@ static void do_translate(int x, int y)
   ModifyWorldTransform(fl_gc, &tr, MWT_LEFTMULTIPLY);
 }
 
-void Fl_GDI_Printer::translate (int x, int y)
+void Fl_Printer::translate (int x, int y)
 {
   do_translate(x, y);
   if (translate_stack_depth < translate_stack_max) {
@@ -264,7 +264,7 @@ void Fl_GDI_Printer::translate (int x, int y)
     }
 }
 
-void Fl_GDI_Printer::untranslate (void)
+void Fl_Printer::untranslate (void)
 {
   if (translate_stack_depth > 0) {
     translate_stack_depth--;
diff --git a/src/Fl_PS_Printer.cxx b/src/Fl_PS_Printer.cxx
index a4db78203..c4fde68bc 100644
--- a/src/Fl_PS_Printer.cxx
+++ b/src/Fl_PS_Printer.cxx
@@ -25,7 +25,7 @@
 //     http://www.fltk.org/str.php
 //
 
-#include <FL/Fl_Device.H>
+#include <FL/Fl_PSfile_Device.H>
 
 #include <FL/Fl.H>
 #include <FL/fl_ask.H>
@@ -1248,7 +1248,7 @@ void Fl_PSfile_Device::end_job (void)
 }
 
 #if ! (defined(__APPLE__) || defined(WIN32) )
-int Fl_PS_Printer::start_job(int pages, int *firstpage, int *lastpage) {
+int Fl_Printer::start_job(int pages, int *firstpage, int *lastpage) {
   enum Page_Format format;
   enum Page_Layout layout;
 
diff --git a/src/Fl_Quartz_Printer.mm b/src/Fl_Quartz_Printer.mm
index 7ffdc4eef..fad2894bd 100644
--- a/src/Fl_Quartz_Printer.mm
+++ b/src/Fl_Quartz_Printer.mm
@@ -37,14 +37,14 @@
 
 extern void fl_quartz_restore_line_style_();
 
-Fl_Quartz_Printer::Fl_Quartz_Printer(void)
+Fl_Printer::Fl_Printer(void)
 {
   x_offset = 0;
   y_offset = 0;
   type_ = quartz_printer;
 }
 
-int Fl_Quartz_Printer::start_job (int pagecount, int *frompage, int *topage)
+int Fl_Printer::start_job (int pagecount, int *frompage, int *topage)
 //printing using a Quartz graphics context
 //returns 0 iff OK
 {
@@ -128,7 +128,7 @@ int Fl_Quartz_Printer::start_job (int pagecount, int *frompage, int *topage)
   return 0;
 }
 
-void Fl_Quartz_Printer::margins(int *left, int *top, int *right, int *bottom)
+void Fl_Printer::margins(int *left, int *top, int *right, int *bottom)
 {
   PMPaper paper;
   PMGetPageFormatPaper(pageFormat, &paper);
@@ -150,7 +150,7 @@ void Fl_Quartz_Printer::margins(int *left, int *top, int *right, int *bottom)
   }
 }
 
-int Fl_Quartz_Printer::printable_rect(int *w, int *h)
+int Fl_Printer::printable_rect(int *w, int *h)
 //returns 0 iff OK
 {
   OSStatus status;
@@ -167,7 +167,7 @@ int Fl_Quartz_Printer::printable_rect(int *w, int *h)
   return 0;
 }
 
-void Fl_Quartz_Printer::origin(int x, int y)
+void Fl_Printer::origin(int x, int y)
 {
   x_offset = x;
   y_offset = y;
@@ -180,7 +180,7 @@ void Fl_Quartz_Printer::origin(int x, int y)
   CGContextSaveGState(fl_gc);
 }
 
-void Fl_Quartz_Printer::scale (float s_x, float s_y)
+void Fl_Printer::scale (float s_x, float s_y)
 {
   scale_x = s_x;
   scale_y = s_y;
@@ -193,7 +193,7 @@ void Fl_Quartz_Printer::scale (float s_x, float s_y)
   CGContextSaveGState(fl_gc);
 }
 
-void Fl_Quartz_Printer::rotate (float rot_angle)
+void Fl_Printer::rotate (float rot_angle)
 {
   angle = - rot_angle * M_PI / 180.;
   CGContextRestoreGState(fl_gc);
@@ -205,20 +205,20 @@ void Fl_Quartz_Printer::rotate (float rot_angle)
   CGContextSaveGState(fl_gc);
 }
 
-void Fl_Quartz_Printer::translate(int x, int y)
+void Fl_Printer::translate(int x, int y)
 {
   CGContextSaveGState(fl_gc);
   CGContextTranslateCTM(fl_gc, x, y );
   CGContextSaveGState(fl_gc);
 }
 
-void Fl_Quartz_Printer::untranslate(void)
+void Fl_Printer::untranslate(void)
 {
   CGContextRestoreGState(fl_gc);
   CGContextRestoreGState(fl_gc);
 }
 
-int Fl_Quartz_Printer::start_page (void)
+int Fl_Printer::start_page (void)
 {	
   OSStatus status = PMSessionBeginPageNoDialog(printSession, pageFormat, NULL);
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
@@ -267,7 +267,7 @@ int Fl_Quartz_Printer::start_page (void)
   return status != noErr;
 }
 
-int Fl_Quartz_Printer::end_page (void)
+int Fl_Printer::end_page (void)
 {	
   CGContextFlush(fl_gc);
   CGContextRestoreGState(fl_gc);
@@ -278,7 +278,7 @@ int Fl_Quartz_Printer::end_page (void)
   return status != noErr;
 }
 
-void Fl_Quartz_Printer::end_job (void)
+void Fl_Printer::end_job (void)
 {
   OSStatus status;
   
diff --git a/src/ps_image.cxx b/src/ps_image.cxx
index b2ff2f011..4ebdb1051 100644
--- a/src/ps_image.cxx
+++ b/src/ps_image.cxx
@@ -29,13 +29,11 @@
 #include <math.h>
 #include <string.h>
 
-#include <FL/Fl_Printer.H>
+#include <FL/Fl_PSfile_Device.H>
 #include <FL/Fl.H>
 #include <FL/Fl_Pixmap.H>
 #include <FL/Fl_Bitmap.H>
  
-
-
 int Fl_PSfile_Device::alpha_mask(const uchar * data, int w, int h, int D, int LD){
 
   mask = 0;