setup.h for makefile builds

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

diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index dc434d0f931a52606f55a41e6645dc7a6d6add1c..3dcf523f55d6e186a6e2570482a663515b8646a1 100644 (file)
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -5,34 +5,50 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DCPRINTH__
-#define __DCPRINTH__
+#ifndef _WX_DCPRINT_H_
+#define _WX_DCPRINT_H_

 
 #ifdef __GNUG__
 #pragma interface "dcprint.h"
 #endif
 
 #include "wx/dc.h"
 
 #ifdef __GNUG__
 #pragma interface "dcprint.h"
 #endif
 
 #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
-  wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, const bool interactive = TRUE, const int orientation = wxPORTRAIT);
-  wxPrinterDC(WXHDC theDC);
+    // 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(void);
+    // 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);
+
+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
 
 #endif

-    // __DCPRINTH__
+    // _WX_DCPRINT_H_