X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f37154e988c597e32a840e43783cf0b23e5f8b4..a29567c821c3c82cfbafbbd8182c0be5ff042d08:/include/wx/gtk/print.h

diff --git a/include/wx/gtk/print.h b/include/wx/gtk/print.h
index 492554a6ae..46dde4f2b0 100644
--- a/include/wx/gtk/print.h
+++ b/include/wx/gtk/print.h
@@ -53,11 +53,7 @@ public:
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL );
 
-#if wxUSE_NEW_DC
-    virtual wxImplDC* CreatePrinterImplDC( wxPrinterDC *owner, const wxPrintData& data );
-#else
-    virtual wxDC* CreatePrinterDC( const wxPrintData& data );
-#endif
+    virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
 
     virtual bool HasPrintSetupDialog();
     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
@@ -222,20 +218,11 @@ private:
 // wxGtkPrinterDC
 //-----------------------------------------------------------------------------
 
-#if wxUSE_NEW_DC
-class WXDLLIMPEXP_CORE wxGtkPrinterImplDC : public wxImplDC
-#else
-#define wxGtkPrinterImplDC wxGtkPrinterDC
-class WXDLLIMPEXP_CORE wxGtkPrinterDC : public wxDC
-#endif
+class WXDLLIMPEXP_CORE wxGtkPrinterDCImpl : public wxDCImpl
 {
 public:
-#if wxUSE_NEW_DC
-    wxGtkPrinterImplDC( wxPrinterDC *owner, const wxPrintData& data );
-#else
-    wxGtkPrinterDC( const wxPrintData& data );
-#endif
-    virtual ~wxGtkPrinterImplDC();
+    wxGtkPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
+    virtual ~wxGtkPrinterDCImpl();
 
     bool Ok() const { return IsOk(); }
     bool IsOk() const;
@@ -320,8 +307,8 @@ private:
     double                  m_PS2DEV;
     double                  m_DEV2PS;
 
-    DECLARE_DYNAMIC_CLASS(wxGtkPrinterImplDC)
-    DECLARE_NO_COPY_CLASS(wxGtkPrinterImplDC)
+    DECLARE_DYNAMIC_CLASS(wxGtkPrinterDCImpl)
+    DECLARE_NO_COPY_CLASS(wxGtkPrinterDCImpl)
 };
 
 // ----------------------------------------------------------------------------
@@ -345,11 +332,16 @@ public:
     virtual void DetermineScaling();
 
 private:
-    void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
+    void Init(wxPrintout *printout,
+              wxPrintout *printoutForPrinting,
+              wxPrintData *data);
+
+    // resolution to use in DPI
+    int m_resolution;
 
     DECLARE_CLASS(wxGtkPrintPreview)
 };
 
-#endif
+#endif // wxUSE_GTKPRINT
 
-#endif
+#endif // _WX_GTK_PRINT_H_