static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
{
HGLOBAL hDev = NULL;
- // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty())
- if (driverName.IsEmpty() && printerName.IsEmpty() && portName.IsEmpty())
+ // if (!driverName.empty() && !printerName.empty() && !portName.empty())
+ if (driverName.empty() && printerName.empty() && portName.empty())
{
}
else
{
case DMDUP_HORIZONTAL: data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
case DMDUP_VERTICAL: data.SetDuplex( wxDUPLEX_VERTICAL ); break;
- default:
+ default:
case DMDUP_SIMPLEX: data.SetDuplex( wxDUPLEX_SIMPLEX ); 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);
}
// Not sure if we should check for this mismatch
// wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
- if (printerName != wxT(""))
+ if (!printerName.empty())
data.SetPrinterName( printerName );
GlobalUnlock(hDevNames);
}
}
-
+
return true;
}
//// Printer name
wxString name = data.GetPrinterName();
- if (name != wxT(""))
+ if (!name.empty())
{
//int len = wxMin(31, m_printerName.Len());
wxStrncpy((wxChar*)devMode->dmDeviceName,name.c_str(),31);
devMode->dmPrintQuality = quality;
devMode->dmFields |= DM_PRINTQUALITY;
+ if (data.GetPrivDataLen() > 0)
+ {
+ memcpy( (char *)devMode+devMode->dmSize, data.GetPrivData(), data.GetPrivDataLen() );
+ devMode->dmDriverExtra = (WXWORD)data.GetPrivDataLen();
+ }
+
if (data.GetBin() != wxPRINTBIN_DEFAULT)
{
switch (data.GetBin())
}
// TODO: I hope it's OK to pass some empty strings to DEVNAMES.
- m_devNames = (void*) (long) wxCreateDevNames(wxT(""), data.GetPrinterName(), wxT(""));
-
+ m_devNames = (void*) (long) wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString);
+
return true;
}
-
+
// ---------------------------------------------------------------------------
// wxPrintDialog
// ---------------------------------------------------------------------------
// MSW handle
m_printDlg = NULL;
-
+
if ( data )
m_printDialogData = *data;
ConvertToNative( m_printDialogData );
PRINTDLG *pd = (PRINTDLG*) m_printDlg;
-
+
if (m_dialogParent)
pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
else if (wxTheApp->GetTopWindow())
wxWindowsPrintNativeData *native_data =
(wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
data.GetPrintData().ConvertToNative();
-
+
PRINTDLG *pd = (PRINTDLG*) m_printDlg;
// Shouldn't have been defined anywhere
if (pd)
return false;
-
+
pd = new PRINTDLG;
memset( pd, 0, sizeof(PRINTDLG) );
m_printDlg = (void*) pd;
pd->Flags = PD_RETURNDEFAULT;
pd->nCopies = 1;
-
+
// Pass the devmode data to the PRINTDLG structure, since it'll
// be needed when PrintDlg is called.
if (pd->hDevMode)
if ( data.GetSetupDialog() )
pd->Flags |= PD_PRINTSETUP;
#endif
-
+
return true;
}
wxWindowsPrintNativeData *native_data =
(wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
-
+
// Pass the devmode data back to the wxPrintData structure where it really belongs.
if (pd->hDevMode)
{
data.EnableHelp( ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP) );
#if WXWIN_COMPATIBILITY_2_4
data.SetSetupDialog( ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP) );
-#endif
+#endif
return true;
}
int wxWindowsPageSetupDialog::ShowModal()
{
ConvertToNative( m_pageSetupData );
-
+
PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
if (m_dialogParent)
pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
// Shouldn't have been defined anywhere
if (pd)
return false;
-
+
pd = new PAGESETUPDLG;
pd->hDevMode = NULL;
pd->hDevNames = NULL;
wxWindowsPrintNativeData *native_data =
(wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
-
+
// Pass the devmode data back to the wxPrintData structure where it really belongs.
if (pd->hDevMode)
{
native_data->SetDevMode( (void*) pd->hDevMode );
pd->hDevMode = NULL;
}
-
+
// Isn't this superfluous? It's called again below.
// data.GetPrintData().ConvertFromNative();
data.SetMarginTopLeft( wxPoint(pd->rtMargin.left / 100, pd->rtMargin.top / 100) );
data.SetMarginBottomRight( wxPoint(pd->rtMargin.right / 100, pd->rtMargin.bottom / 100) );
-
+
return true;
}