Filter index wasn't being set for multiple file dialog

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 1fabf5e6df8690aeb30721b063ee5c9c0575acda..53542de5ea305ad0c257f2203b31f4ecaab0601c 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,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dcprint.h"
 #endif
 
     #pragma implementation "dcprint.h"
 #endif
 


@@ -35,11 +35,18 @@
     #include "wx/dcmemory.h"
 #endif
 
     #include "wx/dcmemory.h"
 #endif
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

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

+
+#if wxUSE_WXDIB
+#include "wx/msw/dib.h"
+#endif
+

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

-#if wxUSE_COMMON_DIALOGS || defined(__WXWINE__)
+#if wxUSE_COMMON_DIALOGS

     #include <commdlg.h>
 #endif
 
     #include <commdlg.h>
 #endif
 


@@ -48,7 +55,7 @@
 #endif
 
 // mingw32 defines GDI_ERROR incorrectly
 #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


@@ -68,68 +75,61 @@ IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 // ----------------------------------------------------------------------------
 
 // This form is deprecated
 // ----------------------------------------------------------------------------
 
 // This form is deprecated

-wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_name, const wxString& file, bool interactive, int orientation)
+wxPrinterDC::wxPrinterDC(const wxString& driver_name,
+                         const wxString& device_name,
+                         const wxString& file,
+                         bool interactive,
+                         int orientation)

 {
     m_isInteractive = interactive;
 
 {
     m_isInteractive = interactive;
 

-    if ( !!file )
+    if ( !file.empty() )

         m_printData.SetFilename(file);
 
 #if wxUSE_COMMON_DIALOGS
         m_printData.SetFilename(file);
 
 #if wxUSE_COMMON_DIALOGS

-    if (interactive)
+    if ( interactive )

     {
         PRINTDLG pd;
 
         pd.lStructSize = sizeof( PRINTDLG );
     {
         PRINTDLG pd;
 
         pd.lStructSize = sizeof( PRINTDLG );

-        pd.hwndOwner=(HWND) NULL;
-        pd.hDevMode=(HANDLE)NULL;
-        pd.hDevNames=(HANDLE)NULL;
-        pd.Flags=PD_RETURNDC | PD_NOSELECTION | PD_NOPAGENUMS;
-        pd.nFromPage=0;
-        pd.nToPage=0;
-        pd.nMinPage=0;
-        pd.nMaxPage=0;
-        pd.nCopies=1;
-        pd.hInstance=(HINSTANCE)NULL;
-
-        if ( PrintDlg( &pd ) != 0 )
+        pd.hwndOwner = (HWND) NULL;
+        pd.hDevMode = (HANDLE)NULL;
+        pd.hDevNames = (HANDLE)NULL;
+        pd.Flags = PD_RETURNDC | PD_NOSELECTION | PD_NOPAGENUMS;
+        pd.nFromPage = 0;
+        pd.nToPage = 0;
+        pd.nMinPage = 0;
+        pd.nMaxPage = 0;
+        pd.nCopies = 1;
+        pd.hInstance = (HINSTANCE)NULL;
+
+        m_ok = PrintDlg( &pd ) != 0;
+        if ( m_ok )

         {
             m_hDC = (WXHDC) pd.hDC;
         {
             m_hDC = (WXHDC) pd.hDC;

-            m_ok = TRUE;
-        }
-        else
-        {
-            m_ok = FALSE;
-            return;

         }
         }

-
-        //     m_dontDelete = TRUE;

     }
     else
 #endif // wxUSE_COMMON_DIALOGS
     }
     else
 #endif // wxUSE_COMMON_DIALOGS

-        if ((!driver_name.IsNull() && driver_name != wxT("")) &&
-            (!device_name.IsNull() && device_name != wxT("")) &&
-            (!file.IsNull() && file != wxT("")))
+    {
+        if ( !driver_name.empty() && !device_name.empty() && !file.empty() )

         {
         {

-            m_hDC = (WXHDC) CreateDC(WXSTRINGCAST driver_name, WXSTRINGCAST device_name, WXSTRINGCAST file, NULL);
-            m_ok = m_hDC ? TRUE: FALSE;
+            m_hDC = (WXHDC) CreateDC(driver_name, device_name, file, NULL);

         }
         }

-        else
+        else // we don't have all parameters, ask the user

         {
             wxPrintData printData;
             printData.SetOrientation(orientation);
             m_hDC = wxGetPrinterDC(printData);
         {
             wxPrintData printData;
             printData.SetOrientation(orientation);
             m_hDC = wxGetPrinterDC(printData);

-            m_ok = m_hDC ? TRUE: FALSE;

         }
 
         }
 

-        if (m_hDC)
-        {
-            //     int width = GetDeviceCaps(m_hDC, VERTRES);
-            //     int height = GetDeviceCaps(m_hDC, HORZRES);
-            SetMapMode(wxMM_TEXT);
-        }
-        SetBrush(*wxBLACK_BRUSH);
-        SetPen(*wxBLACK_PEN);
+        m_ok = m_hDC ? TRUE: FALSE;
+
+        // as we created it, we must delete it as well
+        m_bOwnsDC = TRUE;
+    }
+
+    Init();

 }
 
 wxPrinterDC::wxPrinterDC(const wxPrintData& printData)
 }
 
 wxPrinterDC::wxPrinterDC(const wxPrintData& printData)


