Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 655a1ad3d6bc05a03bcc1ec8e6ff79e67c87241d..9f2330f071418d223527bc85e5e546b89b866dcb 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -1,70 +1,126 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        printdlg.h
+// Name:        wx/msw/printdlg.h

 // Purpose:     wxPrintDialog, wxPageSetupDialog classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxPrintDialog, wxPageSetupDialog classes
 // Author:      Julian Smart
 // Modified by:
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTDLG_H_
 #define _WX_PRINTDLG_H_
 

-#ifdef __GNUG__
-#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"

+#include "wx/prntbase.h"
+#include "wx/printdlg.h"
+
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WinPrinter;

 
 

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

 
 

-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxPrintDialog: public wxDialog
+class WXDLLIMPEXP_CORE wxWindowsPrintNativeData: public wxPrintNativeDataBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPrintDialog)
+public:
+    wxWindowsPrintNativeData();
+    virtual ~wxWindowsPrintNativeData();
+
+    virtual bool TransferTo( wxPrintData &data );
+    virtual bool TransferFrom( const wxPrintData &data );
+
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;
+
+    void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL);
+    void* GetDevMode() const { return m_devMode; }
+    void SetDevMode(void* data) { m_devMode = data; }
+    void* GetDevNames() const { return m_devNames; }
+    void SetDevNames(void* data) { m_devNames = data; }
+
+private:
+    void* m_devMode;
+    void* m_devNames;
+
+    short m_customWindowsPaperId;

 
 

+private:
+    DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
+};
+
+// ---------------------------------------------------------------------------
+// wxWindowsPrintDialog: the MSW dialog for printing
+// ---------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxWindowsPrintDialog : public wxPrintDialogBase
+{

 public:
 public:

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

 
 

-  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:
+    wxPrintDialogData m_printDialogData;
+    wxPrinterDC*      m_printerDC;
+    bool              m_destroyDC;
+    wxWindow*         m_dialogParent;

 
 private:
 
 private:

-  wxPrintDialogData m_printDialogData;
-  wxDC*             m_printerDC;
-  bool              m_destroyDC;
-  wxWindow*         m_dialogParent;
+    bool ConvertToNative( wxPrintDialogData &data );
+    bool ConvertFromNative( wxPrintDialogData &data );
+
+    // holds MSW handle
+    void*             m_printDlg;
+
+private:
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog);
+    DECLARE_CLASS(wxWindowsPrintDialog)

 };
 
 };
 

-class WXDLLEXPORT wxPageSetupDialog: public wxDialog
+// ---------------------------------------------------------------------------
+// wxWindowsPageSetupDialog: the MSW page setup dialog
+// ---------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
+public:
+    wxWindowsPageSetupDialog();
+    wxWindowsPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
+    virtual ~wxWindowsPageSetupDialog();
+
+    bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
+    virtual int ShowModal();
+    bool ConvertToNative( wxPageSetupDialogData &data );
+    bool ConvertFromNative( wxPageSetupDialogData &data );
+
+    virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; }

 
 

- private:
-  wxPageSetupData   m_pageSetupData;
-  wxWindow*         m_dialogParent;
- public:
-  wxPageSetupDialog(void);
-  wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
-  ~wxPageSetupDialog(void);
+private:
+    wxPageSetupDialogData   m_pageSetupData;
+    wxWindow*               m_dialogParent;

 
 

-  bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
-  virtual int ShowModal(void);
+    // holds MSW handle
+    void*                   m_pageDlg;

 
 

-  inline wxPageSetupData& GetPageSetupData(void) { return m_pageSetupData; }
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPageSetupDialog)

 };
 
 };
 

+#endif // wxUSE_PRINTING_ARCHITECTURE
+

 #endif
     // _WX_PRINTDLG_H_
 #endif
     // _WX_PRINTDLG_H_