don't use deprecated toolbar API

[wxWidgets.git] / src / gtk / gnome / gprint.cpp

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 54d2c0870842c213a2999b3003807c3989bea801..aa93c96e64d29bd6b82c55f36172f40d1213da6a 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -33,6 +33,7 @@
 #include "wx/gtk/private.h"
 #include "wx/dynlib.h"
 #include "wx/paper.h"
 #include "wx/gtk/private.h"
 #include "wx/dynlib.h"
 #include "wx/paper.h"

+#include "wx/dcprint.h"

 
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-pango.h>
 
 #include <libgnomeprint/gnome-print.h>
 #include <libgnomeprint/gnome-print-pango.h>


@@ -476,11 +477,23 @@ wxGnomePrintFactory::CreatePrintSetupDialog(wxWindow * WXUNUSED(parent),
     return NULL;
 }
 
     return NULL;
 }
 

+
+#if wxUSE_NEW_DC
+
+wxDCImpl* wxGnomePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )
+{
+    return new wxGnomePrinterDCImpl( owner, data );
+}
+
+#else
+

 wxDC* wxGnomePrintFactory::CreatePrinterDC( const wxPrintData& data )
 {
     return new wxGnomePrinterDC(data);
 }
 
 wxDC* wxGnomePrintFactory::CreatePrinterDC( const wxPrintData& data )
 {
     return new wxGnomePrinterDC(data);
 }
 

+#endif
+

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


@@ -841,7 +854,11 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     if (prompt)
         dc = PrintDialog( parent );
     else
     if (prompt)
         dc = PrintDialog( parent );
     else

-        dc = new wxGnomePrinterDC( printdata );
+#if wxUSE_NEW_DC
+        dc = new wxPrinterDC( printdata );  // TODO: check that this works
+#else
+        dc = new wxGnomePrinterDC( printdata );  // TODO: check that this works
+#endif

 
     if (m_native_preview)
         printout->SetIsPreview(true);
 
     if (m_native_preview)
         printout->SetIsPreview(true);


@@ -860,8 +877,8 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
 
     printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
                             (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
 
     printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
                             (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );

-    printout->SetPPIPrinter( wxGnomePrinterDC::GetResolution(),
-                             wxGnomePrinterDC::GetResolution() );
+    printout->SetPPIPrinter( dc->GetResolution(),
+                             dc->GetResolution() );

 
     printout->SetDC(dc);
 
 
     printout->SetDC(dc);
 


@@ -959,7 +976,11 @@ wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent )
     m_native_preview = ret == wxID_PREVIEW;
 
     m_printDialogData = dialog.GetPrintDialogData();
     m_native_preview = ret == wxID_PREVIEW;
 
     m_printDialogData = dialog.GetPrintDialogData();

+#if wxUSE_NEW_DC
+    return new wxPrinterDC( m_printDialogData.GetPrintData() );
+#else

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

+#endif

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


@@ -984,9 +1005,18 @@ static const double DEV2PS = 72.0 / 600.0;
 #define YLOG2DEV(x)     ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS)
 #define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
 
 #define YLOG2DEV(x)     ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS)
 #define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
 

-IMPLEMENT_CLASS(wxGnomePrinterDC, wxDC)
+#if wxUSE_NEW_DC
+IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDCImpl, wxDCImpl)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxGnomePrinterDC, wxDC)
+#endif

 
 

+#if wxUSE_NEW_DC
+wxGnomePrinterDCImpl::wxGnomePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) :
+   wxDCImpl( owner )
+#else

 wxGnomePrinterDC::wxGnomePrinterDC( const wxPrintData& data )
 wxGnomePrinterDC::wxGnomePrinterDC( const wxPrintData& data )

+#endif

 {
     m_printData = data;
 
 {
     m_printData = data;
 


@@ -1011,17 +1041,17 @@ wxGnomePrinterDC::wxGnomePrinterDC( const wxPrintData& data )
     m_pageHeight = ph * PS2DEV;
 }
 
     m_pageHeight = ph * PS2DEV;
 }
 

