Use real id for wxPGCanvas

[wxWidgets.git] / src / osx / core / printmac.cpp

diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp
index c64891c3ffbb2fd2dcf7e3d50b9e9acad929243a..53cf637057fb482ad70817dc5467efa5a23f21e8 100644 (file)
--- a/src/osx/core/printmac.cpp
+++ b/src/osx/core/printmac.cpp
@@ -89,17 +89,17 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
     {
         papersize = data.GetPaperSize();
     }
     {
         papersize = data.GetPaperSize();
     }

-    
+

     if ( papersize != wxDefaultSize )
     {
         papersize.x = (wxInt32) (papersize.x * mm2pt);
         papersize.y = (wxInt32) (papersize.y * mm2pt);
     if ( papersize != wxDefaultSize )
     {
         papersize.x = (wxInt32) (papersize.x * mm2pt);
         papersize.y = (wxInt32) (papersize.y * mm2pt);

-        
+

         double height, width;
         PMPaperGetHeight(m_macPaper, &height);
         PMPaperGetWidth(m_macPaper, &width);
         double height, width;
         PMPaperGetHeight(m_macPaper, &height);
         PMPaperGetWidth(m_macPaper, &width);

-        
-        if ( fabs( width - papersize.x ) >= 5 || 
+
+        if ( fabs( width - papersize.x ) >= 5 ||

             fabs( height - papersize.y ) >= 5 )
         {
             // we have to change the current paper
             fabs( height - papersize.y ) >= 5 )
         {
             // we have to change the current paper


@@ -113,7 +113,7 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
                     PMPaper paper = (PMPaper) CFArrayGetValueAtIndex( paperlist, i );
                     PMPaperGetHeight(paper, &height);
                     PMPaperGetWidth(paper, &width);
                     PMPaper paper = (PMPaper) CFArrayGetValueAtIndex( paperlist, i );
                     PMPaperGetHeight(paper, &height);
                     PMPaperGetWidth(paper, &width);

-                    if ( fabs( width - papersize.x ) < 5 && 
+                    if ( fabs( width - papersize.x ) < 5 &&

                         fabs( height - papersize.y ) < 5 )
                     {
                         // TODO test for duplicate hits and use additional
                         fabs( height - papersize.y ) < 5 )
                     {
                         // TODO test for duplicate hits and use additional


@@ -125,8 +125,8 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
                 if ( bestPaper == kPMNoData )
                 {
                     const PMPaperMargins margins = { 0.0, 0.0, 0.0, 0.0 };
                 if ( bestPaper == kPMNoData )
                 {
                     const PMPaperMargins margins = { 0.0, 0.0, 0.0, 0.0 };

-                    wxString id, name(_T("Custom paper"));                    
-                    id.Printf(_T("wxPaperCustom%dx%d"), papersize.x, papersize.y);
+                    wxString id, name(wxT("Custom paper"));
+                    id.Printf(wxT("wxPaperCustom%dx%d"), papersize.x, papersize.y);

 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
                     if ( PMPaperCreateCustom != NULL)
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
                     if ( PMPaperCreateCustom != NULL)


@@ -135,10 +135,10 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
                             papersize.x, papersize.y, &margins, &paper);
                     }
 #endif
                             papersize.x, papersize.y, &margins, &paper);
                     }
 #endif

-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5

                     if ( paper == kPMNoData )
                     {
                     if ( paper == kPMNoData )
                     {

-                        PMPaperCreate(printer, wxCFStringRef( id, wxFont::GetDefaultEncoding() ), wxCFStringRef( name, wxFont::GetDefaultEncoding() ), 
+                        PMPaperCreate(printer, wxCFStringRef( id, wxFont::GetDefaultEncoding() ), wxCFStringRef( name, wxFont::GetDefaultEncoding() ),

                             papersize.x, papersize.y, &margins, &paper);
                     }
 #endif
                             papersize.x, papersize.y, &margins, &paper);
                     }
 #endif


@@ -159,7 +159,7 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
     CFArrayRef printerList;
     CFIndex index, count;
     CFStringRef name;
     CFArrayRef printerList;
     CFIndex index, count;
     CFStringRef name;

-    
+

     if (PMServerCreatePrinterList(kPMServerLocal, &printerList) == noErr)
     {
         count = CFArrayGetCount(printerList);
     if (PMServerCreatePrinterList(kPMServerLocal, &printerList) == noErr)
     {
         count = CFArrayGetCount(printerList);


@@ -180,7 +180,7 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
             PMSessionSetCurrentPMPrinter(m_macPrintSession, printer);
         CFRelease(printerList);
     }
             PMSessionSetCurrentPMPrinter(m_macPrintSession, printer);
         CFRelease(printerList);
     }

-    
+

     PMSetCopies( m_macPrintSettings , data.GetNoCopies() , false ) ;
     PMSetCollate(m_macPrintSettings, data.GetCollate());
     if ( data.IsOrientationReversed() )
     PMSetCopies( m_macPrintSettings , data.GetNoCopies() , false ) ;
     PMSetCollate(m_macPrintSettings, data.GetCollate());
     if ( data.IsOrientationReversed() )


@@ -189,7 +189,7 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
     else
         PMSetOrientation( m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
             kPMLandscape : kPMPortrait , false ) ;
     else
         PMSetOrientation( m_macPageFormat , ( data.GetOrientation() == wxLANDSCAPE ) ?
             kPMLandscape : kPMPortrait , false ) ;

-    
+

     PMDuplexMode mode = 0 ;
     switch( data.GetDuplex() )
     {
     PMDuplexMode mode = 0 ;
     switch( data.GetDuplex() )
     {


@@ -207,25 +207,27 @@ bool wxOSXPrintData::TransferFrom( const wxPrintData &data )
     PMSetDuplex(  m_macPrintSettings, mode ) ;
 
     // PMQualityMode not yet accessible via API
     PMSetDuplex(  m_macPrintSettings, mode ) ;
 
     // PMQualityMode not yet accessible via API

-    
-    
+
+

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

-    
+
+#ifndef __LP64__

     // PMQualityMode not accessible via API
     // TODO: use our quality property to determine optimal resolution
     PMResolution res;
     PMTag tag = kPMMaxSquareResolution;
     PMPrinterGetPrinterResolution(printer, tag, &res);
     PMSetResolution( m_macPageFormat, &res);
     // PMQualityMode not accessible via API
     // TODO: use our quality property to determine optimal resolution
     PMResolution res;
     PMTag tag = kPMMaxSquareResolution;
     PMPrinterGetPrinterResolution(printer, tag, &res);
     PMSetResolution( m_macPageFormat, &res);

+#endif

 
 

-    // after setting the new resolution the format has to be updated, otherwise the page rect remains 
+    // after setting the new resolution the format has to be updated, otherwise the page rect remains

     // at the 'old' scaling
     // at the 'old' scaling

-    
+

     PMSessionValidatePageFormat(m_macPrintSession,
         m_macPageFormat, kPMDontWantBoolean);
     PMSessionValidatePrintSettings(m_macPrintSession,
     PMSessionValidatePageFormat(m_macPrintSession,
         m_macPageFormat, kPMDontWantBoolean);
     PMSessionValidatePrintSettings(m_macPrintSession,


@@ -267,7 +269,7 @@ bool wxOSXPrintData::TransferTo( wxPrintData &data )
     Boolean collate;
     if (PMGetCollate(m_macPrintSettings, &collate) == noErr)
         data.SetCollate(collate);
     Boolean collate;
     if (PMGetCollate(m_macPrintSettings, &collate) == noErr)
         data.SetCollate(collate);

-    
+

     CFStringRef name;
     PMPrinter printer ;
     PMSessionGetCurrentPrinter( m_macPrintSession, &printer );
     CFStringRef name;
     PMPrinter printer ;
     PMSessionGetCurrentPrinter( m_macPrintSession, &printer );


@@ -279,7 +281,7 @@ bool wxOSXPrintData::TransferTo( wxPrintData &data )
         CFRetain(name);
         data.SetPrinterName(wxCFStringRef(name).AsString());
     }
         CFRetain(name);
         data.SetPrinterName(wxCFStringRef(name).AsString());
     }

-    
+

     PMDuplexMode mode = 0 ;
     PMGetDuplex(  m_macPrintSettings, &mode ) ;
     switch( mode )
     PMDuplexMode mode = 0 ;
     PMGetDuplex(  m_macPrintSettings, &mode ) ;
     switch( mode )


@@ -296,7 +298,7 @@ bool wxOSXPrintData::TransferTo( wxPrintData &data )
             break ;
     }
     // PMQualityMode not yet accessible via API
             break ;
     }
     // PMQualityMode not yet accessible via API

-    
+

     double height, width;
     PMPaperGetHeight(m_macPaper, &height);
     PMPaperGetWidth(m_macPaper, &width);
     double height, width;
     PMPaperGetHeight(m_macPaper, &height);
     PMPaperGetWidth(m_macPaper, &width);


@@ -477,12 +479,13 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 
     // on the mac we have always pixels as addressing mode with 72 dpi
     printout->SetPPIScreen(72, 72);
 
     // on the mac we have always pixels as addressing mode with 72 dpi
     printout->SetPPIScreen(72, 72);

+#ifndef __LP64__

     PMResolution res;
     wxOSXPrintData* nativeData = (wxOSXPrintData*)
           (m_printDialogData.GetPrintData().GetNativeData());
     PMGetResolution( (nativeData->GetPageFormat()), &res);
     printout->SetPPIPrinter(int(res.hRes), int(res.vRes));
     PMResolution res;
     wxOSXPrintData* nativeData = (wxOSXPrintData*)
           (m_printDialogData.GetPrintData().GetNativeData());
     PMGetResolution( (nativeData->GetPageFormat()), &res);
     printout->SetPPIPrinter(int(res.hRes), int(res.vRes));

-
+#endif

     // Set printout parameters
     printout->SetDC(dc);
 
     // Set printout parameters
     printout->SetDC(dc);
 


@@ -562,7 +565,7 @@ bool wxMacPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 
 wxDC* wxMacPrinter::PrintDialog(wxWindow *parent)
 {
 
 wxDC* wxMacPrinter::PrintDialog(wxWindow *parent)
 {

-    wxDC* dc = (wxDC*) NULL;
+    wxDC* dc = NULL;

 
     wxPrintDialog dialog(parent, & m_printDialogData);
     int ret = dialog.ShowModal();
 
     wxPrintDialog dialog(parent, & m_printDialogData);
     int ret = dialog.ShowModal();


@@ -633,10 +636,10 @@ void wxMacPrintPreview::DetermineScaling(void)
 
     wxSize ppiScreen( 72 , 72 ) ;
     wxSize ppiPrinter( 72 , 72 ) ;
 
     wxSize ppiScreen( 72 , 72 ) ;
     wxSize ppiPrinter( 72 , 72 ) ;

-    
+

     // Note that with Leopard, screen dpi=72 is no longer a given
     m_previewPrintout->SetPPIScreen( ppiScreen.x , ppiScreen.y ) ;
     // Note that with Leopard, screen dpi=72 is no longer a given
     m_previewPrintout->SetPPIScreen( ppiScreen.x , ppiScreen.y ) ;

-    
+

     wxCoord w , h ;
     wxCoord ww, hh;
     wxRect paperRect;
     wxCoord w , h ;
     wxCoord ww, hh;
     wxRect paperRect;


@@ -663,7 +666,7 @@ void wxMacPrintPreview::DetermineScaling(void)
     }
     m_pageWidth = w;
     m_pageHeight = h;
     }
     m_pageWidth = w;
     m_pageHeight = h;

-    
+

     m_previewPrintout->SetPageSizePixels(w , h) ;
     m_previewPrintout->SetPageSizeMM(ww, hh);
     m_previewPrintout->SetPaperRectPixels(paperRect);
     m_previewPrintout->SetPageSizePixels(w , h) ;
     m_previewPrintout->SetPageSizeMM(ww, hh);
     m_previewPrintout->SetPaperRectPixels(paperRect);


@@ -691,7 +694,7 @@ wxOSXCarbonPrintData::wxOSXCarbonPrintData()
                     m_macPageFormat);
             PMGetPageFormatPaper(m_macPageFormat, &m_macPaper);
         }
                     m_macPageFormat);
             PMGetPageFormatPaper(m_macPageFormat, &m_macPaper);
         }

-        
+

         if ( PMCreatePrintSettings(&m_macPrintSettings) == noErr )
         {
             PMSessionDefaultPrintSettings(m_macPrintSession,
         if ( PMCreatePrintSettings(&m_macPrintSettings) == noErr )
         {
             PMSessionDefaultPrintSettings(m_macPrintSession,