eVC3 build fix.

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

diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index 3dcf523f55d6e186a6e2570482a663515b8646a1..c39ddbfc8e5aeb42c029fa9c0a741001cf3cee0f 100644 (file)
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -1,46 +1,58 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 

-#ifdef __GNUG__
-#pragma interface "dcprint.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "dcprint.h"

 #endif
 
 #endif
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 

-class WXDLLEXPORT wxPrinterDC: public wxDC
+class WXDLLEXPORT wxPrinterDC : public wxDC

 {
 public:
 {
 public:

-DECLARE_CLASS(wxPrinterDC)
-

     // Create a printer DC (obsolete function: use wxPrintData version now)
     // 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);
 
 
     // Create from print data
     wxPrinterDC(const wxPrintData& data);
 
     wxPrinterDC(WXHDC theDC);
 

-    ~wxPrinterDC(void);
-
-    bool StartDoc(const wxString& message);
-    void EndDoc(void);
-    void StartPage(void);
-    void EndPage(void);
+    // override some base class virtuals
+    virtual bool StartDoc(const wxString& message);
+    virtual void EndDoc();
+    virtual void StartPage();
+    virtual void EndPage();

 
 protected:
 
 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);
+
+    // init the dc
+    void Init();
+

     wxPrintData m_printData;
     wxPrintData m_printData;

+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPrinterDC)

 };
 
 // Gets an HDC for the default printer configuration
 };
 
 // Gets an HDC for the default printer configuration


@@ -49,6 +61,8 @@ protected:
 // Gets an HDC for the specified printer configuration
 WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data);
 
 // Gets an HDC for the specified printer configuration
 WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data);
 

+#endif // wxUSE_PRINTING_ARCHITECTURE
+

 #endif
     // _WX_DCPRINT_H_
 
 #endif
     // _WX_DCPRINT_H_