X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..77ec05d4776a5210c766fcd4b6b2c63a23b1f86a:/include/wx/msw/printdlg.h

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index cf14ef75b0..dba9a45412 100644
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -6,66 +6,119 @@
 // 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.
- */
+#include "wx/prntbase.h"
+#include "wx/printdlg.h"
 
 class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxPrintDialog: public wxDialog
+
+//----------------------------------------------------------------------------
+// wxWindowsPrintNativeData
+//----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxWindowsPrintNativeData: public wxPrintNativeDataBase
 {
-  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);
+public:
+    wxWindowsPrintNativeData();
+    virtual ~wxWindowsPrintNativeData();
+    
+    virtual bool TransferTo( wxPrintData &data );
+    virtual bool TransferFrom( const wxPrintData &data );
+    
+    virtual bool Ok() const;
+    
+    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;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };
+    
+// ---------------------------------------------------------------------------
+// wxWindowsPrintDialog: the MSW dialog for printing
+// ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPageSetupDialog: public wxDialog
+class WXDLLEXPORT wxWindowsPrintDialog : public wxPrintDialogBase
 {
-  DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
+public:
+    wxWindowsPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
+    wxWindowsPrintDialog(wxWindow *parent, wxPrintData* data);
+    virtual ~wxWindowsPrintDialog();
+
+    bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
+    virtual int ShowModal();
 
- private:
-  wxPageSetupData   m_pageSetupData;
-  wxWindow*         m_dialogParent;
- public:
-  wxPageSetupDialog(void);
-  wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
-  ~wxPageSetupDialog(void);
+    wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
+    wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
+    virtual wxDC *GetPrintDC();
 
-  bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
-  virtual int ShowModal(void);
+private:
+    wxPrintDialogData m_printDialogData;
+    wxDC*             m_printerDC;
+    bool              m_destroyDC;
+    wxWindow*         m_dialogParent;
+    
+private:
+    bool ConvertToNative( wxPrintDialogData &data );
+    bool ConvertFromNative( wxPrintDialogData &data );
+    
+    // holds MSW handle
+    void*             m_printDlg;
 
-  inline wxPageSetupData& GetPageSetupData(void) { return m_pageSetupData; }
+private:
+    DECLARE_NO_COPY_CLASS(wxWindowsPrintDialog)
+    DECLARE_CLASS(wxWindowsPrintDialog)
 };
 
+// ---------------------------------------------------------------------------
+// wxWindowsPageSetupDialog: the MSW page setup dialog 
+// ---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxWindowsPageSetupDialog: public wxPageSetupDialogBase
+{
+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 wxPageSetupData& GetPageSetupDialogData() { return m_pageSetupData; }
+
+private:
+    wxPageSetupDialogData   m_pageSetupData;
+    wxWindow*               m_dialogParent;
+    
+    // holds MSW handle
+    void*                   m_pageDlg;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPageSetupDialog)
+};
+
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
 #endif
     // _WX_PRINTDLG_H_