removing outdated code

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

diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index 6fe3feab10ff1500412726415f773b0bd4d22cbc..9d98518299e71cc78869bce2bce9dd16a2185f14 100644 (file)
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -22,7 +22,7 @@
 //    wxPrinterDCImpl
 //
 
 //    wxPrinterDCImpl
 //
 

-class WXDLLEXPORT wxPrinterDCImpl : public wxMSWDCImpl
+class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxMSWDCImpl

 {
 public:
     // Create from print data
 {
 public:
     // Create from print data


@@ -35,7 +35,7 @@ public:
     virtual void StartPage();
     virtual void EndPage();
 
     virtual void StartPage();
     virtual void EndPage();
 

-    virtual wxRect GetPaperRect();
+    virtual wxRect GetPaperRect() const;

 
 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
 
 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,


@@ -43,7 +43,8 @@ protected:
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
     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);
     virtual void DoGetSize(int *w, int *h) const
     {
         GetDeviceSize(w, h);


@@ -57,22 +58,22 @@ protected:
 
 private:
     DECLARE_CLASS(wxPrinterDCImpl)
 
 private:
     DECLARE_CLASS(wxPrinterDCImpl)

-    DECLARE_NO_COPY_CLASS(wxPrinterDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);

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

-WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data);
+WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& data);

 
 // ------------------------------------------------------------------------
 //    wxPrinterDCromHDC
 //
 
 
 // ------------------------------------------------------------------------
 //    wxPrinterDCromHDC
 //
 

-class WXDLLEXPORT wxPrinterDCFromHDC: public wxPrinterDC
+class WXDLLIMPEXP_CORE wxPrinterDCFromHDC: public wxPrinterDC

 {
 public:
     wxPrinterDCFromHDC( WXHDC theDC )
 {
 public:
     wxPrinterDCFromHDC( WXHDC theDC )

+        : wxPrinterDC(new wxPrinterDCImpl(this, theDC))

     {
     {

-        m_pimpl = new wxPrinterDCImpl( this, theDC );

     }
 };
 
     }
 };