Some wxComboCtrlBase member functions were enclosed within incorrect compatibility...

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

diff --git a/include/wx/dcprint.h b/include/wx/dcprint.h
index 1ee323a6ffdaa6c329fd6c14a90ed0158a9032c3..95dbff8f7adc348a29cf7c2f9cabf40fcc1bab2d 100644 (file)
--- a/include/wx/dcprint.h
+++ b/include/wx/dcprint.h
@@ -16,47 +16,28 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 
 #if wxUSE_PRINTING_ARCHITECTURE
 

-#if wxUSE_NEW_DC
-

 #include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
 // wxPrinterDC
 //-----------------------------------------------------------------------------
 
 #include "wx/dc.h"
 
 //-----------------------------------------------------------------------------
 // wxPrinterDC
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxPrinterImplDCBase
+class WXDLLIMPEXP_CORE wxPrinterDC : public wxDC

 {
 public:
 {
 public:

-    wxPrinterImplDCBase() { }
+    wxPrinterDC();
+    wxPrinterDC(const wxPrintData& data);

 
 

-    virtual wxRect DoGetPaperRect() = 0;
-};
+    wxRect GetPaperRect() const;
+    int GetResolution() const;

 
 

+protected:
+    wxPrinterDC(wxDCImpl *impl) : wxDC(impl) { }

 
 

-class WXDLLIMPEXP_CORE wxPrinterDC: public wxDC
-{
-public:
-    wxPrinterDC( const wxPrintData& data );
-    
-    wxRect GetPaperRect();
+private:
+    DECLARE_DYNAMIC_CLASS(wxPrinterDC)

 };
 
 };
 

-#else
-
-
-#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
-
-#endif // wxUSE_NEW_DC

 #endif // wxUSE_PRINTING_ARCHITECTURE
 #endif // wxUSE_PRINTING_ARCHITECTURE

-#endif
-    // _WX_DCPRINT_H_BASE_
+
+#endif // _WX_DCPRINT_H_BASE_