Add wxDataViewRendererBase::GetEffectiveAlignment() and use it.

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

diff --git a/include/wx/dcprint.h b/include/wx/dcprint.h
index 338f2f017a48bc303400d78f67b4a5b2228dffb2..6d84731116804dd9434c15b183abb288c0e3a4c1 100644 (file)
--- a/include/wx/dcprint.h
+++ b/include/wx/dcprint.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,44 +15,28 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
-#if wxUSE_NEW_DC
-
 #include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
 // wxPrinterDC
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPrinterDC: public wxDC
+class WXDLLIMPEXP_CORE wxPrinterDC : public wxDC
 {
 public:
     wxPrinterDC();
-    wxPrinterDC( const wxPrintData& data );
-    ~wxPrinterDC();
-    
-    wxRect GetPaperRect();
-    int GetResolution();
-    
-private:
-    DECLARE_DYNAMIC_CLASS()
-};
+    wxPrinterDC(const wxPrintData& data);
 
-#else
+    wxRect GetPaperRect() const;
+    int GetResolution() const;
 
+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_