X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/186b445c7f5dc00ef6dcc1a27e80e63a1802c76a..035fa7f78c8915a24114d26728fa805773f2c4b5:/src/common/paper.cpp diff --git a/src/common/paper.cpp b/src/common/paper.cpp index 368d3a51c8..db2f7e0a5d 100644 --- a/src/common/paper.cpp +++ b/src/common/paper.cpp @@ -212,6 +212,12 @@ void wxPrintPaperDatabase::CreateDatabase() WXADDPAPER(wxPAPER_PENV_8_ROTATED, 116, wxTRANSLATE("PRC Envelope #8 Rotated 309 x 120 mm"), 3090, 1200); WXADDPAPER(wxPAPER_PENV_9_ROTATED, 117, wxTRANSLATE("PRC Envelope #9 Rotated 324 x 229 mm"), 3240, 2290); WXADDPAPER(wxPAPER_PENV_10_ROTATED, 118, wxTRANSLATE("PRC Envelope #10 Rotated 458 x 324 mm"), 4580, 3240); + + // notice that the values 135 and 136 for Windows paper size ids of A0 and + // A1 formats are not documented anywhere but seem to work for at least + // some printers so we use them until we find a better way (see #11083) + WXADDPAPER(wxPAPER_A0, 136, wxTRANSLATE("A0 sheet, 841 x 1189 mm"), 8410, 11888); + WXADDPAPER(wxPAPER_A1, 135, wxTRANSLATE("A1 sheet, 594 x 841 mm"), 5940, 8410); } void wxPrintPaperDatabase::ClearDatabase() @@ -246,16 +252,12 @@ wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(const wxString& name) wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(wxPaperSize id) { - // Take the item ordering into account so that the more common types - // are likely to be taken into account first. This fixes problems with, - // for example, Letter reverting to A4 in the page setup dialog because - // it was wrongly translated to Note. - size_t i; - for (i = 0; i < GetCount(); i++) + typedef wxStringToPrintPaperTypeHashMap::iterator iterator; + + for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it) { - wxPrintPaperType* paperType = Item(i); - wxSize paperSize = paperType->GetSize() ; - if ( abs( paperSize.x - sz.x ) < 10 && abs( paperSize.y - sz.y ) < 10 ) + wxPrintPaperType* paperType = it->second; + if (paperType->GetId() == id) return paperType; } @@ -278,13 +280,15 @@ wxPrintPaperType *wxPrintPaperDatabase::FindPaperTypeByPlatformId(int id) wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(const wxSize& sz) { - typedef wxStringToPrintPaperTypeHashMap::iterator iterator; - - for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it) + // Take the item ordering into account so that the more common types + // are likely to be taken into account first. This fixes problems with, + // for example, Letter reverting to A4 in the page setup dialog because + // it was wrongly translated to Note. + for ( size_t i = 0; i < GetCount(); i++ ) { - wxPrintPaperType* paperType = it->second; - wxSize paperSize = paperType->GetSize() ; - if ( abs( paperSize.x - sz.x ) < 10 && abs( paperSize.y - sz.y ) < 10 ) + wxPrintPaperType* const paperType = Item(i); + const wxSize paperSize = paperType->GetSize() ; + if ( abs(paperSize.x - sz.x) < 10 && abs(paperSize.y - sz.y) < 10 ) return paperType; } @@ -370,8 +374,7 @@ bool wxPrintPaperModule::OnInit() void wxPrintPaperModule::OnExit() { - delete wxThePrintPaperDatabase; - wxThePrintPaperDatabase = NULL; + wxDELETE(wxThePrintPaperDatabase); } #endif // wxUSE_PRINTING_ARCHITECTURE