Include wx/dcprint.h according to precompiled headers of wx/wx.h (with other minor cleaning).

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

src/common/prntbase.cpp

@@ -18,6 +18,8 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
+#include "wx/dcprint.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dc.h"
@@ -35,7 +37,6 @@
 #endif // !WX_PRECOMP
 
 #include "wx/prntbase.h"
-#include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #include "wx/print.h"
 #include "wx/module.h"

src/generic/printps.cpp

@@ -34,10 +34,10 @@
     #include "wx/intl.h"
     #include "wx/progdlg.h"
     #include "wx/log.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/generic/printps.h"
-#include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #include "wx/generic/prntdlgg.h"
 #include "wx/generic/progdlgg.h"

src/mac/carbon/dc.cpp

@@ -19,10 +19,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/dcmemory.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/mac/uma.h"
-#include "wx/dcprint.h"
 #include "wx/region.h"
 #include "wx/image.h"
 

src/mac/carbon/dccg.cpp

@@ -19,10 +19,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/dcmemory.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/mac/uma.h"
-#include "wx/dcprint.h"
 #include "wx/region.h"
 #include "wx/image.h"
 

src/mac/carbon/dcprint.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcprint.cpp
+// Name:        src/mac/carbon/dcprint.cpp
 // Purpose:     wxPrinterDC class
 // Author:      Julian Smart
 // Modified by:
@@ -18,10 +18,11 @@
     #pragma hdrstop
 #endif
 
+#include "wx/dcprint.h"
+
 #ifndef WX_PRECOMP
 #endif
 
-#include "wx/dcprint.h"
 #include "wx/msgdlg.h"
 #include "wx/math.h"
 #include "wx/mac/uma.h"
@@ -207,7 +208,7 @@ void wxMacCarbonPrinterDC::EndPage( wxPrinterDC* dc )
 
 wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
 {
-    m_ok = FALSE ;
+    m_ok = false ;
     m_printData = printdata ;
     m_printData.ConvertToNative() ;
     m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ;

src/mac/carbon/printdlg.cpp

@@ -15,11 +15,11 @@
 
 #ifndef WXPRECOMP
     #include "wx/object.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/printdlg.h"
 #include "wx/mac/printdlg.h"
-#include "wx/dcprint.h"
 #include "wx/msgdlg.h"
 #include "wx/mac/private/print.h"
 

src/mac/carbon/printmac.cpp

@@ -23,6 +23,7 @@
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/msgdlg.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/math.h"
@@ -31,7 +32,6 @@
 #include "wx/mac/printmac.h"
 #include "wx/mac/private/print.h"
 
-#include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #include "wx/mac/printdlg.h"
 

src/mac/classic/dc.cpp

@@ -17,10 +17,10 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/dcmemory.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/mac/uma.h"
-#include "wx/dcprint.h"
 #include "wx/region.h"
 #include "wx/image.h"
 

src/mac/classic/dcprint.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcprint.cpp
+// Name:        src/mac/classic/dcprint.cpp
 // Purpose:     wxPrinterDC class
 // Author:      Julian Smart
 // Modified by:
@@ -16,10 +16,11 @@
     #pragma hdrstop
 #endif
 
+#include "wx/dcprint.h"
+
 #ifndef WX_PRECOMP
 #endif
 
-#include "wx/dcprint.h"
 #include "wx/msgdlg.h"
 #include "wx/math.h"
 #include "wx/mac/uma.h"
@@ -300,7 +301,7 @@ void wxMacClassicPrinterDC::EndPage( wxPrinterDC* dc )
 
 wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
 {
-    m_ok = FALSE ;
+    m_ok = false ;
     m_printData = printdata ;
     m_printData.ConvertToNative() ;
     m_nativePrinterDC = wxNativePrinterDC::Create( &m_printData ) ;
@@ -406,5 +407,3 @@ void wxPrinterDC::DoGetSize(int *width, int *height) const
     if ( height )
         * height = m_nativePrinterDC->GetMaxY() ;
 }
-
-

src/mac/classic/printdlg.cpp

@@ -14,10 +14,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/printdlg.h"
-#include "wx/dcprint.h"
 #include "wx/msgdlg.h"
 #include "wx/mac/private/print.h"
 

src/mac/classic/printmac.cpp

@@ -21,6 +21,7 @@
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/msgdlg.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/mac/uma.h"
@@ -31,7 +32,6 @@
 #define mm2pt            2.83464566929
 #define pt2mm            0.352777777778
 
-#include "wx/dcprint.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
-    if ( m_printerName.Length() > 0 )
+    if ( !m_printerName.empty() )
         PMSessionSetCurrentPrinter( (PMPrintSession) m_macPrintSession , wxMacCFStringHolder( m_printerName , wxFont::GetDefaultEncoding() ) ) ;
 #endif
     PMColorMode color ;

src/msw/dc.cpp

@@ -35,10 +35,10 @@
     #include "wx/dcmemory.h"
     #include "wx/log.h"
     #include "wx/icon.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/sysopt.h"
-#include "wx/dcprint.h"
 #include "wx/module.h"
 #include "wx/dynlib.h"
 

src/msw/dcprint.cpp

@@ -24,6 +24,10 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
+#include "wx/dcprint.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
@@ -31,15 +35,12 @@
     #include "wx/dcmemory.h"
 #endif
 
-#if wxUSE_PRINTING_ARCHITECTURE
-
 #include "wx/msw/private.h"
 
 #if wxUSE_WXDIB
     #include "wx/msw/dib.h"
 #endif
 
-#include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #include "wx/msw/printdlg.h"
 #include "wx/math.h"

src/msw/printdlg.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        printdlg.cpp
+// Name:        src/msw/printdlg.cpp
 // Purpose:     wxPrintDialog, wxPageSetupDialog
 // Author:      Julian Smart
 // Modified by:
@@ -30,12 +30,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/cmndata.h"
 #include "wx/printdlg.h"
 #include "wx/msw/printdlg.h"
-#include "wx/dcprint.h"
 #include "wx/paper.h"
 
 #include <stdlib.h>
@@ -95,19 +95,19 @@ static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& prin
     else
     {
         hDev = GlobalAlloc(GPTR, 4*sizeof(WORD)+
-                           ( driverName.Length() + 1 +
+                           ( driverName.length() + 1 +
-            printerName.Length() + 1 +
+            printerName.length() + 1 +
-                             portName.Length()+1 ) * sizeof(wxChar) );
+                             portName.length()+1 ) * sizeof(wxChar) );
         LPDEVNAMES lpDev = (LPDEVNAMES)GlobalLock(hDev);
         lpDev->wDriverOffset = sizeof(WORD) * 4 / sizeof(wxChar);
         wxStrcpy((wxChar*)lpDev + lpDev->wDriverOffset, driverName);
 
         lpDev->wDeviceOffset = (WORD)( lpDev->wDriverOffset +
-                                       driverName.Length() + 1 );
+                                       driverName.length() + 1 );
         wxStrcpy((wxChar*)lpDev + lpDev->wDeviceOffset, printerName);
 
         lpDev->wOutputOffset = (WORD)( lpDev->wDeviceOffset +
-                                       printerName.Length() + 1 );
+                                       printerName.length() + 1 );
         wxStrcpy((wxChar*)lpDev + lpDev->wOutputOffset, portName);
 
         lpDev->wDefault = 0;

