Remove several hack from PS code, use high resolution code from GNOME print, invert Y axis internally

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/dcpsg.h

@@ -13,9 +13,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT
-
-#if wxUSE_POSTSCRIPT
 
 #include "wx/dc.h"
 #include "wx/dialog.h"
@@ -23,14 +21,6 @@
 #include "wx/cmndata.h"
 #include "wx/strvararg.h"
 
-extern WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxPostScriptDC;
-
 //-----------------------------------------------------------------------------
 // wxPostScriptDC
 //-----------------------------------------------------------------------------
@@ -71,18 +61,18 @@ public:
     // Resolution in pixels per logical inch
     wxSize GetPPI() const;
 
-    // overridden because origin is bottom left and
+#if wxUSE_NEW_DC
-    // axes are inverted
+#else
-    void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
-    
     // these need to be overridden as wxPostscriptDC inherits
     // from the platform dependent wxDC and this we'd call
     // e.g. wxMSW specific code here.
+    virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
     virtual void SetMapMode(int mode);
     virtual void SetUserScale(double x, double y);
     virtual void SetLogicalScale(double x, double y);
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
+#endif
 
     void SetBackgroundMode(int WXUNUSED(mode)) { }
     void SetPalette(const wxPalette& WXUNUSED(palette)) { }
@@ -95,32 +85,9 @@ public:
     static void SetResolution(int ppi);
     static int GetResolution();
 
-    WX_DEFINE_VARARG_FUNC_VOID(PsPrintf, 1, (const wxFormatString&),
-                               DoPsPrintfFormatWchar, DoPsPrintfFormatUtf8)
-#ifdef __WATCOMC__
-    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-    WX_VARARG_WATCOM_WORKAROUND(void, PsPrintf, 1, (const wxString&),
-                                (wxFormatString(f1)));
-    WX_VARARG_WATCOM_WORKAROUND(void, PsPrintf, 1, (const wxCStrData&),
-                                (wxFormatString(f1)));
-    WX_VARARG_WATCOM_WORKAROUND(void, PsPrintf, 1, (const char*),
-                                (wxFormatString(f1)));
-    WX_VARARG_WATCOM_WORKAROUND(void, PsPrintf, 1, (const wchar_t*),
-                                (wxFormatString(f1)));
-#endif
-
     void PsPrint( const wxString& psdata );
-    void PsPrint( int ch );
 
 private:
-#if !wxUSE_UTF8_LOCALE_ONLY
-    void DoPsPrintfFormatWchar(const wxChar *fmt, ... );
-#endif
-#if wxUSE_UNICODE_UTF8
-    void DoPsPrintfFormatUtf8(const char *fmt, ... );
-#endif
-
-    static float ms_PSScaleFactor;
 
 protected:
     bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style = wxFLOOD_SURFACE);
@@ -165,16 +132,14 @@ protected:
     double            m_underlinePosition;
     double            m_underlineThickness;
     wxPrintData       m_printData;
+    double            m_pageHeight;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
 };
 
 #endif
-    // wxUSE_POSTSCRIPT
+    // wxUSE_POSTSCRIPT && wxUSE_PRINTING_ARCHITECTURE
-
-#endif
-    // wxUSE_PRINTING_ARCHITECTURE
 
 #endif
         // _WX_DCPSG_H_

include/wx/gtk/dc.h

@@ -47,16 +47,6 @@ public:
     virtual GdkWindow* GetGDKWindow() const { return NULL; }
 
 protected:
-    // implementation
-    wxCoord XDEV2LOG(wxCoord x) const       { return DeviceToLogicalX(x); }
-    wxCoord XDEV2LOGREL(wxCoord x) const    { return DeviceToLogicalXRel(x); }
-    wxCoord YDEV2LOG(wxCoord y) const       { return DeviceToLogicalY(y); }
-    wxCoord YDEV2LOGREL(wxCoord y) const    { return DeviceToLogicalYRel(y); }
-    wxCoord XLOG2DEV(wxCoord x) const       { return LogicalToDeviceX(x); }
-    wxCoord XLOG2DEVREL(wxCoord x) const    { return LogicalToDeviceXRel(x); }
-    wxCoord YLOG2DEV(wxCoord y) const       { return LogicalToDeviceY(y); }
-    wxCoord YLOG2DEVREL(wxCoord y) const    { return LogicalToDeviceYRel(y); }
-
     // base class pure virtuals implemented here
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSizeMM(int* width, int* height) const;

src/gtk/dcclient.cpp

@@ -37,6 +37,11 @@
 // local defines
 //-----------------------------------------------------------------------------
 
+#define XLOG2DEV(x)    LogicalToDeviceX(x)
+#define XLOG2DEVREL(x) LogicalToDeviceXRel(x)
+#define YLOG2DEV(y)    LogicalToDeviceY(y)
+#define YLOG2DEVREL(y) LogicalToDeviceYRel(y)
+
 #define USE_PAINT_REGION 1
 
 //-----------------------------------------------------------------------------