Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/dcprint.h b/include/wx/os2/dcprint.h
index b742273bc93fda62f287791731c3a2f5cec43045..6418f99a312bc661b5c658f4c364c3462ec7fdda 100644 (file)
--- a/include/wx/os2/dcprint.h
+++ b/include/wx/os2/dcprint.h
@@ -18,7 +18,7 @@
 #include "wx/cmndata.h"
 #include "wx/os2/dc.h"
 
-class WXDLLEXPORT wxPrinterDCImpl: public wxPMDCImpl
+class WXDLLIMPEXP_CORE wxPrinterDCImpl: public wxPMDCImpl
 {
  public:
     // Create a printer DC
@@ -33,7 +33,7 @@ class WXDLLEXPORT wxPrinterDCImpl: public wxPMDCImpl
     virtual void StartPage(void);
     virtual void EndPage(void);
 
-    virtual wxRect GetPaperRect();
+    virtual wxRect GetPaperRect() const;
 
 protected:
     virtual void DoDrawBitmap( const wxBitmap& rBmp
@@ -48,7 +48,7 @@ protected:
                         ,wxDC*   pSource
                         ,wxCoord vXsrc
                         ,wxCoord vYsrc
-                        ,int     nRop = wxCOPY
+                        ,wxRasterOperationMode     nRop = wxCOPY
                         ,bool    bUseMask = FALSE
                         ,wxCoord vXsrcMask = -1
                         ,wxCoord vYsrcMask = -1
@@ -60,11 +60,11 @@ protected:
     wxPrintData                     m_printData;
 private:
     DECLARE_CLASS(wxPrinterDCImpl)
-    DECLARE_NO_COPY_CLASS(wxPrinterDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);
 }; // end of CLASS wxPrinterDC
 
 // Gets an HDC for the specified printer configuration
-WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& rData);
+WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& rData);
 
 #endif // wxUSE_PRINTING_ARCHITECTURE