-wxGnomePrinterDC::~wxGnomePrinterDC()
+wxGnomePrinterDCImpl::~wxGnomePrinterDCImpl()

 {
 }
 
 {
 }
 

-bool wxGnomePrinterDC::IsOk() const
+bool wxGnomePrinterDCImpl::IsOk() const

 {
     return true;
 }
 
 bool
 {
     return true;
 }
 
 bool

-wxGnomePrinterDC::DoFloodFill(wxCoord WXUNUSED(x1),
+wxGnomePrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),

                             wxCoord WXUNUSED(y1),
                             const wxColour& WXUNUSED(col),
                             int WXUNUSED(style))
                             wxCoord WXUNUSED(y1),
                             const wxColour& WXUNUSED(col),
                             int WXUNUSED(style))


@@ -1030,16 +1060,16 @@ wxGnomePrinterDC::DoFloodFill(wxCoord WXUNUSED(x1),
 }
 
 bool
 }
 
 bool

-wxGnomePrinterDC::DoGetPixel(wxCoord WXUNUSED(x1),
+wxGnomePrinterDCImpl::DoGetPixel(wxCoord WXUNUSED(x1),

                            wxCoord WXUNUSED(y1),
                            wxColour * WXUNUSED(col)) const
 {
     return false;
 }
 
                            wxCoord WXUNUSED(y1),
                            wxColour * WXUNUSED(col)) const
 {
     return false;
 }
 

-void wxGnomePrinterDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxGnomePrinterDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)

 {
 {

-    if  (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if  (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;

 
     SetPen( m_pen );
 
 
     SetPen( m_pen );
 


@@ -1051,11 +1081,11 @@ void wxGnomePrinterDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2
     CalcBoundingBox( x2, y2 );
 }
 
     CalcBoundingBox( x2, y2 );
 }
 

-void wxGnomePrinterDC::DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
+void wxGnomePrinterDCImpl::DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))

 {
 }
 
 {
 }
 

-void wxGnomePrinterDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
+void wxGnomePrinterDCImpl::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)

 {
     double dx = x1 - xc;
     double dy = y1 - yc;
 {
     double dx = x1 - xc;
     double dy = y1 - yc;


@@ -1086,7 +1116,7 @@ void wxGnomePrinterDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxC
         while (alpha2 > 360)  alpha2 -= 360;
     }
 
         while (alpha2 > 360)  alpha2 -= 360;
     }
 

-    if (m_brush.GetStyle() != wxTRANSPARENT)
+    if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)

     {
         SetBrush( m_brush );
         gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
     {
         SetBrush( m_brush );
         gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );


@@ -1095,7 +1125,7 @@ void wxGnomePrinterDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxC
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 

-    if (m_pen.GetStyle() != wxTRANSPARENT)
+    if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)

     {
         SetPen (m_pen);
         gs_libGnomePrint->gnome_print_newpath( m_gpc );
     {
         SetPen (m_pen);
         gs_libGnomePrint->gnome_print_newpath( m_gpc );


@@ -1111,7 +1141,7 @@ void wxGnomePrinterDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxC
     CalcBoundingBox (xc, yc);
 }
 
     CalcBoundingBox (xc, yc);
 }
 

-void wxGnomePrinterDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
+void wxGnomePrinterDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)

 {
     x += w/2;
     y += h/2;
 {
     x += w/2;
     y += h/2;


@@ -1128,7 +1158,7 @@ void wxGnomePrinterDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h
     xx = 0.0;
     yy = 0.0;
 
     xx = 0.0;
     yy = 0.0;
 

-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -1140,7 +1170,7 @@ void wxGnomePrinterDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 

-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)

     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 


@@ -1156,13 +1186,13 @@ void wxGnomePrinterDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h
     CalcBoundingBox( x+w, y+h );
 }
 
     CalcBoundingBox( x+w, y+h );
 }
 

