no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / gtk / gnome / gprint.h

diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h
index 77e924d71134dc456f9b4e5c5a93c58a42bd58cd..182b5e316b0a2141393dceef1cbbaafd5bd73753 100644 (file)
--- a/include/wx/gtk/gnome/gprint.h
+++ b/include/wx/gtk/gnome/gprint.h
@@ -1,35 +1,44 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gprint.h
+// Name:        wx/gtk/gnome/gprint.h

 // Author:      Robert Roebling
 // Purpose:     GNOME printing support
 // Created:     09/20/04
 // Author:      Robert Roebling
 // Purpose:     GNOME printing support
 // Created:     09/20/04

+// RCS-ID:      $Id$

 // Copyright:   Robert Roebling
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   Robert Roebling
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __gprint_H__
-#define __gprint_H__
+#ifndef _WX_GTK_GPRINT_H_
+#define _WX_GTK_GPRINT_H_

 
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-// Include wxWindows' headers
-
-#ifndef WX_PRECOMP
-    #include <wx/wx.h>
-#endif
+#include "wx/defs.h"

 
 #if wxUSE_LIBGNOMEPRINT
 
 #include "wx/print.h"
 
 #if wxUSE_LIBGNOMEPRINT
 
 #include "wx/print.h"

-#include "wx/prntbase.h"

 #include "wx/printdlg.h"
 #include "wx/printdlg.h"

+#include "wx/dc.h"
+#include "wx/module.h"

 
 typedef struct _GnomePrintJob GnomePrintJob;
 typedef struct _GnomePrintContext GnomePrintContext;
 typedef struct _GnomePrintConfig GnomePrintConfig;
 
 
 typedef struct _GnomePrintJob GnomePrintJob;
 typedef struct _GnomePrintContext GnomePrintContext;
 typedef struct _GnomePrintConfig GnomePrintConfig;
 

+// ----------------------------------------------------------------------------
+// wxGnomePrintModule
+// ----------------------------------------------------------------------------
+
+class wxGnomePrintModule: public wxModule
+{
+public:
+    wxGnomePrintModule() {}
+    bool OnInit();
+    void OnExit();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxGnomePrintModule)
+};
+

 //----------------------------------------------------------------------------
 // wxGnomePrintNativeData
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // wxGnomePrintNativeData
 //----------------------------------------------------------------------------


@@ -39,24 +48,25 @@ class wxGnomePrintNativeData: public wxPrintNativeDataBase
 public:
     wxGnomePrintNativeData();
     virtual ~wxGnomePrintNativeData();
 public:
     wxGnomePrintNativeData();
     virtual ~wxGnomePrintNativeData();

-    
+

     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );

-    
-    virtual bool Ok() const { return true; }
-    
+
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return true; }
+

     GnomePrintConfig* GetPrintConfig() { return m_config; }
     GnomePrintConfig* GetPrintConfig() { return m_config; }

+    void SetPrintJob( GnomePrintJob *job ) { m_job = job; }

     GnomePrintJob* GetPrintJob() { return m_job; }
     GnomePrintJob* GetPrintJob() { return m_job; }

-    
-    
+
+

 private:
     GnomePrintConfig  *m_config;
     GnomePrintJob     *m_job;
 private:
     GnomePrintConfig  *m_config;
     GnomePrintJob     *m_job;

-    
-private:
+

     DECLARE_DYNAMIC_CLASS(wxGnomePrintNativeData)
 };
     DECLARE_DYNAMIC_CLASS(wxGnomePrintNativeData)
 };

-    
+

 //----------------------------------------------------------------------------
 // wxGnomePrintFactory
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // wxGnomePrintFactory
 //----------------------------------------------------------------------------


@@ -65,19 +75,28 @@ class wxGnomePrintFactory: public wxPrintFactory
 {
 public:
     virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );
 {
 public:
     virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );

-    
-    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
-                                                    wxPrintout *printout = NULL, 
+
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview,
+                                                    wxPrintout *printout = NULL,

                                                     wxPrintDialogData *data = NULL );
                                                     wxPrintDialogData *data = NULL );

-    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview,

                                                     wxPrintout *printout,
                                                     wxPrintData *data );
                                                     wxPrintout *printout,
                                                     wxPrintData *data );

-                                                    
-    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent,

                                                   wxPrintDialogData *data = NULL );
                                                   wxPrintDialogData *data = NULL );

-    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent,

                                                   wxPrintData *data );
                                                   wxPrintData *data );

