Move "static" keyword out from wxDEPRECATED() macros to placate icc.

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

diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index 00abaf710d7819bad6075ce6df287515cca1b316..d902c42c464d4f53fac179a984443969a26478f5 100644 (file)
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -6,54 +6,62 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTWIN_H_
 #define _WX_PRINTWIN_H_
 
-#ifdef __GNUG__
-#pragma interface "printwin.h"
-#endif
-
 #include "wx/prntbase.h"
 
-/*
- * Represents the printer: manages printing a wxPrintout object
- */
- 
-class WXDLLEXPORT wxWindowsPrinter: public wxPrinterBase
+// ---------------------------------------------------------------------------
+// Represents the printer: manages printing a wxPrintout object
+// ---------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxWindowsPrinter : public wxPrinterBase
 {
-  DECLARE_DYNAMIC_CLASS(wxWindowsPrinter)
+    DECLARE_DYNAMIC_CLASS(wxWindowsPrinter)
+
+public:
+    wxWindowsPrinter(wxPrintDialogData *data = NULL);
 
- public:
-  wxWindowsPrinter(wxPrintDialogData *data = NULL);
-  ~wxWindowsPrinter(void);
+    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 bool Setup(wxWindow *parent);
+    virtual wxDC *PrintDialog(wxWindow *parent);
+    virtual bool Setup(wxWindow *parent);
 
- private:
-  WXFARPROC     m_lpAbortProc;
+private:
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);
 };
 
-/*
- * wxPrintPreview
- * Programmer creates an object of this class to preview a wxPrintout.
- */
- 
-class WXDLLEXPORT wxWindowsPrintPreview: public wxPrintPreviewBase
+// ---------------------------------------------------------------------------
+// wxPrintPreview: programmer creates an object of this class to preview a
+// wxPrintout.
+// ---------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxWindowsPrintPreview : public wxPrintPreviewBase
 {
-  DECLARE_CLASS(wxWindowsPrintPreview)
+public:
+    wxWindowsPrintPreview(wxPrintout *printout,
+                          wxPrintout *printoutForPrinting = NULL,
+                          wxPrintDialogData *data = NULL);
+    wxWindowsPrintPreview(wxPrintout *printout,
+                          wxPrintout *printoutForPrinting,
+                          wxPrintData *data);
+    virtual ~wxWindowsPrintPreview();
+
+    virtual bool Print(bool interactive);
+    virtual void DetermineScaling();
 
- public:
-  wxWindowsPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintDialogData *data = NULL);
-  ~wxWindowsPrintPreview(void);
+protected:
+#if wxUSE_ENH_METAFILE
+    virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
+#endif
 
-  virtual bool Print(bool interactive);
-  virtual void DetermineScaling(void);
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview)
 };
 
 #endif
-    // _WX_PRINTWIN_H_
+// _WX_PRINTWIN_H_