From 995a48dd003b51291bb1f2c5513c529a1ad8dfed Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Sun, 31 Oct 2021 14:20:04 +0100
Subject: Consistently make Fl_Paged_Device::begin_page call
 Fl_Surface_Device::push_current.

---
 src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/drivers/WinAPI')

diff --git a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
index 2e808f1f5..a92600d91 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Printer_Driver.cxx
@@ -152,14 +152,12 @@ int Fl_WinAPI_Printer_Driver::begin_job (int pagecount, int *frompage, int *topa
     y_offset = 0;
     WIN_SetupPrinterDeviceContext (hPr);
     driver()->gc(hPr);
-    this->set_current();
   }
   return err;
 }
 
 void Fl_WinAPI_Printer_Driver::end_job (void)
 {
-  Fl_Display_Device::display_device()->set_current();
   if (hPr != NULL) {
     if (! abortPrint) {
       prerr = EndDoc (hPr);
@@ -232,6 +230,7 @@ int Fl_WinAPI_Printer_Driver::begin_page (void)
 
   rsult = 0;
   if (hPr != NULL) {
+    Fl_Surface_Device::push_current(this);
     WIN_SetupPrinterDeviceContext (hPr);
     prerr = StartPage (hPr);
     if (prerr < 0) {
@@ -280,6 +279,7 @@ int Fl_WinAPI_Printer_Driver::end_page (void)
 
   rsult = 0;
   if (hPr != NULL) {
+    Fl_Surface_Device::pop_current();
     prerr = EndPage (hPr);
     if (prerr < 0) {
       abortPrint = TRUE;
-- 
cgit v1.2.3