use global operator new to fix compilation errors if type T overloads new (as wxObjec...

[wxWidgets.git] / include / wx / generic / dcpsg.h

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 4e05b2e930e08f4ec3455516739d6ec7d467339d..bb66e50ce15d7e885f8d66d0ee6a716506c581dd 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -27,42 +27,26 @@
 //-----------------------------------------------------------------------------
 
 
-#if wxUSE_NEW_DC
-
-class WXDLLEXPORT wxPostScriptDC : public wxDC
+class WXDLLIMPEXP_CORE wxPostScriptDC : public wxDC
 {
 public:
     wxPostScriptDC();
 
     // Recommended constructor
     wxPostScriptDC(const wxPrintData& printData);
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
 };
 
-#endif
-
-#if wxUSE_NEW_DC
-class WXDLLEXPORT wxPostScriptDCImpl : public wxDCImpl
-#else
-#define wxPostScriptDCImpl wxPostScriptDC
-class WXDLLEXPORT wxPostScriptDC : public wxDC
-#endif
+class WXDLLIMPEXP_CORE wxPostScriptDCImpl : public wxDCImpl
 {
 public:
-#if wxUSE_NEW_DC
     wxPostScriptDCImpl( wxPrinterDC *owner );
     wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data );
     wxPostScriptDCImpl( wxPostScriptDC *owner );
     wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data );
-#else
-    wxPostScriptDC();
 
-    // Recommended constructor
-    wxPostScriptDC(const wxPrintData& printData);
-#endif
-    
     void Init();
 
     virtual ~wxPostScriptDCImpl();
@@ -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();
 
@@ -147,7 +119,10 @@ protected:
     void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
     void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
     void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip)) { }
+    void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip))
+    {
+        wxFAIL_MSG( "not implemented" );
+    }
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                          wxCoord *descent = NULL,
                          wxCoord *externalLeading = NULL,
@@ -156,7 +131,6 @@ protected:
     void DoGetSizeMM(int *width, int *height) const;
 
     FILE*             m_pstream;    // PostScript output stream
-    wxString          m_title;
     unsigned char     m_currentRed;
     unsigned char     m_currentGreen;
     unsigned char     m_currentBlue;