setup.h for makefile builds

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

diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index 075c34b472113232b031cea7aa7c623478dad2b9..00abaf710d7819bad6075ce6df287515cca1b316 100644 (file)
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -26,15 +26,16 @@ class WXDLLEXPORT wxWindowsPrinter: public wxPrinterBase
 {
   DECLARE_DYNAMIC_CLASS(wxWindowsPrinter)
 
- private:
-  WXFARPROC lpAbortProc;
  public:
-  wxWindowsPrinter(wxPrintData *data = NULL);
+  wxWindowsPrinter(wxPrintDialogData *data = NULL);
   ~wxWindowsPrinter(void);
 
   virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
-  virtual bool PrintDialog(wxWindow *parent);
+  virtual wxDC* PrintDialog(wxWindow *parent);
   virtual bool Setup(wxWindow *parent);
+
+ private:
+  WXFARPROC     m_lpAbortProc;
 };
 
 /*
@@ -47,7 +48,7 @@ class WXDLLEXPORT wxWindowsPrintPreview: public wxPrintPreviewBase
   DECLARE_CLASS(wxWindowsPrintPreview)
 
  public:
-  wxWindowsPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
+  wxWindowsPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintDialogData *data = NULL);
   ~wxWindowsPrintPreview(void);
 
   virtual bool Print(bool interactive);