-                                                  
+
+    virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
+                                                          wxPageSetupDialogData * data = NULL );
+
+#if wxUSE_NEW_DC
+    virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
+#else
+    virtual wxDC* CreatePrinterDC( const wxPrintData& data );
+#endif
+

     virtual bool HasPrintSetupDialog();
     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
     virtual bool HasOwnPrintToFile();
     virtual bool HasPrintSetupDialog();
     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
     virtual bool HasOwnPrintToFile();


@@ -85,7 +104,7 @@ public:
     virtual wxString CreatePrinterLine();
     virtual bool HasStatusLine();
     virtual wxString CreateStatusLine();
     virtual wxString CreatePrinterLine();
     virtual bool HasStatusLine();
     virtual wxString CreateStatusLine();

-    
+

     virtual wxPrintNativeDataBase *CreatePrintNativeData();
 };
 
     virtual wxPrintNativeDataBase *CreatePrintNativeData();
 };
 


@@ -97,15 +116,15 @@ class wxGnomePrintDialog: public wxPrintDialogBase
 {
 public:
     wxGnomePrintDialog( wxWindow *parent,
 {
 public:
     wxGnomePrintDialog( wxWindow *parent,

-                         wxPrintDialogData* data = (wxPrintDialogData*)NULL );
+                         wxPrintDialogData* data = NULL );

     wxGnomePrintDialog( wxWindow *parent, wxPrintData* data);
     wxGnomePrintDialog( wxWindow *parent, wxPrintData* data);

-    ~wxGnomePrintDialog();
+    virtual ~wxGnomePrintDialog();

 
     wxPrintData& GetPrintData()
         { return m_printDialogData.GetPrintData(); }
     wxPrintDialogData& GetPrintDialogData()
         { return m_printDialogData; }
 
     wxPrintData& GetPrintData()
         { return m_printDialogData.GetPrintData(); }
     wxPrintDialogData& GetPrintDialogData()
         { return m_printDialogData; }

-        
+

     wxDC *GetPrintDC();
 
     virtual int ShowModal();
     wxDC *GetPrintDC();
 
     virtual int ShowModal();


@@ -114,7 +133,7 @@ public:
     virtual bool TransferDataToWindow();
     virtual bool TransferDataFromWindow();
 
     virtual bool TransferDataToWindow();
     virtual bool TransferDataFromWindow();
 

-private:    
+protected:

     // Implement some base class methods to do nothing to avoid asserts and
     // GTK warnings, since this is not a real wxDialog.
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
     // Implement some base class methods to do nothing to avoid asserts and
     // GTK warnings, since this is not a real wxDialog.
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),


@@ -122,14 +141,48 @@ private:
                            int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
     virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
                               int WXUNUSED(width), int WXUNUSED(height)) {}
                            int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
     virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
                               int WXUNUSED(width), int WXUNUSED(height)) {}

-                              
+
+private:

     void Init();
     wxPrintDialogData   m_printDialogData;
     void Init();
     wxPrintDialogData   m_printDialogData;

-    
-private:
+

     DECLARE_DYNAMIC_CLASS(wxGnomePrintDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGnomePrintDialog)
 };
 

+//----------------------------------------------------------------------------
+// wxGnomePageSetupDialog
+//----------------------------------------------------------------------------
+
+class wxGnomePageSetupDialog: public wxPageSetupDialogBase
+{
+public:
+    wxGnomePageSetupDialog( wxWindow *parent,
+                            wxPageSetupDialogData* data = NULL );
+    virtual ~wxGnomePageSetupDialog();
+
+    virtual wxPageSetupDialogData& GetPageSetupDialogData();
+
+    virtual int ShowModal();
+
+    virtual bool Validate();
+    virtual bool TransferDataToWindow();
+    virtual bool TransferDataFromWindow();
+
+protected:
+    // Implement some base class methods to do nothing to avoid asserts and
+    // GTK warnings, since this is not a real wxDialog.
+    virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
+                           int WXUNUSED(width), int WXUNUSED(height),
+                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
+    virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
+                              int WXUNUSED(width), int WXUNUSED(height)) {}
+
+private:
+    wxPageSetupDialogData   m_pageDialogData;
+
+    DECLARE_DYNAMIC_CLASS(wxGnomePageSetupDialog)
+};
+

 //----------------------------------------------------------------------------
 // wxGnomePrinter
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // wxGnomePrinter
 //----------------------------------------------------------------------------


@@ -145,34 +198,60 @@ public:
                        bool prompt = true);
     virtual wxDC* PrintDialog(wxWindow *parent);
     virtual bool Setup(wxWindow *parent);
                        bool prompt = true);
     virtual wxDC* PrintDialog(wxWindow *parent);
     virtual bool Setup(wxWindow *parent);

-    
-    GnomePrintContext *GetPrintContext() { return m_gpc; }
-    
+

 private:
 private:

