Rebake from clean wx tree.

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

diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index 7d7e466ed93a75bfb4f228f060a673f58b48a53e..de5b3975e30c021a88590f8d2ebaeb4d04cbdbbb 100644 (file)
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -36,7 +36,7 @@ public:
 private:
     WXFARPROC     m_lpAbortProc;
 
 private:
     WXFARPROC     m_lpAbortProc;
 

-    DECLARE_NO_COPY_CLASS(wxWindowsPrinter)
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);

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


@@ -44,8 +44,6 @@ private:
 // wxPrintout.
 // ---------------------------------------------------------------------------
 
 // wxPrintout.
 // ---------------------------------------------------------------------------
 

-#define wxUSE_HIGH_QUALITY_PREVIEW (wxUSE_IMAGE && wxUSE_WXDIB)
-

 class WXDLLIMPEXP_CORE wxWindowsPrintPreview : public wxPrintPreviewBase
 {
 public:
 class WXDLLIMPEXP_CORE wxWindowsPrintPreview : public wxPrintPreviewBase
 {
 public:


@@ -60,22 +58,9 @@ public:
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 

-#if wxUSE_HIGH_QUALITY_PREVIEW

 protected:
 protected:

-    bool RenderPageIntoBitmapHQ(wxBitmap& bmp, int pageNum);

     virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
 
     virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
 

-private:
-    bool RenderPageFragment(float scaleX, float scaleY,
-                            int *nextFinalLine,
-                            wxPrinterDC& printer,
-                            wxMemoryDC& finalDC,
-                            const wxRect& rect,
-                            int pageNum);
-
-    bool m_hqPreviewFailed;
-#endif // wxUSE_HIGH_QUALITY_PREVIEW
-

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