fixed typo in library name

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index b49d678fb8184e459282e24744d95715916c9828..adc0e859306003c92040058fcd97d4d07870e52d 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -35,11 +35,13 @@
     #include "wx/dcmemory.h"
 #endif
 
     #include "wx/dcmemory.h"
 #endif
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #include "wx/msw/private.h"
 #include "wx/dcprint.h"
 #include "math.h"
 
 #include "wx/msw/private.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
 


@@ -47,9 +49,16 @@
     #include <print.h>
 #endif
 
     #include <print.h>
 #endif
 

+// mingw32 defines GDI_ERROR incorrectly
+#ifdef __GNUWIN32__
+    #undef GDI_ERROR
+    #define GDI_ERROR ((int)-1)
+#endif
+

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

+

 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 
 // ============================================================================
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 
 // ============================================================================


@@ -61,68 +70,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)


@@ -132,34 +134,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);
+    }

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


@@ -193,7 +194,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
 


@@ -220,19 +221,21 @@ 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      lpszDriverName;
+    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
 


@@ -255,9 +258,9 @@ 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;
+        lpszDriverName = (LPTSTR)lpDevNames + lpDevNames->wDriverOffset;
+        lpszDeviceName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
+        lpszPortName   = (LPTSTR)lpDevNames + lpDevNames->wOutputOffset;

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


@@ -350,7 +353,7 @@ WXHDC wxGetPrinterDC(int orientation)
     }
     return (WXHDC) hDC;
 }
     }
     return (WXHDC) hDC;
 }

-#endif
+#endif // 0

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


@@ -408,6 +411,15 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 // wxPrinterDC bit blitting/bitmap drawing
 // ----------------------------------------------------------------------------
 
 // 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,
                                wxCoord x, wxCoord y,
                                bool useMask)
 void wxPrinterDC::DoDrawBitmap(const wxBitmap &bmp,
                                wxCoord x, wxCoord y,
                                bool useMask)


@@ -419,37 +431,78 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap &bmp,
 
     if ( ::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB )
     {
 
     if ( ::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB )
     {

-        BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) );
-        memset( info, 0, sizeof( BITMAPINFOHEADER ) );
+#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 ) );

 
 

-        int iBitsSize = ((width + 3 ) & ~3 ) * height;
+#if wxUSE_DRAWBITMAP_24BITS
+            int iBitsSize = (((width * 3) + 3 ) & ~3 ) * height;
+#else
+            int iBitsSize = ((width + 3 ) & ~3 ) * height ;
+#endif

 
 

-        void* bits = malloc( iBitsSize );
+            void* bits = malloc( iBitsSize );

 
 

-        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;
+            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 )
+            ScreenHDC display;
+            if ( GetDIBits(display, GetHbitmapOf(bmp), 0,
+                        bmp.GetHeight(), bits, info,
+                        DIB_RGB_COLORS) )

             {
             {

-                wxLogLastError("StretchDIBits");
+                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);
+            free(bits);
+            free(info);
+        }

     }
     else // no support for StretchDIBits()
     {
     }
     else // no support for StretchDIBits()
     {


@@ -466,15 +519,15 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,
                          wxDC *source,
                          wxCoord xsrc, wxCoord ysrc,
                          wxCoord width, wxCoord height,
                          wxDC *source,
                          wxCoord xsrc, wxCoord ysrc,

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

 {
     bool success = TRUE;
 
     if ( useMask )
     {
 {
     bool success = TRUE;
 
     if ( useMask )
     {

-        // 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;
         HDC dc_src = GetHdcOf(*source);
         HDC dc_mask = ::CreateCompatibleDC(dc_src);
         RECT rect;
         HDC dc_src = GetHdcOf(*source);
         HDC dc_mask = ::CreateCompatibleDC(dc_src);


@@ -490,7 +543,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
                     HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
                     rect.left = xdest + x;
                     rect.right = rect.left + 1;
                     HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
                     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);


@@ -507,58 +560,97 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
             wxBitmap& bmp = source->GetSelectedBitmap();
             int width = bmp.GetWidth(),
                 height = bmp.GetHeight();
             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

 
 

-            BITMAPINFO *info = (BITMAPINFO *) malloc( sizeof( BITMAPINFOHEADER ) + 256 * sizeof(RGBQUAD ) );
-            int iBitsSize = ((width + 3 ) & ~3 ) * height;
-
-            void* bits = malloc( iBitsSize );
+                void* bits = malloc( iBitsSize );

 
 

-            memset( info , 0 , sizeof( BITMAPINFOHEADER ) );
+                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;
+                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("GetDIBits");
+                ScreenHDC display;
+                if ( !::GetDIBits(display, GetHbitmapOf(bmp), 0,
+                            height, bits, info, DIB_RGB_COLORS) )
+                {
+                    wxLogLastError(wxT("GetDIBits"));

 
 

-                success = FALSE;
-            }
+                    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 )
+                if ( success )

                 {
                 {

-                    wxLogLastError("StretchDIBits");
+                    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);
+                free(bits);
+                free(info);
+            }

         }
         else // no support for StretchDIBits
         {
         }
         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);
             RECT rect;
             for (int y = 0; y < height; y++)
             {
             HDC dc_src = GetHdcOf(*source);
             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++)
                 {
                     COLORREF col = ::GetPixel(dc_src, x, y);
                 for (int x = 0; x < width; x++)
                 {
                     COLORREF col = ::GetPixel(dc_src, x, y);


@@ -581,3 +673,6 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
 
     return success;
 }
 
     return success;
 }

+
+#endif
+    // wxUSE_PRINTING_ARCHITECTURE