@@ -139,34 +139,33 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printData)
     m_isInteractive = FALSE;
 
     m_hDC = wxGetPrinterDC(printData);
     m_isInteractive = FALSE;
 
     m_hDC = wxGetPrinterDC(printData);

-    m_ok = (m_hDC != 0);
+    m_ok = m_hDC != 0;
+    m_bOwnsDC = TRUE;

 
 

-    if (m_hDC)
-        SetMapMode(wxMM_TEXT);
-
-    SetBrush(*wxBLACK_BRUSH);
-    SetPen(*wxBLACK_PEN);
+    Init();

 }
 
 
 }
 
 

-wxPrinterDC::wxPrinterDC(WXHDC theDC)
+wxPrinterDC::wxPrinterDC(WXHDC dc)

 {
     m_isInteractive = FALSE;
 
 {
     m_isInteractive = FALSE;
 

-    m_hDC = theDC;
+    m_hDC = dc;
+    m_bOwnsDC = TRUE;

     m_ok = TRUE;
     m_ok = TRUE;

-    if (m_hDC)
+}
+
+void wxPrinterDC::Init()
+{
+    if ( m_hDC )

     {
         //     int width = GetDeviceCaps(m_hDC, VERTRES);
         //     int height = GetDeviceCaps(m_hDC, HORZRES);
         SetMapMode(wxMM_TEXT);
     {
         //     int width = GetDeviceCaps(m_hDC, VERTRES);
         //     int height = GetDeviceCaps(m_hDC, HORZRES);
         SetMapMode(wxMM_TEXT);

-    }
-    SetBrush(*wxBLACK_BRUSH);
-    SetPen(*wxBLACK_PEN);
-}

 
 

-wxPrinterDC::~wxPrinterDC()
-{
+        SetBrush(*wxBLACK_BRUSH);
+        SetPen(*wxBLACK_PEN);
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -200,7 +199,7 @@ bool wxPrinterDC::StartDoc(const wxString& message)
     if (ret <= 0)
     {
         DWORD lastError = GetLastError();
     if (ret <= 0)
     {
         DWORD lastError = GetLastError();

-        wxLogDebug(wxT("wxDC::StartDoc failed with error: %d\n"), lastError);
+        wxLogDebug(wxT("wxDC::StartDoc failed with error: %ld\n"), lastError);

     }
 #endif
 
     }
 #endif
 


@@ -227,19 +226,20 @@ void wxPrinterDC::EndPage()
 // Returns default device and port names
 static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
 {
 // Returns default device and port names
 static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
 {

-    deviceName = "";
+    deviceName.clear();

 
     LPDEVNAMES  lpDevNames;
 
     LPDEVNAMES  lpDevNames;

-    LPSTR       lpszDriverName;
-    LPSTR       lpszDeviceName;
-    LPSTR       lpszPortName;
+    LPTSTR      lpszDeviceName;
+    LPTSTR      lpszPortName;

 
     PRINTDLG    pd;
 
     // Cygwin has trouble believing PRINTDLG is 66 bytes - thinks it is 68
 #ifdef __GNUWIN32__
 
     PRINTDLG    pd;
 
     // Cygwin has trouble believing PRINTDLG is 66 bytes - thinks it is 68
 #ifdef __GNUWIN32__

+    memset(&pd, 0, 66);

     pd.lStructSize    = 66; // sizeof(PRINTDLG);
 #else
     pd.lStructSize    = 66; // sizeof(PRINTDLG);
 #else

+    memset(&pd, 0, sizeof(PRINTDLG));

     pd.lStructSize    = sizeof(PRINTDLG);
 #endif
 
     pd.lStructSize    = sizeof(PRINTDLG);
 #endif
 


@@ -262,9 +262,8 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
     if (pd.hDevNames)
     {
         lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames);
     if (pd.hDevNames)
     {
         lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames);

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

 
         deviceName = lpszDeviceName;
         portName = lpszPortName;
 
         deviceName = lpszDeviceName;
         portName = lpszPortName;


@@ -279,86 +278,9 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }

-    return ( deviceName != wxT("") );
+    return ( deviceName != wxEmptyString );

 }
 
 }
 

-#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;
-
-    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))
-    {
-        if ( pd.hDevMode )
-            GlobalFree(pd.hDevMode);
-        if (pd.hDevNames)
-            GlobalFree(pd.hDevNames);
-
-        return(0);
-    }
-
-    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);
-
-    if ( pd.hDevMode )
-    {
-        lpDevMode = (DEVMODE*) GlobalLock(pd.hDevMode);
-        lpDevMode->dmOrientation = orientation;
-        lpDevMode->dmFields |= DM_ORIENTATION;
-    }
-
-#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;
-}
-#endif
-

 // Gets an HDC for the specified printer configuration
 WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 {
 // Gets an HDC for the specified printer configuration
 WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 {


@@ -387,15 +309,10 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
     {
         // Retrieve the default device name
         wxString portName;
     {
         // Retrieve the default device name
         wxString portName;

-#ifdef  __WXDEBUG__
-        bool ret =
-#else   // !Debug
-        (void)
-#endif // Debug/Release
-        wxGetDefaultDeviceName(devNameStr, portName);
-
-        wxASSERT_MSG( ret, wxT("Could not get default device name.") );
-
+        if ( !wxGetDefaultDeviceName(devNameStr, portName) )
+        {
+            return 0; // Could not get default device name
+        }

         deviceName = devNameStr.c_str();
     }
 
         deviceName = devNameStr.c_str();
     }
 


@@ -415,51 +332,64 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 // wxPrinterDC bit blitting/bitmap drawing
 // ----------------------------------------------------------------------------
 
 // wxPrinterDC bit blitting/bitmap drawing
 // ----------------------------------------------------------------------------
 

-void wxPrinterDC::DoDrawBitmap(const wxBitmap &bmp,
-                               wxCoord x, wxCoord y,
-                               bool useMask)
+// helper of DoDrawBitmap() and DoBlit()
+static
+bool DrawBitmapUsingStretchDIBits(HDC hdc,
+                                  const wxBitmap& bmp,
+                                  wxCoord x, wxCoord y)

 {
 {

-    wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") );
+#if wxUSE_WXDIB
+    wxDIB dib(bmp);
+    bool ok = dib.IsOk();
+    if ( !ok )
+        return FALSE;

 
 

-    int width = bmp.GetWidth(),
-        height = bmp.GetHeight();
+    DIBSECTION ds;
+    if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) )
+    {
+        wxLogLastError(_T("GetObject(DIBSECTION)"));
+
+        return FALSE;
+    }

 
 

-    if ( ::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB )
+    // 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 )

     {
     {

-        BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) );
-        memset( info, 0, sizeof( BITMAPINFOHEADER ) );
+        wxLogLastError(wxT("StretchDIBits"));

 
 

-        int iBitsSize = ((width + 3 ) & ~3 ) * height;
+        return FALSE;
+    }

 
 

-        void* bits = malloc( iBitsSize );
+    return TRUE;
+#else
+    return FALSE;
+#endif
+}

 
 

