Various changes to make pop up menus work

[wxWidgets.git] / src / msw / printwin.cpp

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index f65d3e74317b21e637434964fc082468b9e804fb..b159af65f90bd6f91d8f3517fc7d73e25c273c61 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -6,95 +6,130 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "printwin.h"
+    #pragma implementation "printwin.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #include "wx/defs.h"
 
 #endif
 
 #include "wx/defs.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/utils.h"
-#include "wx/dc.h"
-#include "wx/app.h"
-#include "wx/msgdlg.h"
+    #include "wx/window.h"
+    #include "wx/msw/private.h"
+    #include "wx/utils.h"
+    #include "wx/dc.h"
+    #include "wx/app.h"
+    #include "wx/msgdlg.h"
+    #include "wx/intl.h"

 #endif
 
 #include "wx/msw/printwin.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #endif
 
 #include "wx/msw/printwin.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"

+#include "wx/log.h"

 #include "wx/msw/private.h"
 
 #include <stdlib.h>
 #include "wx/msw/private.h"
 
 #include <stdlib.h>

-#include <windows.h>
-#include <commdlg.h>

 
 

-// Clash with Windows header files
-#ifdef StartDoc
-#undef StartDoc
-#endif
+#include "wx/msw/private.h"
+
+#include <commdlg.h>

 
 #ifndef __WIN32__
 
 #ifndef __WIN32__

-#include <print.h>
+    #include <print.h>

 #endif
 
 #endif
 

+// ---------------------------------------------------------------------------
+// private functions
+// ---------------------------------------------------------------------------
+

 LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 
 LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
-IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
-#endif
+// ---------------------------------------------------------------------------
+// wxWin macros
+// ---------------------------------------------------------------------------

 
 

-/*
-* Printer
-*/
+    IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
+    IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// Printer
+// ---------------------------------------------------------------------------

 
 

-wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data):
-wxPrinterBase(data)
+wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
+                : wxPrinterBase(data)

 {
     m_lpAbortProc = (WXFARPROC) MakeProcInstance((FARPROC) wxAbortProc, wxGetInstance());
 }
 
 {
     m_lpAbortProc = (WXFARPROC) MakeProcInstance((FARPROC) wxAbortProc, wxGetInstance());
 }
 

-wxWindowsPrinter::~wxWindowsPrinter(void)
+wxWindowsPrinter::~wxWindowsPrinter()

 {
 {

+    // avoids warning about statement with no effect (FreeProcInstance
+       // doesn't do anything under Win32)
+#if !defined(WIN32) && !defined(_WIN32) && !defined(__WIN32__) && !defined(__NT__) && !defined(__GNUWIN32__)

     FreeProcInstance((FARPROC) m_lpAbortProc);
     FreeProcInstance((FARPROC) m_lpAbortProc);

+#endif

 }
 
 bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {
     sm_abortIt = FALSE;
     sm_abortWindow = NULL;
 }
 
 bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {
     sm_abortIt = FALSE;
     sm_abortWindow = NULL;

-    
+

     if (!printout)
     if (!printout)

+    {
+        sm_lastError = wxPRINTER_ERROR;

         return FALSE;
         return FALSE;

-    
+    }
+

     printout->SetIsPreview(FALSE);
     printout->SetIsPreview(FALSE);

-    printout->OnPreparePrinting();
-    
+
+    // 4/9/99, JACS: this is a silly place to allow preparation, considering
+    // the DC and no parameters have been set in the printout object.
+    // Moved further down.
+    // printout->OnPreparePrinting();
+

     // Get some parameters from the printout, if defined
     int fromPage, toPage;
     int minPage, maxPage;
     printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
     // Get some parameters from the printout, if defined
     int fromPage, toPage;
     int minPage, maxPage;
     printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);

-    
+

     if (maxPage == 0)
     if (maxPage == 0)

+    {
+        sm_lastError = wxPRINTER_ERROR;

         return FALSE;
         return FALSE;

-    
+    }
+

     m_printDialogData.SetMinPage(minPage);
     m_printDialogData.SetMaxPage(maxPage);
     if (fromPage != 0)
         m_printDialogData.SetFromPage(fromPage);
     if (toPage != 0)
         m_printDialogData.SetToPage(toPage);
     m_printDialogData.SetMinPage(minPage);
     m_printDialogData.SetMaxPage(maxPage);
     if (fromPage != 0)
         m_printDialogData.SetFromPage(fromPage);
     if (toPage != 0)
         m_printDialogData.SetToPage(toPage);

-    
+

     if (minPage != 0)
     {
         m_printDialogData.EnablePageNumbers(TRUE);
     if (minPage != 0)
     {
         m_printDialogData.EnablePageNumbers(TRUE);


@@ -110,7 +145,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     else
         m_printDialogData.EnablePageNumbers(FALSE);
 
     else
         m_printDialogData.EnablePageNumbers(FALSE);
 

-    // Create a suitable device context  
+    // Create a suitable device context

     wxDC *dc = NULL;
     if (prompt)
     {
     wxDC *dc = NULL;
     if (prompt)
     {


@@ -123,58 +158,65 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         //      dc = new wxPrinterDC("", "", "", FALSE, m_printData.GetOrientation());
         dc = new wxPrinterDC(m_printDialogData.GetPrintData());
     }
         //      dc = new wxPrinterDC("", "", "", FALSE, m_printData.GetOrientation());
         dc = new wxPrinterDC(m_printDialogData.GetPrintData());
     }

-    
+

     // May have pressed cancel.
     if (!dc || !dc->Ok())
     {
         if (dc) delete dc;
         return FALSE;
     }
     // May have pressed cancel.
     if (!dc || !dc->Ok())
     {
         if (dc) delete dc;
         return FALSE;
     }

-    
+

     int logPPIScreenX = 0;
     int logPPIScreenY = 0;
     int logPPIPrinterX = 0;
     int logPPIPrinterY = 0;
     int logPPIScreenX = 0;
     int logPPIScreenY = 0;
     int logPPIPrinterX = 0;
     int logPPIPrinterY = 0;

-    
+

     HDC hdc = ::GetDC(NULL);
     logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
     logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
     ::ReleaseDC(NULL, hdc);
     HDC hdc = ::GetDC(NULL);
     logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
     logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
     ::ReleaseDC(NULL, hdc);

-    
+

     logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
     logPPIPrinterY = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSY);
     if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
     {
         delete dc;
     logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
     logPPIPrinterY = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSY);
     if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
     {
         delete dc;

+        sm_lastError = wxPRINTER_ERROR;

         return FALSE;
     }
         return FALSE;
     }

-    
+

     printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
     printout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
     printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
     printout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);

