X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa12f7e60939a13ce899cbf4fa3286c367bf0093..c8e1af672f46e93ae2fe6d7f9d5b35a3d8d49c16:/include/wx/generic/prntdlgg.h?ds=sidebyside

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 097ea5403f..70ce01a6d0 100644
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -13,7 +13,7 @@
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "prntdlgg.h"
 #endif
 
@@ -22,7 +22,10 @@
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dialog.h"
-#include "wx/dialog.h"
+#include "wx/cmndata.h"
+#include "wx/prntbase.h"
+#include "wx/printdlg.h"
+#include "wx/listctrl.h"
 
 #if wxUSE_POSTSCRIPT
     #include "wx/dcps.h"
@@ -34,13 +37,14 @@ class WXDLLEXPORT wxCheckBox;
 class WXDLLEXPORT wxComboBox;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxRadioBox;
-class WXDLLEXPORT wxPrintSetupData;
+class WXDLLEXPORT wxPageSetupData;
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
-// FIXME why all these enums start with 10 or 30?
+// This is not clear why all these enums start with 10 or 30 but do not change it
+// without good reason to avoid some subtle backwards compatibility breakage
 
 enum
 {
@@ -67,7 +71,67 @@ enum
     wxPRINTID_ORIENTATION,
     wxPRINTID_COMMAND,
     wxPRINTID_OPTIONS,
-    wxPRINTID_PAPERSIZE
+    wxPRINTID_PAPERSIZE,
+    wxPRINTID_PRINTER
+};
+
+#if wxUSE_POSTSCRIPT
+
+//----------------------------------------------------------------------------
+// wxPostScriptNativeData
+//----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPostScriptPrintNativeData: public wxPrintNativeDataBase
+{
+public:
+    wxPostScriptPrintNativeData();
+    virtual ~wxPostScriptPrintNativeData();
+
+    virtual bool TransferTo( wxPrintData &data );
+    virtual bool TransferFrom( const wxPrintData &data );
+
+    virtual bool Ok() const { return true; }
+
+    const wxString& GetPrinterCommand() const { return m_printerCommand; }
+    const wxString& GetPrinterOptions() const { return m_printerOptions; }
+    const wxString& GetPreviewCommand() const { return m_previewCommand; }
+    const wxString& GetFontMetricPath() const { return m_afmPath; }
+    double GetPrinterScaleX() const { return m_printerScaleX; }
+    double GetPrinterScaleY() const { return m_printerScaleY; }
+    long GetPrinterTranslateX() const { return m_printerTranslateX; }
+    long GetPrinterTranslateY() const { return m_printerTranslateY; }
+
+    void SetPrinterCommand(const wxString& command) { m_printerCommand = command; }
+    void SetPrinterOptions(const wxString& options) { m_printerOptions = options; }
+    void SetPreviewCommand(const wxString& command) { m_previewCommand = command; }
+    void SetFontMetricPath(const wxString& path) { m_afmPath = path; }
+    void SetPrinterScaleX(double x) { m_printerScaleX = x; }
+    void SetPrinterScaleY(double y) { m_printerScaleY = y; }
+    void SetPrinterScaling(double x, double y) { m_printerScaleX = x; m_printerScaleY = y; }
+    void SetPrinterTranslateX(long x) { m_printerTranslateX = x; }
+    void SetPrinterTranslateY(long y) { m_printerTranslateY = y; }
+    void SetPrinterTranslation(long x, long y) { m_printerTranslateX = x; m_printerTranslateY = y; }
+
+#if wxUSE_STREAMS
+    wxOutputStream *GetOutputStream() { return m_outputStream; }
+    void SetOutputStream( wxOutputStream *output ) { m_outputStream = output; }
+#endif
+
+private:
+    wxString        m_printerCommand;
+    wxString        m_previewCommand;
+    wxString        m_printerOptions;
+    wxString        m_afmPath;
+    double          m_printerScaleX;
+    double          m_printerScaleY;
+    long            m_printerTranslateX;
+    long            m_printerTranslateY;
+#if wxUSE_STREAMS
+    wxOutputStream *m_outputStream;
+#endif
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPostScriptPrintNativeData)
 };
 
 // ----------------------------------------------------------------------------
