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

[wxWidgets.git] / include / wx / dcprint.h

diff --git a/include/wx/dcprint.h b/include/wx/dcprint.h
index 1ee323a6ffdaa6c329fd6c14a90ed0158a9032c3..65e725482fc0601478e91102862ebd217fa13ef2 100644 (file)
--- a/include/wx/dcprint.h
+++ b/include/wx/dcprint.h
@@ -16,47 +16,28 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
-#if wxUSE_NEW_DC
-
 #include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
 // wxPrinterDC
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPrinterImplDCBase
+class WXDLLIMPEXP_CORE wxPrinterDC : public wxDC
 {
 public:
-    wxPrinterImplDCBase() { }
-
-    virtual wxRect DoGetPaperRect() = 0;
-};
+    wxPrinterDC();
+    wxPrinterDC(const wxPrintData& data);
 
-
-class WXDLLIMPEXP_CORE wxPrinterDC: public wxDC
-{
-public:
-    wxPrinterDC( const wxPrintData& data );
-    
     wxRect GetPaperRect();
-};
-
-#else
+    int GetResolution();
 
+protected:
+    wxPrinterDC(wxDCImpl *impl) : wxDC(impl) { }
 
-#if defined(__WXPALMOS__)
-#include "wx/palmos/dcprint.h"
-#elif defined(__WXMSW__)
-#include "wx/msw/dcprint.h"
-#endif
-#if defined(__WXPM__)
-#include "wx/os2/dcprint.h"
-#endif
-#if defined(__WXMAC__)
-#include "wx/mac/dcprint.h"
-#endif
+private:
+    DECLARE_DYNAMIC_CLASS(wxPrinterDC)
+};
 
-#endif // wxUSE_NEW_DC
 #endif // wxUSE_PRINTING_ARCHITECTURE
-#endif
-    // _WX_DCPRINT_H_BASE_
+
+#endif // _WX_DCPRINT_H_BASE_