-    
-    // Set printout parameters  
+
+    // Set printout parameters

     printout->SetDC(dc);
     printout->SetDC(dc);

-    
+

     int w, h;
     dc->GetSize(&w, &h);
     printout->SetPageSizePixels((int)w, (int)h);
 
     dc->GetSizeMM(&w, &h);
     printout->SetPageSizeMM((int)w, (int)h);
     int w, h;
     dc->GetSize(&w, &h);
     printout->SetPageSizePixels((int)w, (int)h);
 
     dc->GetSizeMM(&w, &h);
     printout->SetPageSizeMM((int)w, (int)h);

-    
+

     // Create an abort window
     wxBeginBusyCursor();
     // Create an abort window
     wxBeginBusyCursor();

-    
+
+    printout->OnPreparePrinting();
+

     wxWindow *win = CreateAbortWindow(parent, printout);
     wxYield();
     wxWindow *win = CreateAbortWindow(parent, printout);
     wxYield();

-    
+

 #if defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)
 #if defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)

+#ifdef STRICT
+    ::SetAbortProc((HDC) dc->GetHDC(), (ABORTPROC) m_lpAbortProc);
+#else

     ::SetAbortProc((HDC) dc->GetHDC(), (FARPROC) m_lpAbortProc);
     ::SetAbortProc((HDC) dc->GetHDC(), (FARPROC) m_lpAbortProc);

+#endif

 #else
     ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)
         // cast it to right type only if required
 #else
     ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)
         // cast it to right type only if required

-        // @@@ it's really cdecl and we're casting it to stdcall - either there is
-        //     something I don't understand or it will crash at first usage
+        // FIXME it's really cdecl and we're casting it to stdcall - either there is
+        //       something I don't understand or it will crash at first usage

 #ifdef STRICT
         (HDC, int)
 #else
 #ifdef STRICT
         (HDC, int)
 #else


@@ -182,66 +224,80 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 #endif
         )m_lpAbortProc);
 #endif
 #endif
         )m_lpAbortProc);
 #endif

-    
+

     if (!win)
     {
         wxEndBusyCursor();
     if (!win)
     {
         wxEndBusyCursor();

-        wxMessageBox("Sorry, could not create an abort dialog.", "Print Error", wxOK, parent);
+        wxLogDebug(wxT("Could not create an abort dialog."));
+        sm_lastError = wxPRINTER_ERROR;
+

         delete dc;
     }
     sm_abortWindow = win;
     sm_abortWindow->Show(TRUE);
         delete dc;
     }
     sm_abortWindow = win;
     sm_abortWindow->Show(TRUE);