-void wxGnomePrinterDC::DoDrawPoint(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
+void wxGnomePrinterDCImpl::DoDrawPoint(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))

 {
 }
 
 {
 }
 

-void wxGnomePrinterDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxGnomePrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)

 {
 {

-    if (m_pen.GetStyle() == wxTRANSPARENT) return;
+    if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;

 
     if (n <= 0) return;
 
 
     if (n <= 0) return;
 


@@ -1180,13 +1210,13 @@ void wxGnomePrinterDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxC
     gs_libGnomePrint->gnome_print_stroke ( m_gpc);
 }
 
     gs_libGnomePrint->gnome_print_stroke ( m_gpc);
 }
 

-void wxGnomePrinterDC::DoDrawPolygon(int n, wxPoint points[],
+void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],

                                    wxCoord xoffset, wxCoord yoffset,
                                    int WXUNUSED(fillStyle))
 {
     if (n==0) return;
 
                                    wxCoord xoffset, wxCoord yoffset,
                                    int WXUNUSED(fillStyle))
 {
     if (n==0) return;
 

-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -1207,7 +1237,7 @@ void wxGnomePrinterDC::DoDrawPolygon(int n, wxPoint points[],
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 

-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)

     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 


@@ -1228,17 +1258,21 @@ void wxGnomePrinterDC::DoDrawPolygon(int n, wxPoint points[],
     }
 }
 
     }
 }
 

-void wxGnomePrinterDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGnomePrinterDCImpl::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 );
+#else

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

+#endif

 }
 
 }
 

-void wxGnomePrinterDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGnomePrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
     width--;
     height--;
 
 {
     width--;
     height--;
 

-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -1254,7 +1288,7 @@ void wxGnomePrinterDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCo
         CalcBoundingBox( x + width, y + height );
     }
 
         CalcBoundingBox( x + width, y + height );
     }
 

-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)

     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 


@@ -1271,14 +1305,14 @@ void wxGnomePrinterDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCo
     }
 }
 
     }
 }
 

-void wxGnomePrinterDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
+void wxGnomePrinterDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)

 {
     width--;
     height--;
 
     wxCoord rad = wxRound( radius );
 
 {
     width--;
     height--;
 
     wxCoord rad = wxRound( radius );
 

-    if (m_brush.GetStyle() != wxTRANSPARENT)
+    if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)

     {
         SetBrush(m_brush);
         gs_libGnomePrint->gnome_print_newpath(m_gpc);
     {
         SetBrush(m_brush);
         gs_libGnomePrint->gnome_print_newpath(m_gpc);


@@ -1310,7 +1344,7 @@ void wxGnomePrinterDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord widt
         CalcBoundingBox(x+width,y+height);
     }
 
         CalcBoundingBox(x+width,y+height);
     }
 

-    if (m_pen.GetStyle() != wxTRANSPARENT)
+    if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)

     {
         SetPen(m_pen);
         gs_libGnomePrint->gnome_print_newpath(m_gpc);
     {
         SetPen(m_pen);
         gs_libGnomePrint->gnome_print_newpath(m_gpc);


@@ -1343,7 +1377,7 @@ void wxGnomePrinterDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord widt
     }
 }
 
     }
 }
 