-    GnomePrintContext *m_gpc;

     bool               m_native_preview;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGnomePrinter)
     bool               m_native_preview;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGnomePrinter)

-    DECLARE_NO_COPY_CLASS(wxGnomePrinter)
+    wxDECLARE_NO_COPY_CLASS(wxGnomePrinter);

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxGnomePrintDC
+// wxGnomePrinterDC

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxGnomePrintDC: public wxDC
+#if wxUSE_NEW_DC
+class wxGnomePrinterDCImpl : public wxDCImpl
+#else
+#define wxGnomePrinterDCImpl wxGnomePrinterDC
+class wxGnomePrinterDC : public wxDC
+#endif

 {
 public:
 {
 public:

-    wxGnomePrintDC( wxGnomePrinter *printer );
-    ~wxGnomePrintDC();
-    
-    bool Ok() const;
-    
-    virtual void BeginDrawing() {}
-    virtual void EndDrawing() {}
-
-    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE );
+#if wxUSE_NEW_DC
+    wxGnomePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
+#else
+    wxGnomePrinterDC( const wxPrintData& data );
+#endif
+    virtual ~wxGnomePrinterDCImpl();
+
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
+
+    bool CanDrawBitmap() const { return true; }
+    void Clear();
+    void SetFont( const wxFont& font );
+    void SetPen( const wxPen& pen );
+    void SetBrush( const wxBrush& brush );
+    void SetLogicalFunction( wxRasterOperationMode function );
+    void SetBackground( const wxBrush& brush );
+    void DestroyClippingRegion();
+    bool StartDoc(const wxString& message);
+    void EndDoc();
+    void StartPage();
+    void EndPage();
+    wxCoord GetCharHeight() const;
+    wxCoord GetCharWidth() const;
+    bool CanGetTextExtent() const { return true; }
+    wxSize GetPPI() const;
+    virtual int GetDepth() const { return 24; }
+    void SetBackgroundMode(int WXUNUSED(mode)) { }
+    void SetPalette(const wxPalette& WXUNUSED(palette)) { }
+
+protected:
+    bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, 
+                    wxFloodFillStyle style=wxFLOOD_SURFACE );

     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
     void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
     void DoCrossHair(wxCoord x, wxCoord y);
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
     void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
     void DoCrossHair(wxCoord x, wxCoord y);


@@ -180,145 +259,91 @@ public:
     void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
     void DoDrawPoint(wxCoord x, wxCoord y);
     void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
     void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
     void DoDrawPoint(wxCoord x, wxCoord y);
     void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);

-    void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle=wxODDEVEN_RULE);
-    void DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle=wxODDEVEN_RULE);
+    void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE);
+    void DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE);

     void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0);
     void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0);
     void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

-    void DoDrawSpline(wxList *points);
-    
+#if wxUSE_SPLINES
+    void DoDrawSpline(const wxPointList *points);
+#endif

     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-            wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,
+            wxDC *source, wxCoord xsrc, wxCoord ysrc, 
+            wxRasterOperationMode = wxCOPY, bool useMask = false,

             wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
     void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false  );
             wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
     void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false  );

-    bool CanDrawBitmap() const { return true; }
-    

     void DoDrawText(const wxString& text, wxCoord x, wxCoord y );
     void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
     void DoDrawText(const wxString& text, wxCoord x, wxCoord y );
     void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);

-    void Clear();
-    void SetFont( const wxFont& font );
-    void SetPen( const wxPen& pen );
-    void SetBrush( const wxBrush& brush );
-    void SetLogicalFunction( int function );
-    void SetBackground( const wxBrush& brush );
-    

     void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

-    void DestroyClippingRegion();
-    void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) { }
-    
-    bool StartDoc(const wxString& message);
-    void EndDoc();
-    void StartPage();
-    void EndPage();
-    
-    wxCoord GetCharHeight() const;
-    wxCoord GetCharWidth() const;
-    bool CanGetTextExtent() const { return true; }
+    void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip) )
+    {
+        wxFAIL_MSG( "not implemented" );
+    }

     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,

-                     wxCoord *descent = (wxCoord *) NULL,
-                     wxCoord *externalLeading = (wxCoord *) NULL,
-                     wxFont *theFont = (wxFont *) NULL ) const;
-                     
+                     wxCoord *descent = NULL,
+                     wxCoord *externalLeading = NULL,
+                     const wxFont *theFont = NULL ) const;

     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;
     void DoGetSize(int* width, int* height) const;
     void DoGetSizeMM(int *width, int *height) const;

