Allow using wxDEFAULT as font size in wxOSX.

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

diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index de5b3975e30c021a88590f8d2ebaeb4d04cbdbbb..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:


@@ -24,7 +24,6 @@ class WXDLLIMPEXP_CORE wxWindowsPrinter : public wxPrinterBase
 
 public:
     wxWindowsPrinter(wxPrintDialogData *data = NULL);
 
 public:
     wxWindowsPrinter(wxPrintDialogData *data = NULL);

-    virtual ~wxWindowsPrinter();

 
     virtual bool Print(wxWindow *parent,
                        wxPrintout *printout,
 
     virtual bool Print(wxWindow *parent,
                        wxPrintout *printout,


@@ -34,8 +33,6 @@ public:
     virtual bool Setup(wxWindow *parent);
 
 private:
     virtual bool Setup(wxWindow *parent);
 
 private:

-    WXFARPROC     m_lpAbortProc;
-

     wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);
 };
 


@@ -59,7 +56,9 @@ public:
     virtual void DetermineScaling();
 
 protected:
     virtual void DetermineScaling();
 
 protected:

+#if wxUSE_ENH_METAFILE

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

+#endif

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