check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index bc72876edd8346ad9451ff179cee4749263d33db..98dae5fc7506142462356ae747aeeea39984eb36 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        printwin.cpp
+// Name:        src/msw/printwin.cpp

 // Purpose:     wxWindowsPrinter framework
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxWindowsPrinter framework
 // Author:      Julian Smart
 // Modified by:


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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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"
 


@@ -28,13 +24,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#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
 // 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/msw/wrapcdlg.h"

     #include "wx/window.h"
     #include "wx/msw/private.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/msw/private.h"
     #include "wx/utils.h"


@@ -42,20 +37,17 @@
     #include "wx/app.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"

+    #include "wx/log.h"
+    #include "wx/dcprint.h"

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

-#include "wx/dcprint.h"
-#include "wx/printdlg.h"
-#include "wx/log.h"
+#include "wx/msw/printdlg.h"

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

+#include "wx/msw/dcprint.h"

 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 

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

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


@@ -84,7 +76,7 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
                 : wxPrinterBase(data)
 {
 wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
                 : wxPrinterBase(data)
 {

-    m_lpAbortProc = (WXFARPROC) MakeProcInstance((FARPROC) wxAbortProc, wxGetInstance());
+    m_lpAbortProc = (WXFARPROC)wxAbortProc;

 }
 
 wxWindowsPrinter::~wxWindowsPrinter()
 }
 
 wxWindowsPrinter::~wxWindowsPrinter()


@@ -115,10 +107,10 @@ 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;
+    wxPrinterDC *dc wxDUMMY_INITIALIZE(NULL);

     if (prompt)
     {
     if (prompt)
     {

-        dc = PrintDialog(parent);
+        dc = wxDynamicCast(PrintDialog(parent), wxPrinterDC);

         if (!dc)
             return false;
     }
         if (!dc)
             return false;
     }


@@ -128,24 +120,21 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     }
 
     // May have pressed cancel.
     }
 
     // May have pressed cancel.

-    if (!dc || !dc->Ok())
+    if (!dc || !dc->IsOk())

     {
         if (dc) delete dc;
         return false;
     }
 
     {
         if (dc) delete dc;
         return false;
     }
 

-    int logPPIScreenX = 0;
-    int logPPIScreenY = 0;
-    int logPPIPrinterX = 0;
-    int logPPIPrinterY = 0;
+    wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();

 
     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) impl->GetHDC(), LOGPIXELSX);
+    int logPPIPrinterY = ::GetDeviceCaps((HDC) impl->GetHDC(), LOGPIXELSY);

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


@@ -162,6 +151,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     int w, h;
     dc->GetSize(&w, &h);
     printout->SetPageSizePixels((int)w, (int)h);
     int w, h;
     dc->GetSize(&w, &h);
     printout->SetPageSizePixels((int)w, (int)h);

+    printout->SetPaperRectPixels(dc->GetPaperRect());

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


@@ -190,14 +180,14 @@ 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
 #ifdef STRICT

-    ::SetAbortProc((HDC) dc->GetHDC(), (ABORTPROC) m_lpAbortProc);
+    ::SetAbortProc((HDC) impl->GetHDC(), (ABORTPROC) m_lpAbortProc);

 #else
 #else

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

 #endif
 #else
 #endif
 #else

-    ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)
+    ::SetAbortProc((HDC) impl->GetHDC(), (int (_stdcall *)

         // cast it to right type only if required
         // 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
         // cast it to right type only if required
         // 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


@@ -215,6 +205,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         sm_lastError = wxPRINTER_ERROR;
 
         delete dc;
         sm_lastError = wxPRINTER_ERROR;
 
         delete dc;

+        return false;

     }
     sm_abortWindow = win;
     sm_abortWindow->Show();
     }
     sm_abortWindow = win;
     sm_abortWindow->Show();


@@ -286,14 +277,14 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 
     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)

 {
 {

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

 
 

-    wxPrintDialog dialog(parent, & m_printDialogData);
+    wxWindowsPrintDialog dialog(parent, & m_printDialogData);

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


@@ -311,8 +302,10 @@ 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);
     dialog.GetPrintDialogData().SetSetupDialog(true);
 
     wxPrintDialog dialog(parent, & m_printDialogData);
     dialog.GetPrintDialogData().SetSetupDialog(true);
 


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

+#else
+    return false;
+#endif

 }
 
 /*
 }
 
 /*


@@ -360,49 +356,67 @@ bool wxWindowsPrintPreview::Print(bool interactive)
 
 void wxWindowsPrintPreview::DetermineScaling()
 {
 
 void wxWindowsPrintPreview::DetermineScaling()
 {

-    HDC dc = ::GetDC(NULL);
-    int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);
-    int screenYRes = ::GetDeviceCaps(dc, VERTRES);
+    ScreenHDC dc;

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

     // 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 printerWidthMM;
+    int printerHeightMM;
+    int printerXRes;
+    int printerYRes;
+    int logPPIPrinterX;
+    int logPPIPrinterY;
+
+    wxRect paperRect;

 
 

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

     {
     {

-        printerWidth = ::GetDeviceCaps(dc, HORZSIZE);
-        printerHeight = ::GetDeviceCaps(dc, VERTSIZE);
+        wxPrinterDCImpl *impl = (wxPrinterDCImpl*) printerDC.GetImpl();
+        HDC dc = GetHdcOf(*impl);
+        printerWidthMM = ::GetDeviceCaps(dc, HORZSIZE);
+        printerHeightMM = ::GetDeviceCaps(dc, VERTSIZE);

         printerXRes = ::GetDeviceCaps(dc, HORZRES);
         printerYRes = ::GetDeviceCaps(dc, VERTRES);
         printerXRes = ::GetDeviceCaps(dc, HORZRES);
         printerYRes = ::GetDeviceCaps(dc, VERTRES);

+        logPPIPrinterX = ::GetDeviceCaps(dc, LOGPIXELSX);
+        logPPIPrinterY = ::GetDeviceCaps(dc, LOGPIXELSY);

 
 

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

 
 

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

             m_isOk = false;
             m_isOk = false;

+        }

     }
     else
     }
     else

+    {
+        // use some defaults
+        printerWidthMM = 150;
+        printerHeightMM = 250;
+        printerXRes = 1500;
+        printerYRes = 2500;
+        logPPIPrinterX = 600;
+        logPPIPrinterY = 600;
+
+        paperRect = wxRect(0, 0, printerXRes, printerYRes);

         m_isOk = false;
         m_isOk = false;

-
+    }

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

+    m_previewPrintout->SetPageSizePixels(printerXRes, printerYRes);
+    m_previewPrintout->SetPageSizeMM(printerWidthMM, printerHeightMM);
+    m_previewPrintout->SetPaperRectPixels(paperRect);
+    m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);

 
     // At 100%, the page should look about page-size on the screen.
 
     // 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)screenYRes/(float)printerYRes);
+    m_previewScaleX = float(logPPIScreenX) / logPPIPrinterX;
+    m_previewScaleY = float(logPPIScreenY) / logPPIPrinterY;

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


@@ -422,15 +436,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