Ticket #11494: update.diff

File update.diff, 1.4 KB (added by SnowLeopard, 9 years ago)

patch file

  • src/osx/core/printmac.cpp

    Binary files wxorig/src/osx/.DS_Store and wxnew/src/osx/.DS_Store differ
    diff -uNr wxorig/src/osx/core/printmac.cpp wxnew/src/osx/core/printmac.cpp
    old new  
    449449
    450450    printout->SetIsPreview(false);
    451451
    452     // Get some parameters from the printout, if defined
    453     int fromPage, toPage;
    454     int minPage, maxPage;
    455     printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
    456 
    457     if (maxPage == 0) return false;
    458 
    459     // Only set min and max, because from and to will be
    460     // set by the user
    461     m_printDialogData.SetMinPage(minPage);
    462     m_printDialogData.SetMaxPage(maxPage);
    463 
    464452    if (m_printDialogData.GetMinPage() < 1)
    465453        m_printDialogData.SetMinPage(1);
    466454    if (m_printDialogData.GetMaxPage() < 1)
     
    515503
    516504    printout->OnPreparePrinting();
    517505
     506    // Get some parameters from the printout, if defined
     507    int fromPage, toPage;
     508    int minPage, maxPage;
     509    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
     510
     511    if (maxPage == 0)
     512    {
     513        sm_lastError = wxPRINTER_ERROR;
     514        return false;
     515    }
     516
     517    // Only set min and max, because from and to have been
     518    // set by the user
     519    m_printDialogData.SetMinPage(minPage);
     520    m_printDialogData.SetMaxPage(maxPage);
     521
    518522    printout->OnBeginPrinting();
    519523
    520524    bool keepGoing = true;