Allow OS X Cocoa (or any OS X port) to override GetBestSize and provide a native...

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index adc0e859306003c92040058fcd97d4d07870e52d..16402f760e61a4401a362fa783f122d4fcaa90cb 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


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

-#ifdef __GNUG__
-    #pragma implementation "dcprint.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,38 +24,50 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

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

     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"

+    #include "wx/math.h"

 #endif
 
 #endif
 

-#if wxUSE_PRINTING_ARCHITECTURE
-

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

-#include "wx/dcprint.h"
-#include "math.h"

 
 

-#if wxUSE_COMMON_DIALOGS
-    #include <commdlg.h>
+#if wxUSE_WXDIB
+    #include "wx/msw/dib.h"

 #endif
 
 #endif
 

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

 #ifndef __WIN32__
     #include <print.h>
 #endif
 
 // mingw32 defines GDI_ERROR incorrectly
 #ifndef __WIN32__
     #include <print.h>
 #endif
 
 // mingw32 defines GDI_ERROR incorrectly

-#ifdef __GNUWIN32__
+#if defined(__GNUWIN32__) || !defined(GDI_ERROR)

     #undef GDI_ERROR
     #define GDI_ERROR ((int)-1)
 #endif
 
     #undef GDI_ERROR
     #define GDI_ERROR ((int)-1)
 #endif
 

+#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
+    #define wxUSE_PS_PRINTING 1
+#else
+    #define wxUSE_PS_PRINTING 0
+#endif
+

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 

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

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


@@ -69,6 +77,7 @@ IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 // wxPrinterDC construction
 // ----------------------------------------------------------------------------
 
 // wxPrinterDC construction
 // ----------------------------------------------------------------------------
 

+#if 0

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


@@ -109,7 +118,10 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name,
     {
         if ( !driver_name.empty() && !device_name.empty() && !file.empty() )
         {
     {
         if ( !driver_name.empty() && !device_name.empty() && !file.empty() )
         {

-            m_hDC = (WXHDC) CreateDC(driver_name, device_name, file, NULL);
+            m_hDC = (WXHDC) CreateDC(driver_name.wx_str(),
+                                     device_name.wx_str(),
+                                     file.fn_str(),
+                                     NULL);

         }
         else // we don't have all parameters, ask the user
         {
         }
         else // we don't have all parameters, ask the user
         {


@@ -118,39 +130,42 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name,
             m_hDC = wxGetPrinterDC(printData);
         }
 
             m_hDC = wxGetPrinterDC(printData);
         }
 

-        m_ok = m_hDC ? TRUE: FALSE;
+        m_ok = m_hDC ? true: false;

 
         // as we created it, we must delete it as well
 
         // as we created it, we must delete it as well

-        m_bOwnsDC = TRUE;
+        m_bOwnsDC = true;

     }
 
     Init();
 }
     }
 
     Init();
 }

+#endif

 
 

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

 {
     m_printData = printData;
 
 {
     m_printData = printData;
 

-    m_isInteractive = FALSE;
+    m_isInteractive = false;

 
     m_hDC = wxGetPrinterDC(printData);
     m_ok = m_hDC != 0;
 
     m_hDC = wxGetPrinterDC(printData);
     m_ok = m_hDC != 0;

-    m_bOwnsDC = TRUE;
+    m_bOwnsDC = true;

 
     Init();
 }
 
 
 
     Init();
 }
 
 

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

 {
 {

-    m_isInteractive = FALSE;
+    m_isInteractive = false;

 
     m_hDC = dc;
 
     m_hDC = dc;

-    m_bOwnsDC = TRUE;
-    m_ok = TRUE;
+    m_bOwnsDC = true;
+    m_ok = true;

 }
 
 }
 

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

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


@@ -164,67 +179,75 @@ 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);

-    docinfo.lpszDocName = (const wxChar*)message;
+    docinfo.lpszDocName = message.wx_str();

 
     wxString filename(m_printData.GetFilename());
 
 
     wxString filename(m_printData.GetFilename());
 

