wxCALLBACK added, wxCOMPFUNC_CONV moved to defs.h

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

diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index 8ad3c3574b9f21d1ed413587163e79c82e598371..4052a617a1b8f61224ab4ff1b598603819a8c1f7 100644 (file)
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -16,22 +16,42 @@
 #pragma interface "dcprint.h"
 #endif
 
 #pragma interface "dcprint.h"
 #endif
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

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

+#include "wx/cmndata.h"

 
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
 
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {

- public:
-  DECLARE_CLASS(wxPrinterDC)
+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);
+
+    // Create from print data
+    wxPrinterDC(const wxPrintData& data);
+
+    wxPrinterDC(WXHDC theDC);

 
 

-  // Create a printer DC
-  wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT);
-  wxPrinterDC(WXHDC theDC);
+    ~wxPrinterDC(void);

 
 

-  ~wxPrinterDC(void);
+    bool StartDoc(const wxString& message);
+    void EndDoc(void);
+    void StartPage(void);
+    void EndPage(void);
+
+protected:
+    wxPrintData m_printData;

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

-WXHDC WXDLLEXPORT wxGetPrinterDC(int orientation);
+// WXHDC WXDLLEXPORT wxGetPrinterDC(int orientation);
+
+// 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_