#include <stdlib.h>
-#include "wx/msw/private.h"
-
-#include <commdlg.h>
+#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
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
{
m_devMode = (void*) NULL;
m_devNames = (void*) NULL;
+ m_customWindowsPaperId = 0;
}
wxWindowsPrintNativeData::~wxWindowsPrintNativeData()
HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
if (!hDevMode)
+ {
return false;
-
- if ( hDevMode )
+ }
+ else
{
LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
// 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))
{
if (wxThePrintPaperDatabase)
{
data.SetPaperId( paper->GetId() );
data.SetPaperSize( wxSize(paper->GetWidth() / 10,paper->GetHeight() / 10) );
- }
- else
- {
- // Shouldn't really get here
- wxFAIL_MSG(wxT("Couldn't find paper size in paper database."));
- data.SetPaperId( wxPAPER_NONE );
- data.SetPaperSize( wxSize(0,0) );
+ m_customWindowsPaperId = 0;
+ foundPaperSize = true;
}
}
else
wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
data.SetPaperId( wxPAPER_NONE );
data.SetPaperSize( wxSize(0,0) );
+ m_customWindowsPaperId = 0;
+
+ GlobalUnlock(hDevMode);
+ return false;
}
}
- else if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
+
+ if (!foundPaperSize && (devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
{
// DEVMODE is in tenths of a milimeter
- data.SetPaperId( wxPAPER_NONE );
data.SetPaperSize( wxSize(devMode->dmPaperWidth / 10, devMode->dmPaperLength / 10) );
+ data.SetPaperId( wxPAPER_NONE );
+ m_customWindowsPaperId = devMode->dmPaperSize;
}
else
{
- // Shouldn't really get here
- wxFAIL_MSG(wxT("Couldn't find paper size from DEVMODE."));
- data.SetPaperId( wxPAPER_NONE );
+ // 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;
}
//// Duplex
{
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);
}
wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
// 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!");
+// wxASSERT_MSG( (m_printerName.empty() || (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 is in tenths of a milimeter
devMode->dmPaperWidth = (short)(data.GetPaperSize().x * 10);
devMode->dmPaperLength = (short)(data.GetPaperSize().y * 10);
- devMode->dmPaperSize = DMPAPER_USER;
+ if(m_customWindowsPaperId != 0)
+ devMode->dmPaperSize = m_customWindowsPaperId;
+ else
+ devMode->dmPaperSize = DMPAPER_USER;
devMode->dmFields |= DM_PAPERWIDTH;
devMode->dmFields |= DM_PAPERLENGTH;
}
devMode->dmPaperSize = (short)paper->GetPlatformId();
devMode->dmFields |= DM_PAPERSIZE;
}
+ else
+ {
+ // Fall back on specifying the paper size explicitly
+ devMode->dmPaperWidth = (short)(data.GetPaperSize().x * 10);
+ devMode->dmPaperLength = (short)(data.GetPaperSize().y * 10);
+ devMode->dmPaperSize = DMPAPER_USER;
+ devMode->dmFields |= DM_PAPERWIDTH;
+ devMode->dmFields |= DM_PAPERLENGTH;
+ }
}
}
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;
}
projects / wxWidgets.git / blobdiff