-    if (filename.IsEmpty())
+    if (filename.empty())

         docinfo.lpszOutput = NULL;
     else
         docinfo.lpszOutput = NULL;
     else

-        docinfo.lpszOutput = (const wxChar *) filename;
+        docinfo.lpszOutput = filename.wx_str();

 
 

-#if defined(__WIN95__)

     docinfo.lpszDatatype = NULL;
     docinfo.fwType = 0;
     docinfo.lpszDatatype = NULL;
     docinfo.fwType = 0;

-#endif

 
     if (!m_hDC)
 
     if (!m_hDC)

-        return FALSE;
-
-    int ret = ::StartDoc(GetHdc(), &docinfo);
+        return false;

 
 

-#ifndef __WIN16__
-    if (ret <= 0)
+    if ( ::StartDoc(GetHdc(), &docinfo) <= 0 )

     {
     {

-        DWORD lastError = GetLastError();
-        wxLogDebug(wxT("wxDC::StartDoc failed with error: %ld\n"), lastError);
+        wxLogLastError(wxT("StartDoc"));
+        return false;

     }
     }

-#endif

 
 

-    return (ret > 0);
+    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 wxPrinterDCImpl::GetPaperRect() const
+
+{
+    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 y = -::GetDeviceCaps((HDC) m_hDC, PHYSICALOFFSETY);
+    return wxRect(x, y, w, h);
+}
+
+
+#if !wxUSE_PS_PRINTING
+

 // Returns default device and port names
 static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
 {
     deviceName.clear();
 
     LPDEVNAMES  lpDevNames;
 // Returns default device and port names
 static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
 {
     deviceName.clear();
 
     LPDEVNAMES  lpDevNames;

-    LPTSTR      lpszDriverName;

     LPTSTR      lpszDeviceName;
     LPTSTR      lpszPortName;
 
     LPTSTR      lpszDeviceName;
     LPTSTR      lpszPortName;
 


@@ -252,13 +275,12 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
         if (pd.hDevNames)
             GlobalFree(pd.hDevNames);
 
         if (pd.hDevNames)
             GlobalFree(pd.hDevNames);
 

-        return FALSE;
+        return false;

     }
 
     if (pd.hDevNames)
     {
         lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames);
     }
 
     if (pd.hDevNames)
     {
         lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames);

-        lpszDriverName = (LPTSTR)lpDevNames + lpDevNames->wDriverOffset;

         lpszDeviceName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
         lpszPortName   = (LPTSTR)lpDevNames + lpDevNames->wOutputOffset;
 
         lpszDeviceName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
         lpszPortName   = (LPTSTR)lpDevNames + lpDevNames->wOutputOffset;
 


@@ -275,272 +297,160 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }

-    return ( deviceName != wxT("") );
+    return ( !deviceName.empty() );

 }
 
 }
 