-void wxGnomePrinterDC::makeEllipticalPath(wxCoord x, wxCoord y,
+void wxGnomePrinterDCImpl::makeEllipticalPath(wxCoord x, wxCoord y,

                                         wxCoord width, wxCoord height)
 {
     double r = 4 * (sqrt(2.) - 1) / 3;
                                         wxCoord width, wxCoord height)
 {
     double r = 4 * (sqrt(2.) - 1) / 3;


@@ -1389,12 +1423,12 @@ void wxGnomePrinterDC::makeEllipticalPath(wxCoord x, wxCoord y,
     gs_libGnomePrint->gnome_print_closepath(m_gpc);
 }
 
     gs_libGnomePrint->gnome_print_closepath(m_gpc);
 }
 

-void wxGnomePrinterDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGnomePrinterDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
     width--;
     height--;
 
 {
     width--;
     height--;
 

-    if (m_brush.GetStyle () != wxTRANSPARENT)
+    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)

     {
         SetBrush( m_brush );
         makeEllipticalPath( x, y, width, height );
     {
         SetBrush( m_brush );
         makeEllipticalPath( x, y, width, height );


@@ -1403,7 +1437,7 @@ void wxGnomePrinterDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoor
         CalcBoundingBox( x + width, y + height );
     }
 
         CalcBoundingBox( x + width, y + height );
     }
 

-    if (m_pen.GetStyle () != wxTRANSPARENT)
+    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)

     {
         SetPen (m_pen);
         makeEllipticalPath( x, y, width, height );
     {
         SetPen (m_pen);
         makeEllipticalPath( x, y, width, height );


@@ -1414,7 +1448,7 @@ void wxGnomePrinterDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoor
 }
 
 #if wxUSE_SPLINES
 }
 
 #if wxUSE_SPLINES

-void wxGnomePrinterDC::DoDrawSpline(const wxPointList *points)
+void wxGnomePrinterDCImpl::DoDrawSpline(const wxPointList *points)

 {
     SetPen (m_pen);
 
 {
     SetPen (m_pen);
 


@@ -1474,7 +1508,7 @@ void wxGnomePrinterDC::DoDrawSpline(const wxPointList *points)
 #endif // wxUSE_SPLINES
 
 bool
 #endif // wxUSE_SPLINES
 
 bool

-wxGnomePrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
+wxGnomePrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,

                       wxCoord width, wxCoord height,
                       wxDC *source,
                       wxCoord xsrc, wxCoord ysrc,
                       wxCoord width, wxCoord height,
                       wxDC *source,
                       wxCoord xsrc, wxCoord ysrc,


@@ -1492,18 +1526,18 @@ wxGnomePrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
     memDC.SelectObject(wxNullBitmap);
 
     // draw bitmap. scaling and positioning is done there
     memDC.SelectObject(wxNullBitmap);
 
     // draw bitmap. scaling and positioning is done there

-    DrawBitmap( bitmap, xdest, ydest );
+    GetOwner()->DrawBitmap( bitmap, xdest, ydest );

 
     return true;
 }
 
 
     return true;
 }
 

-void wxGnomePrinterDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
+void wxGnomePrinterDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )

 {
     DoDrawBitmap( icon, x, y, true );
 }
 
 void
 {
     DoDrawBitmap( icon, x, y, true );
 }
 
 void

-wxGnomePrinterDC::DoDrawBitmap(const wxBitmap& bitmap,
+wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap,

                              wxCoord x, wxCoord y,
                              bool WXUNUSED(useMask))
 {
                              wxCoord x, wxCoord y,
                              bool WXUNUSED(useMask))
 {


@@ -1555,12 +1589,12 @@ wxGnomePrinterDC::DoDrawBitmap(const wxBitmap& bitmap,
     }
 }
 
     }
 }
 

-void wxGnomePrinterDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
+void wxGnomePrinterDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y )

 {
     DoDrawRotatedText( text, x, y, 0.0 );
 }
 
 {
     DoDrawRotatedText( text, x, y, 0.0 );
 }
 

-void wxGnomePrinterDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
+void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)

 {
     double xx = XLOG2DEV(x);
     double yy = YLOG2DEV(y);
 {
     double xx = XLOG2DEV(x);
     double yy = YLOG2DEV(y);


@@ -1642,11 +1676,11 @@ void wxGnomePrinterDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoor
     CalcBoundingBox (x + w, y + h);
 }
 
     CalcBoundingBox (x + w, y + h);
 }
 

-void wxGnomePrinterDC::Clear()
+void wxGnomePrinterDCImpl::Clear()

 {
 }
 
 {
 }
 

