1. wxStaticLine implemented (generic (ugly) and MSW versions)

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

diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index 2f92fa3ca9872fb5e826840c0e51878f72270c4d..9f7d368f7aa5e46a00b85f87fdf87ecbd5a43d73 100644 (file)
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -6,54 +6,61 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTWIN_H_
 #define _WX_PRINTWIN_H_
 
 #ifdef __GNUG__

-#pragma interface "printwin.h"
+    #pragma interface "printwin.h"

 #endif
 
 #include "wx/prntbase.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(wxPrintData *data = NULL);
-  ~wxWindowsPrinter(void);
+public:
+    wxWindowsPrinter(wxPrintDialogData *data = NULL);
+    virtual ~wxWindowsPrinter();

 
 

-  virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
-  virtual bool PrintDialog(wxWindow *parent);
-  virtual bool Setup(wxWindow *parent);
+    virtual bool Print(wxWindow *parent,
+                       wxPrintout *printout,
+                       bool prompt = TRUE);
+    virtual wxDC* PrintDialog(wxWindow *parent);
+    virtual bool Setup(wxWindow *parent);

 
 

- private:
-  WXFARPROC     m_lpAbortProc;
+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
 };
 
 #endif

-    // _WX_PRINTWIN_H_
+// _WX_PRINTWIN_H_