Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First step at moving the print (dialog) native

Browse Source 
data into native dirs and cleaning up the code.
   The native part of wxPrintData is now created
   via the wxPrintFactory. I moved the code for
   PostScript to /src/generic/prntdlgg. and for
   MSW to its the respective dir. I only made
   wxMac compile, but it already has a native
   print data class, which should be easy to
   merge.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-10-17 17:25:40 +00:00
parent 4200d1f416
commit 8850cbd3c3
11 changed files with 801 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

620
src/common/cmndata.cpp
View File

@@ -38,6 +38,8 @@
#include "wx/gdicmn.h"
#include "wx/cmndata.h"
#include "wx/log.h"
#include "wx/prntbase.h"
#include "wx/printdlg.h"
#if wxUSE_FONTDLG
#include "wx/fontdlg.h"
@@ -165,10 +167,7 @@ wxFontDialogBase::~wxFontDialogBase()
wxPrintData::wxPrintData()
{
#ifdef __WXMSW__
m_devMode = (void*) NULL;
m_devNames = (void*) NULL;
#elif defined( __WXMAC__ )
#ifdef __WXMAC__
m_nativePrintData = wxNativePrintData::Create() ;
#endif
m_bin = wxPRINTBIN_DEFAULT;
@@ -184,536 +183,28 @@ wxPrintData::wxPrintData()
m_paperId = wxPAPER_A4;
m_paperSize = wxSize(210, 297);
// PostScript-specific data
m_previewCommand = wxT("");
m_filename = wxT("");
#ifdef __VMS__
m_printerCommand = wxT("print");
m_printerOptions = wxT("/nonotify/queue=psqueue");
m_afmPath = wxT("sys$ps_font_metrics:");
#endif
#ifdef __WXMSW__
m_printerCommand = wxT("print");
m_printerOptions = wxT("");
m_afmPath = wxT("c:\\windows\\system\\");
#endif
#if !defined(__VMS__) && !defined(__WXMSW__)
m_printerCommand = wxT("lpr");
m_printerOptions = wxT("");
m_afmPath = wxT("");
#endif
m_printerScaleX = 1.0;
m_printerScaleY = 1.0;
m_printerTranslateX = 0;
m_printerTranslateY = 0;
m_printMode = wxPRINT_MODE_FILE;
#ifdef wxUSE_STREAMS
m_outputstream = NULL;
#endif
m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
}
wxPrintData::wxPrintData(const wxPrintData& printData)
: wxObject()
{
#ifdef __WXMSW__
m_devMode = (void*) NULL;
m_devNames = (void*) NULL;
#elif defined( __WXMAC__ )
m_nativePrintData = wxNativePrintData::Create() ;
#endif
(*this) = printData;
}
wxPrintData::~wxPrintData()
{
#ifdef __WXMSW__
HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
if ( hDevMode )
GlobalFree(hDevMode);
HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
if ( hDevNames )
GlobalFree(hDevNames);
#elif defined(__WXMAC__)
m_nativeData->m_ref--;
if (m_nativeData->m_ref == 0)
delete m_nativeData;
#ifdef __WXMAC__
delete m_nativePrintData ;
#endif
}
#if defined(__WXMSW__) // && defined(__WIN32__)
#if defined(__WXDEBUG__) && defined(__WIN32__)
static wxString wxGetPrintDlgError()
{
DWORD err = CommDlgExtendedError();
wxString msg = wxT("Unknown");
switch (err)
{
case CDERR_FINDRESFAILURE: msg = wxT("CDERR_FINDRESFAILURE"); break;
case CDERR_INITIALIZATION: msg = wxT("CDERR_INITIALIZATION"); break;
case CDERR_LOADRESFAILURE: msg = wxT("CDERR_LOADRESFAILURE"); break;
case CDERR_LOADSTRFAILURE: msg = wxT("CDERR_LOADSTRFAILURE"); break;
case CDERR_LOCKRESFAILURE: msg = wxT("CDERR_LOCKRESFAILURE"); break;
case CDERR_MEMALLOCFAILURE: msg = wxT("CDERR_MEMALLOCFAILURE"); break;
case CDERR_MEMLOCKFAILURE: msg = wxT("CDERR_MEMLOCKFAILURE"); break;
case CDERR_NOHINSTANCE: msg = wxT("CDERR_NOHINSTANCE"); break;
case CDERR_NOHOOK: msg = wxT("CDERR_NOHOOK"); break;
case CDERR_NOTEMPLATE: msg = wxT("CDERR_NOTEMPLATE"); break;
case CDERR_STRUCTSIZE: msg = wxT("CDERR_STRUCTSIZE"); break;
case PDERR_RETDEFFAILURE: msg = wxT("PDERR_RETDEFFAILURE"); break;
case PDERR_PRINTERNOTFOUND: msg = wxT("PDERR_PRINTERNOTFOUND"); break;
case PDERR_PARSEFAILURE: msg = wxT("PDERR_PARSEFAILURE"); break;
case PDERR_NODEVICES: msg = wxT("PDERR_NODEVICES"); break;
case PDERR_NODEFAULTPRN: msg = wxT("PDERR_NODEFAULTPRN"); break;
case PDERR_LOADDRVFAILURE: msg = wxT("PDERR_LOADDRVFAILURE"); break;
case PDERR_INITFAILURE: msg = wxT("PDERR_INITFAILURE"); break;
case PDERR_GETDEVMODEFAIL: msg = wxT("PDERR_GETDEVMODEFAIL"); break;
case PDERR_DNDMMISMATCH: msg = wxT("PDERR_DNDMMISMATCH"); break;
case PDERR_DEFAULTDIFFERENT: msg = wxT("PDERR_DEFAULTDIFFERENT"); break;
case PDERR_CREATEICFAILURE: msg = wxT("PDERR_CREATEICFAILURE"); break;
default: break;
}
return msg;
}
#endif
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())
{
}
else
{
hDev = GlobalAlloc(GPTR, 4*sizeof(WORD)+
( driverName.Length() + 1 +
printerName.Length() + 1 +
portName.Length()+1 ) * sizeof(wxChar) );
LPDEVNAMES lpDev = (LPDEVNAMES)GlobalLock(hDev);
lpDev->wDriverOffset = sizeof(WORD) * 4 / sizeof(wxChar);
wxStrcpy((wxChar*)lpDev + lpDev->wDriverOffset, driverName);
lpDev->wDeviceOffset = (WORD)( lpDev->wDriverOffset +
driverName.Length() + 1 );
wxStrcpy((wxChar*)lpDev + lpDev->wDeviceOffset, printerName);
lpDev->wOutputOffset = (WORD)( lpDev->wDeviceOffset +
printerName.Length() + 1 );
wxStrcpy((wxChar*)lpDev + lpDev->wOutputOffset, portName);
lpDev->wDefault = 0;
GlobalUnlock(hDev);
}
return hDev;
}
void wxPrintData::ConvertToNative()
{
HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
if (!hDevMode)
{
// 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.hDevMode = NULL; // Will be created by PrintDlg
pd.hDevNames = NULL; // Ditto
//pd.hInstance = (HINSTANCE) wxGetInstance();
pd.Flags = PD_RETURNDEFAULT;
pd.nCopies = 1;
// Fill out the DEVMODE structure
// so we can use it as input in the 'real' PrintDlg
if (!PrintDlg(&pd))
{
if ( pd.hDevMode )
GlobalFree(pd.hDevMode);
if ( pd.hDevNames )
GlobalFree(pd.hDevNames);
pd.hDevMode = NULL;
pd.hDevNames = NULL;
#if defined(__WXDEBUG__) && defined(__WIN32__)
wxString str(wxT("Printing error: "));
str += wxGetPrintDlgError();
wxLogDebug(str);
#endif
}
else
{
hDevMode = pd.hDevMode;
m_devMode = (void*)(long) hDevMode;
pd.hDevMode = NULL;
// We'll create a new DEVNAMEs structure below.
if ( pd.hDevNames )
GlobalFree(pd.hDevNames);
pd.hDevNames = NULL;
// hDevNames = pd->hDevNames;
// m_devNames = (void*)(long) hDevNames;
// pd->hDevnames = NULL;
}
}
if ( hDevMode )
{
LPDEVMODE devMode = (LPDEVMODE) GlobalLock(hDevMode);
//// Orientation
devMode->dmOrientation = (short)m_printOrientation;
//// Collation
devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
devMode->dmFields |= DM_COLLATE;
//// Number of copies
devMode->dmCopies = (short)m_printNoCopies;
devMode->dmFields |= DM_COPIES;
//// Printer name
if (m_printerName != wxT(""))
{
//int len = wxMin(31, m_printerName.Len());
wxStrncpy((wxChar*)devMode->dmDeviceName,m_printerName.c_str(),31);
devMode->dmDeviceName[31] = wxT('\0');
}
//// Colour
if (m_colour)
devMode->dmColor = DMCOLOR_COLOR;
else
devMode->dmColor = DMCOLOR_MONOCHROME;
devMode->dmFields |= DM_COLOR;
//// Paper size
if (m_paperId == wxPAPER_NONE)
{
// DEVMODE is in tenths of a milimeter
devMode->dmPaperWidth = (short)(m_paperSize.x * 10);
devMode->dmPaperLength = (short)(m_paperSize.y * 10);
devMode->dmPaperSize = DMPAPER_USER;
devMode->dmFields |= DM_PAPERWIDTH;
devMode->dmFields |= DM_PAPERLENGTH;
}
else
{
if (wxThePrintPaperDatabase)
{
wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType(m_paperId);
if (paper)
{
devMode->dmPaperSize = (short)paper->GetPlatformId();
devMode->dmFields |= DM_PAPERSIZE;
}
}
}
//// Duplex
short duplex;
switch (m_duplexMode)
{
case wxDUPLEX_HORIZONTAL:
duplex = DMDUP_HORIZONTAL;
break;
case wxDUPLEX_VERTICAL:
duplex = DMDUP_VERTICAL;
break;
default:
// in fact case wxDUPLEX_SIMPLEX:
duplex = DMDUP_SIMPLEX;
break;
}
devMode->dmDuplex = duplex;
devMode->dmFields |= DM_DUPLEX;
//// Quality
short quality;
switch (m_printQuality)
{
case wxPRINT_QUALITY_MEDIUM:
quality = DMRES_MEDIUM;
break;
case wxPRINT_QUALITY_LOW:
quality = DMRES_LOW;
break;
case wxPRINT_QUALITY_DRAFT:
quality = DMRES_DRAFT;
break;
case wxPRINT_QUALITY_HIGH:
quality = DMRES_HIGH;
break;
default:
quality = (short)m_printQuality;
break;
}
devMode->dmPrintQuality = quality;
devMode->dmFields |= DM_PRINTQUALITY;
if ( m_bin != wxPRINTBIN_DEFAULT )
{
switch ( m_bin )
{
case wxPRINTBIN_ONLYONE: devMode->dmDefaultSource = DMBIN_ONLYONE; break;
case wxPRINTBIN_LOWER: devMode->dmDefaultSource = DMBIN_LOWER; break;
case wxPRINTBIN_MIDDLE: devMode->dmDefaultSource = DMBIN_MIDDLE; break;
case wxPRINTBIN_MANUAL: devMode->dmDefaultSource = DMBIN_MANUAL; break;
case wxPRINTBIN_ENVELOPE: devMode->dmDefaultSource = DMBIN_ENVELOPE; break;
case wxPRINTBIN_ENVMANUAL: devMode->dmDefaultSource = DMBIN_ENVMANUAL; break;
case wxPRINTBIN_AUTO: devMode->dmDefaultSource = DMBIN_AUTO; break;
case wxPRINTBIN_TRACTOR: devMode->dmDefaultSource = DMBIN_TRACTOR; break;
case wxPRINTBIN_SMALLFMT: devMode->dmDefaultSource = DMBIN_SMALLFMT; break;
case wxPRINTBIN_LARGEFMT: devMode->dmDefaultSource = DMBIN_LARGEFMT; break;
case wxPRINTBIN_LARGECAPACITY: devMode->dmDefaultSource = DMBIN_LARGECAPACITY; break;
case wxPRINTBIN_CASSETTE: devMode->dmDefaultSource = DMBIN_CASSETTE; break;
case wxPRINTBIN_FORMSOURCE: devMode->dmDefaultSource = DMBIN_FORMSOURCE; break;
default:
devMode->dmDefaultSource = (short)(DMBIN_USER + m_bin - wxPRINTBIN_USER);
break;
}
devMode->dmFields |= DM_DEFAULTSOURCE;
}
GlobalUnlock(hDevMode);
}
if ( hDevNames )
{
GlobalFree(hDevNames);
}
// TODO: I hope it's OK to pass some empty strings to DEVNAMES.
m_devNames = (void*) (long) wxCreateDevNames(wxT(""), m_printerName, wxT(""));
}
void wxPrintData::ConvertFromNative()
{
HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
if (!hDevMode)
return;
if ( hDevMode )
{
LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
//// Orientation
if (devMode->dmFields & DM_ORIENTATION)
m_printOrientation = devMode->dmOrientation;
//// Collation
if (devMode->dmFields & DM_COLLATE)
{
if (devMode->dmCollate == DMCOLLATE_TRUE)
m_printCollate = true;
else
m_printCollate = false;
}
//// Number of copies
if (devMode->dmFields & DM_COPIES)
{
m_printNoCopies = devMode->dmCopies;
}
if (devMode->dmFields & DM_DEFAULTSOURCE)
{
m_bin = (wxPrintBin)devMode->dmDefaultSource;
}
//// Printer name
if (devMode->dmDeviceName[0] != 0)
{
m_printerName = devMode->dmDeviceName;
}
//// Colour
if (devMode->dmFields & DM_COLOR)
{
if (devMode->dmColor == DMCOLOR_COLOR)
m_colour = true;
else
m_colour = false;
}
else
m_colour = true;
//// 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.
if ((devMode->dmFields & DM_PAPERSIZE) && (devMode->dmPaperSize < DMPAPER_USER))
{
if (wxThePrintPaperDatabase)
{
wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperTypeByPlatformId(devMode->dmPaperSize);
if (paper)
{
m_paperId = paper->GetId();
m_paperSize.x = paper->GetWidth() / 10;
m_paperSize.y = paper->GetHeight() / 10;
}
else
{
// Shouldn't really get here
wxFAIL_MSG(wxT("Couldn't find paper size in paper database."));
m_paperId = wxPAPER_NONE;
m_paperSize.x = 0;
m_paperSize.y = 0;
}
}
else
{
// Shouldn't really get here
wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
m_paperId = wxPAPER_NONE;
m_paperSize.x = 0;
m_paperSize.y = 0;
}
}
else if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
{
// DEVMODE is in tenths of a milimeter
m_paperSize.x = devMode->dmPaperWidth / 10;
m_paperSize.y = devMode->dmPaperLength / 10;
m_paperId = wxPAPER_NONE;
}
else
{
// Shouldn't really get here
wxFAIL_MSG(wxT("Couldn't find paper size from DEVMODE."));
m_paperSize.x = 0;
m_paperSize.y = 0;
m_paperId = wxPAPER_NONE;
}
//// Duplex
if (devMode->dmFields & DM_DUPLEX)
{
switch (devMode->dmDuplex)
{
case DMDUP_HORIZONTAL: {
m_duplexMode = wxDUPLEX_HORIZONTAL; break;
}
case DMDUP_VERTICAL: {
m_duplexMode = wxDUPLEX_VERTICAL; break;
}
default:
case DMDUP_SIMPLEX: {
m_duplexMode = wxDUPLEX_SIMPLEX; break;
}
}
}
else
m_duplexMode = wxDUPLEX_SIMPLEX;
//// Quality
if (devMode->dmFields & DM_PRINTQUALITY)
{
switch (devMode->dmPrintQuality)
{
case DMRES_MEDIUM: {
m_printQuality = wxPRINT_QUALITY_MEDIUM; break;
}
case DMRES_LOW: {
m_printQuality = wxPRINT_QUALITY_LOW; break;
}
case DMRES_DRAFT: {
m_printQuality = wxPRINT_QUALITY_DRAFT; break;
}
case DMRES_HIGH: {
m_printQuality = 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.");
m_printQuality = devMode->dmPrintQuality; break;
}
}
}
else
m_printQuality = wxPRINT_QUALITY_HIGH;
GlobalUnlock(hDevMode);
}
if (hDevNames)
{
LPDEVNAMES lpDevNames = (LPDEVNAMES)GlobalLock(hDevNames);
if (lpDevNames)
{
// TODO: Unicode-ification
// Get the port name
// port is obsolete in WIN32
// m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
// Get the printer name
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!");
if (printerName != wxT(""))
m_printerName = printerName;
GlobalUnlock(hDevNames);
}
}
}
#endif
#ifdef __WXMAC__
void wxPrintData::ConvertToNative()
{
m_nativePrintData->TransferFrom( this ) ;
@@ -723,14 +214,10 @@ void wxPrintData::ConvertFromNative()
{
m_nativePrintData->TransferTo( this ) ;
}
#endif
void wxPrintData::operator=(const wxPrintData& data)
{
#ifdef __WXMAC__
m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
#endif
m_printNoCopies = data.m_printNoCopies;
m_printCollate = data.m_printCollate;
m_printOrientation = data.m_printOrientation;
@@ -741,32 +228,21 @@ void wxPrintData::operator=(const wxPrintData& data)
m_paperId = data.m_paperId;
m_paperSize = data.m_paperSize;
m_bin = data.m_bin;
#ifdef wxUSE_STREAMS
m_outputstream = data.m_outputstream;
m_nativeData = data.GetNativeData();
m_nativeData->m_ref++;
#ifdef __WXMAC__
m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
#endif
// PostScript-specific data
m_printerCommand = data.m_printerCommand;
m_previewCommand = data.m_previewCommand;
m_printerOptions = data.m_printerOptions;
m_filename = data.m_filename;
m_afmPath = data.m_afmPath;
m_printerScaleX = data.m_printerScaleX;
m_printerScaleY = data.m_printerScaleY;
m_printerTranslateX = data.m_printerTranslateX;
m_printerTranslateY = data.m_printerTranslateY;
m_printMode = data.m_printMode;
}
// Is this data OK for showing the print dialog?
bool wxPrintData::Ok() const
{
#ifdef __WXMSW__
((wxPrintData*)this)->ConvertToNative();
return (m_devMode != NULL) ;
#else
return true;
#endif
m_nativeData->ConvertFrom( *this );
return m_nativeData->Ok();
}
// ----------------------------------------------------------------------------
@@ -840,7 +316,9 @@ wxPrintDialogData::~wxPrintDialogData()
#ifdef __WXMSW__
void wxPrintDialogData::ConvertToNative()
{
m_printData.ConvertToNative();
wxWindowsPrintNativeData *data =
(wxWindowsPrintNativeData *) m_printData.GetNativeData();
data->ConvertFrom( m_printData );
PRINTDLG *pd = (PRINTDLG*) m_printDlgData;
@@ -878,16 +356,16 @@ void wxPrintDialogData::ConvertToNative()
GlobalFree(pd->hDevNames);
}
pd->hDevMode = (HGLOBAL)(DWORD) m_printData.GetNativeData();
pd->hDevMode = (HGLOBAL)(DWORD) data->GetNativeData();
m_printData.SetNativeData((void*) NULL);
data->SetNativeData((void*) 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) m_printData.GetNativeDataDevNames();
pd->hDevNames = (HGLOBAL)(DWORD) data->GetNativeDataDevNames();
m_printData.SetNativeDataDevNames((void*) NULL);
data->SetNativeDataDevNames((void*) NULL);
pd->hDC = (HDC) NULL;
pd->nFromPage = (WORD)m_printFromPage;
@@ -943,33 +421,36 @@ void wxPrintDialogData::ConvertFromNative()
if ( pd == NULL )
return;
wxWindowsPrintNativeData *data =
(wxWindowsPrintNativeData *) m_printData.GetNativeData();
// Pass the devmode data back to the wxPrintData structure where it really belongs.
if (pd->hDevMode)
{
if (m_printData.GetNativeData())
if (data->GetNativeData())
{
// Make sure we don't leak memory
GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeData());
GlobalFree( (HGLOBAL)(DWORD) data->GetNativeData() );
}
m_printData.SetNativeData((void*)(long) pd->hDevMode);
data->SetNativeData( (void*)(long) pd->hDevMode );
pd->hDevMode = NULL;
}
// Pass the devnames data back to the wxPrintData structure where it really belongs.
if (pd->hDevNames)
{
if (m_printData.GetNativeDataDevNames())
if (data->GetNativeDataDevNames())
{
// Make sure we don't leak memory
GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames());
GlobalFree((HGLOBAL)(DWORD) data->GetNativeDataDevNames());
}
m_printData.SetNativeDataDevNames((void*)(long) pd->hDevNames);
data->SetNativeDataDevNames((void*)(long) pd->hDevNames);
pd->hDevNames = NULL;
}
// Now convert the DEVMODE object, passed down from the PRINTDLG object,
// into wxWidgets form.
m_printData.ConvertFromNative();
data->ConvertTo( m_printData );
m_printFromPage = pd->nFromPage;
m_printToPage = pd->nToPage;
@@ -1165,7 +646,9 @@ wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
#if defined(__WIN95__)
void wxPageSetupDialogData::ConvertToNative()
{
m_printData.ConvertToNative();
wxWindowsPrintNativeData *data =
(wxWindowsPrintNativeData *) m_printData.GetNativeData();
data->ConvertFrom( m_printData );
PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData;
@@ -1187,9 +670,9 @@ void wxPageSetupDialogData::ConvertToNative()
pd->hDevMode = NULL;
}
pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
pd->hDevMode = (HGLOBAL) data->GetNativeData();
m_printData.SetNativeData((void*) NULL);
data->SetNativeData((void*) 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!"));
@@ -1204,9 +687,9 @@ void wxPageSetupDialogData::ConvertToNative()
pd->hDevNames = NULL;
}
pd->hDevNames = (HGLOBAL) m_printData.GetNativeDataDevNames();
pd->hDevNames = (HGLOBAL) data->GetNativeDataDevNames();
m_printData.SetNativeDataDevNames((void*) NULL);
data->SetNativeDataDevNames((void*) NULL);
// pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
@@ -1273,33 +756,36 @@ void wxPageSetupDialogData::ConvertFromNative()
if ( !pd )
return;
wxWindowsPrintNativeData *data =
(wxWindowsPrintNativeData *) m_printData.GetNativeData();
// Pass the devmode data back to the wxPrintData structure where it really belongs.
if (pd->hDevMode)
{
if (m_printData.GetNativeData())
if (data->GetNativeData())
{
// Make sure we don't leak memory
GlobalFree((HGLOBAL) m_printData.GetNativeData());
GlobalFree((HGLOBAL) data->GetNativeData());
}
m_printData.SetNativeData((void*) pd->hDevMode);
data->SetNativeData((void*) pd->hDevMode);
pd->hDevMode = NULL;
}
m_printData.ConvertFromNative();
data->ConvertTo( m_printData );
// Pass the devnames data back to the wxPrintData structure where it really belongs.
if (pd->hDevNames)
{
if (m_printData.GetNativeDataDevNames())
if (data->GetNativeDataDevNames())
{
// Make sure we don't leak memory
GlobalFree((HGLOBAL) m_printData.GetNativeDataDevNames());
GlobalFree((HGLOBAL) data->GetNativeDataDevNames());
}
m_printData.SetNativeDataDevNames((void*) pd->hDevNames);
data->SetNativeDataDevNames((void*) pd->hDevNames);
pd->hDevNames = NULL;
}
m_printData.ConvertFromNative();
data->ConvertTo( m_printData );
pd->Flags = PSD_MARGINS|PSD_MINMARGINS;