4 files changed, 11 insertions, 6 deletions
diff --git a/src/Fl_Printer.cxx b/src/Fl_Printer.cxx
index 9d10a92b5..c9f0d2a2c 100644
--- a/src/Fl_Printer.cxx
+++ b/src/Fl_Printer.cxx
@@ -31,6 +31,9 @@
 Fl_Printer::Fl_Printer(void) {
   printer = NULL;
 }
+Fl_Paged_Device* Fl_Printer::newPrinterDriver(void) {
+  return NULL;
+}
 int Fl_Printer::begin_job(int pagecount, int *frompage, int *topage) {return 1;}
 int Fl_Printer::begin_page(void) {return 1;}
 int Fl_Printer::printable_rect(int *w, int *h) {return 1;}
@@ -130,7 +133,7 @@ const char *Fl_Printer::property_cancel = "Cancel";
 
 
 Fl_Printer::Fl_Printer(void) {
-  printer = Fl_Paged_Device::newPrinterDriver();
+  printer = Fl_Printer::newPrinterDriver();
   driver(printer->driver());
 }
 
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
index fbc4584b7..179c304bf 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
+++ b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
@@ -17,6 +17,7 @@
 //
 
 #include <FL/Fl_Paged_Device.H>
+#include <FL/Fl_Printer.H>
 #include <FL/Fl_Window_Driver.H>
 #include <FL/Fl_Screen_Driver.H>
 #include "../Quartz/Fl_Quartz_Graphics_Driver.H"
@@ -47,7 +48,7 @@ typedef OSStatus
 
 /** Support for printing on the Apple OS X platform */
 class Fl_Cocoa_Printer_Driver : public Fl_Paged_Device {
-  friend class Fl_Paged_Device;
+  friend class Fl_Printer;
 private:
   float scale_x;
   float scale_y;
@@ -81,7 +82,7 @@ Fl_Cocoa_Printer_Driver::Fl_Cocoa_Printer_Driver(void)
   driver(new Fl_Quartz_Printer_Graphics_Driver);
 }
 
-Fl_Paged_Device* Fl_Paged_Device::newPrinterDriver(void)
+Fl_Paged_Device* Fl_Printer::newPrinterDriver(void)
 {
   return new Fl_Cocoa_Printer_Driver();
 }
diff --git a/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx b/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
index ad8b4fb8d..835529be1 100644
--- a/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
+++ b/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
@@ -31,7 +31,7 @@ class Fl_Posix_Printer_Driver : public Fl_PostScript_File_Device {
   virtual int begin_job(int pagecount, int *frompage = NULL, int *topage = NULL);
 };
 
-Fl_Paged_Device* Fl_Paged_Device::newPrinterDriver(void)
+Fl_Paged_Device* Fl_Printer::newPrinterDriver(void)
 {
   return new Fl_Posix_Printer_Driver();
 }
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
index 2568743c6..4366f8827 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
@@ -18,6 +18,7 @@
 
 #include "../GDI/Fl_GDI_Graphics_Driver.H"
 #include <FL/Fl_Paged_Device.H>
+#include <FL/Fl_Printer.H>
 #include <FL/fl_ask.H>
 #include <FL/math.h>
 #include <FL/fl_draw.H>
@@ -27,7 +28,7 @@ extern HWND fl_window;
 
 /** Support for printing on the Windows platform */
 class Fl_WinAPI_Printer_Driver : public Fl_Paged_Device {
-  friend class Fl_Paged_Device;
+  friend class Fl_Printer;
 private:
   int   abortPrint;
   PRINTDLG      pd;
@@ -57,7 +58,7 @@ Fl_WinAPI_Printer_Driver::Fl_WinAPI_Printer_Driver(void) : Fl_Paged_Device() {
   driver(new Fl_GDI_Printer_Graphics_Driver);
 }
 
-Fl_Paged_Device* Fl_Paged_Device::newPrinterDriver(void)
+Fl_Paged_Device* Fl_Printer::newPrinterDriver(void)
 {
   return new Fl_WinAPI_Printer_Driver();
 }