A more complete fix for the generic control border issue, a fix for getting/setting...

[wxWidgets.git] / src / mac / carbon / printmac.cpp

diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp
index 6df266562e57e352bfe3e06023ae63e6ce37aaa7..1a1086cd93d9bcf11fa714e6115a9967bf9ba3bd 100644 (file)
--- a/src/mac/carbon/printmac.cpp
+++ b/src/mac/carbon/printmac.cpp
@@ -130,8 +130,12 @@ bool wxMacCarbonPrintData::TransferFrom( const wxPrintData &data )
 {
     ValidateOrCreate() ;
     PMSetCopies( (PMPrintSettings) m_macPrintSettings , data.GetNoCopies() , false ) ;
 {
     ValidateOrCreate() ;
     PMSetCopies( (PMPrintSettings) m_macPrintSettings , data.GetNoCopies() , false ) ;

-    PMSetOrientation( (PMPageFormat) m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
-        kPMLandscape : kPMPortrait , false ) ;
+    if ( data.IsOrientationReversed() )
+        PMSetOrientation( (PMPageFormat) m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
+            kPMReverseLandscape : kPMReversePortrait , false ) ;
+    else
+        PMSetOrientation( (PMPageFormat) m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
+            kPMLandscape : kPMPortrait , false ) ;

     // collate cannot be set
 #if 0 // not yet tested
     if ( !m_printerName.empty() )
     // collate cannot be set
 #if 0 // not yet tested
     if ( !m_printerName.empty() )


@@ -188,9 +192,15 @@ bool wxMacCarbonPrintData::TransferTo( wxPrintData &data )
     if ( err == noErr )
     {
         if ( orientation == kPMPortrait || orientation == kPMReversePortrait )
     if ( err == noErr )
     {
         if ( orientation == kPMPortrait || orientation == kPMReversePortrait )

+        {

             data.SetOrientation( wxPORTRAIT  );
             data.SetOrientation( wxPORTRAIT  );

+            data.SetOrientationReversed( orientation == kPMReversePortrait );
+        }

         else
         else

+        {

             data.SetOrientation( wxLANDSCAPE );
             data.SetOrientation( wxLANDSCAPE );

+            data.SetOrientationReversed( orientation == kPMReverseLandscape );
+        }

     }
 
     // collate cannot be set
     }
 
     // collate cannot be set