-void wxGnomePrinterDC::SetFont( const wxFont& font )
+void wxGnomePrinterDCImpl::SetFont( const wxFont& font )

 {
     m_font = font;
 
 {
     m_font = font;
 


@@ -1661,7 +1695,7 @@ void wxGnomePrinterDC::SetFont( const wxFont& font )
     }
 }
 
     }
 }
 

-void wxGnomePrinterDC::SetPen( const wxPen& pen )
+void wxGnomePrinterDCImpl::SetPen( const wxPen& pen )

 {
     if (!pen.Ok()) return;
 
 {
     if (!pen.Ok()) return;
 


@@ -1683,11 +1717,11 @@ void wxGnomePrinterDC::SetPen( const wxPen& pen )
 
     switch (m_pen.GetStyle())
     {
 
     switch (m_pen.GetStyle())
     {

-        case wxDOT:           gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, dotted, 0 ); break;
-        case wxSHORT_DASH:    gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
-        case wxLONG_DASH:     gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
-        case wxDOT_DASH:      gs_libGnomePrint->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 );  break;
-        case wxUSER_DASH:
+        case wxPENSTYLE_DOT:        gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, dotted, 0 ); break;
+        case wxPENSTYLE_SHORT_DASH: gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
+        case wxPENSTYLE_LONG_DASH:  gs_libGnomePrint->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
+        case wxPENSTYLE_DOT_DASH:   gs_libGnomePrint->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 );  break;
+        case wxPENSTYLE_USER_DASH:

         {
             // It may be noted that libgnomeprint between at least
             // versions 2.8.0 and 2.12.1 makes a copy of the dashes
         {
             // It may be noted that libgnomeprint between at least
             // versions 2.8.0 and 2.12.1 makes a copy of the dashes


@@ -1703,8 +1737,8 @@ void wxGnomePrinterDC::SetPen( const wxPen& pen )
             g_free( g_dashes );
         }
         break;
             g_free( g_dashes );
         }
         break;

-        case wxSOLID:
-        case wxTRANSPARENT:
+        case wxPENSTYLE_SOLID:
+        case wxPENSTYLE_TRANSPARENT:

         default:              gs_libGnomePrint->gnome_print_setdash( m_gpc, 0, NULL, 0 );   break;
     }
 
         default:              gs_libGnomePrint->gnome_print_setdash( m_gpc, 0, NULL, 0 );   break;
     }
 


@@ -1727,7 +1761,7 @@ void wxGnomePrinterDC::SetPen( const wxPen& pen )
     }
 }
 
     }
 }
 

-void wxGnomePrinterDC::SetBrush( const wxBrush& brush )
+void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush )

 {
     if (!brush.Ok()) return;
 
 {
     if (!brush.Ok()) return;
 


@@ -1766,17 +1800,25 @@ void wxGnomePrinterDC::SetBrush( const wxBrush& brush )
     }
 }
 
     }
 }
 

-void wxGnomePrinterDC::SetLogicalFunction(int WXUNUSED(function))
+void wxGnomePrinterDCImpl::SetLogicalFunction(int WXUNUSED(function))

 {
 }
 
 {
 }
 

-void wxGnomePrinterDC::SetBackground(const wxBrush& WXUNUSED(brush))
+void wxGnomePrinterDCImpl::SetBackground(const wxBrush& WXUNUSED(brush))

 {
 }
 
 {
 }
 

-void wxGnomePrinterDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGnomePrinterDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
 {

+#if wxUSE_NEW_DC
+    m_clipping = TRUE;    // TODO move somewhere else
+    m_clipX1 = x;
+    m_clipY1 = y;
+    m_clipX2 = x + width;
+    m_clipY2 = y + height;
+#else

     wxDC::DoSetClippingRegion( x, y, width, height );
     wxDC::DoSetClippingRegion( x, y, width, height );

+#endif

 
     gs_libGnomePrint->gnome_print_gsave( m_gpc );
 
 
     gs_libGnomePrint->gnome_print_gsave( m_gpc );
 


@@ -1789,9 +1831,13 @@ void wxGnomePrinterDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width,
     gs_libGnomePrint->gnome_print_clip( m_gpc );
 }
 
     gs_libGnomePrint->gnome_print_clip( m_gpc );
 }
 

