X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/348675e1cc36a6e98a5124cd5a18edbec2f12255..0c35333e9eb2b387c06cc285916b65a7cebdf0b9:/src/common/cmndata.cpp?ds=sidebyside diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index 3510acc06f..8445b73952 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -37,6 +37,7 @@ #include "wx/gdicmn.h" #include "wx/cmndata.h" +#include "wx/log.h" #include "wx/paper.h" @@ -51,6 +52,7 @@ #ifdef __WXMSW__ #include + #include #if !defined(__WIN32__) #include @@ -197,6 +199,10 @@ wxPrintData::wxPrintData() wxPrintData::wxPrintData(const wxPrintData& printData) { +#ifdef __WXMSW__ + m_devMode = NULL; +#endif + (*this) = printData; } @@ -209,7 +215,42 @@ wxPrintData::~wxPrintData() #endif } -#ifdef __WXMSW__ +#if defined(__WXMSW__) && defined(__WIN32__) + +static wxString wxGetPrintDlgError() +{ + DWORD err = CommDlgExtendedError(); + wxString msg = _T("Unknown"); + switch (err) + { + case CDERR_FINDRESFAILURE: msg = _T("CDERR_FINDRESFAILURE"); break; + case CDERR_INITIALIZATION: msg = _T("CDERR_INITIALIZATION"); break; + case CDERR_LOADRESFAILURE: msg = _T("CDERR_LOADRESFAILURE"); break; + case CDERR_LOADSTRFAILURE: msg = _T("CDERR_LOADSTRFAILURE"); break; + case CDERR_LOCKRESFAILURE: msg = _T("CDERR_LOCKRESFAILURE"); break; + case CDERR_MEMALLOCFAILURE: msg = _T("CDERR_MEMALLOCFAILURE"); break; + case CDERR_MEMLOCKFAILURE: msg = _T("CDERR_MEMLOCKFAILURE"); break; + case CDERR_NOHINSTANCE: msg = _T("CDERR_NOHINSTANCE"); break; + case CDERR_NOHOOK: msg = _T("CDERR_NOHOOK"); break; + case CDERR_NOTEMPLATE: msg = _T("CDERR_NOTEMPLATE"); break; + case CDERR_STRUCTSIZE: msg = _T("CDERR_STRUCTSIZE"); break; + case PDERR_RETDEFFAILURE: msg = _T("PDERR_RETDEFFAILURE"); break; + case PDERR_PRINTERNOTFOUND: msg = _T("PDERR_PRINTERNOTFOUND"); break; + case PDERR_PARSEFAILURE: msg = _T("PDERR_PARSEFAILURE"); break; + case PDERR_NODEVICES: msg = _T("PDERR_NODEVICES"); break; + case PDERR_NODEFAULTPRN: msg = _T("PDERR_NODEFAULTPRN"); break; + case PDERR_LOADDRVFAILURE: msg = _T("PDERR_LOADDRVFAILURE"); break; + case PDERR_INITFAILURE: msg = _T("PDERR_INITFAILURE"); break; + case PDERR_GETDEVMODEFAIL: msg = _T("PDERR_GETDEVMODEFAIL"); break; + case PDERR_DNDMMISMATCH: msg = _T("PDERR_DNDMMISMATCH"); break; + case PDERR_DEFAULTDIFFERENT: msg = _T("PDERR_DEFAULTDIFFERENT"); break; + case PDERR_CREATEICFAILURE: msg = _T("PDERR_CREATEICFAILURE"); break; + default: break; + } + return msg; +} + + void wxPrintData::ConvertToNative() { @@ -221,16 +262,17 @@ void wxPrintData::ConvertToNative() // GNU-WIN32 has the wrong size PRINTDLG - can't work out why. #ifdef __GNUWIN32__ + memset(pd, 0, 66); pd->lStructSize = 66 ; - memset(pd, 0, sizeof(PRINTDLG)); #else - pd->lStructSize = sizeof(PRINTDLG); memset(pd, 0, sizeof(PRINTDLG)); + pd->lStructSize = sizeof(PRINTDLG); #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; @@ -245,6 +287,12 @@ void wxPrintData::ConvertToNative() GlobalFree(pd->hDevNames); pd->hDevMode = NULL; pd->hDevNames = NULL; + +#if defined(__WXDEBUG__) && defined(__WIN32__) + wxString str(_T("Printing error: ")); + str += wxGetPrintDlgError(); + wxLogDebug(str); +#endif } else { @@ -281,7 +329,7 @@ void wxPrintData::ConvertToNative() //// Printer name - if (m_printerName != "") + if (m_printerName != _T("")) { // TODO: make this Unicode compatible int len = wxMin(31, m_printerName.Len()); @@ -447,7 +495,7 @@ void wxPrintData::ConvertFromNative() else { // Shouldn't really get here - wxFAIL_MSG("Couldn't find paper size in paper database."); + wxFAIL_MSG(_T("Couldn't find paper size in paper database.")); m_paperId = wxPAPER_NONE; m_paperSize.x = 0; @@ -457,7 +505,7 @@ void wxPrintData::ConvertFromNative() else { // Shouldn't really get here - wxFAIL_MSG("Paper database wasn't initialized in wxPrintData::ConvertFromNative."); + wxFAIL_MSG(_T("Paper database wasn't initialized in wxPrintData::ConvertFromNative.")); m_paperId = wxPAPER_NONE; m_paperSize.x = 0; @@ -473,7 +521,7 @@ void wxPrintData::ConvertFromNative() else { // Shouldn't really get here - wxFAIL_MSG("Couldn't find paper size from DEVMODE."); + wxFAIL_MSG(_T("Couldn't find paper size from DEVMODE.")); m_paperSize.x = 0; m_paperSize.y = 0; @@ -690,7 +738,7 @@ void wxPrintDialogData::ConvertToNative() m_printData.SetNativeData((void*) NULL); - wxASSERT_MSG( (pd->hDevMode), "hDevMode must be non-NULL in ConvertToNative!"); + wxASSERT_MSG( (pd->hDevMode), _T("hDevMode must be non-NULL in ConvertToNative!")); pd->hDC = (HDC) NULL; pd->nFromPage = (UINT)m_printFromPage; @@ -949,7 +997,7 @@ void wxPageSetupDialogData::ConvertToNative() m_printData.SetNativeData((void*) NULL); - wxASSERT_MSG( (pd->hDevMode), "hDevMode must be non-NULL in ConvertToNative!"); + wxASSERT_MSG( (pd->hDevMode), _T("hDevMode must be non-NULL in ConvertToNative!")); // pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE)); @@ -1089,8 +1137,8 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id) void wxPageSetupDialogData::CalculateIdFromPaperSize() { wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL), - "wxThePrintPaperDatabase should not be NULL. " - "Do not create global print dialog data objects." ); + _T("wxThePrintPaperDatabase should not be NULL. " + "Do not create global print dialog data objects.") ); wxSize sz = GetPaperSize(); @@ -1105,8 +1153,8 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize() void wxPageSetupDialogData::CalculatePaperSizeFromId() { wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL), - "wxThePrintPaperDatabase should not be NULL. " - "Do not create global print dialog data objects." ); + _T("wxThePrintPaperDatabase should not be NULL. " + "Do not create global print dialog data objects.") ); wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());