Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index 477b38bd62d595c2ba7428313e9a23ba8b791aa6..85a60246dd882fa35f3253d21a85d6099d519106 100644 (file)
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,7 +21,7 @@
 //    wxPrinterDCImpl
 //
 
-class WXDLLEXPORT wxPrinterDCImpl : public wxMSWDCImpl
+class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxMSWDCImpl
 {
 public:
     // Create from print data
@@ -35,7 +34,7 @@ public:
     virtual void StartPage();
     virtual void EndPage();
 
-    virtual wxRect GetPaperRect();
+    virtual wxRect GetPaperRect() const;
 
 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
@@ -43,7 +42,8 @@ protected:
     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);
+                        wxRasterOperationMode rop = wxCOPY, bool useMask = false,
+                        wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     virtual void DoGetSize(int *w, int *h) const
     {
         GetDeviceSize(w, h);
@@ -57,17 +57,17 @@ protected:
 
 private:
     DECLARE_CLASS(wxPrinterDCImpl)
-    DECLARE_NO_COPY_CLASS(wxPrinterDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);
 };
 
 // Gets an HDC for the specified printer configuration
-WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data);
+WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& data);
 
 // ------------------------------------------------------------------------
 //    wxPrinterDCromHDC
 //
 
-class WXDLLEXPORT wxPrinterDCFromHDC: public wxPrinterDC
+class WXDLLIMPEXP_CORE wxPrinterDCFromHDC: public wxPrinterDC
 {
 public:
     wxPrinterDCFromHDC( WXHDC theDC )