fixing osx_cocoa

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 92425e9cf7cffe52afdf379b11f2e57a8d5c8141..150232ed1990002dd16de0489528b12917923873 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -27,6 +27,7 @@
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dcprint.h"
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dcprint.h"

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

 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"


@@ -66,7 +67,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxPrinterDC, wxDC)
+IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxMSWDCImpl)

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


@@ -76,12 +77,13 @@ IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 // wxPrinterDC construction
 // ----------------------------------------------------------------------------
 
 // wxPrinterDC construction
 // ----------------------------------------------------------------------------
 

+#if 0

 // This form is deprecated
 wxPrinterDC::wxPrinterDC(const wxString& driver_name,
                          const wxString& device_name,
                          const wxString& file,
                          bool interactive,
 // This form is deprecated
 wxPrinterDC::wxPrinterDC(const wxString& driver_name,
                          const wxString& device_name,
                          const wxString& file,
                          bool interactive,

-                         int orientation)
+                         wxPrintOrientation orientation)

 {
     m_isInteractive = interactive;
 
 {
     m_isInteractive = interactive;
 


@@ -136,8 +138,10 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name,
 
     Init();
 }
 
     Init();
 }

+#endif

 
 

-wxPrinterDC::wxPrinterDC(const wxPrintData& printData)
+wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printData ) :
+    wxMSWDCImpl( owner )

 {
     m_printData = printData;
 
 {
     m_printData = printData;
 


@@ -151,7 +155,8 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printData)
 }
 
 
 }
 
 

-wxPrinterDC::wxPrinterDC(WXHDC dc)
+wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, WXHDC dc ) :
+    wxMSWDCImpl( owner )

 {
     m_isInteractive = false;
 
 {
     m_isInteractive = false;
 


@@ -160,7 +165,7 @@ wxPrinterDC::wxPrinterDC(WXHDC dc)
     m_ok = true;
 }
 
     m_ok = true;
 }
 

-void wxPrinterDC::Init()
+void wxPrinterDCImpl::Init()

 {
     if ( m_hDC )
     {
 {
     if ( m_hDC )
     {


@@ -174,10 +179,10 @@ void wxPrinterDC::Init()
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxPrinterDC {Start/End}{Page/Doc} methods
+// wxPrinterDCImpl {Start/End}{Page/Doc} methods

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-bool wxPrinterDC::StartDoc(const wxString& message)
+bool wxPrinterDCImpl::StartDoc(const wxString& message)

 {
     DOCINFO docinfo;
     docinfo.cbSize = sizeof(DOCINFO);
 {
     DOCINFO docinfo;
     docinfo.cbSize = sizeof(DOCINFO);


@@ -205,28 +210,28 @@ bool wxPrinterDC::StartDoc(const wxString& message)
     return true;
 }
 
     return true;
 }
 

-void wxPrinterDC::EndDoc()
+void wxPrinterDCImpl::EndDoc()

 {
     if (m_hDC) ::EndDoc((HDC) m_hDC);
 }
 
 {
     if (m_hDC) ::EndDoc((HDC) m_hDC);
 }
 

-void wxPrinterDC::StartPage()
+void wxPrinterDCImpl::StartPage()

 {
     if (m_hDC)
         ::StartPage((HDC) m_hDC);
 }
 
 {
     if (m_hDC)
         ::StartPage((HDC) m_hDC);
 }
 

-void wxPrinterDC::EndPage()
+void wxPrinterDCImpl::EndPage()

 {
     if (m_hDC)
         ::EndPage((HDC) m_hDC);
 }
 
 
 {
     if (m_hDC)
         ::EndPage((HDC) m_hDC);
 }
 
 

-wxRect wxPrinterDC::GetPaperRect()
+wxRect wxPrinterDCImpl::GetPaperRect() const

 
 {
 
 {

-    if (!Ok()) return wxRect(0, 0, 0, 0);
+    if (!IsOk()) return wxRect(0, 0, 0, 0);

     int w = ::GetDeviceCaps((HDC) m_hDC, PHYSICALWIDTH);
     int h = ::GetDeviceCaps((HDC) m_hDC, PHYSICALHEIGHT);
     int x = -::GetDeviceCaps((HDC) m_hDC, PHYSICALOFFSETX);
     int w = ::GetDeviceCaps((HDC) m_hDC, PHYSICALWIDTH);
     int h = ::GetDeviceCaps((HDC) m_hDC, PHYSICALHEIGHT);
     int x = -::GetDeviceCaps((HDC) m_hDC, PHYSICALOFFSETX);


@@ -322,23 +327,29 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
     }
 
 
     }
 
 

-    HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();
-
-    DEVMODE *lpDevMode = hDevMode ? (DEVMODE *)::GlobalLock(hDevMode) : NULL;
+    GlobalPtrLock lockDevMode;
+    const HGLOBAL devMode = data->GetDevMode();
+    if ( devMode )
+        lockDevMode.Init(devMode);

 
 

-    HDC hDC = ::CreateDC(NULL, deviceName.wx_str(), NULL, lpDevMode);
+    HDC hDC = ::CreateDC
+                (
+                    NULL,               // no driver name as we use device name
+                    deviceName.wx_str(),
+                    NULL,               // unused
+                    static_cast<DEVMODE *>(lockDevMode.Get())
+                );

     if ( !hDC )
     if ( !hDC )

-        wxLogLastError(_T("CreateDC(printer)"));
-
-    if ( lpDevMode )
-        ::GlobalUnlock(hDevMode);
+    {
+        wxLogLastError(wxT("CreateDC(printer)"));
+    }

 
     return (WXHDC) hDC;
 #endif // PostScript/Windows printing
 }
 
 // ----------------------------------------------------------------------------
 
     return (WXHDC) hDC;
 #endif // PostScript/Windows printing
 }
 
 // ----------------------------------------------------------------------------

-// wxPrinterDC bit blitting/bitmap drawing
+// wxPrinterDCImpl bit blitting/bitmap drawing

 // ----------------------------------------------------------------------------
 
 // helper of DoDrawBitmap() and DoBlit()
 // ----------------------------------------------------------------------------
 
 // helper of DoDrawBitmap() and DoBlit()


@@ -356,7 +367,7 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc,
     DIBSECTION ds;
     if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) )
     {
     DIBSECTION ds;
     if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) )
     {

-        wxLogLastError(_T("GetObject(DIBSECTION)"));
+        wxLogLastError(wxT("GetObject(DIBSECTION)"));

 
         return false;
     }
 
         return false;
     }