-        info->bmiHeader.biSize = sizeof( BITMAPINFOHEADER );
-        info->bmiHeader.biWidth = width;
-        info->bmiHeader.biHeight = height;
-        info->bmiHeader.biPlanes = 1;
-        info->bmiHeader.biBitCount = 8;
-        info->bmiHeader.biCompression = BI_RGB;
+void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp,
+                               wxCoord x, wxCoord y,
+                               bool useMask)
+{
+    wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") );

 
 

-        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("StretchDIBits");
-            }
-        }
+    int width = bmp.GetWidth(),
+        height = bmp.GetHeight();

 
 

-        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 occured if we got here

         wxMemoryDC memDC;
         memDC.SelectObject(bmp);
 
         wxMemoryDC memDC;
         memDC.SelectObject(bmp);
 


@@ -472,108 +402,62 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap &bmp,
 bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,
                          wxDC *source,
 bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,
                          wxDC *source,

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

 {
 {

-    bool success = TRUE;
-
-    if ( useMask )
+    wxBitmap& bmp = source->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.
+        // If we are printing source colours are screen colours not printer
+        // colours and so we need copy the bitmap pixel by pixel.

         RECT rect;
         RECT rect;

-        HDC dc_src = GetHdcOf(*source);
-        HDC dc_mask = ::CreateCompatibleDC(dc_src);
+        HDC dcSrc = GetHdcOf(*source);
+        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.left = xdest + x;
                     rect.right = rect.left + 1;

-                    rect.top = ydest + y; 
+                    rect.top = ydest + y;

                     rect.bottom = rect.top + 1;
                     ::FillRect(GetHdc(), &rect, brush);
                     ::DeleteObject(brush);
                 }
             }
         }
                     rect.bottom = rect.top + 1;
                     ::FillRect(GetHdc(), &rect, brush);
                     ::DeleteObject(brush);
                 }
             }
         }

