Applied patch [ 1349607 ] [msw] Multiline notebook tab label change can add extra row

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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index d09ddc2dd985103ef5f07b58385de4ce5c915091..dd37d4f050966284b02269132602ad3f39504784 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "printwin.h"
-#endif
-

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


@@ -30,6 +26,10 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+// Don't use the Windows printer if we're in wxUniv mode and using
+// the PostScript architecture
+#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+

 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/msw/private.h"
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/msw/private.h"


@@ -48,10 +48,7 @@
 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 

-#include "wx/msw/private.h"
-
-#include <commdlg.h>
-
+#include "wx/msw/wrapcdlg.h"

 #ifndef __WIN32__
     #include <print.h>
 #endif
 #ifndef __WIN32__
     #include <print.h>
 #endif


@@ -66,10 +63,8 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 // wxWin macros
 // ---------------------------------------------------------------------------
 
 // wxWin macros
 // ---------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
     IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
     IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)

-#endif

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -87,61 +82,41 @@ wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
 
 wxWindowsPrinter::~wxWindowsPrinter()
 {
 
 wxWindowsPrinter::~wxWindowsPrinter()
 {

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

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

+#endif

 }
 
 bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {
 }
 
 bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {

-    sm_abortIt = FALSE;
+    sm_abortIt = false;

     sm_abortWindow = NULL;
 
     if (!printout)
     sm_abortWindow = NULL;
 
     if (!printout)

-        return FALSE;
-
-    printout->SetIsPreview(FALSE);
-    printout->OnPreparePrinting();
-
-    // Get some parameters from the printout, if defined
-    int fromPage, toPage;
-    int minPage, maxPage;
-    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
-
-    if (maxPage == 0)
-        return FALSE;
-
-    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 (m_printDialogData.GetFromPage() < m_printDialogData.GetMinPage())
-            m_printDialogData.SetFromPage(m_printDialogData.GetMinPage());
-        else if (m_printDialogData.GetFromPage() > m_printDialogData.GetMaxPage())
-            m_printDialogData.SetFromPage(m_printDialogData.GetMaxPage());
-        if (m_printDialogData.GetToPage() > m_printDialogData.GetMaxPage())
-            m_printDialogData.SetToPage(m_printDialogData.GetMaxPage());
-        else if (m_printDialogData.GetToPage() < m_printDialogData.GetMinPage())
-            m_printDialogData.SetToPage(m_printDialogData.GetMinPage());
+        sm_lastError = wxPRINTER_ERROR;
+        return false;

     }
     }

-    else
-        m_printDialogData.EnablePageNumbers(FALSE);
+
+    printout->SetIsPreview(false);
+
+    if (m_printDialogData.GetMinPage() < 1)
+        m_printDialogData.SetMinPage(1);
+    if (m_printDialogData.GetMaxPage() < 1)
+        m_printDialogData.SetMaxPage(9999);

 
     // Create a suitable device context
 
     // Create a suitable device context

-    wxDC *dc = NULL;
+    wxDC *dc wxDUMMY_INITIALIZE(NULL);

     if (prompt)
     {
         dc = PrintDialog(parent);
         if (!dc)
     if (prompt)
     {
         dc = PrintDialog(parent);
         if (!dc)

-            return FALSE;
+            return false;

     }
     else
     {
     }
     else
     {

-        //      dc = new wxPrinterDC("", "", "", FALSE, m_printData.GetOrientation());

         dc = new wxPrinterDC(m_printDialogData.GetPrintData());
     }
 
         dc = new wxPrinterDC(m_printDialogData.GetPrintData());
     }
 


@@ -149,25 +124,21 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     if (!dc || !dc->Ok())
     {
         if (dc) delete dc;
     if (!dc || !dc->Ok())
     {
         if (dc) delete dc;

-        return FALSE;
+        return false;

     }
 
     }
 

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

     HDC hdc = ::GetDC(NULL);
     HDC hdc = ::GetDC(NULL);

-    logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
-    logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
+    int logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
+    int logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);

     ::ReleaseDC(NULL, hdc);
 
     ::ReleaseDC(NULL, hdc);
 

-    logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
-    logPPIPrinterY = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSY);
+    int logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
+    int logPPIPrinterY = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSY);

     if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
     {
         delete dc;
     if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
     {
         delete dc;

-        return FALSE;
+        sm_lastError = wxPRINTER_ERROR;
+        return false;

     }
 
     printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
     }
 
     printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);


@@ -184,13 +155,35 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     printout->SetPageSizeMM((int)w, (int)h);
 
     // Create an abort window
     printout->SetPageSizeMM((int)w, (int)h);
 
     // Create an abort window

-    wxBeginBusyCursor();
+    wxBusyCursor busyCursor;
+
+    printout->OnPreparePrinting();
+
+    // Get some parameters from the printout, if defined
+    int fromPage, toPage;
+    int minPage, maxPage;
+    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
+
+    if (maxPage == 0)
+    {
+        sm_lastError = wxPRINTER_ERROR;
+        return false;
+    }
+
+    // Only set min and max, because from and to have been
+    // set by the user
+    m_printDialogData.SetMinPage(minPage);
+    m_printDialogData.SetMaxPage(maxPage);

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

-#if defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)
+#if defined(__WATCOMC__) || 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


