non-pch build fix

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 8636a4447cc6610dd5f94999428a0f41c8568adc..a2e365c0725b39416e8d1f16e15d563e87ada6e1 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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,29 +24,27 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_PRINTING_ARCHITECTURE
+
+#include "wx/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"
 
 #if wxUSE_WXDIB
 #include "wx/msw/private.h"
 
 #if wxUSE_WXDIB

-#include "wx/msw/dib.h"
+    #include "wx/msw/dib.h"

 #endif
 
 #endif
 

-#include "wx/dcprint.h"

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

-#include "wx/math.h"
-
-#if wxUSE_COMMON_DIALOGS
-    #include <commdlg.h>
-#endif

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


@@ -62,6 +56,12 @@
     #define GDI_ERROR ((int)-1)
 #endif
 
     #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
 // ----------------------------------------------------------------------------


@@ -187,10 +187,8 @@ bool wxPrinterDC::StartDoc(const wxString& message)
     else
         docinfo.lpszOutput = (const wxChar *) filename;
 
     else
         docinfo.lpszOutput = (const wxChar *) filename;
 

-#if defined(__WIN95__)

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

-#endif

 
     if (!m_hDC)
         return false;
 
     if (!m_hDC)
         return false;


@@ -223,6 +221,8 @@ void wxPrinterDC::EndPage()
         ::EndPage((HDC) m_hDC);
 }
 
         ::EndPage((HDC) m_hDC);
 }
 

+#if !wxUSE_PS_PRINTING
+

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


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

-    return ( deviceName != wxEmptyString );
+    return ( !deviceName.empty() );

 }
 
 }
 

+#endif // !wxUSE_PS_PRINTING
+

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

-#if defined(__WXUNIVERSAL__) && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
-
-#if 0
-    wxPostScriptPrintNativeData *data =
-        (wxPostScriptPrintNativeData *) printDataConst.GetNativeData();
-    // FIXME: how further ???
-#else
+#if wxUSE_PS_PRINTING
+    // TODO
+    wxUnusedVar(printDataConst);

     return 0;
     return 0;

-#endif
-
-#else // Postscript vs. native Windows
-
+#else // native Windows printing

     wxWindowsPrintNativeData *data =
         (wxWindowsPrintNativeData *) printDataConst.GetNativeData();
 
     data->TransferFrom( printDataConst );
 
     wxWindowsPrintNativeData *data =
         (wxWindowsPrintNativeData *) printDataConst.GetNativeData();
 
     data->TransferFrom( printDataConst );
 

-    wxChar* driverName = (wxChar*) NULL;
-
-    wxString devNameStr = printDataConst.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;
-
-    HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();
-
-    if ( hDevMode )
-        lpDevMode = (DEVMODE*) GlobalLock(hDevMode);
-
-    if ( !devNameStr )
+    wxString deviceName = printDataConst.GetPrinterName();
+    if ( deviceName.empty() )

     {
         // Retrieve the default device name
         wxString portName;
     {
         // Retrieve the default device name
         wxString portName;

-        if ( !wxGetDefaultDeviceName(devNameStr, portName) )
+        if ( !wxGetDefaultDeviceName(deviceName, portName) )

         {
             return 0; // Could not get default device name
         }
         {
             return 0; // Could not get default device name
         }

-        deviceName = devNameStr.c_str();

     }
 
     }
 

-#ifdef __WIN32__
-    HDC hDC = CreateDC(driverName, deviceName, portName, (DEVMODE *) lpDevMode);
-#else
-    HDC hDC = CreateDC(driverName, deviceName, portName, (LPSTR) lpDevMode);
-#endif

 
 

-    if (hDevMode && lpDevMode)
-        GlobalUnlock(hDevMode);
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();
+
+    DEVMODE *lpDevMode = hDevMode ? (DEVMODE *)::GlobalLock(hDevMode) : NULL;
+
+    HDC hDC = ::CreateDC(NULL, deviceName, NULL, lpDevMode);
+    if ( !hDC )
+        wxLogLastError(_T("CreateDC(printer)"));
+
+    if ( lpDevMode )
+        ::GlobalUnlock(hDevMode);

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

-#endif
+#endif // PostScript/Windows printing

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


@@ -404,7 +384,7 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp,
     if ( !(::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB) ||
             !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, x, y) )
     {
     if ( !(::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB) ||
             !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, x, y) )
     {

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

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