@@ -75,11 +139,8 @@ enum
 // Windows using PostScript print/preview)
 // ----------------------------------------------------------------------------
 
-#if wxUSE_POSTSCRIPT
-class WXDLLEXPORT wxGenericPrintDialog : public wxDialog
+class WXDLLEXPORT wxGenericPrintDialog : public wxPrintDialogBase
 {
-    DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)
-
 public:
     wxGenericPrintDialog(wxWindow *parent,
                          wxPrintDialogData* data = (wxPrintDialogData*)NULL);
@@ -96,10 +157,8 @@ public:
 
     virtual int ShowModal();
 
-#if wxUSE_POSTSCRIPT
     wxPrintData& GetPrintData()
         { return m_printDialogData.GetPrintData(); }
-#endif // wxUSE_POSTSCRIPT
 
     wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
     wxDC *GetPrintDC();
@@ -122,56 +181,61 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)
 };
 
 class WXDLLEXPORT wxGenericPrintSetupDialog : public wxDialog
 {
-    DECLARE_CLASS(wxGenericPrintSetupDialog)
-
 public:
     // There are no configuration options for the dialog, so we
     // just pass the wxPrintData object (no wxPrintSetupDialogData class needed)
     wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data);
-    wxGenericPrintSetupDialog(wxWindow *parent, wxPrintSetupData* data);
     virtual ~wxGenericPrintSetupDialog();
 
     void Init(wxPrintData* data);
 
+    void OnPrinter(wxListEvent& event);
+
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
-    wxComboBox *CreatePaperTypeChoice(int* x, int* y);
+    virtual wxComboBox *CreatePaperTypeChoice();
 
 public:
+    wxListCtrl*         m_printerListCtrl;
     wxRadioBox*         m_orientationRadioBox;
     wxTextCtrl*         m_printerCommandText;
     wxTextCtrl*         m_printerOptionsText;
     wxCheckBox*         m_colourCheckBox;
-    wxComboBox*           m_paperTypeChoice;
+    wxComboBox*         m_paperTypeChoice;
 
-#if wxUSE_POSTSCRIPT
     wxPrintData         m_printData;
     wxPrintData&        GetPrintData() { return m_printData; }
-#endif // wxUSE_POSTSCRIPT
+
+    // After pressing OK, write data here.
+    wxPrintData*        m_targetData;
+
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_CLASS(wxGenericPrintSetupDialog)
 };
 #endif
     // wxUSE_POSTSCRIPT
 
-class WXDLLEXPORT wxGenericPageSetupDialog : public wxDialog
+class WXDLLEXPORT wxGenericPageSetupDialog : public wxPageSetupDialogBase
 {
-    DECLARE_CLASS(wxGenericPageSetupDialog)
-
 public:
-    wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data = (wxPageSetupData*) NULL);
+    wxGenericPageSetupDialog(wxWindow *parent = NULL,
+                             wxPageSetupDialogData* data = NULL);
     virtual ~wxGenericPageSetupDialog();
 
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
-    void OnPrinter(wxCommandEvent& event);
+    virtual wxPageSetupDialogData& GetPageSetupDialogData();
 
+    void OnPrinter(wxCommandEvent& event);
     wxComboBox *CreatePaperTypeChoice(int* x, int* y);
-    wxPageSetupData& GetPageSetupData() { return m_pageData; }
 
 public:
     wxButton*       m_printerButton;
@@ -182,15 +246,14 @@ public:
     wxTextCtrl*     m_marginBottomText;
     wxComboBox*       m_paperTypeChoice;
 
-    static bool     m_pageSetupDialogCancelled;
-
-    wxPageSetupData m_pageData;
+    wxPageSetupDialogData m_pageData;
 
 private:
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericPageSetupDialog)
 };
 
 #endif
 
 #endif
-// __PRINTDLGH_G__
+// __PRINTDLGH_G_