X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2eb10e2a17a02acaaa32a41304243999f3a862a1..5c17f6d377e0de9be8677118b1889468c9142e29:/src/msw/dcprint.cpp?ds=sidebyside

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index c0f9a2c097..5c90a1f9e5 100644
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "dcprint.h"
 #endif
 
@@ -44,12 +44,11 @@
 #endif
 
 #include "wx/dcprint.h"
-#include "math.h"
-
-#if wxUSE_COMMON_DIALOGS
-    #include <commdlg.h>
-#endif
+#include "wx/printdlg.h"
+#include "wx/msw/printdlg.h"
+#include "wx/math.h"
 
+#include "wx/msw/wrapcdlg.h"
 #ifndef __WIN32__
     #include <print.h>
 #endif
@@ -123,10 +122,10 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name,
             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
-        m_bOwnsDC = TRUE;
+        m_bOwnsDC = true;
     }
 
     Init();
@@ -136,11 +135,11 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printData)
 {
     m_printData = printData;
 
-    m_isInteractive = FALSE;
+    m_isInteractive = false;
 
     m_hDC = wxGetPrinterDC(printData);
     m_ok = m_hDC != 0;
-    m_bOwnsDC = TRUE;
+    m_bOwnsDC = true;
 
     Init();
 }
@@ -148,11 +147,11 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printData)
 
 wxPrinterDC::wxPrinterDC(WXHDC dc)
 {
-    m_isInteractive = FALSE;
+    m_isInteractive = false;
 
     m_hDC = dc;
-    m_bOwnsDC = TRUE;
-    m_ok = TRUE;
+    m_bOwnsDC = true;
+    m_ok = true;
 }
 
 void wxPrinterDC::Init()
@@ -180,7 +179,7 @@ bool wxPrinterDC::StartDoc(const wxString& message)
 
     wxString filename(m_printData.GetFilename());
 
-    if (filename.IsEmpty())
+    if (filename.empty())
         docinfo.lpszOutput = NULL;
     else
         docinfo.lpszOutput = (const wxChar *) filename;
@@ -191,17 +190,15 @@ bool wxPrinterDC::StartDoc(const wxString& message)
 #endif
 
     if (!m_hDC)
-        return FALSE;
+        return false;
 
     int ret = ::StartDoc(GetHdc(), &docinfo);
 
-#ifndef __WIN16__
     if (ret <= 0)
     {
         DWORD lastError = GetLastError();
         wxLogDebug(wxT("wxDC::StartDoc failed with error: %ld\n"), lastError);
     }
-#endif
 
     return (ret > 0);
 }
@@ -229,7 +226,6 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
     deviceName.clear();
 
     LPDEVNAMES  lpDevNames;
-    LPTSTR      lpszDriverName;
     LPTSTR      lpszDeviceName;
     LPTSTR      lpszPortName;
 
@@ -257,13 +253,12 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
         if (pd.hDevNames)
             GlobalFree(pd.hDevNames);
 
-        return FALSE;
+        return false;
     }
 
     if (pd.hDevNames)
     {
         lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames);
-        lpszDriverName = (LPTSTR)lpDevNames + lpDevNames->wDriverOffset;
         lpszDeviceName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
         lpszPortName   = (LPTSTR)lpDevNames + lpDevNames->wOutputOffset;
 
@@ -280,18 +275,32 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }
-    return ( deviceName != wxEmptyString );
+    return ( !deviceName.empty() );
 }
 
 // Gets an HDC for the specified printer configuration
 WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 {
-    wxPrintData printData = printDataConst;
-    printData.ConvertToNative();
+#if defined(__WXUNIVERSAL__) && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+
+#if 0
+    wxPostScriptPrintNativeData *data =
+        (wxPostScriptPrintNativeData *) printDataConst.GetNativeData();
+    // FIXME: how further ???
+#else
+    return 0;
+#endif
+
+#else // Postscript vs. native Windows
+
+    wxWindowsPrintNativeData *data =
+        (wxWindowsPrintNativeData *) printDataConst.GetNativeData();
+
+    data->TransferFrom( printDataConst );
 
     wxChar* driverName = (wxChar*) NULL;
 
-    wxString devNameStr = printData.GetPrinterName();
+    wxString devNameStr = printDataConst.GetPrinterName();
     wxChar* portName = (wxChar*) NULL; // Obsolete in WIN32
 
     const wxChar* deviceName;
@@ -302,7 +311,7 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 
     LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
 
-    HGLOBAL hDevMode = (HGLOBAL)(DWORD) printData.GetNativeData();
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();
 
     if ( hDevMode )
         lpDevMode = (DEVMODE*) GlobalLock(hDevMode);
@@ -311,15 +320,10 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
     {
         // 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();
     }
 
@@ -333,6 +337,7 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
         GlobalUnlock(hDevMode);
 
     return (WXHDC) hDC;
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -347,15 +352,16 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc,
 {
 #if wxUSE_WXDIB
     wxDIB dib(bmp);
-    if ( !dib.IsOk() )
-        return FALSE;
+    bool ok = dib.IsOk();
+    if ( !ok )
+        return false;
 
     DIBSECTION ds;
     if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) )
     {
         wxLogLastError(_T("GetObject(DIBSECTION)"));
 
-        return FALSE;
+        return false;
     }
 
     // ok, we've got all data we need, do blit it
@@ -374,12 +380,12 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc,
     {
         wxLogLastError(wxT("StretchDIBits"));
 
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 #else
-    return FALSE;
+    return false;
 #endif
 }
 
@@ -476,7 +482,7 @@ bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 #endif