-void wxGnomePrinterDC::DestroyClippingRegion()
+void wxGnomePrinterDCImpl::DestroyClippingRegion()

 {
 {

+#if wxUSE_NEW_DC
+    wxDCImpl::DestroyClippingRegion();
+#else

     wxDC::DestroyClippingRegion();
     wxDC::DestroyClippingRegion();

+#endif

 
     gs_libGnomePrint->gnome_print_grestore( m_gpc );
 
 
     gs_libGnomePrint->gnome_print_grestore( m_gpc );
 


@@ -1804,27 +1850,27 @@ void wxGnomePrinterDC::DestroyClippingRegion()
 #endif
 }
 
 #endif
 }
 

-bool wxGnomePrinterDC::StartDoc(const wxString& WXUNUSED(message))
+bool wxGnomePrinterDCImpl::StartDoc(const wxString& WXUNUSED(message))

 {
     return true;
 }
 
 {
     return true;
 }
 

-void wxGnomePrinterDC::EndDoc()
+void wxGnomePrinterDCImpl::EndDoc()

 {
     gs_libGnomePrint->gnome_print_end_doc( m_gpc );
 }
 
 {
     gs_libGnomePrint->gnome_print_end_doc( m_gpc );
 }
 

-void wxGnomePrinterDC::StartPage()
+void wxGnomePrinterDCImpl::StartPage()

 {
     gs_libGnomePrint->gnome_print_beginpage( m_gpc, (const guchar*) "page" );
 }
 
 {
     gs_libGnomePrint->gnome_print_beginpage( m_gpc, (const guchar*) "page" );
 }
 

-void wxGnomePrinterDC::EndPage()
+void wxGnomePrinterDCImpl::EndPage()

 {
     gs_libGnomePrint->gnome_print_showpage( m_gpc );
 }
 
 {
     gs_libGnomePrint->gnome_print_showpage( m_gpc );
 }
 

-wxCoord wxGnomePrinterDC::GetCharHeight() const
+wxCoord wxGnomePrinterDCImpl::GetCharHeight() const

 {
     pango_layout_set_text( m_layout, "H", 1 );
 
 {
     pango_layout_set_text( m_layout, "H", 1 );
 


@@ -1834,7 +1880,7 @@ wxCoord wxGnomePrinterDC::GetCharHeight() const
     return h;
 }
 
     return h;
 }
 

-wxCoord wxGnomePrinterDC::GetCharWidth() const
+wxCoord wxGnomePrinterDCImpl::GetCharWidth() const

 {
     pango_layout_set_text( m_layout, "H", 1 );
 
 {
     pango_layout_set_text( m_layout, "H", 1 );
 


@@ -1844,7 +1890,7 @@ wxCoord wxGnomePrinterDC::GetCharWidth() const
     return w;
 }
 
     return w;
 }
 

-void wxGnomePrinterDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
+void wxGnomePrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,

                      wxCoord *descent,
                      wxCoord *externalLeading,
                      const wxFont *theFont ) const
                      wxCoord *descent,
                      wxCoord *externalLeading,
                      const wxFont *theFont ) const


@@ -1908,7 +1954,7 @@ void wxGnomePrinterDC::DoGetTextExtent(const wxString& string, wxCoord *width, w
     pango_layout_set_font_description( m_layout, m_fontdesc );
 }
 
     pango_layout_set_font_description( m_layout, m_fontdesc );
 }
 

-void wxGnomePrinterDC::DoGetSize(int* width, int* height) const
+void wxGnomePrinterDCImpl::DoGetSize(int* width, int* height) const

 {
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) m_printData.GetNativeData();
 {
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) m_printData.GetNativeData();