-    wxYield();
-    
+    wxSafeYield();
+

     printout->OnBeginPrinting();
     printout->OnBeginPrinting();

-    
-    bool keepGoing = TRUE;
-    
+
+    sm_lastError = wxPRINTER_NO_ERROR;
+

     int copyCount;
     int copyCount;

-    for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++)
+    for ( copyCount = 1;
+          copyCount <= m_printDialogData.GetNoCopies();
+          copyCount++ )

     {
         if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
         {
             wxEndBusyCursor();
     {
         if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
         {
             wxEndBusyCursor();

-            wxMessageBox("Could not start printing.", "Print Error", wxOK, parent);
+            wxLogError(_("Could not start printing."));
+            sm_lastError = wxPRINTER_ERROR;

             break;
         }
         if (sm_abortIt)
             break;
         }
         if (sm_abortIt)

+        {
+            sm_lastError = wxPRINTER_CANCELLED;

             break;
             break;

-        
+        }
+

         int pn;
         int pn;

-        for (pn = m_printDialogData.GetFromPage(); keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn);
-        pn++)
+        for ( pn = m_printDialogData.GetFromPage();
+              pn <= m_printDialogData.GetToPage() && printout->HasPage(pn);
+              pn++ )

         {
         {

-            if (sm_abortIt)
+            if ( sm_abortIt )

             {
             {

-                keepGoing = FALSE;
+                sm_lastError = wxPRINTER_CANCELLED;

                 break;
             }
                 break;
             }

-            else
+
+            dc->StartPage();
+            bool cont = printout->OnPrintPage(pn);
+            dc->EndPage();
+
+            if ( !cont )

             {
             {

-                dc->StartPage();
-                printout->OnPrintPage(pn);
-                dc->EndPage();
+                sm_lastError = wxPRINTER_CANCELLED;
+                break;

             }
         }
             }
         }

+

         printout->OnEndDocument();
     }
         printout->OnEndDocument();
     }

-    
+

     printout->OnEndPrinting();
     printout->OnEndPrinting();

-    
+

     if (sm_abortWindow)
     {
         sm_abortWindow->Show(FALSE);
         delete sm_abortWindow;
         sm_abortWindow = NULL;
     }
     if (sm_abortWindow)
     {
         sm_abortWindow->Show(FALSE);
         delete sm_abortWindow;
         sm_abortWindow = NULL;
     }

-    
+

     wxEndBusyCursor();
     wxEndBusyCursor();

-    
+

     delete dc;
     delete dc;

-    
-    return TRUE;
+
+    return (sm_lastError == wxPRINTER_NO_ERROR);

 }
 
 wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
 }
 
 wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)


@@ -255,7 +311,13 @@ wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
     {
         dc = dialog.GetPrintDC();
         m_printDialogData = dialog.GetPrintDialogData();
     {
         dc = dialog.GetPrintDC();
         m_printDialogData = dialog.GetPrintDialogData();

+        if (dc == NULL)
+            sm_lastError = wxPRINTER_ERROR;
+        else
+            sm_lastError = wxPRINTER_NO_ERROR;

     }
     }

+    else
+        sm_lastError = wxPRINTER_CANCELLED;

 
     return dc;
 }
 
     return dc;
 }


@@ -279,13 +341,23 @@ bool wxWindowsPrinter::Setup(wxWindow *parent)
 * Print preview
 */
 
 * Print preview
 */
 

-wxWindowsPrintPreview::wxWindowsPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintDialogData *data):
-wxPrintPreviewBase(printout, printoutForPrinting, data)
+wxWindowsPrintPreview::wxWindowsPrintPreview(wxPrintout *printout,
+                                             wxPrintout *printoutForPrinting,
+                                             wxPrintDialogData *data)
+                     : wxPrintPreviewBase(printout, printoutForPrinting, data)

 {
     DetermineScaling();
 }
 
 {
     DetermineScaling();
 }
 

-wxWindowsPrintPreview::~wxWindowsPrintPreview(void)
+wxWindowsPrintPreview::wxWindowsPrintPreview(wxPrintout *printout,
+                                             wxPrintout *printoutForPrinting,
+                                             wxPrintData *data)
+                     : wxPrintPreviewBase(printout, printoutForPrinting, data)
+{
+    DetermineScaling();
+}
+
+wxWindowsPrintPreview::~wxWindowsPrintPreview()

 {
 }
 
 {
 }
 


