removing outdated code

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

diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index 4f9d1b0fdb7d2bbb602b41b37a793e170907d0f9..14951384b37d6fc1d425cd67ee46afebc0a02a06 100644 (file)
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        printwin.h
+// Name:        wx/msw/printwin.h

 // Purpose:     wxWindowsPrinter, wxWindowsPrintPreview classes
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxWindowsPrinter, wxWindowsPrintPreview classes
 // Author:      Julian Smart
 // Modified by:


@@ -18,24 +18,22 @@
 // Represents the printer: manages printing a wxPrintout object
 // ---------------------------------------------------------------------------
 
 // Represents the printer: manages printing a wxPrintout object
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindowsPrinter : public wxPrinterBase
+class WXDLLIMPEXP_CORE wxWindowsPrinter : public wxPrinterBase

 {
     DECLARE_DYNAMIC_CLASS(wxWindowsPrinter)
 
 public:
     wxWindowsPrinter(wxPrintDialogData *data = NULL);
 {
     DECLARE_DYNAMIC_CLASS(wxWindowsPrinter)
 
 public:
     wxWindowsPrinter(wxPrintDialogData *data = NULL);

-    virtual ~wxWindowsPrinter();

 
     virtual bool Print(wxWindow *parent,
                        wxPrintout *printout,
                        bool prompt = true);
 
     virtual bool Print(wxWindow *parent,
                        wxPrintout *printout,
                        bool prompt = true);

-    virtual wxDC* PrintDialog(wxWindow *parent);
+
+    virtual wxDC *PrintDialog(wxWindow *parent);

     virtual bool Setup(wxWindow *parent);
 
 private:
     virtual bool Setup(wxWindow *parent);
 
 private:

-    WXFARPROC     m_lpAbortProc;
-
-    DECLARE_NO_COPY_CLASS(wxWindowsPrinter)
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -43,7 +41,7 @@ private:
 // wxPrintout.
 // ---------------------------------------------------------------------------
 
 // wxPrintout.
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindowsPrintPreview : public wxPrintPreviewBase
+class WXDLLIMPEXP_CORE wxWindowsPrintPreview : public wxPrintPreviewBase

 {
 public:
     wxWindowsPrintPreview(wxPrintout *printout,
 {
 public:
     wxWindowsPrintPreview(wxPrintout *printout,


@@ -57,7 +55,11 @@ public:
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 

-private:
+protected:
+#if wxUSE_ENH_METAFILE
+    virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
+#endif
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview)
 };