#include <stdlib.h>
-#ifndef __WIN32__
- #include <print.h>
-#endif
-
//----------------------------------------------------------------------------
// wxWindowsPrintNativeData
//----------------------------------------------------------------------------
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL
+
static wxString wxGetPrintDlgError()
{
DWORD err = CommDlgExtendedError();
}
return msg;
}
-#endif
-static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
+#endif // wxDEBUG_LEVEL
+
+
+static HGLOBAL
+wxCreateDevNames(const wxString& driverName,
+ const wxString& printerName,
+ const wxString& portName)
{
HGLOBAL hDev = NULL;
// if (!driverName.empty() && !printerName.empty() && !portName.empty())
wxWindowsPrintNativeData::wxWindowsPrintNativeData()
{
- m_devMode = (void*) NULL;
- m_devNames = (void*) NULL;
+ m_devMode = NULL;
+ m_devNames = NULL;
m_customWindowsPaperId = 0;
}
wxWindowsPrintNativeData::~wxWindowsPrintNativeData()
{
- HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
- if ( hDevMode )
- GlobalFree(hDevMode);
- HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
- if ( hDevNames )
- GlobalFree(hDevNames);
+ if ( m_devMode )
+ ::GlobalFree(static_cast<HGLOBAL>(m_devMode));
+
+ if ( m_devNames )
+ ::GlobalFree(static_cast<HGLOBAL>(m_devNames));
}
bool wxWindowsPrintNativeData::IsOk() const
bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
{
- HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
- HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
-
- if (!hDevMode)
- {
+ if ( !m_devMode )
return false;
- }
- else
- {
- LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
- //// Orientation
- if (devMode->dmFields & DM_ORIENTATION)
- data.SetOrientation( devMode->dmOrientation );
+ GlobalPtrLock lockDevMode(m_devMode);
- //// Collation
- if (devMode->dmFields & DM_COLLATE)
- {
- if (devMode->dmCollate == DMCOLLATE_TRUE)
- data.SetCollate( true );
- else
- data.SetCollate( false );
- }
+ LPDEVMODE devMode = static_cast<LPDEVMODE>(lockDevMode.Get());
- //// Number of copies
- if (devMode->dmFields & DM_COPIES)
- data.SetNoCopies( devMode->dmCopies );
-
- //// Bin
- if (devMode->dmFields & DM_DEFAULTSOURCE) {
- switch (devMode->dmDefaultSource) {
- case DMBIN_ONLYONE : data.SetBin(wxPRINTBIN_ONLYONE ); break;
- case DMBIN_LOWER : data.SetBin(wxPRINTBIN_LOWER ); break;
- case DMBIN_MIDDLE : data.SetBin(wxPRINTBIN_MIDDLE ); break;
- case DMBIN_MANUAL : data.SetBin(wxPRINTBIN_MANUAL ); break;
- case DMBIN_ENVELOPE : data.SetBin(wxPRINTBIN_ENVELOPE ); break;
- case DMBIN_ENVMANUAL : data.SetBin(wxPRINTBIN_ENVMANUAL ); break;
- case DMBIN_AUTO : data.SetBin(wxPRINTBIN_AUTO ); break;
- case DMBIN_TRACTOR : data.SetBin(wxPRINTBIN_TRACTOR ); break;
- case DMBIN_SMALLFMT : data.SetBin(wxPRINTBIN_SMALLFMT ); break;
- case DMBIN_LARGEFMT : data.SetBin(wxPRINTBIN_LARGEFMT ); break;
- case DMBIN_LARGECAPACITY : data.SetBin(wxPRINTBIN_LARGECAPACITY ); break;
- case DMBIN_CASSETTE : data.SetBin(wxPRINTBIN_CASSETTE ); break;
- case DMBIN_FORMSOURCE : data.SetBin(wxPRINTBIN_FORMSOURCE ); break;
- default:
- if (devMode->dmDefaultSource>=DMBIN_USER) {
- data.SetBin((wxPrintBin)((devMode->dmDefaultSource)-DMBIN_USER+(int)wxPRINTBIN_USER));
- } else {
- data.SetBin(wxPRINTBIN_DEFAULT);
- }
- break;
- }
- } else {
- data.SetBin(wxPRINTBIN_DEFAULT);
- }
- if (devMode->dmFields & DM_MEDIATYPE)
- {
- wxASSERT( (int)devMode->dmMediaType != wxPRINTMEDIA_DEFAULT );
- data.SetMedia(devMode->dmMediaType);
- }
- //// Printer name
- if (devMode->dmDeviceName[0] != 0)
- // This syntax fixes a crash when using VS 7.1
- data.SetPrinterName( wxString(devMode->dmDeviceName, CCHDEVICENAME) );
+ //// Orientation
+ if (devMode->dmFields & DM_ORIENTATION)
+ data.SetOrientation( devMode->dmOrientation );
- //// Colour
- if (devMode->dmFields & DM_COLOR)
- {
- if (devMode->dmColor == DMCOLOR_COLOR)
- data.SetColour( true );
- else
- data.SetColour( false );
- }
+ //// Collation
+ if (devMode->dmFields & DM_COLLATE)
+ {
+ if (devMode->dmCollate == DMCOLLATE_TRUE)
+ data.SetCollate( true );
else
+ data.SetCollate( false );
+ }
+
+ //// Number of copies
+ if (devMode->dmFields & DM_COPIES)
+ data.SetNoCopies( devMode->dmCopies );
+
+ //// Bin
+ if (devMode->dmFields & DM_DEFAULTSOURCE) {
+ switch (devMode->dmDefaultSource) {
+ case DMBIN_ONLYONE : data.SetBin(wxPRINTBIN_ONLYONE ); break;
+ case DMBIN_LOWER : data.SetBin(wxPRINTBIN_LOWER ); break;
+ case DMBIN_MIDDLE : data.SetBin(wxPRINTBIN_MIDDLE ); break;
+ case DMBIN_MANUAL : data.SetBin(wxPRINTBIN_MANUAL ); break;
+ case DMBIN_ENVELOPE : data.SetBin(wxPRINTBIN_ENVELOPE ); break;
+ case DMBIN_ENVMANUAL : data.SetBin(wxPRINTBIN_ENVMANUAL ); break;
+ case DMBIN_AUTO : data.SetBin(wxPRINTBIN_AUTO ); break;
+ case DMBIN_TRACTOR : data.SetBin(wxPRINTBIN_TRACTOR ); break;
+ case DMBIN_SMALLFMT : data.SetBin(wxPRINTBIN_SMALLFMT ); break;
+ case DMBIN_LARGEFMT : data.SetBin(wxPRINTBIN_LARGEFMT ); break;
+ case DMBIN_LARGECAPACITY : data.SetBin(wxPRINTBIN_LARGECAPACITY ); break;
+ case DMBIN_CASSETTE : data.SetBin(wxPRINTBIN_CASSETTE ); break;
+ case DMBIN_FORMSOURCE : data.SetBin(wxPRINTBIN_FORMSOURCE ); break;
+ default:
+ if (devMode->dmDefaultSource >= DMBIN_USER)
+ data.SetBin((wxPrintBin)((devMode->dmDefaultSource)-DMBIN_USER+(int)wxPRINTBIN_USER));
+ else
+ data.SetBin(wxPRINTBIN_DEFAULT);
+ }
+ } else {
+ data.SetBin(wxPRINTBIN_DEFAULT);
+ }
+ if (devMode->dmFields & DM_MEDIATYPE)
+ {
+ wxASSERT( (int)devMode->dmMediaType != wxPRINTMEDIA_DEFAULT );
+ data.SetMedia(devMode->dmMediaType);
+ }
+ //// Printer name
+ if (devMode->dmDeviceName[0] != 0)
+ // This syntax fixes a crash when using VS 7.1
+ data.SetPrinterName( wxString(devMode->dmDeviceName, CCHDEVICENAME) );
+
+ //// Colour
+ if (devMode->dmFields & DM_COLOR)
+ {
+ if (devMode->dmColor == DMCOLOR_COLOR)
data.SetColour( true );
+ else
+ data.SetColour( false );
+ }
+ else
+ data.SetColour( true );
- //// Paper size
+ //// Paper size
- // We don't know size of user defined paper and some buggy drivers
- // set both DM_PAPERSIZE and DM_PAPERWIDTH & DM_PAPERLENGTH. Since
- // dmPaperSize >= DMPAPER_USER wouldn't be in wxWin's database, this
- // code wouldn't set m_paperSize correctly.
+ // We don't know size of user defined paper and some buggy drivers
+ // set both DM_PAPERSIZE and DM_PAPERWIDTH & DM_PAPERLENGTH. Since
+ // dmPaperSize >= DMPAPER_USER wouldn't be in wxWin's database, this
+ // code wouldn't set m_paperSize correctly.
- bool foundPaperSize = false;
- if ((devMode->dmFields & DM_PAPERSIZE) && (devMode->dmPaperSize < DMPAPER_USER))
+ bool foundPaperSize = false;
+ if ((devMode->dmFields & DM_PAPERSIZE) && (devMode->dmPaperSize < DMPAPER_USER))
+ {
+ if (wxThePrintPaperDatabase)
{
- if (wxThePrintPaperDatabase)
+ wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperTypeByPlatformId(devMode->dmPaperSize);
+ if (paper)
{
- wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperTypeByPlatformId(devMode->dmPaperSize);
- if (paper)
- {
- data.SetPaperId( paper->GetId() );
- data.SetPaperSize( wxSize(paper->GetWidth() / 10,paper->GetHeight() / 10) );
- m_customWindowsPaperId = 0;
- foundPaperSize = true;
- }
- }
- else
- {
- // Shouldn't really get here
- wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
- data.SetPaperId( wxPAPER_NONE );
- data.SetPaperSize( wxSize(0,0) );
+ data.SetPaperId( paper->GetId() );
+ data.SetPaperSize( wxSize(paper->GetWidth() / 10,paper->GetHeight() / 10) );
m_customWindowsPaperId = 0;
-
- GlobalUnlock(hDevMode);
- return false;
+ foundPaperSize = true;
}
}
+ else
+ {
+ // Shouldn't really get here
+ wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
+ data.SetPaperId( wxPAPER_NONE );
+ data.SetPaperSize( wxSize(0,0) );
+ m_customWindowsPaperId = 0;
- if (!foundPaperSize) {
- if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
- {
- // DEVMODE is in tenths of a millimeter
- data.SetPaperSize( wxSize(devMode->dmPaperWidth / 10, devMode->dmPaperLength / 10) );
- data.SetPaperId( wxPAPER_NONE );
- m_customWindowsPaperId = devMode->dmPaperSize;
- }
- else
- {
- // Often will reach this for non-standard paper sizes (sizes which
- // wouldn't be in wxWidget's paper database). Setting
- // m_customWindowsPaperId to devMode->dmPaperSize should be enough
- // to get this paper size working.
- data.SetPaperSize( wxSize(0,0) );
- data.SetPaperId( wxPAPER_NONE );
- m_customWindowsPaperId = devMode->dmPaperSize;
- }
+ return false;
}
+ }
- //// Duplex
-
- if (devMode->dmFields & DM_DUPLEX)
+ if (!foundPaperSize) {
+ if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
{
- switch (devMode->dmDuplex)
- {
- case DMDUP_HORIZONTAL: data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
- case DMDUP_VERTICAL: data.SetDuplex( wxDUPLEX_VERTICAL ); break;
- default:
- case DMDUP_SIMPLEX: data.SetDuplex( wxDUPLEX_SIMPLEX ); break;
- }
+ // DEVMODE is in tenths of a millimeter
+ data.SetPaperSize( wxSize(devMode->dmPaperWidth / 10, devMode->dmPaperLength / 10) );
+ data.SetPaperId( wxPAPER_NONE );
+ m_customWindowsPaperId = devMode->dmPaperSize;
}
else
- data.SetDuplex( wxDUPLEX_SIMPLEX );
+ {
+ // Often will reach this for non-standard paper sizes (sizes which
+ // wouldn't be in wxWidget's paper database). Setting
+ // m_customWindowsPaperId to devMode->dmPaperSize should be enough
+ // to get this paper size working.
+ data.SetPaperSize( wxSize(0,0) );
+ data.SetPaperId( wxPAPER_NONE );
+ m_customWindowsPaperId = devMode->dmPaperSize;
+ }
+ }
- //// Quality
+ //// Duplex
- if (devMode->dmFields & DM_PRINTQUALITY)
+ if (devMode->dmFields & DM_DUPLEX)
+ {
+ switch (devMode->dmDuplex)
{
- switch (devMode->dmPrintQuality)
+ case DMDUP_HORIZONTAL: data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
+ case DMDUP_VERTICAL: data.SetDuplex( wxDUPLEX_VERTICAL ); break;
+ default:
+ case DMDUP_SIMPLEX: data.SetDuplex( wxDUPLEX_SIMPLEX ); break;
+ }
+ }
+ else
+ data.SetDuplex( wxDUPLEX_SIMPLEX );
+
+ //// Quality
+
+ if (devMode->dmFields & DM_PRINTQUALITY)
+ {
+ switch (devMode->dmPrintQuality)
+ {
+ case DMRES_MEDIUM: data.SetQuality( wxPRINT_QUALITY_MEDIUM ); break;
+ case DMRES_LOW: data.SetQuality( wxPRINT_QUALITY_LOW ); break;
+ case DMRES_DRAFT: data.SetQuality( wxPRINT_QUALITY_DRAFT ); break;
+ case DMRES_HIGH: data.SetQuality( wxPRINT_QUALITY_HIGH ); break;
+ default:
{
- case DMRES_MEDIUM: data.SetQuality( wxPRINT_QUALITY_MEDIUM ); break;
- case DMRES_LOW: data.SetQuality( wxPRINT_QUALITY_LOW ); break;
- case DMRES_DRAFT: data.SetQuality( wxPRINT_QUALITY_DRAFT ); break;
- case DMRES_HIGH: data.SetQuality( wxPRINT_QUALITY_HIGH ); break;
- default:
- {
- // TODO: if the printer fills in the resolution in DPI, how
- // will the application know if it's high, low, draft etc.??
- // wxFAIL_MSG("Warning: DM_PRINTQUALITY was not one of the standard values.");
- data.SetQuality( devMode->dmPrintQuality );
- break;
+ // TODO: if the printer fills in the resolution in DPI, how
+ // will the application know if it's high, low, draft etc.??
+ // wxFAIL_MSG("Warning: DM_PRINTQUALITY was not one of the standard values.");
+ data.SetQuality( devMode->dmPrintQuality );
+ break;
- }
}
}
- else
- data.SetQuality( wxPRINT_QUALITY_HIGH );
-
- if (devMode->dmDriverExtra > 0)
- data.SetPrivData( (char *)devMode+devMode->dmSize, devMode->dmDriverExtra );
- else
- data.SetPrivData( NULL, 0 );
-
- GlobalUnlock(hDevMode);
}
+ else
+ data.SetQuality( wxPRINT_QUALITY_HIGH );
+
+ if (devMode->dmDriverExtra > 0)
+ data.SetPrivData( (char *)devMode+devMode->dmSize, devMode->dmDriverExtra );
+ else
+ data.SetPrivData( NULL, 0 );
- if (hDevNames)
+ if ( m_devNames )
{
- LPDEVNAMES lpDevNames = (LPDEVNAMES)GlobalLock(hDevNames);
- if (lpDevNames)
- {
- // TODO: Unicode-ification
+ GlobalPtrLock lockDevNames(m_devNames);
+ LPDEVNAMES lpDevNames = static_cast<LPDEVNAMES>(lockDevNames.Get());
- // Get the port name
- // port is obsolete in WIN32
- // m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
+ // TODO: Unicode-ification
- // Get the printer name
- wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
+ // Get the port name
+ // port is obsolete in WIN32
+ // m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
- // Not sure if we should check for this mismatch
-// wxASSERT_MSG( (m_printerName.empty() || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
+ // Get the printer name
+ wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
- if (!printerName.empty())
- data.SetPrinterName( printerName );
+ // Not sure if we should check for this mismatch
+// wxASSERT_MSG( (m_printerName.empty() || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
- GlobalUnlock(hDevNames);
- }
+ if (!printerName.empty())
+ data.SetPrinterName( printerName );
}
return true;
bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
{
- HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
- HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
- if (!hDevMode)
+ HGLOBAL hDevMode = static_cast<HGLOBAL>(m_devMode);
+ WinPrinter printer;
+ LPTSTR szPrinterName = (LPTSTR)data.GetPrinterName().wx_str();
+
+ // From MSDN: How To Modify Printer Settings with the DocumentProperties() Function
+ // The purpose of this is to fill the DEVMODE with privdata from printer driver.
+ // If we have a printer name and OpenPrinter sucessfully returns
+ // this replaces the PrintDlg function which creates the DEVMODE filled only with data from default printer.
+ if ( !m_devMode && !data.GetPrinterName().IsEmpty() )
+ {
+ // Open printer
+ if ( printer.Open( data.GetPrinterName() ) == TRUE )
+ {
+ DWORD dwNeeded, dwRet;
+
+ // Step 1:
+ // Allocate a buffer of the correct size.
+ dwNeeded = DocumentProperties( NULL,
+ printer, // Handle to our printer.
+ szPrinterName, // Name of the printer.
+ NULL, // Asking for size, so
+ NULL, // these are not used.
+ 0 ); // Zero returns buffer size.
+
+ LPDEVMODE tempDevMode = static_cast<LPDEVMODE>( GlobalAlloc( GMEM_FIXED | GMEM_ZEROINIT, dwNeeded ) );
+
+ // Step 2:
+ // Get the default DevMode for the printer
+ dwRet = DocumentProperties( NULL,
+ printer,
+ szPrinterName,
+ tempDevMode, // The address of the buffer to fill.
+ NULL, // Not using the input buffer.
+ DM_OUT_BUFFER ); // Have the output buffer filled.
+
+ if ( dwRet != IDOK )
+ {
+ // If failure, cleanup
+ GlobalFree( tempDevMode );
+ printer.Close();
+ }
+ else
+ {
+ hDevMode = tempDevMode;
+ m_devMode = hDevMode;
+ tempDevMode = NULL;
+ }
+ }
+ }
+
+ if ( !m_devMode )
{
// Use PRINTDLG as a way of creating a DEVMODE object
PRINTDLG pd;
- // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
-#ifdef __GNUWIN32__
- memset(&pd, 0, 66);
- pd.lStructSize = 66;
-#else
memset(&pd, 0, sizeof(PRINTDLG));
#ifdef __WXWINCE__
pd.cbStruct = sizeof(PRINTDLG);
#else
pd.lStructSize = sizeof(PRINTDLG);
-#endif
#endif
- pd.hwndOwner = (HWND)NULL;
+ pd.hwndOwner = NULL;
pd.hDevMode = NULL; // Will be created by PrintDlg
pd.hDevNames = NULL; // Ditto
- //pd.hInstance = (HINSTANCE) wxGetInstance();
pd.Flags = PD_RETURNDEFAULT;
pd.nCopies = 1;
pd.hDevMode = NULL;
pd.hDevNames = NULL;
-#if defined(__WXDEBUG__) && defined(__WIN32__)
- wxString str(wxT("Printing error: "));
- str += wxGetPrintDlgError();
- wxLogDebug(str);
-#endif
+#if wxDEBUG_LEVEL
+ wxLogDebug(wxT("Printing error: ") + wxGetPrintDlgError());
+#endif // wxDEBUG_LEVEL
}
else
{
hDevMode = pd.hDevMode;
- m_devMode = (void*)(long) hDevMode;
+ m_devMode = hDevMode;
pd.hDevMode = NULL;
// We'll create a new DEVNAMEs structure below.
if ( hDevMode )
{
- LPDEVMODE devMode = (LPDEVMODE) GlobalLock(hDevMode);
+ GlobalPtrLock lockDevMode(hDevMode);
+ DEVMODE * const devMode = static_cast<DEVMODE *>(lockDevMode.Get());
//// Orientation
devMode->dmOrientation = (short)data.GetOrientation();
wxString name = data.GetPrinterName();
if (!name.empty())
{
- //int len = wxMin(31, m_printerName.Len());
- wxStrncpy((wxChar*)devMode->dmDeviceName,name.c_str(),31);
- devMode->dmDeviceName[31] = wxT('\0');
+ // NB: the cast is needed in the ANSI build, strangely enough
+ // dmDeviceName is BYTE[] and not char[] there
+ wxStrlcpy(reinterpret_cast<wxChar *>(devMode->dmDeviceName),
+ name.wx_str(),
+ WXSIZEOF(devMode->dmDeviceName));
}
//// Colour
devMode->dmPaperLength = (short)(paperSize.y * 10);
devMode->dmFields |= DM_PAPERWIDTH;
devMode->dmFields |= DM_PAPERLENGTH;
+
+ // A printer driver may or may not also want DM_PAPERSIZE to
+ // be specified. Also, if the printer driver doesn't implement the DMPAPER_USER
+ // size, then this won't work, and even if you found the correct id by
+ // enumerating the driver's paper sizes, it probably won't change the actual size,
+ // it'll just select that custom paper type with its own current setting.
+ // For a discussion on this, see http://www.codeguru.com/forum/showthread.php?threadid=458617
+ // Although m_customWindowsPaperId is intended to work around this, it's
+ // unclear how it can help you set the custom paper size programmatically.
}
//else: neither paper type nor size specified, don't fill DEVMODE
// at all so that the system defaults are used
break;
default:
quality = (short)data.GetQuality();
+ devMode->dmYResolution = quality;
+ devMode->dmFields |= DM_YRESOLUTION;
break;
}
devMode->dmPrintQuality = quality;
devMode->dmMediaType = data.GetMedia();
devMode->dmFields |= DM_MEDIATYPE;
}
- GlobalUnlock(hDevMode);
+
+ if( printer )
+ {
+ // Step 3:
+ // Merge the new settings with the old.
+ // This gives the driver an opportunity to update any private
+ // portions of the DevMode structure.
+ DocumentProperties( NULL,
+ printer,
+ szPrinterName,
+ (LPDEVMODE)hDevMode, // Reuse our buffer for output.
+ (LPDEVMODE)hDevMode, // Pass the driver our changes
+ DM_IN_BUFFER | // Commands to Merge our changes and
+ DM_OUT_BUFFER ); // write the result.
+ }
}
- if ( hDevNames )
+ if ( m_devNames )
{
- GlobalFree(hDevNames);
+ ::GlobalFree(static_cast<HGLOBAL>(m_devNames));
}
// TODO: I hope it's OK to pass some empty strings to DEVNAMES.
- m_devNames = (void*) (long) wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString);
+ m_devNames = wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString);
return true;
}
return m_printerDC;
}
else
- return (wxPrinterDC*) NULL;
+ return NULL;
}
bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
memset( pd, 0, sizeof(PRINTDLG) );
m_printDlg = (void*) pd;
- // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
-#ifdef __GNUWIN32__
- pd->lStructSize = 66;
-#else
pd->lStructSize = sizeof(PRINTDLG);
-#endif
- pd->hwndOwner = (HWND)NULL;
+ pd->hwndOwner = NULL;
pd->hDevMode = NULL; // Will be created by PrintDlg
pd->hDevNames = NULL; // Ditto
if (pd->hDevNames)
GlobalFree(pd->hDevNames);
- pd->hDevMode = (HGLOBAL)(DWORD) native_data->GetDevMode();
- native_data->SetDevMode( (void*) NULL);
+ pd->hDevMode = static_cast<HGLOBAL>(native_data->GetDevMode());
+ native_data->SetDevMode(NULL);
// Shouldn't assert; we should be able to test Ok-ness at a higher level
//wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
- pd->hDevNames = (HGLOBAL)(DWORD) native_data->GetDevNames();
- native_data->SetDevNames( (void*) NULL);
+ pd->hDevNames = static_cast<HGLOBAL>(native_data->GetDevNames());
+ native_data->SetDevNames(NULL);
- pd->hDC = (HDC) NULL;
+ pd->hDC = NULL;
pd->nFromPage = (WORD)data.GetFromPage();
pd->nToPage = (WORD)data.GetToPage();
pd->nMinPage = (WORD)data.GetMinPage();
pd->nCopies = (WORD)data.GetNoCopies();
pd->Flags = PD_RETURNDC;
-
-#ifdef __GNUWIN32__
- pd->lStructSize = 66;
-#else
pd->lStructSize = sizeof( PRINTDLG );
-#endif
- pd->hwndOwner=(HWND)NULL;
-// pd->hDevNames=(HANDLE)NULL;
- pd->hInstance=(HINSTANCE)NULL;
- pd->lCustData = (LPARAM) NULL;
+ pd->hwndOwner = NULL;
+ pd->hInstance = NULL;
+ pd->lCustData = 0;
pd->lpfnPrintHook = NULL;
pd->lpfnSetupHook = NULL;
pd->lpPrintTemplateName = NULL;
pd->lpSetupTemplateName = NULL;
- pd->hPrintTemplate = (HGLOBAL) NULL;
- pd->hSetupTemplate = (HGLOBAL) NULL;
+ pd->hPrintTemplate = NULL;
+ pd->hSetupTemplate = NULL;
if ( data.GetAllPages() )
pd->Flags |= PD_ALLPAGES;
{
if (native_data->GetDevMode())
{
- // Make sure we don't leak memory
- GlobalFree( (HGLOBAL)(DWORD) native_data->GetDevMode() );
+ ::GlobalFree(static_cast<HGLOBAL>(native_data->GetDevMode()));
}
- native_data->SetDevMode( (void*)(long) pd->hDevMode );
+ native_data->SetDevMode(pd->hDevMode);
pd->hDevMode = NULL;
}
{
if (native_data->GetDevNames())
{
- // Make sure we don't leak memory
- GlobalFree((HGLOBAL)(DWORD) native_data->GetDevNames());
+ ::GlobalFree(static_cast<HGLOBAL>(native_data->GetDevNames()));
}
- native_data->SetDevNames((void*)(long) pd->hDevNames);
+ native_data->SetDevNames(pd->hDevNames);
pd->hDevNames = NULL;
}
pd->hDevMode = NULL;
}
pd->hDevMode = (HGLOBAL) native_data->GetDevMode();
- native_data->SetDevMode( (void*) NULL );
+ native_data->SetDevMode(NULL);
// Shouldn't assert; we should be able to test Ok-ness at a higher level
//wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
pd->hDevNames = NULL;
}
pd->hDevNames = (HGLOBAL) native_data->GetDevNames();
- native_data->SetDevNames((void*) NULL);
+ native_data->SetDevNames(NULL);
// pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
pd->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
pd->lStructSize = sizeof( PAGESETUPDLG );
- pd->hwndOwner=(HWND)NULL;
-// pd->hDevNames=(HWND)NULL;
- pd->hInstance=(HINSTANCE)NULL;
+ pd->hwndOwner = NULL;
+ pd->hInstance = NULL;
// PAGESETUPDLG is in hundreds of a mm
pd->ptPaperSize.x = data.GetPaperSize().x * 100;
pd->ptPaperSize.y = data.GetPaperSize().y * 100;