@@ -1924,7 +1970,7 @@ void wxGnomePrinterDC::DoGetSize(int* width, int* height) const
         *height = wxRound( ph * PS2DEV );
 }
 
         *height = wxRound( ph * PS2DEV );
 }
 

-void wxGnomePrinterDC::DoGetSizeMM(int *width, int *height) const
+void wxGnomePrinterDCImpl::DoGetSizeMM(int *width, int *height) const

 {
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) m_printData.GetNativeData();
 {
     wxGnomePrintNativeData *native =
       (wxGnomePrintNativeData*) m_printData.GetNativeData();


@@ -1947,30 +1993,37 @@ void wxGnomePrinterDC::DoGetSizeMM(int *width, int *height) const
         *height = (int) (ph + 0.5);
 }
 
         *height = (int) (ph + 0.5);
 }
 

-wxSize wxGnomePrinterDC::GetPPI() const
+wxSize wxGnomePrinterDCImpl::GetPPI() const

 {
     return wxSize(DPI,DPI);
 }
 
 {
     return wxSize(DPI,DPI);
 }
 

-void wxGnomePrinterDC::SetPrintData(const wxPrintData& data)
+void wxGnomePrinterDCImpl::SetPrintData(const wxPrintData& data)

 {
     m_printData = data;
 
     int height;
     if (m_printData.GetOrientation() == wxPORTRAIT)
 {
     m_printData = data;
 
     int height;
     if (m_printData.GetOrientation() == wxPORTRAIT)

-        GetSize( NULL, &height );
+        GetOwner()->GetSize( NULL, &height );

     else
     else

-        GetSize( &height, NULL );
+        GetOwner()->GetSize( &height, NULL );

     m_deviceLocalOriginY = height;
 }
 
     m_deviceLocalOriginY = height;
 }
 

-void wxGnomePrinterDC::SetResolution(int WXUNUSED(ppi))
+// overridden for wxPrinterDC Impl
+
+int wxGnomePrinterDCImpl::GetResolution()

 {
 {

+    return DPI;

 }
 
 }
 

-int wxGnomePrinterDC::GetResolution()
+wxRect wxGnomePrinterDCImpl::GetPaperRect()

 {
 {

-    return DPI;
+    // GNOME print doesn't support printer margins
+    int w = 0;
+    int h = 0;
+    DoGetSize( &w, &h );
+    return wxRect( 0, 0, w, h );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -2051,14 +2104,16 @@ void wxGnomePrintPreview::DetermineScaling()
 
         m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
                                          (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
 
         m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
                                          (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );

-        m_previewPrintout->SetPPIPrinter(wxGnomePrinterDC::GetResolution(), wxGnomePrinterDC::GetResolution());
+                                         
+        int resolution = DPI;
+        m_previewPrintout->SetPPIPrinter( resolution, resolution );

 
         wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
 
 
         wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
 

-        // TODO: get better resolution information from wxGnomePrinterDC, if possible.
+        // TODO: get better resolution information from wxGnomePrinterDCImpl, if possible.

 
 

-        sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxGnomePrinterDC::GetResolution() / 72.0);
-        sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * wxGnomePrinterDC::GetResolution() / 72.0);
+        sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * resolution / 72.0);
+        sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * resolution / 72.0);

         wxSize sizeTenthsMM(paper->GetSize());
         wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
 
         wxSize sizeTenthsMM(paper->GetSize());
         wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
 


@@ -2079,7 +2134,7 @@ void wxGnomePrintPreview::DetermineScaling()
         m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight));
 
         // At 100%, the page should look about page-size on the screen.
         m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight));
 
         // At 100%, the page should look about page-size on the screen.

-        m_previewScaleX = (float)0.8 * 72.0 / (float)wxGnomePrinterDC::GetResolution();
+        m_previewScaleX = (double)0.8 * 72.0 / (double)resolution;

         m_previewScaleY = m_previewScaleX;
     }
 }
         m_previewScaleY = m_previewScaleX;
     }
 }