-#if 0
-// This uses defaults, except for orientation, so we should eliminate this function
-// and use the 2nd form (passing wxPrintData) instead.
-WXHDC wxGetPrinterDC(int orientation)
-{
-    HDC         hDC;
-    LPDEVMODE   lpDevMode = NULL;
-    LPDEVNAMES  lpDevNames;
-    LPSTR       lpszDriverName;
-    LPSTR       lpszDeviceName;
-    LPSTR       lpszPortName;
+#endif // !wxUSE_PS_PRINTING

 
 

-    PRINTDLG    pd;
-    // __GNUWIN32__ has trouble believing PRINTDLG is 66 bytes - thinks it is 68
-#ifdef __GNUWIN32__
-    pd.lStructSize    = 66; // sizeof(PRINTDLG);
-#else
-    pd.lStructSize    = sizeof(PRINTDLG);
-#endif
-    pd.hwndOwner      = (HWND)NULL;
-    pd.hDevMode       = NULL; // Will be created by PrintDlg
-    pd.hDevNames      = NULL; // Ditto
-    pd.Flags          = PD_RETURNDEFAULT;
-    pd.nCopies        = 1;
-
-    if (!PrintDlg((LPPRINTDLG)&pd))
+// Gets an HDC for the specified printer configuration
+WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
+{
+#if wxUSE_PS_PRINTING
+    // TODO
+    wxUnusedVar(printDataConst);
+    return 0;
+#else // native Windows printing
+    wxWindowsPrintNativeData *data =
+        (wxWindowsPrintNativeData *) printDataConst.GetNativeData();
+
+    data->TransferFrom( printDataConst );
+
+    wxString deviceName = printDataConst.GetPrinterName();
+    if ( deviceName.empty() )

     {
     {

-        if ( pd.hDevMode )
-            GlobalFree(pd.hDevMode);
-        if (pd.hDevNames)
-            GlobalFree(pd.hDevNames);
-
-        return(0);
+        // Retrieve the default device name
+        wxString portName;
+        if ( !wxGetDefaultDeviceName(deviceName, portName) )
+        {
+            return 0; // Could not get default device name
+        }

     }
 
     }
 

-    if (!pd.hDevNames)
-    {
-        if ( pd.hDevMode )
-            GlobalFree(pd.hDevMode);
-    }

 
 

-    lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames);
-    lpszDriverName = (LPSTR)lpDevNames + lpDevNames->wDriverOffset;
-    lpszDeviceName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
-    lpszPortName   = (LPSTR)lpDevNames + lpDevNames->wOutputOffset;
-    GlobalUnlock(pd.hDevNames);
+    GlobalPtrLock lockDevMode;
+    const HGLOBAL devMode = data->GetDevMode();
+    if ( devMode )
+        lockDevMode.Init(devMode);

 
 

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

     {
     {

-        lpDevMode = (DEVMODE*) GlobalLock(pd.hDevMode);
-        lpDevMode->dmOrientation = orientation;
-        lpDevMode->dmFields |= DM_ORIENTATION;
+        wxLogLastError(wxT("CreateDC(printer)"));

     }
 
     }
 

-#ifdef __WIN32__
-    hDC = CreateDC(lpszDriverName, lpszDeviceName, lpszPortName, (DEVMODE *)lpDevMode);
-#else
-    hDC = CreateDC(lpszDriverName, lpszDeviceName, lpszPortName, (LPSTR)lpDevMode);
-#endif
-
-    if (pd.hDevMode && lpDevMode)
-        GlobalUnlock(pd.hDevMode);
-
-    if (pd.hDevNames)
-    {
-        GlobalFree(pd.hDevNames);
-        pd.hDevNames=NULL;
-    }
-    if (pd.hDevMode)
-    {
-        GlobalFree(pd.hDevMode);
-        pd.hDevMode=NULL;
-    }

     return (WXHDC) hDC;
     return (WXHDC) hDC;

+#endif // PostScript/Windows printing

 }
 }

-#endif // 0

 
 

-// Gets an HDC for the specified printer configuration
-WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
-{
-    wxPrintData printData = printDataConst;
-    printData.ConvertToNative();
-
-    wxChar* driverName = (wxChar*) NULL;
-
-    wxString devNameStr = printData.GetPrinterName();
-    wxChar* portName = (wxChar*) NULL; // Obsolete in WIN32
-
-    const wxChar* deviceName;
-    if ( !devNameStr )
-        deviceName = (wxChar*) NULL;
-    else
-        deviceName = devNameStr.c_str();
-
-    LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
+// ----------------------------------------------------------------------------
+// wxPrinterDCImpl bit blitting/bitmap drawing
+// ----------------------------------------------------------------------------

 
 

-    HGLOBAL hDevMode = (HGLOBAL)(DWORD) printData.GetNativeData();
+// helper of DoDrawBitmap() and DoBlit()
+static
+bool DrawBitmapUsingStretchDIBits(HDC hdc,
+                                  const wxBitmap& bmp,
+                                  wxCoord x, wxCoord y)
+{
+#if wxUSE_WXDIB
+    wxDIB dib(bmp);
+    bool ok = dib.IsOk();
+    if ( !ok )
+        return false;
+
+    DIBSECTION ds;
+    if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) )
+    {
+        wxLogLastError(wxT("GetObject(DIBSECTION)"));

 
 

-    if ( hDevMode )
-        lpDevMode = (DEVMODE*) GlobalLock(hDevMode);
+        return false;
+    }

 
 