-    wxSize GetPPI() const;
-    void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
-    void SetDeviceOrigin( wxCoord x, wxCoord y );
-    
-    virtual int GetDepth() const { return 24; }
-  
-    void SetBackgroundMode(int WXUNUSED(mode)) { }
-    void SetPalette(const wxPalette& WXUNUSED(palette)) { }
-    
+
+    void SetPrintData(const wxPrintData& data);

     wxPrintData& GetPrintData() { return m_printData; }
     wxPrintData& GetPrintData() { return m_printData; }

-    void SetPrintData(const wxPrintData& data) { m_printData = data; }
-    
-    static void SetResolution(int ppi);
-    static int GetResolution();
+
+    // overriden for wxPrinterDC Impl
+    virtual wxRect GetPaperRect() const;
+    virtual int GetResolution() const;

 
 private:
 
 private:

-    static float ms_PSScaleFactor;
-    
-private:
+    wxPrintData             m_printData;

     PangoContext           *m_context;
     PangoLayout            *m_layout;
     PangoFontDescription   *m_fontdesc;
     PangoContext           *m_context;
     PangoLayout            *m_layout;
     PangoFontDescription   *m_fontdesc;

-    
+

     unsigned char           m_currentRed;
     unsigned char           m_currentGreen;
     unsigned char           m_currentBlue;
     unsigned char           m_currentRed;
     unsigned char           m_currentGreen;
     unsigned char           m_currentBlue;

-    wxPrintData             m_printData;
-    
-    wxGnomePrinter         *m_printer;
+
+    double                  m_pageHeight;
+

     GnomePrintContext      *m_gpc;
     GnomePrintContext      *m_gpc;

+    GnomePrintJob*          m_job;
+
+    void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height);

 
 private:
 
 private:

-    wxCoord XDEV2LOG(wxCoord x) const
-    {
-        wxCoord new_x = x - m_deviceOriginX;
-        if (new_x > 0)
-            return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
-        else
-            return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
-    }
-    wxCoord XDEV2LOGREL(wxCoord x) const
-    {
-        if (x > 0)
-            return (wxCoord)((double)(x) / m_scaleX + 0.5);
-        else
-            return (wxCoord)((double)(x) / m_scaleX - 0.5);
-    }
-    wxCoord YDEV2LOG(wxCoord y) const
-    {
-        wxCoord new_y = y - m_deviceOriginY;
-        if (new_y > 0)
-            return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
-        else
-            return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
-    }
-    wxCoord YDEV2LOGREL(wxCoord y) const
-    {
-        if (y > 0)
-            return (wxCoord)((double)(y) / m_scaleY + 0.5);
-        else
-            return (wxCoord)((double)(y) / m_scaleY - 0.5);
-    }
-    wxCoord XLOG2DEV(wxCoord x) const
-    {
-        wxCoord new_x = x - m_logicalOriginX;
-        if (new_x > 0)
-            return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
-        else
-            return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
-    }
-    wxCoord XLOG2DEVREL(wxCoord x) const
-    {
-        if (x > 0)
-            return (wxCoord)((double)(x) * m_scaleX + 0.5);
-        else
-            return (wxCoord)((double)(x) * m_scaleX - 0.5);
-    }
-    wxCoord YLOG2DEV(wxCoord y) const
-    {
-        wxCoord new_y = y - m_logicalOriginY;
-        if (new_y > 0)
-            return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
-        else
-            return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
-    }
-    wxCoord YLOG2DEVREL(wxCoord y) const
-    {
-        if (y > 0)
-            return (wxCoord)((double)(y) * m_scaleY + 0.5);
-        else
-            return (wxCoord)((double)(y) * m_scaleY - 0.5);
-    }
+    DECLARE_DYNAMIC_CLASS(wxGnomePrinterDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxGnomePrinterDCImpl);
+};
+
+// ----------------------------------------------------------------------------
+// wxGnomePrintPreview: programmer creates an object of this class to preview a
+// wxPrintout.
+// ----------------------------------------------------------------------------
+
+class wxGnomePrintPreview : public wxPrintPreviewBase
+{
+public:
+    wxGnomePrintPreview(wxPrintout *printout,
+                             wxPrintout *printoutForPrinting = NULL,
+                             wxPrintDialogData *data = NULL);
+    wxGnomePrintPreview(wxPrintout *printout,
+                             wxPrintout *printoutForPrinting,
+                             wxPrintData *data);
+
+    virtual ~wxGnomePrintPreview();
+
+    virtual bool Print(bool interactive);
+    virtual void DetermineScaling();
+
+private:
+    void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxGnomePrintDC)
-    DECLARE_NO_COPY_CLASS(wxGnomePrintDC)
+    DECLARE_CLASS(wxGnomePrintPreview)

 };
 
 };
 

+

 #endif
     // wxUSE_LIBGNOMEPRINT
 
 #endif
     // wxUSE_LIBGNOMEPRINT