Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 655a1ad3d6bc05a03bcc1ec8e6ff79e67c87241d..7704c3f15d19877f938405ed6a8dd3fcf6e58601 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -6,7 +6,7 @@
 // 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_PRINTDLG_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTDLG_H_


@@ -16,55 +16,61 @@
 #pragma interface "printdlg.h"
 #endif
 
 #pragma interface "printdlg.h"
 #endif
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 

-/*
- * wxPrinterDialog
- * The common dialog for printing.
- */
-

 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxDC;

-class WXDLLEXPORT wxPrintDialog: public wxDialog
+
+// ---------------------------------------------------------------------------
+// wxPrinterDialog: the common dialog for printing.
+// ---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPrintDialog : public wxDialog

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPrintDialog)
+    DECLARE_DYNAMIC_CLASS(wxPrintDialog)

 
 public:
 
 public:

-  wxPrintDialog(void);
-  wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
-  ~wxPrintDialog(void);
+    wxPrintDialog();
+    wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
+    wxPrintDialog(wxWindow *parent, wxPrintData* data);
+    virtual ~wxPrintDialog();

 
 

-  bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
-  virtual int ShowModal(void);
+    bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
+    virtual int ShowModal();

 
 

-  inline wxPrintDialogData& GetPrintDialogData(void) { return m_printDialogData; }
-  inline wxPrintData& GetPrintData(void) { return m_printDialogData.GetPrintData(); }
-  virtual wxDC *GetPrintDC(void);
+    wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
+    wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
+    virtual wxDC *GetPrintDC();

 
 private:
 
 private:

-  wxPrintDialogData m_printDialogData;
-  wxDC*             m_printerDC;
-  bool              m_destroyDC;
-  wxWindow*         m_dialogParent;
+    wxPrintDialogData m_printDialogData;
+    wxDC*             m_printerDC;
+    bool              m_destroyDC;
+    wxWindow*         m_dialogParent;

 };
 
 class WXDLLEXPORT wxPageSetupDialog: public wxDialog
 {
 };
 
 class WXDLLEXPORT wxPageSetupDialog: public wxDialog
 {

-  DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
+    DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)

 
 

- private:
-  wxPageSetupData   m_pageSetupData;
-  wxWindow*         m_dialogParent;
- public:
-  wxPageSetupDialog(void);
-  wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
-  ~wxPageSetupDialog(void);
+public:
+    wxPageSetupDialog();
+    wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
+    virtual ~wxPageSetupDialog();
+
+    bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
+    virtual int ShowModal();

 
 

-  bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
-  virtual int ShowModal(void);
+    wxPageSetupData& GetPageSetupData() { return m_pageSetupData; }

 
 

-  inline wxPageSetupData& GetPageSetupData(void) { return m_pageSetupData; }
+private:
+    wxPageSetupData   m_pageSetupData;
+    wxWindow*         m_dialogParent;

 };
 
 };
 

+#endif // wxUSE_PRINTING_ARCHITECTURE
+

 #endif
     // _WX_PRINTDLG_H_
 #endif
     // _WX_PRINTDLG_H_