safe macro expansion

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

diff --git a/include/wx/os2/dcprint.h b/include/wx/os2/dcprint.h
index faeaf40180ca15d85330cacb2ab0dd0c493bd93c..d924f0550a850097d57eadfd49c1ae2d56b70f6b 100644 (file)
--- a/include/wx/os2/dcprint.h
+++ b/include/wx/os2/dcprint.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dcprint.h
 // Purpose:     wxPrinterDC class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     09/12/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 
-#ifdef __GNUG__
-#pragma interface "dcprint.h"
-#endif
-
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dc.h"
@@ -24,29 +20,50 @@
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
  public:
-  DECLARE_CLASS(wxPrinterDC)
-
-   // Create a printer DC [obsolete]
-   wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT);
-
-   // Create from print data
-   wxPrinterDC(const wxPrintData& data);
+    // Create a printer DC [obsolete]
+    wxPrinterDC( const wxString& rsDriver
+                ,const wxString& rsDevice
+                ,const wxString& rsOutput
+                ,bool            bInteractive = TRUE
+                ,int             nOrientation = wxPORTRAIT
+               );
 
-   wxPrinterDC(WXHDC theDC);
+    // Create from print data
+    wxPrinterDC(const wxPrintData& rData);
+    wxPrinterDC(WXHDC hTheDC);
 
-   ~wxPrinterDC();
-
-    bool StartDoc(const wxString& message);
+    bool StartDoc(const wxString& rsMessage);
     void EndDoc(void);
     void StartPage(void);
     void EndPage(void);
 
 protected:
-    wxPrintData         m_printData;
-};
+    virtual void DoDrawBitmap( const wxBitmap& rBmp
+                              ,wxCoord         vX
+                              ,wxCoord         vY
+                              ,bool            bUseMask = FALSE
+                             );
+    virtual bool DoBlit( wxCoord vXdest
+                        ,wxCoord vYdest
+                        ,wxCoord vWidth
+                        ,wxCoord vHeight
+                        ,wxDC*   pSource
+                        ,wxCoord vXsrc
+                        ,wxCoord vYsrc
+                        ,int     nRop = wxCOPY
+                        ,bool    bUseMask = FALSE
+                       );
+
+    // init the dc
+    void Init(void);
+
+    wxPrintData                     m_printData;
+private:
+    DECLARE_CLASS(wxPrinterDC)
+}; // end of CLASS wxPrinterDC
 
 // Gets an HDC for the specified printer configuration
-WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data);
+WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& rData);
 
 #endif // wxUSE_PRINTING_ARCHITECTURE