added virtual dtor to wxDateTimeHolidayAuthority (patch 753947)

[wxWidgets.git] / include / wx / mac / printmac.h

diff --git a/include/wx/mac/printmac.h b/include/wx/mac/printmac.h
index df7ccd0b82d5056e4f0b23f21fa299989d43a68a..388f4dc796360fd12ab9b86d09a4b39b0f0bbfa4 100644 (file)
--- a/include/wx/mac/printmac.h
+++ b/include/wx/mac/printmac.h
@@ -6,13 +6,13 @@
 // 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__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "printwin.h"
 #endif
 
@@ -27,14 +27,15 @@ class WXDLLEXPORT wxMacPrinter: public wxPrinterBase
   DECLARE_DYNAMIC_CLASS(wxMacPrinter)
 
  public:
-  wxMacPrinter(wxPrintData *data = NULL);
-  ~wxMacPrinter(void);
+    wxMacPrinter(wxPrintDialogData *data = NULL);
+    virtual ~wxMacPrinter();
 
-  virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
-  virtual bool PrintDialog(wxWindow *parent);
+    virtual bool Print(wxWindow *parent,
+                       wxPrintout *printout,
+                       bool prompt = TRUE);
+    virtual wxDC* PrintDialog(wxWindow *parent);
   virtual bool Setup(wxWindow *parent);
 
- private:
 };
 
 /*
@@ -47,11 +48,16 @@ class WXDLLEXPORT wxMacPrintPreview: public wxPrintPreviewBase
   DECLARE_CLASS(wxMacPrintPreview)
 
  public:
-  wxMacPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
-  ~wxMacPrintPreview(void);
+    wxMacPrintPreview(wxPrintout *printout,
+                          wxPrintout *printoutForPrinting = NULL,
+                          wxPrintDialogData *data = NULL);
+    wxMacPrintPreview(wxPrintout *printout,
+                          wxPrintout *printoutForPrinting,
+                          wxPrintData *data);
+    virtual ~wxMacPrintPreview();
 
   virtual bool Print(bool interactive);
-  virtual void DetermineScaling(void);
+    virtual void DetermineScaling();
 };
 
 #endif