X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8850cbd3c3f4e714e6883d3ff8e4ac58144427bc..25b0e7c89788b36fe415a4fc707fa5bc22b3e9dc:/include/wx/prntbase.h?ds=sidebyside

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 4da1b0c9be..3307ba26af 100644
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -32,8 +32,10 @@ class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxChoice;
 class WXDLLEXPORT wxPrintout;
 class WXDLLEXPORT wxPrinterBase;
-class WXDLLEXPORT wxPrintDialog;
 class WXDLLEXPORT wxPrintDialogBase;
+class WXDLLEXPORT wxPrintDialog;
+class WXDLLEXPORT wxPageSetupDialogBase;
+class WXDLLEXPORT wxPageSetupDialog;
 class WXDLLEXPORT wxPrintPreviewBase;
 class WXDLLEXPORT wxPreviewCanvas;
 class WXDLLEXPORT wxPreviewControlBar;
@@ -62,9 +64,6 @@ public:
     wxPrintFactory() {}
     virtual ~wxPrintFactory() {}
     
-    virtual bool HasPageSetupDialog() = 0;
-    virtual bool HasPrintSetupDialog() = 0;
-    
     virtual wxPrinterBase *CreatePrinter( wxPrintDialogData* data ) = 0;
     
     virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
@@ -79,6 +78,23 @@ public:
     virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
                                                   wxPrintData *data ) = 0;
                                                   
+    virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
+                                                          wxPageSetupDialogData * data = NULL ) = 0;
+                                                  
+    // What to do and what to show in the wxPrintDialog
+    // a) Use the generic print setup dialog or a native one?
+    virtual bool HasPrintSetupDialog() = 0;
+    virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) = 0;
+    // b) Provide the "print to file" option ourselves or via print setup?
+    virtual bool HasOwnPrintToFile() = 0;
+    // c) Show current printer
+    virtual bool HasPrinterLine() = 0;
+    virtual wxString CreatePrinterLine() = 0;
+    // d) Show Status line for current printer?
+    virtual bool HasStatusLine() = 0;
+    virtual wxString CreateStatusLine() = 0;
+
+                                                  
     virtual wxPrintNativeDataBase *CreatePrintNativeData() = 0;
     
     static void SetPrintFactory( wxPrintFactory *factory );
@@ -89,11 +105,6 @@ public:
 class WXDLLEXPORT wxNativePrintFactory: public wxPrintFactory
 {
 public:
-    virtual bool HasPageSetupDialog() 
-        { return true; }
-    virtual bool HasPrintSetupDialog() 
-        { return true; }
-    
     virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );
     
     virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
@@ -108,6 +119,17 @@ public:
     virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
                                                   wxPrintData *data );
                                                   
+    virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
+                                                          wxPageSetupDialogData * data = NULL );
+                                                  
+    virtual bool HasPrintSetupDialog();
+    virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
+    virtual bool HasOwnPrintToFile();
+    virtual bool HasPrinterLine();
+    virtual wxString CreatePrinterLine();
+    virtual bool HasStatusLine();
+    virtual wxString CreateStatusLine();
+    
     virtual wxPrintNativeDataBase *CreatePrintNativeData();
 };
 
@@ -121,8 +143,8 @@ public:
     wxPrintNativeDataBase();
     virtual ~wxPrintNativeDataBase() {}
     
-    virtual bool ConvertTo( wxPrintData &data ) = 0;
-    virtual bool ConvertFrom( const wxPrintData &data ) = 0; 
+    virtual bool TransferTo( wxPrintData &data ) = 0;
+    virtual bool TransferFrom( const wxPrintData &data ) = 0; 
     
     virtual bool Ok() const = 0;