Applied patch from Neil Robinson to allow manipulation of unattached menubars

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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 36691904cc81adf81567b6794c511aab8d013185..dd37d4f050966284b02269132602ad3f39504784 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -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,7 +26,9 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_PRINTING_ARCHITECTURE
+// 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"
 
 #ifndef WX_PRECOMP
     #include "wx/window.h"


@@ -50,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


@@ -88,7 +83,7 @@ wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
 wxWindowsPrinter::~wxWindowsPrinter()
 {
     // avoids warning about statement with no effect (FreeProcInstance
 wxWindowsPrinter::~wxWindowsPrinter()
 {
     // avoids warning about statement with no effect (FreeProcInstance

-       // doesn't do anything under Win32)
+    // doesn't do anything under Win32)

 #if !defined(__WIN32__) && !defined(__NT__)
     FreeProcInstance((FARPROC) m_lpAbortProc);
 #endif
 #if !defined(__WIN32__) && !defined(__NT__)
     FreeProcInstance((FARPROC) m_lpAbortProc);
 #endif


@@ -96,16 +91,16 @@ wxWindowsPrinter::~wxWindowsPrinter()
 
 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_lastError = wxPRINTER_ERROR;
     sm_abortWindow = NULL;
 
     if (!printout)
     {
         sm_lastError = wxPRINTER_ERROR;

-        return FALSE;
+        return false;

     }
 
     }
 

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

 
     if (m_printDialogData.GetMinPage() < 1)
         m_printDialogData.SetMinPage(1);
 
     if (m_printDialogData.GetMinPage() < 1)
         m_printDialogData.SetMinPage(1);


@@ -113,12 +108,12 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         m_printDialogData.SetMaxPage(9999);
 
     // Create a suitable device context
         m_printDialogData.SetMaxPage(9999);
 
     // 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
     {


@@ -129,26 +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;
         sm_lastError = wxPRINTER_ERROR;
     if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
     {
         delete dc;
         sm_lastError = wxPRINTER_ERROR;

-        return FALSE;
+        return false;

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


@@ -165,7 +155,7 @@ 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();
 
 
     printout->OnPreparePrinting();
 


@@ -177,8 +167,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     if (maxPage == 0)
     {
         sm_lastError = wxPRINTER_ERROR;
     if (maxPage == 0)
     {
         sm_lastError = wxPRINTER_ERROR;

-        wxEndBusyCursor();
-        return FALSE;
+        return false;

     }
 
     // Only set min and max, because from and to have been
     }
 
     // Only set min and max, because from and to have been


@@ -189,7 +178,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     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
 #ifdef STRICT
     ::SetAbortProc((HDC) dc->GetHDC(), (ABORTPROC) m_lpAbortProc);
 #else


@@ -210,28 +199,35 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 
     if (!win)
     {
 
     if (!win)
     {

-        wxEndBusyCursor();

         wxLogDebug(wxT("Could not create an abort dialog."));
         sm_lastError = wxPRINTER_ERROR;
 
         delete dc;
         wxLogDebug(wxT("Could not create an abort dialog."));
         sm_lastError = wxPRINTER_ERROR;
 
         delete dc;

+        return false;

     }
     sm_abortWindow = win;
     }
     sm_abortWindow = win;

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

     wxSafeYield();
 
     printout->OnBeginPrinting();
 
     sm_lastError = wxPRINTER_NO_ERROR;
 
     wxSafeYield();
 
     printout->OnBeginPrinting();
 
     sm_lastError = wxPRINTER_NO_ERROR;
 

+    int minPageNum = minPage, maxPageNum = maxPage;
+
+    if ( !m_printDialogData.GetAllPages() )
+    {
+        minPageNum = m_printDialogData.GetFromPage();
+        maxPageNum = m_printDialogData.GetToPage();
+    }
+

     int copyCount;
     for ( copyCount = 1;
           copyCount <= m_printDialogData.GetNoCopies();
           copyCount++ )
     {
     int 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."));
             sm_lastError = wxPRINTER_ERROR;
             break;
             wxLogError(_("Could not start printing."));
             sm_lastError = wxPRINTER_ERROR;
             break;


@@ -243,8 +239,9 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         }
 
         int pn;
         }
 
         int pn;

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

               pn++ )
         {
             if ( sm_abortIt )
               pn++ )
         {
             if ( sm_abortIt )


@@ -271,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 (sm_lastError == wxPRINTER_NO_ERROR);
+    return sm_lastError == wxPRINTER_NO_ERROR;

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


@@ -305,10 +300,12 @@ wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
     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();
 


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

+#else
+    return false;
+#endif

 }
 
 /*
 }
 
 /*


@@ -347,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);
 }


@@ -367,7 +367,7 @@ 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;
 


@@ -386,10 +386,10 @@ void wxWindowsPrintPreview::DetermineScaling()
         m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
 
         if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)
         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;
 
     m_pageWidth = printerXRes;
     m_pageHeight = printerYRes;


@@ -416,15 +416,15 @@ 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
 }
 
 #endif