-        ::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();
-
-            BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) );
-            int iBitsSize = ((width + 3 ) & ~3 ) * height;
+            // no support for StretchDIBits

 
 

-            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;
-            info->bmiHeader.biBitCount = 8;
-            info->bmiHeader.biCompression = BI_RGB;
-
-            ScreenHDC display;
-            if ( !::GetDIBits(display, GetHbitmapOf(bmp), 0,
-                              height, bits, info, DIB_RGB_COLORS) )
-            {
-                wxLogLastError("GetDIBits");
-
-                success = FALSE;
-            }
-
-            if ( success )
-            {
-                success = ::StretchDIBits(GetHdc(), xdest, ydest,
-                                          width, height,
-                                          xsrc, ysrc,
-                                          width, height,
-                                          bits, info ,
-                                          DIB_RGB_COLORS,
-                                          SRCCOPY) != GDI_ERROR;
-                if ( !success )
-                {
-                    wxLogLastError("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.
-            HDC dc_src = GetHdcOf(*source);
+            // 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);

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

-                // This is Stefan Csomor's optimisation, where identical adjacent
-                // pixels are drawn together.
+                // optimization: draw identical adjacent pixels together.

                 for (int x = 0; x < width; x++)
                 {
                 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;
                     }


@@ -586,5 +470,8 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
         }
     }
 
         }
     }
 

-    return success;
+    return TRUE;

 }
 }

+
+#endif
+    // wxUSE_PRINTING_ARCHITECTURE