removed WXWIN_COMPATIBILITY_2_4 in non-MSW code

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

diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index 4052a617a1b8f61224ab4ff1b598603819a8c1f7..29a79daf186a43bb6f972f9293275c1ef5422a8e 100644 (file)
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -1,48 +1,61 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcprint.h
+// Name:        wx/msw/dcprint.h
 // Purpose:     wxPrinterDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_DCPRINT_H_
-#define _WX_DCPRINT_H_
-
-#ifdef __GNUG__
-#pragma interface "dcprint.h"
-#endif
+#ifndef _WX_MSW_DCPRINT_H_
+#define _WX_MSW_DCPRINT_H_
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
-class WXDLLEXPORT wxPrinterDC: public wxDC
+class WXDLLEXPORT wxPrinterDC : public wxDC
 {
 public:
-DECLARE_CLASS(wxPrinterDC)
-
     // Create a printer DC (obsolete function: use wxPrintData version now)
-    wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT);
+    wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = true, int orientation = wxPORTRAIT);
 
     // Create from print data
     wxPrinterDC(const wxPrintData& data);
 
     wxPrinterDC(WXHDC theDC);
 
-    ~wxPrinterDC(void);
+    // override some base class virtuals
+    virtual bool StartDoc(const wxString& message);
+    virtual void EndDoc();
+    virtual void StartPage();
+    virtual void EndPage();
 
-    bool StartDoc(const wxString& message);
-    void EndDoc(void);
-    void StartPage(void);
-    void EndPage(void);
+    wxRect GetPaperRect();
 
 protected:
+    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
+                              bool useMask = false);
+    virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
+                        wxCoord width, wxCoord height,
+                        wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
+    virtual void DoGetSize(int *w, int *h) const
+    {
+        GetDeviceSize(w, h);
+    }
+
+
+    // init the dc
+    void Init();
+
     wxPrintData m_printData;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPrinterDC)
 };
 
 // Gets an HDC for the default printer configuration
@@ -53,6 +66,5 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data);
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
-#endif
-    // _WX_DCPRINT_H_
+#endif // _WX_MSW_DCPRINT_H_