unified wxTaskBarIcon behaviour: wxMSW version is not removed automatically when...

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

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index cf14ef75b037e81f8b071ac2365ae122bc043e17..041b389a8e4ab2a82eb5df40941428c4a2aee046 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -6,66 +6,75 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTDLG_H_
 #define _WX_PRINTDLG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "printdlg.h"
 #endif
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
-/*
- * wxPrinterDialog
- * The common dialog for printing.
- */
-
 class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxPrintDialog: public wxDialog
+
+// ---------------------------------------------------------------------------
+// wxPrinterDialog: the common dialog for printing.
+// ---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPrintDialog : public wxDialog
 {
-  DECLARE_DYNAMIC_CLASS(wxPrintDialog)
-
- private:
-  wxPrintData printData;
-  wxDC *printerDC;
-  bool destroyDC;
-  char *deviceName;
-  char *driverName;
-  char *portName;
-  wxWindow *dialogParent;
- public:
-  wxPrintDialog(void);
-  wxPrintDialog(wxWindow *parent, wxPrintData* data = NULL);
-  ~wxPrintDialog(void);
-
-  bool Create(wxWindow *parent, wxPrintData* data = NULL);
-  virtual int ShowModal(void);
-
-  inline wxPrintData& GetPrintData(void) { return printData; }
-  virtual wxDC *GetPrintDC(void);
+    DECLARE_DYNAMIC_CLASS(wxPrintDialog)
+
+public:
+    wxPrintDialog();
+    wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
+    wxPrintDialog(wxWindow *parent, wxPrintData* data);
+    virtual ~wxPrintDialog();
+
+    bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
+    virtual int ShowModal();
+
+    wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
+    wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
+    virtual wxDC *GetPrintDC();
+
+private:
+    wxPrintDialogData m_printDialogData;
+    wxDC*             m_printerDC;
+    bool              m_destroyDC;
+    wxWindow*         m_dialogParent;
+
+    DECLARE_NO_COPY_CLASS(wxPrintDialog)
 };
 
 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(void);
+    bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
+    virtual int ShowModal();
 
-  inline wxPageSetupData& GetPageSetupData(void) { return m_pageSetupData; }
+    wxPageSetupData& GetPageSetupData() { return m_pageSetupData; }
+
+private:
+    wxPageSetupData   m_pageSetupData;
+    wxWindow*         m_dialogParent;
+
+    DECLARE_NO_COPY_CLASS(wxPageSetupDialog)
 };
 
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
 #endif
     // _WX_PRINTDLG_H_