@@ -386,11 +397,11 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc,
 #endif
 }
 
 #endif
 }
 

-void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp,
+void wxPrinterDCImpl::DoDrawBitmap(const wxBitmap& bmp,

                                wxCoord x, wxCoord y,
                                bool useMask)
 {
                                wxCoord x, wxCoord y,
                                bool useMask)
 {

-    wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") );
+    wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") );

 
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();
 
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();


@@ -403,27 +414,32 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp,
 
         memDC.SelectObjectAsSource(bmp);
 
 
         memDC.SelectObjectAsSource(bmp);
 

-        Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
+        GetOwner()->Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);

 
         memDC.SelectObject(wxNullBitmap);
     }
 }
 
 
         memDC.SelectObject(wxNullBitmap);
     }
 }
 

-bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
+bool wxPrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,

                          wxCoord width, wxCoord height,
                          wxDC *source,
                          wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc),
                          wxCoord width, wxCoord height,
                          wxDC *source,
                          wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc),

-                         int WXUNUSED(rop), bool useMask,
+                         wxRasterOperationMode WXUNUSED(rop), bool useMask,

                          wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
 {
                          wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
 {

-    wxBitmap& bmp = source->GetSelectedBitmap();
+    wxDCImpl *impl = source->GetImpl();
+    wxMSWDCImpl *msw_impl = wxDynamicCast(impl, wxMSWDCImpl);
+    if (!msw_impl)
+        return false;
+
+    wxBitmap& bmp = msw_impl->GetSelectedBitmap();

     wxMask *mask = useMask ? bmp.GetMask() : NULL;
     if ( mask )
     {
         // If we are printing source colours are screen colours not printer
         // colours and so we need copy the bitmap pixel by pixel.
         RECT rect;
     wxMask *mask = useMask ? bmp.GetMask() : NULL;
     if ( mask )
     {
         // If we are printing source colours are screen colours not printer
         // colours and so we need copy the bitmap pixel by pixel.
         RECT rect;

-        HDC dcSrc = GetHdcOf(*source);
+        HDC dcSrc = GetHdcOf(*msw_impl);

         MemoryHDC dcMask(dcSrc);
         SelectInHDC selectMask(dcMask, (HBITMAP)mask->GetMaskBitmap());
 
         MemoryHDC dcMask(dcSrc);
         SelectInHDC selectMask(dcMask, (HBITMAP)mask->GetMaskBitmap());
 


@@ -454,7 +470,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
 
             // as we are printing, source colours are screen colours not
             // printer colours and so we need copy the bitmap pixel by pixel.
 
             // as we are printing, source colours are screen colours not
             // printer colours and so we need copy the bitmap pixel by pixel.

-            HDC dcSrc = GetHdcOf(*source);
+            HDC dcSrc = GetHdcOf(*msw_impl);

             RECT rect;
             for (int y = 0; y < height; y++)
             {
             RECT rect;
             for (int y = 0; y < height; y++)
             {