From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 23 May 2003 18:38:12 +0000 (+0000)
Subject: Applied patch [ 742452 ] wxPrintDialogData: can't set PD_PAGENUMS
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/404749841f636ab8eb0ae2e44c7b6fe5a81552b1?ds=inline

Applied patch [ 742452 ] wxPrintDialogData: can't set PD_PAGENUMS
Applied patch [ 742446 ] wxPrintDialogData::GetAllPages always returns TRUE


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 9a4eca6f15..e9d1a56c75 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -894,6 +894,8 @@ void wxPrintDialogData::ConvertToNative()
         pd->Flags |= PD_NOSELECTION;
     if ( !m_printEnablePageNumbers )
         pd->Flags |= PD_NOPAGENUMS;
+    else if ( (!m_printAllPages) && (!m_printSelection) )
+        pd->Flags |= PD_PAGENUMS;
     if ( m_printEnableHelp )
         pd->Flags |= PD_SHOWHELP;
     if ( m_printSetupDialog )
@@ -940,7 +942,7 @@ void wxPrintDialogData::ConvertFromNative()
     m_printMaxPage = pd->nMaxPage;
     m_printNoCopies = pd->nCopies;
 
-    m_printAllPages = ((pd->Flags & PD_ALLPAGES) == PD_ALLPAGES);
+    m_printAllPages = (((pd->Flags & PD_PAGENUMS) != PD_PAGENUMS) && ((pd->Flags & PD_SELECTION) != PD_SELECTION));
     m_printSelection = ((pd->Flags & PD_SELECTION) == PD_SELECTION);
     m_printCollate = ((pd->Flags & PD_COLLATE) == PD_COLLATE);
     m_printToFile = ((pd->Flags & PD_PRINTTOFILE) == PD_PRINTTOFILE);