MSW compilation fixes (untested)

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

diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index 6ba0aa6a72beff055e33469057a7b20333a92f24..9f7d368f7aa5e46a00b85f87fdf87ecbd5a43d73 100644 (file)
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -5,54 +5,62 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __PRINTWINH__
-#define __PRINTWINH__
+#ifndef _WX_PRINTWIN_H_
+#define _WX_PRINTWIN_H_
 
 #ifdef __GNUG__
-#pragma interface "printwin.h"
+    #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 WXDLLEXPORT wxWindowsPrinter : public wxPrinterBase
 {
-  DECLARE_DYNAMIC_CLASS(wxWindowsPrinter)
+    DECLARE_DYNAMIC_CLASS(wxWindowsPrinter)
+
+public:
+    wxWindowsPrinter(wxPrintDialogData *data = NULL);
+    virtual ~wxWindowsPrinter();
 
- private:
-  WXFARPROC lpAbortProc;
- public:
-  wxWindowsPrinter(wxPrintData *data = NULL);
-  ~wxWindowsPrinter(void);
+    virtual bool Print(wxWindow *parent,
+                       wxPrintout *printout,
+                       bool prompt = TRUE);
+    virtual wxDC* PrintDialog(wxWindow *parent);
+    virtual bool Setup(wxWindow *parent);
 
-  virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
-  virtual bool PrintDialog(wxWindow *parent);
-  virtual bool Setup(wxWindow *parent);
+private:
+    WXFARPROC     m_lpAbortProc;
 };
 
-/*
- * 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 WXDLLEXPORT wxWindowsPrintPreview : public wxPrintPreviewBase
 {
-  DECLARE_CLASS(wxWindowsPrintPreview)
+    DECLARE_CLASS(wxWindowsPrintPreview)
 
- public:
-  wxWindowsPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
-  ~wxWindowsPrintPreview(void);
+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(void);
+    virtual bool Print(bool interactive);
+    virtual void DetermineScaling();
 };
 
 #endif
-    // __PRINTWINH__
+// _WX_PRINTWIN_H_