X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..dd65d8c83003ebbf9ab3275957fefa8cd7c87cc3:/src/common/cmndata.cpp diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index 1956c43b70..42fca79834 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -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" @@ -47,11 +49,11 @@ #include "wx/paper.h" #endif // wxUSE_PRINTING_ARCHITECTURE -#ifdef __WXMSW__ +#if defined(__WXMSW__) && !defined(__PALMOS__) #include #include "wx/msw/private.h" - #ifndef __SMARTPHONE__ + #ifndef __SMARTPHONE__ /* of WinCE */ #include #endif @@ -88,12 +90,9 @@ wxColourData::wxColourData() { - int i; - for (i = 0; i < 16; i++) - m_custColours[i].Set(255, 255, 255); - - m_chooseFull = FALSE; + m_chooseFull = false; m_dataColour.Set(0,0,0); + // m_custColours are wxNullColours initially } wxColourData::wxColourData(const wxColourData& data) @@ -108,16 +107,15 @@ wxColourData::~wxColourData() void wxColourData::SetCustomColour(int i, const wxColour& colour) { - if (i > 15 || i < 0) - return; + wxCHECK_RET( (i >= 0 && i < 16), _T("custom colour index out of range") ); m_custColours[i] = colour; } wxColour wxColourData::GetCustomColour(int i) { - if (i > 15 || i < 0) - return wxColour(0,0,0); + wxCHECK_MSG( (i >= 0 && i < 16), wxColour(0,0,0), + _T("custom colour index out of range") ); return m_custColours[i]; } @@ -141,9 +139,9 @@ wxFontData::wxFontData() // Intialize colour to black. m_fontColour = wxNullColour; - m_showHelp = FALSE; - m_allowSymbols = TRUE; - m_enableEffects = TRUE; + m_showHelp = false; + m_allowSymbols = true; + m_enableEffects = true; m_minSize = 0; m_maxSize = 0; @@ -169,523 +167,45 @@ 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; + m_printMode = wxPRINT_MODE_PRINTER; m_printOrientation = wxPORTRAIT; m_printNoCopies = 1; - m_printCollate = FALSE; + m_printCollate = false; // New, 24/3/99 m_printerName = wxT(""); - m_colour = TRUE; + m_colour = true; m_duplexMode = wxDUPLEX_SIMPLEX; m_printQuality = wxPRINT_QUALITY_HIGH; 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; - wxStrcpy((wxChar*)((char*)lpDev + lpDev->wDriverOffset ), driverName); - - lpDev->wDeviceOffset = (WORD)( lpDev->wDriverOffset + - sizeof(wxChar) * ( driverName.Length() + 1 ) ); - wxStrcpy((wxChar*)((char*)lpDev + lpDev->wDeviceOffset ), printerName); - - lpDev->wOutputOffset = (WORD)( lpDev->wDeviceOffset + - sizeof(wxChar) * ( printerName.Length() + 1 ) ); - wxStrcpy((wxChar*)((char*) 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 = m_printOrientation; - - //// Collation - - devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE); - devMode->dmFields |= DM_COLLATE; - - //// Number of copies - - devMode->dmCopies = 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 = m_paperSize.x * 10; - devMode->dmPaperLength = 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 = paper->GetPlatformId(); - devMode->dmFields |= DM_PAPERSIZE; - } - } - } - - //// Duplex - - int duplex; - switch (m_duplexMode) - { - case wxDUPLEX_HORIZONTAL: { - duplex = DMDUP_HORIZONTAL; break; - } - case wxDUPLEX_VERTICAL: { - duplex = DMDUP_VERTICAL; break; - } - default: - case wxDUPLEX_SIMPLEX: { - duplex = DMDUP_SIMPLEX; break; - } - } - devMode->dmDuplex = duplex; - devMode->dmFields |= DM_DUPLEX; - - //// Quality - - int 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 = m_printQuality; break; - } - } - devMode->dmPrintQuality = quality; - devMode->dmFields |= DM_PRINTQUALITY; - - 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; - } - - //// 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 ) ; @@ -695,14 +215,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; @@ -712,32 +228,23 @@ void wxPrintData::operator=(const wxPrintData& data) m_printQuality = data.m_printQuality; m_paperId = data.m_paperId; m_paperSize = data.m_paperSize; -#ifdef wxUSE_STREAMS - m_outputstream = data.m_outputstream; -#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_bin = data.m_bin; m_printMode = data.m_printMode; + + m_nativeData = data.GetNativeData(); + m_nativeData->m_ref++; + +#ifdef __WXMAC__ + m_nativePrintData->CopyFrom( data.m_nativePrintData ) ; +#endif } // 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->TransferFrom( *this ); + + return m_nativeData->Ok(); } // ---------------------------------------------------------------------------- @@ -754,15 +261,18 @@ wxPrintDialogData::wxPrintDialogData() m_printMinPage = 0; m_printMaxPage = 0; m_printNoCopies = 1; - m_printAllPages = FALSE; - m_printCollate = FALSE; - m_printToFile = FALSE; - m_printSelection = FALSE; - m_printEnableSelection = FALSE; - m_printEnablePageNumbers = TRUE; - m_printEnablePrintToFile = TRUE; - m_printEnableHelp = FALSE; - m_printSetupDialog = FALSE; + m_printAllPages = false; + m_printCollate = false; + m_printToFile = false; + m_printSelection = false; + m_printEnableSelection = false; + m_printEnablePageNumbers = true; + + wxPrintFactory* factory = wxPrintFactory::GetFactory(); + m_printEnablePrintToFile = ! factory->HasOwnPrintToFile(); + + m_printEnableHelp = false; + m_printSetupDialog = false; } wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData) @@ -784,15 +294,15 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData) m_printMinPage = 1; m_printMaxPage = 9999; m_printNoCopies = 1; - m_printAllPages = FALSE; - m_printCollate = FALSE; - m_printToFile = FALSE; - m_printSelection = FALSE; - m_printEnableSelection = FALSE; - m_printEnablePageNumbers = TRUE; - m_printEnablePrintToFile = TRUE; - m_printEnableHelp = FALSE; - m_printSetupDialog = FALSE; + m_printAllPages = false; + m_printCollate = false; + m_printToFile = false; + m_printSelection = false; + m_printEnableSelection = false; + m_printEnablePageNumbers = true; + m_printEnablePrintToFile = true; + m_printEnableHelp = false; + m_printSetupDialog = false; m_printData = printData; } @@ -811,7 +321,9 @@ wxPrintDialogData::~wxPrintDialogData() #ifdef __WXMSW__ void wxPrintDialogData::ConvertToNative() { - m_printData.ConvertToNative(); + wxWindowsPrintNativeData *data = + (wxWindowsPrintNativeData *) m_printData.GetNativeData(); + data->TransferFrom( m_printData ); PRINTDLG *pd = (PRINTDLG*) m_printDlgData; @@ -849,16 +361,16 @@ void wxPrintDialogData::ConvertToNative() GlobalFree(pd->hDevNames); } - pd->hDevMode = (HGLOBAL)(DWORD) m_printData.GetNativeData(); + pd->hDevMode = (HGLOBAL)(DWORD) data->GetDevMode(); - m_printData.SetNativeData((void*) NULL); + data->SetDevMode( (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->GetDevNames(); - m_printData.SetNativeDataDevNames((void*) NULL); + data->SetDevNames( (void*) NULL); pd->hDC = (HDC) NULL; pd->nFromPage = (WORD)m_printFromPage; @@ -914,33 +426,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->GetDevMode()) { // Make sure we don't leak memory - GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeData()); + GlobalFree( (HGLOBAL)(DWORD) data->GetDevMode() ); } - m_printData.SetNativeData((void*)(long) pd->hDevMode); + data->SetDevMode( (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->GetDevNames()) { // Make sure we don't leak memory - GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames()); + GlobalFree((HGLOBAL)(DWORD) data->GetDevNames()); } - m_printData.SetNativeDataDevNames((void*)(long) pd->hDevNames); + data->SetDevNames((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->TransferTo( m_printData ); m_printFromPage = pd->nFromPage; m_printToPage = pd->nToPage; @@ -1048,13 +563,13 @@ wxPageSetupDialogData::wxPageSetupDialogData() m_marginBottomRight = wxPoint(0, 0); // Flags - m_defaultMinMargins = FALSE; - m_enableMargins = TRUE; - m_enableOrientation = TRUE; - m_enablePaper = TRUE; - m_enablePrinter = TRUE; - m_enableHelp = FALSE; - m_getDefaultInfo = FALSE; + m_defaultMinMargins = false; + m_enableMargins = true; + m_enableOrientation = true; + m_enablePaper = true; + m_enablePrinter = true; + m_enableHelp = false; + m_getDefaultInfo = false; } wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData) @@ -1078,13 +593,13 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData) m_marginBottomRight = wxPoint(0, 0); // Flags - m_defaultMinMargins = FALSE; - m_enableMargins = TRUE; - m_enableOrientation = TRUE; - m_enablePaper = TRUE; - m_enablePrinter = TRUE; - m_enableHelp = FALSE; - m_getDefaultInfo = FALSE; + m_defaultMinMargins = false; + m_enableMargins = true; + m_enableOrientation = true; + m_enablePaper = true; + m_enablePrinter = true; + m_enableHelp = false; + m_getDefaultInfo = false; m_printData = printData; @@ -1136,7 +651,9 @@ wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data) #if defined(__WIN95__) void wxPageSetupDialogData::ConvertToNative() { - m_printData.ConvertToNative(); + wxWindowsPrintNativeData *data = + (wxWindowsPrintNativeData *) m_printData.GetNativeData(); + data->TransferFrom( m_printData ); PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData; @@ -1158,9 +675,9 @@ void wxPageSetupDialogData::ConvertToNative() pd->hDevMode = NULL; } - pd->hDevMode = (HGLOBAL) m_printData.GetNativeData(); + pd->hDevMode = (HGLOBAL) data->GetDevMode(); - m_printData.SetNativeData((void*) NULL); + data->SetDevMode( (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!")); @@ -1175,9 +692,9 @@ void wxPageSetupDialogData::ConvertToNative() pd->hDevNames = NULL; } - pd->hDevNames = (HGLOBAL) m_printData.GetNativeDataDevNames(); + pd->hDevNames = (HGLOBAL) data->GetDevNames(); - m_printData.SetNativeDataDevNames((void*) NULL); + data->SetDevNames((void*) NULL); // pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE)); @@ -1244,33 +761,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->GetDevMode()) { // Make sure we don't leak memory - GlobalFree((HGLOBAL) m_printData.GetNativeData()); + GlobalFree((HGLOBAL) data->GetDevMode()); } - m_printData.SetNativeData((void*) pd->hDevMode); + data->SetDevMode( (void*) pd->hDevMode ); pd->hDevMode = NULL; } - m_printData.ConvertFromNative(); + data->TransferTo( m_printData ); // Pass the devnames data back to the wxPrintData structure where it really belongs. if (pd->hDevNames) { - if (m_printData.GetNativeDataDevNames()) + if (data->GetDevNames()) { // Make sure we don't leak memory - GlobalFree((HGLOBAL) m_printData.GetNativeDataDevNames()); + GlobalFree((HGLOBAL) data->GetDevNames()); } - m_printData.SetNativeDataDevNames((void*) pd->hDevNames); + data->SetDevNames((void*) pd->hDevNames); pd->hDevNames = NULL; } - m_printData.ConvertFromNative(); + data->TransferTo( m_printData ); pd->Flags = PSD_MARGINS|PSD_MINMARGINS;