X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f37154e988c597e32a840e43783cf0b23e5f8b4..8949ba7d7450bbecea6b496551f00f01b632c3d6:/include/wx/generic/dcpsg.h

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 4e84bfeffe..3cfbba636a 100644
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -27,8 +27,6 @@
 //-----------------------------------------------------------------------------
 
 
-#if wxUSE_NEW_DC
-
 class WXDLLEXPORT wxPostScriptDC : public wxDC
 {
 public:
@@ -36,36 +34,22 @@ public:
 
     // Recommended constructor
     wxPostScriptDC(const wxPrintData& printData);
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
 };
 
-#endif
-
-#if wxUSE_NEW_DC
-class WXDLLEXPORT wxPostScriptImplDC : public wxImplDC
-#else
-#define wxPostScriptImplDC wxPostScriptDC
-class WXDLLEXPORT wxPostScriptDC : public wxDC
-#endif
+class WXDLLEXPORT wxPostScriptDCImpl : public wxDCImpl
 {
 public:
-#if wxUSE_NEW_DC
-    wxPostScriptImplDC( wxPrinterDC *owner );
-    wxPostScriptImplDC( wxPrinterDC *owner, const wxPrintData& data );
-    wxPostScriptImplDC( wxPostScriptDC *owner );
-    wxPostScriptImplDC( wxPostScriptDC *owner, const wxPrintData& data );
-#else
-    wxPostScriptDC();
+    wxPostScriptDCImpl( wxPrinterDC *owner );
+    wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data );
+    wxPostScriptDCImpl( wxPostScriptDC *owner );
+    wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data );
 
-    // Recommended constructor
-    wxPostScriptDC(const wxPrintData& printData);
-#endif
-    
     void Init();
 
-    virtual ~wxPostScriptImplDC();
+    virtual ~wxPostScriptDCImpl();
 
     virtual bool Ok() const { return IsOk(); }
     virtual bool IsOk() const;
@@ -93,18 +77,6 @@ public:
     // Resolution in pixels per logical inch
     wxSize GetPPI() const;
 
-#if wxUSE_NEW_DC
-#else
-    // 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
     virtual void ComputeScaleAndOrigin();
 
     void SetBackgroundMode(int WXUNUSED(mode)) { }
@@ -116,9 +88,9 @@ public:
     virtual int GetDepth() const { return 24; }
 
     void PsPrint( const wxString& psdata );
-    
+
     // Overrridden for wxPrinterDC Impl
-    
+
     virtual int GetResolution();
     virtual wxRect GetPaperRect();
 
@@ -168,7 +140,7 @@ protected:
     double            m_pageHeight;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPostScriptImplDC)
+    DECLARE_DYNAMIC_CLASS(wxPostScriptDCImpl)
 };
 
 #endif