@@ -297,7 +369,7 @@ bool wxWindowsPrintPreview::Print(bool interactive)
     return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }
 
     return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }
 

-void wxWindowsPrintPreview::DetermineScaling(void)
+void wxWindowsPrintPreview::DetermineScaling()

 {
     HDC dc = ::GetDC(NULL);
     int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);
 {
     HDC dc = ::GetDC(NULL);
     int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);


@@ -307,39 +379,39 @@ void wxWindowsPrintPreview::DetermineScaling(void)
     int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
     int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);
     m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
     int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
     int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);
     m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);

-    
+

     ::ReleaseDC(NULL, dc);
     ::ReleaseDC(NULL, dc);

-    
+

     // Get a device context for the currently selected printer
     wxPrinterDC printerDC(m_printDialogData.GetPrintData());
     // Get a device context for the currently selected printer
     wxPrinterDC printerDC(m_printDialogData.GetPrintData());

-    
+

     int printerWidth = 150;
     int printerHeight = 250;
     int printerXRes = 1500;
     int printerYRes = 2500;
     int printerWidth = 150;
     int printerHeight = 250;
     int printerXRes = 1500;
     int printerYRes = 2500;

-    
+

     if (printerDC.GetHDC())
     {
         printerWidth = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZSIZE);
         printerHeight = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTSIZE);
         printerXRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZRES);
         printerYRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTRES);
     if (printerDC.GetHDC())
     {
         printerWidth = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZSIZE);
         printerHeight = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTSIZE);
         printerXRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZRES);
         printerYRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTRES);

-        
+

         int logPPIPrinterX = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSX);
         int logPPIPrinterY = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSY);
         int logPPIPrinterX = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSX);
         int logPPIPrinterY = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSY);

-        
+

         m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
         m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
         m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
         m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);

-        
+

         if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)
             m_isOk = FALSE;
     }
     else
         m_isOk = FALSE;
         if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)
             m_isOk = FALSE;
     }
     else
         m_isOk = FALSE;

-    
+

     m_pageWidth = printerXRes;
     m_pageHeight = printerYRes;
     m_pageWidth = printerXRes;
     m_pageHeight = printerYRes;

-    
+

     // At 100%, the page should look about page-size on the screen.
     m_previewScale = (float)((float)screenWidth/(float)printerWidth);
     m_previewScale = m_previewScale * (float)((float)screenXRes/(float)printerYRes);
     // At 100%, the page should look about page-size on the screen.
     m_previewScale = (float)((float)screenWidth/(float)printerWidth);
     m_previewScale = m_previewScale * (float)((float)screenXRes/(float)printerYRes);


@@ -348,28 +420,30 @@ void wxWindowsPrintPreview::DetermineScaling(void)
 /****************************************************************************
 
   FUNCTION: wxAbortProc()
 /****************************************************************************
 
   FUNCTION: wxAbortProc()

-  
+

     PURPOSE:  Processes messages for the Abort Dialog box
     PURPOSE:  Processes messages for the Abort Dialog box

-    
+

 ****************************************************************************/
 
 LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
 {
     MSG msg;
 ****************************************************************************/
 
 LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
 {
     MSG msg;

-    
+

     if (!wxPrinterBase::sm_abortWindow)              /* If the abort dialog isn't up yet */
         return(TRUE);
     if (!wxPrinterBase::sm_abortWindow)              /* If the abort dialog isn't up yet */
         return(TRUE);

-    
+

     /* Process messages intended for the abort dialog box */
     /* Process messages intended for the abort dialog box */

-    
+

     while (!wxPrinterBase::sm_abortIt && PeekMessage(&msg, 0, 0, 0, TRUE))
         if (!IsDialogMessage((HWND) wxPrinterBase::sm_abortWindow->GetHWND(), &msg)) {
             TranslateMessage(&msg);
             DispatchMessage(&msg);
         }
     while (!wxPrinterBase::sm_abortIt && PeekMessage(&msg, 0, 0, 0, TRUE))
         if (!IsDialogMessage((HWND) wxPrinterBase::sm_abortWindow->GetHWND(), &msg)) {
             TranslateMessage(&msg);
             DispatchMessage(&msg);
         }

-        
+

         /* bAbort is TRUE (return is FALSE) if the user has aborted */
         /* bAbort is TRUE (return is FALSE) if the user has aborted */

-        
+

         return (!wxPrinterBase::sm_abortIt);
 }
 
         return (!wxPrinterBase::sm_abortIt);
 }
 

+#endif
+    // wxUSE_PRINTING_ARCHITECTURE