src/msw/printwin.cpp

@@ -37,10 +37,10 @@
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/msw/printwin.h"
-#include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #include "wx/msw/private.h"
 

src/os2/dc.cpp

@@ -23,13 +23,13 @@
     #include "wx/log.h"
     #include "wx/icon.h"
     #include "wx/msgdlg.h"
+    #include "wx/dcprint.h"
 #if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
 #endif
 #endif
 
 #include "wx/module.h"
-#include "wx/dcprint.h"
 
 #include <string.h>
 

src/os2/dcprint.cpp

@@ -14,13 +14,13 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
+#include "wx/dcprint.h"
+
 #define INCL_DEV
 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>
 
-#include "wx/dcprint.h"
-
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/math.h"
@@ -278,7 +278,7 @@ static bool wxGetDefaultDeviceName( wxString& rsDeviceName, wxString& rsPortName
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }
-    return ( deviceName != wxT("") );
+    return !deviceName.empty();
 */
     return true;
 } // end of wxGetDefaultDeviceName

src/palmos/dc.cpp

@@ -34,10 +34,10 @@
     #include "wx/dcmemory.h"
     #include "wx/log.h"
     #include "wx/icon.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/sysopt.h"
-#include "wx/dcprint.h"
 #include "wx/module.h"
 #include "wx/dynload.h"
 
@@ -497,4 +497,3 @@ private:
 IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
 
 #endif // wxUSE_DC_CACHEING
-

src/palmos/dcprint.cpp

@@ -24,6 +24,10 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
+#include "wx/dcprint.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
@@ -32,15 +36,12 @@
     #include "wx/math.h"
 #endif
 
-#if wxUSE_PRINTING_ARCHITECTURE
-
 #include "wx/palmos/private.h"
 
 #if wxUSE_WXDIB
 #include "wx/palmos/dib.h"
 #endif
 
-#include "wx/dcprint.h"
 
 // ----------------------------------------------------------------------------
 // wxWin macros

src/palmos/printdlg.cpp

@@ -30,10 +30,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/printdlg.h"
-#include "wx/dcprint.h"
 
 #include "wx/palmos/private.h"
 

src/palmos/printpalm.cpp

@@ -37,10 +37,10 @@
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/dcprint.h"
 #endif
 
 #include "wx/palmos/printpalm.h"
-#include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #include "wx/palmos/private.h"