fixing new inheritance

[wxWidgets.git] / src / gtk / print.cpp

diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index de6c14664fdad97687dd75e3a99e5f09b35e097d..fc72bdf4d525f1fd1302d7453613400d3f5f6f4b 100644 (file)
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -22,6 +22,7 @@
 #ifndef WX_PRECOMP
 #include "wx/log.h"
 #include "wx/dcmemory.h"
 #ifndef WX_PRECOMP
 #include "wx/log.h"
 #include "wx/dcmemory.h"

+#include "wx/dcprint.h"

 #include "wx/icon.h"
 #include "wx/math.h"
 #include "wx/image.h"
 #include "wx/icon.h"
 #include "wx/math.h"
 #include "wx/image.h"


@@ -143,22 +144,11 @@ wxGtkPrintFactory::CreatePrintSetupDialog(wxWindow * WXUNUSED(parent),
     return NULL;
 }
 
     return NULL;
 }
 

-#if wxUSE_NEW_DC
-

 wxDCImpl* wxGtkPrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )
 {
     return new wxGtkPrinterDCImpl( owner, data );
 }
 
 wxDCImpl* wxGtkPrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )
 {
     return new wxGtkPrinterDCImpl( owner, data );
 }
 

-#else
-
-wxDC* wxGtkPrintFactory::CreatePrinterDC( const wxPrintData& data )
-{
-    return new wxGtkPrinterDC(data);
-}
-
-#endif
-

 bool wxGtkPrintFactory::HasOwnPrintToFile()
 {
     return true;
 bool wxGtkPrintFactory::HasOwnPrintToFile()
 {
     return true;


@@ -905,11 +895,7 @@ void wxGtkPrinter::BeginPrint(wxPrintout *printout, GtkPrintOperation *operation
     SetPrintContext(context);
     native->SetPrintContext( context );
 
     SetPrintContext(context);
     native->SetPrintContext( context );
 

-#if wxUSE_NEW_DC

     wxPrinterDC *printDC = new wxPrinterDC( printdata );
     wxPrinterDC *printDC = new wxPrinterDC( printdata );

-#else
-    wxGtkPrinterDC *printDC = new wxGtkPrinterDC( printdata );
-#endif

     m_dc = printDC;
 
     if (!m_dc->IsOk())
     m_dc = printDC;
 
     if (!m_dc->IsOk())


@@ -1081,11 +1067,7 @@ wxDC* wxGtkPrinter::PrintDialog( wxWindow *parent )
 
     m_printDialogData = dialog.GetPrintDialogData();
     
 
     m_printDialogData = dialog.GetPrintDialogData();
     

-#if wxUSE_NEW_DC

     return new wxPrinterDC( m_printDialogData.GetPrintData() );
     return new wxPrinterDC( m_printDialogData.GetPrintData() );

-#else
-    return new wxGtkPrinterDC( m_printDialogData.GetPrintData() );
-#endif

 }
 
 bool wxGtkPrinter::Setup( wxWindow * WXUNUSED(parent) )
 }
 
 bool wxGtkPrinter::Setup( wxWindow * WXUNUSED(parent) )


@@ -1104,18 +1086,10 @@ bool wxGtkPrinter::Setup( wxWindow * WXUNUSED(parent) )
 #define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * m_DEV2PS)
 
 
 #define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * m_DEV2PS)
 
 

-#if wxUSE_NEW_DC

 IMPLEMENT_ABSTRACT_CLASS(wxGtkPrinterDCImpl, wxDCImpl)
 IMPLEMENT_ABSTRACT_CLASS(wxGtkPrinterDCImpl, wxDCImpl)

-#else
-IMPLEMENT_ABSTRACT_CLASS(wxGtkPrinterDC, wxDC)
-#endif

 
 

-#if wxUSE_NEW_DC

 wxGtkPrinterDCImpl::wxGtkPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) :
    wxDCImpl( owner )
 wxGtkPrinterDCImpl::wxGtkPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) :
    wxDCImpl( owner )

-#else
-wxGtkPrinterDC::wxGtkPrinterDC( const wxPrintData& data )
-#endif

 {
     m_printData = data;
 
 {
     m_printData = data;
 


@@ -1458,11 +1432,7 @@ void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset,
 
 void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
 {
 
 void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
 {

-#if wxUSE_NEW_DC

     wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
     wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );

-#else
-    wxDC::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
-#endif

 }
 
 void wxGtkPrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 }
 
 void wxGtkPrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)