AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-05-08 22:34:12 +00:00
parent af867f957d
commit 6d50343d87
21 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/prntbase.cpp
View File

@ -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"

2
src/generic/printps.cpp
View File

@ -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"

2
src/mac/carbon/dc.cpp
View File

@ -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"

2
src/mac/carbon/dccg.cpp
View File

@ -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"

13
src/mac/carbon/dcprint.cpp
View File

@ -1,12 +1,12 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dcprint.cpp
// Name: src/mac/carbon/dcprint.cpp
// Purpose: wxPrinterDC class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
@ -15,13 +15,14 @@
#if wxUSE_PRINTING_ARCHITECTURE
#ifdef __BORLANDC__
#pragma hdrstop
#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 ) ;
@ -238,7 +239,7 @@ wxPrinterDC::~wxPrinterDC(void)
}
#if wxMAC_USE_CORE_GRAPHICS
void wxPrinterDC::MacSetCGContext( void * cg )
void wxPrinterDC::MacSetCGContext( void * cg )
{
((wxMacCGContext*)(m_graphicContext))->SetNativeContext( (CGContextRef) cg ) ;
m_graphicContext->SetPen( m_pen ) ;

2
src/mac/carbon/printdlg.cpp
View File

@ -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"

2
src/mac/carbon/printmac.cpp
View File

@ -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"

2
src/mac/classic/dc.cpp
View File

@ -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"

13
src/mac/classic/dcprint.cpp
View File

@ -1,25 +1,26 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dcprint.cpp
// Name: src/mac/classic/dcprint.cpp
// Purpose: wxPrinterDC class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#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() ;
}

2
src/mac/classic/printdlg.cpp
View File

@ -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"

4
src/mac/classic/printmac.cpp
View File

@ -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 ;

2
src/msw/dc.cpp
View File

@ -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"

9
src/msw/dcprint.cpp
View File

@ -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"
#include "wx/msw/dib.h"
#endif
#include "wx/dcprint.h"
#include "wx/printdlg.h"
#include "wx/msw/printdlg.h"
#include "wx/math.h"

14
src/msw/printdlg.cpp
View File

@ -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 +
printerName.Length() + 1 +
portName.Length()+1 ) * sizeof(wxChar) );
( driverName.length() + 1 +
printerName.length() + 1 +
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;

2
src/msw/printwin.cpp
View File

@ -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"

4
src/os2/dc.cpp
View File

@ -23,19 +23,19 @@
#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>
#include "wx/os2/private.h"
IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
//
// wxWidgets uses the Microsoft convention that the origin is the UPPER left.

6
src/os2/dcprint.cpp
View File

@ -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

3
src/palmos/dc.cpp
View File

@ -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

7
src/palmos/dcprint.cpp
View File

@ -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

2
src/palmos/printdlg.cpp
View File

@ -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"

2
src/palmos/printpalm.cpp
View File

@ -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"