#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
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();
{
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();
}
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()
wxString filename(m_printData.GetFilename());
- if (filename.IsEmpty())
+ if (filename.empty())
docinfo.lpszOutput = NULL;
else
docinfo.lpszOutput = (const wxChar *) filename;
#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);
}
deviceName.clear();
LPDEVNAMES lpDevNames;
- LPTSTR lpszDriverName;
LPTSTR lpszDeviceName;
LPTSTR lpszPortName;
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;
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;
LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
- HGLOBAL hDevMode = (HGLOBAL)(DWORD) printData.GetNativeData();
+ HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();
if ( hDevMode )
lpDevMode = (DEVMODE*) GlobalLock(hDevMode);
{
// 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();
}
GlobalUnlock(hDevMode);
return (WXHDC) hDC;
+#endif
}
// ----------------------------------------------------------------------------
{
#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
{
wxLogLastError(wxT("StretchDIBits"));
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
#else
- return FALSE;
+ return false;
#endif
}
}
}
- return TRUE;
+ return true;
}
#endif