-    if ( !devNameStr )
+    // ok, we've got all data we need, do blit it
+    if ( ::StretchDIBits
+            (
+                hdc,
+                x, y,
+                ds.dsBmih.biWidth, ds.dsBmih.biHeight,
+                0, 0,
+                ds.dsBmih.biWidth, ds.dsBmih.biHeight,
+                ds.dsBm.bmBits,
+                (LPBITMAPINFO)&ds.dsBmih,
+                DIB_RGB_COLORS,
+                SRCCOPY
+            ) == GDI_ERROR )

     {
     {

-        // Retrieve the default device name
-        wxString portName;
-#ifdef  __WXDEBUG__
-        bool ret =
-#else   // !Debug
-        (void)
-#endif // Debug/Release
-        wxGetDefaultDeviceName(devNameStr, portName);
+        wxLogLastError(wxT("StretchDIBits"));

 
 

-        wxASSERT_MSG( ret, wxT("Could not get default device name.") );
-
-        deviceName = devNameStr.c_str();
+        return false;

     }
 
     }
 

-#ifdef __WIN32__
-    HDC hDC = CreateDC(driverName, deviceName, portName, (DEVMODE *) lpDevMode);
+    return true;

 #else
 #else

-    HDC hDC = CreateDC(driverName, deviceName, portName, (LPSTR) lpDevMode);
+    return false;

 #endif
 #endif