@@ -206,47 +199,68 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 
     if (!win)
     {
 
     if (!win)
     {

-        wxEndBusyCursor();
-        wxLogDebug("Could not create an abort dialog.");
+        wxLogDebug(wxT("Could not create an abort dialog."));
+        sm_lastError = wxPRINTER_ERROR;

 
         delete dc;
 
         delete dc;

+        return false;

     }
     sm_abortWindow = win;
     }
     sm_abortWindow = win;

-    sm_abortWindow->Show(TRUE);
+    sm_abortWindow->Show();

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

-    bool keepGoing = TRUE;
+    sm_lastError = wxPRINTER_NO_ERROR;
+
+    int minPageNum = minPage, maxPageNum = maxPage;
+
+    if ( !m_printDialogData.GetAllPages() )
+    {
+        minPageNum = m_printDialogData.GetFromPage();
+        maxPageNum = m_printDialogData.GetToPage();
+    }

 
     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()))
+        if ( !printout->OnBeginDocument(minPageNum, maxPageNum) )

         {
         {

-            wxEndBusyCursor();

             wxLogError(_("Could not start printing."));
             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 = minPageNum;
+              pn <= maxPageNum && 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();
     }
 


@@ -254,16 +268,14 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 
     if (sm_abortWindow)
     {
 
     if (sm_abortWindow)
     {

-        sm_abortWindow->Show(FALSE);
+        sm_abortWindow->Show(false);

         delete sm_abortWindow;
         sm_abortWindow = NULL;
     }
 
         delete sm_abortWindow;
         sm_abortWindow = NULL;
     }
 

-    wxEndBusyCursor();
-

     delete dc;
 
     delete dc;
 

-    return TRUE;
+    return sm_lastError == wxPRINTER_NO_ERROR;

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


@@ -277,15 +289,23 @@ 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;
 }
 

-bool wxWindowsPrinter::Setup(wxWindow *parent)
+bool wxWindowsPrinter::Setup(wxWindow *WXUNUSED(parent))

 {
 {

+#if 0
+    // We no longer expose that dialog

     wxPrintDialog dialog(parent, & m_printDialogData);
     wxPrintDialog dialog(parent, & m_printDialogData);

-    dialog.GetPrintDialogData().SetSetupDialog(TRUE);
+    dialog.GetPrintDialogData().SetSetupDialog(true);

 
     int ret = dialog.ShowModal();
 
 
     int ret = dialog.ShowModal();
 


@@ -295,6 +315,9 @@ bool wxWindowsPrinter::Setup(wxWindow *parent)
     }
 
     return (ret == wxID_OK);
     }
 
     return (ret == wxID_OK);

+#else
+    return false;
+#endif

 }
 
 /*
 }
 
 /*


@@ -324,7 +347,7 @@ wxWindowsPrintPreview::~wxWindowsPrintPreview()
 bool wxWindowsPrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)
 bool wxWindowsPrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)

-        return FALSE;
+        return false;

     wxWindowsPrinter printer(&m_printDialogData);
     return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }
     wxWindowsPrinter printer(&m_printDialogData);
     return printer.Print(m_previewFrame, m_printPrintout, interactive);
 }


@@ -333,9 +356,7 @@ void wxWindowsPrintPreview::DetermineScaling()
 {
     HDC dc = ::GetDC(NULL);
     int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);
 {
     HDC dc = ::GetDC(NULL);
     int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);

-    //    int screenHeight = ::GetDeviceCaps(dc, VERTSIZE);
-    int screenXRes = ::GetDeviceCaps(dc, HORZRES);
-    //    int screenYRes = ::GetDeviceCaps(dc, VERTRES);
+    int screenYRes = ::GetDeviceCaps(dc, VERTRES);

     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);


@@ -346,35 +367,36 @@ void wxWindowsPrintPreview::DetermineScaling()
     wxPrinterDC printerDC(m_printDialogData.GetPrintData());
 
     int printerWidth = 150;
     wxPrinterDC printerDC(m_printDialogData.GetPrintData());
 
     int printerWidth = 150;

-    int printerHeight = 250;
+    int printerHeight wxDUMMY_INITIALIZE(250);

     int printerXRes = 1500;
     int printerYRes = 2500;
 
     int printerXRes = 1500;
     int printerYRes = 2500;
 

-    if (printerDC.GetHDC())
+    dc = GetHdcOf(printerDC);
+    if ( dc )

     {
     {

-        printerWidth = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZSIZE);
-        printerHeight = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTSIZE);
-        printerXRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZRES);
-        printerYRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTRES);
+        printerWidth = ::GetDeviceCaps(dc, HORZSIZE);
+        printerHeight = ::GetDeviceCaps(dc, VERTSIZE);
+        printerXRes = ::GetDeviceCaps(dc, HORZRES);
+        printerYRes = ::GetDeviceCaps(dc, VERTRES);

 
 

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

 
         m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
         m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
 
         if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)
 
         m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
         m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
 
         if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)

-            m_isOk = FALSE;
+            m_isOk = false;

     }
     else
     }
     else

-        m_isOk = FALSE;
+        m_isOk = false;

 
     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_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);
+    m_previewScale = m_previewScale * (float)((float)screenYRes/(float)printerYRes);

 }
 
 /****************************************************************************
 }
 
 /****************************************************************************


@@ -394,14 +416,16 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
 
     /* 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))
+    while (!wxPrinterBase::sm_abortIt && ::PeekMessage(&msg, 0, 0, 0, TRUE))

         if (!IsDialogMessage((HWND) wxPrinterBase::sm_abortWindow->GetHWND(), &msg)) {
             TranslateMessage(&msg);
             DispatchMessage(&msg);
         }
 
         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