Rich text lib separation.

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

diff --git a/src/mac/classic/printmac.cpp b/src/mac/classic/printmac.cpp
index f179f5e7f6d66b5156cae2504247a4cbdb984bf7..bb70bd50e894c56e20d13f0adf98a1e27d946232 100644 (file)
--- a/src/mac/classic/printmac.cpp
+++ b/src/mac/classic/printmac.cpp
@@ -21,6 +21,7 @@
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/msgdlg.h"
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/msgdlg.h"

+    #include "wx/dcprint.h"

 #endif
 
 #include "wx/mac/uma.h"
 #endif
 
 #include "wx/mac/uma.h"


@@ -31,7 +32,6 @@
 #define mm2pt            2.83464566929
 #define pt2mm            0.352777777778
 
 #define mm2pt            2.83464566929
 #define pt2mm            0.352777777778
 

-#include "wx/dcprint.h"

 #include "wx/printdlg.h"
 
 #include <stdlib.h>
 #include "wx/printdlg.h"
 
 #include <stdlib.h>


@@ -135,7 +135,7 @@ void wxMacCarbonPrintData::TransferFrom( wxPrintData* data )
         kPMLandscape : kPMPortrait , false ) ;
     // collate cannot be set
 #if 0 // not yet tested
         kPMLandscape : kPMPortrait , false ) ;
     // collate cannot be set
 #if 0 // not yet tested

-    if ( m_printerName.Length() > 0 )
+    if ( !m_printerName.empty() )

         PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxMacCFStringHolder( m_printerName , wxFont::GetDefaultEncoding() ) ) ;
 #endif
     PMColorMode color ;
         PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxMacCFStringHolder( m_printerName , wxFont::GetDefaultEncoding() ) ) ;
 #endif
     PMColorMode color ;