-
-    if (hDevMode && lpDevMode)
-        GlobalUnlock(hDevMode);
-
-    return (WXHDC) hDC;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxPrinterDC bit blitting/bitmap drawing
-// ----------------------------------------------------------------------------
-
-// Win16 doesn't define GDI_ERROR.
-#ifndef GDI_ERROR
-#define GDI_ERROR -1
-#endif
-
-// Just in case we want to go back to using 8 bits for
-// any reason: set this to 0 for 8 bits.
-#define wxUSE_DRAWBITMAP_24BITS 1
-
-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.Ok(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") );

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

-    if ( ::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB )
-    {
-#if wxUSE_DIB_FOR_BITMAP
-        if ( bmp.IsDIB() )
-        {
-            DIBSECTION dib;
-            if ( ::GetObject(GetHbitmapOf(bmp),
-                             sizeof(dib),
-                             &dib) == sizeof(dib) )
-            {
-                 if ( ::StretchDIBits
-                        (
-                            GetHdc(),
-                            x, y,
-                            width, height,
-                            0, 0,
-                            width, height,
-                            dib.dsBm.bmBits,
-                            (LPBITMAPINFO)&dib.dsBmih,
-                            DIB_RGB_COLORS,
-                            SRCCOPY
-                        ) == GDI_ERROR )
-                 {
-                    wxLogLastError(wxT("StretchDIBits"));
-                 }
-            }
-            else
-            {
-                wxLogLastError(wxT("GetObject"));
-            }
-        }
-        else
-#endif // wxUSE_DIB_FOR_BITMAP
-        {
-            BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) );
-            memset( info, 0, sizeof( BITMAPINFOHEADER ) );
-
-#if wxUSE_DRAWBITMAP_24BITS
-            int iBitsSize = (((width * 3) + 3 ) & ~3 ) * height;
-#else
-            int iBitsSize = ((width + 3 ) & ~3 ) * height ;
-#endif
-
-            void* bits = malloc( iBitsSize );
-
-            info->bmiHeader.biSize = sizeof( BITMAPINFOHEADER );
-            info->bmiHeader.biWidth = width;
-            info->bmiHeader.biHeight = height;
-            info->bmiHeader.biPlanes = 1;
-#if wxUSE_DRAWBITMAP_24BITS
-            info->bmiHeader.biBitCount = 24;
-#else
-            info->bmiHeader.biBitCount = 8;
-#endif
-            info->bmiHeader.biCompression = BI_RGB;
-
-            ScreenHDC display;
-            if ( GetDIBits(display, GetHbitmapOf(bmp), 0,
-                        bmp.GetHeight(), bits, info,
-                        DIB_RGB_COLORS) )
-            {
-                if ( ::StretchDIBits(GetHdc(), x, y,
-                            width, height,
-                            0 , 0, width, height,
-                            bits, info,
-                            DIB_RGB_COLORS, SRCCOPY) == GDI_ERROR )
-                {
-                    wxLogLastError(wxT("StretchDIBits"));
-                }
-            }
-
-            free(bits);
-            free(info);
-        }
-    }
-    else // no support for StretchDIBits()
+    if ( !(::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB) ||
+            !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, x, y) )

     {
     {

+        // no support for StretchDIBits() or an error occurred if we got here

         wxMemoryDC memDC;
         wxMemoryDC memDC;

-        memDC.SelectObject(bmp);

 
 

-        Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
+        memDC.SelectObjectAsSource(bmp);
+
+        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 width, wxCoord height,
                          wxDC *source,

-                         wxCoord xsrc, wxCoord ysrc,
-                         int WXUNUSED(rop), bool useMask,
+                         wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc),
+                         wxRasterOperationMode WXUNUSED(rop), bool useMask,

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

-    bool success = TRUE;
-
-    if ( useMask )
+    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;
     {
         // 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 dc_src = GetHdcOf(*source);
-        HDC dc_mask = ::CreateCompatibleDC(dc_src);
+        HDC dcSrc = GetHdcOf(*msw_impl);
+        MemoryHDC dcMask(dcSrc);
+        SelectInHDC selectMask(dcMask, (HBITMAP)mask->GetMaskBitmap());

 
 

-        ::SelectObject(dc_mask, (HBITMAP) source->GetSelectedBitmap().GetMask()->GetMaskBitmap());

         for (int x = 0; x < width; x++)
         {
             for (int y = 0; y < height; y++)
             {
         for (int x = 0; x < width; x++)
         {
             for (int y = 0; y < height; y++)
             {

-                COLORREF cref = ::GetPixel(dc_mask, x, y);
+                COLORREF cref = ::GetPixel(dcMask, x, y);

                 if (cref)
                 {
                 if (cref)
                 {

-                    HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
+                    HBRUSH brush = ::CreateSolidBrush(::GetPixel(dcSrc, x, y));

                     rect.left = xdest + x;
                     rect.right = rect.left + 1;
                     rect.top = ydest + y;
                     rect.left = xdest + x;
                     rect.right = rect.left + 1;
                     rect.top = ydest + y;


@@ -550,115 +460,30 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
                 }
             }
         }
                 }
             }
         }

-        ::SelectObject(dc_mask, 0);
-        ::DeleteDC(dc_mask);

     }
     else // no mask
     {
     }
     else // no mask
     {

-        if ( ::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB )
+        if ( !(::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB) ||
+                !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, xdest, ydest) )

         {
         {

-            wxBitmap& bmp = source->GetSelectedBitmap();
-            int width = bmp.GetWidth(),
-                height = bmp.GetHeight();
-#if wxUSE_DIB_FOR_BITMAP
-            if ( bmp.IsDIB() )
-            {
-                DIBSECTION dib;
-                if( ::GetObject(GetHbitmapOf(bmp),
-                                sizeof(dib),
-                                &dib) == sizeof(dib) )
-                {
-                     if ( ::StretchDIBits
-                            (
-                                GetHdc(),
-                                xdest, ydest,
-                                width, height,
-                                xsrc, ysrc,
-                                width, height,
-                                dib.dsBm.bmBits,
-                                (LPBITMAPINFO)&dib.dsBmih,
-                                DIB_RGB_COLORS,
-                                SRCCOPY
-                            ) == GDI_ERROR )
-                     {
-                        wxLogLastError(wxT("StretchDIBits"));
-                     }
-                }
-                else
-                {
-                    wxLogLastError(wxT("GetObject"));
-                }
-            }
-            else
-#endif // wxUSE_DIB_FOR_BITMAP
-            {
-                BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) );
-#if wxUSE_DRAWBITMAP_24BITS
-                int iBitsSize = (((width * 3) + 3 ) & ~3 ) * height;
-#else
-                int iBitsSize = ((width + 3 ) & ~3 ) * height ;
-#endif
-
-                void* bits = malloc( iBitsSize );
-
-                memset( info , 0 , sizeof( BITMAPINFOHEADER ) );
-
-                info->bmiHeader.biSize = sizeof( BITMAPINFOHEADER );
-                info->bmiHeader.biWidth = width;
-                info->bmiHeader.biHeight = height;
-                info->bmiHeader.biPlanes = 1;
-#if wxUSE_DRAWBITMAP_24BITS
-                info->bmiHeader.biBitCount = 24;
-#else
-                info->bmiHeader.biBitCount = 8;
-#endif
-                info->bmiHeader.biCompression = BI_RGB;
-
-                ScreenHDC display;
-                if ( !::GetDIBits(display, GetHbitmapOf(bmp), 0,
-                            height, bits, info, DIB_RGB_COLORS) )
-                {
-                    wxLogLastError(wxT("GetDIBits"));
-
-                    success = FALSE;
-                }
+            // no support for StretchDIBits

 
 

-                if ( success )
-                {
-                    success = ::StretchDIBits(GetHdc(), xdest, ydest,
-                            width, height,
-                            xsrc, ysrc,
-                            width, height,
-                            bits, info ,
-                            DIB_RGB_COLORS,
-                            SRCCOPY) != GDI_ERROR;
-                    if ( !success )
-                    {
-                        wxLogLastError(wxT("StretchDIBits"));
-                    }
-                }
-
-                free(bits);
-                free(info);
-            }
-        }
-        else // no support for StretchDIBits
-        {

             // 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 dc_src = GetHdcOf(*source);
+            HDC dcSrc = GetHdcOf(*msw_impl);

             RECT rect;
             for (int y = 0; y < height; y++)
             {
                 // optimization: draw identical adjacent pixels together.
                 for (int x = 0; x < width; x++)
                 {
             RECT rect;
             for (int y = 0; y < height; y++)
             {
                 // optimization: draw identical adjacent pixels together.
                 for (int x = 0; x < width; x++)
                 {

-                    COLORREF col = ::GetPixel(dc_src, x, y);
+                    COLORREF col = ::GetPixel(dcSrc, x, y);

                     HBRUSH brush = ::CreateSolidBrush( col );
 
                     rect.left = xdest + x;
                     rect.top = ydest + y;
                     HBRUSH brush = ::CreateSolidBrush( col );
 
                     rect.left = xdest + x;
                     rect.top = ydest + y;

-                    while( (x + 1 < width) && (::GetPixel(dc_src, x + 1, y) == col ) )
+                    while( (x + 1 < width) &&
+                                (::GetPixel(dcSrc, x + 1, y) == col ) )

                     {
                         ++x;
                     }
                     {
                         ++x;
                     }


@@ -671,7 +496,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
         }
     }
 
         }
     }
 

-    return success;
+    return true;

 }
 
 #endif
 }
 
 #endif