Make wxString::WorstEncodingCase take a const wxMBConv&

[wxWidgets.git] / include / wx / prntbase.h

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 04ad68da24122c0e358ed4d3e21d3a482ed6c6e5..95bbc6291636d139ed3d2c2925c24b89c307c3a9 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -5,18 +5,21 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRNTBASEH__
 #define _WX_PRNTBASEH__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRNTBASEH__
 #define _WX_PRNTBASEH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "prntbase.h"
 #endif
 
 #include "wx/defs.h"
     #pragma interface "prntbase.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_PRINTING_ARCHITECTURE
+

 #include "wx/event.h"
 #include "wx/cmndata.h"
 #include "wx/panel.h"
 #include "wx/event.h"
 #include "wx/cmndata.h"
 #include "wx/panel.h"


@@ -30,10 +33,123 @@ class WXDLLEXPORT wxChoice;
 class WXDLLEXPORT wxPrintout;
 class WXDLLEXPORT wxPrinterBase;
 class WXDLLEXPORT wxPrintDialog;
 class WXDLLEXPORT wxPrintout;
 class WXDLLEXPORT wxPrinterBase;
 class WXDLLEXPORT wxPrintDialog;

+class WXDLLEXPORT wxPrintDialogBase;

 class WXDLLEXPORT wxPrintPreviewBase;
 class WXDLLEXPORT wxPreviewCanvas;
 class WXDLLEXPORT wxPreviewControlBar;
 class WXDLLEXPORT wxPreviewFrame;
 class WXDLLEXPORT wxPrintPreviewBase;
 class WXDLLEXPORT wxPreviewCanvas;
 class WXDLLEXPORT wxPreviewControlBar;
 class WXDLLEXPORT wxPreviewFrame;

+class WXDLLEXPORT wxPrintFactory;
+class WXDLLEXPORT wxPrintNativeDataBase;
+
+//----------------------------------------------------------------------------
+// error consts
+//----------------------------------------------------------------------------
+
+enum wxPrinterError
+{
+    wxPRINTER_NO_ERROR = 0,
+    wxPRINTER_CANCELLED,
+    wxPRINTER_ERROR
+};
+
+//----------------------------------------------------------------------------
+// wxPrintFactory
+//----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPrintFactory
+{
+public:
+    wxPrintFactory() {}
+    virtual ~wxPrintFactory() {}
+    
+    virtual wxPrinterBase *CreatePrinter( wxPrintDialogData* data ) = 0;
+    
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
+                                                    wxPrintout *printout = NULL, 
+                                                    wxPrintDialogData *data = NULL ) = 0;
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
+                                                    wxPrintout *printout, 
+                                                    wxPrintData *data ) = 0;
+
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+                                                  wxPrintDialogData *data = NULL ) = 0;
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+                                                  wxPrintData *data ) = 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 );
+    static wxPrintFactory *GetFactory();
+    static wxPrintFactory *m_factory;
+};
+
+class WXDLLEXPORT wxNativePrintFactory: public wxPrintFactory
+{
+public:
+    virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );
+    
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
+                                                    wxPrintout *printout = NULL, 
+                                                    wxPrintDialogData *data = NULL );
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
+                                                    wxPrintout *printout,
+                                                    wxPrintData *data );
+                                                    
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+                                                  wxPrintDialogData *data = NULL );
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+                                                  wxPrintData *data );
+                                                  
+    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();
+};
+
+//----------------------------------------------------------------------------
+// wxPrintNativeDataBase
+//----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPrintNativeDataBase: public wxObject
+{
+public:
+    wxPrintNativeDataBase();
+    virtual ~wxPrintNativeDataBase() {}
+    
+    virtual bool TransferTo( wxPrintData &data ) = 0;
+    virtual bool TransferFrom( const wxPrintData &data ) = 0; 
+    
+    virtual bool Ok() const = 0;
+    
+    int  m_ref;
+    
+private:
+    DECLARE_CLASS(wxPrintNativeDataBase)
+    DECLARE_NO_COPY_CLASS(wxPrintNativeDataBase)
+};
+
+//----------------------------------------------------------------------------
+// wxPrinterBase
+//----------------------------------------------------------------------------

 
 /*
  * Represents the printer: manages printing a wxPrintout object
 
 /*
  * Represents the printer: manages printing a wxPrintout object


@@ -41,38 +157,72 @@ class WXDLLEXPORT wxPreviewFrame;
 
 class WXDLLEXPORT wxPrinterBase: public wxObject
 {
 
 class WXDLLEXPORT wxPrinterBase: public wxObject
 {

-    DECLARE_CLASS(wxPrinterBase)
-

 public:
     wxPrinterBase(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
     virtual ~wxPrinterBase();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
 public:
     wxPrinterBase(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
     virtual ~wxPrinterBase();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);

-    virtual void ReportError(wxWindow *parent, wxPrintout *printout, char *message);
+    virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);

 
 

-    wxPrintDialogData& GetPrintDialogData() const
-        { return (wxPrintDialogData&) m_printDialogData; }
+    virtual wxPrintDialogData& GetPrintDialogData() const;

     bool GetAbort() const { return sm_abortIt; }
 
     bool GetAbort() const { return sm_abortIt; }
 

+    static wxPrinterError GetLastError() { return sm_lastError; }
+

     ///////////////////////////////////////////////////////////////////////////
     // OVERRIDES
 
     virtual bool Setup(wxWindow *parent) = 0;
     ///////////////////////////////////////////////////////////////////////////
     // OVERRIDES
 
     virtual bool Setup(wxWindow *parent) = 0;

-    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE) = 0;
+    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) = 0;

     virtual wxDC* PrintDialog(wxWindow *parent) = 0;
 
 protected:
     wxPrintDialogData     m_printDialogData;
     wxPrintout*           m_currentPrintout;
 
     virtual wxDC* PrintDialog(wxWindow *parent) = 0;
 
 protected:
     wxPrintDialogData     m_printDialogData;
     wxPrintout*           m_currentPrintout;
 

+    static wxPrinterError sm_lastError;
+

 public:
     static wxWindow*      sm_abortWindow;
     static bool           sm_abortIt;
 
 public:
     static wxWindow*      sm_abortWindow;
     static bool           sm_abortIt;
 

+private:
+    DECLARE_CLASS(wxPrinterBase)
+    DECLARE_NO_COPY_CLASS(wxPrinterBase)
+};
+
+//----------------------------------------------------------------------------
+// wxPrinter
+//----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPrinter: public wxPrinterBase
+{
+public:
+    wxPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+    virtual ~wxPrinter();
+
+    virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
+    virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);
+
+    virtual bool Setup(wxWindow *parent);
+    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
+    virtual wxDC* PrintDialog(wxWindow *parent);
+    
+    virtual wxPrintDialogData& GetPrintDialogData() const;
+
+protected:
+    wxPrinterBase    *m_pimpl;
+    
+private:
+    DECLARE_CLASS(wxPrinter)
+    DECLARE_NO_COPY_CLASS(wxPrinter)

 };
 
 };
 

+//----------------------------------------------------------------------------
+// wxPrintout
+//----------------------------------------------------------------------------
+

 /*
 /*

- * wxPrintout

  * Represents an object via which a document may be printed.
  * The programmer derives from this, overrides (at least) OnPrintPage,
  * and passes it to a wxPrinter object for printing, or a wxPrintPreview
  * Represents an object via which a document may be printed.
  * The programmer derives from this, overrides (at least) OnPrintPage,
  * and passes it to a wxPrinter object for printing, or a wxPrintPreview


@@ -81,10 +231,8 @@ public:
 
 class WXDLLEXPORT wxPrintout: public wxObject
 {
 
 class WXDLLEXPORT wxPrintout: public wxObject
 {

-DECLARE_ABSTRACT_CLASS(wxPrintout)
-

 public:
 public:

-    wxPrintout(const wxString& title = "Printout");
+    wxPrintout(const wxString& title = wxT("Printout"));

     virtual ~wxPrintout();
 
     virtual bool OnBeginDocument(int startPage, int endPage);
     virtual ~wxPrintout();
 
     virtual bool OnBeginDocument(int startPage, int endPage);


@@ -133,6 +281,10 @@ private:
     int              m_PPIPrinterY;
 
     bool             m_isPreview;
     int              m_PPIPrinterY;
 
     bool             m_isPreview;

+
+private:
+    DECLARE_ABSTRACT_CLASS(wxPrintout)
+    DECLARE_NO_COPY_CLASS(wxPrintout)

 };
 
 /*
 };
 
 /*


@@ -142,18 +294,17 @@ private:
 
 class WXDLLEXPORT wxPreviewCanvas: public wxScrolledWindow
 {
 
 class WXDLLEXPORT wxPreviewCanvas: public wxScrolledWindow
 {

-    DECLARE_CLASS(wxPreviewCanvas)
-

 public:
     wxPreviewCanvas(wxPrintPreviewBase *preview,
                     wxWindow *parent,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
 public:
     wxPreviewCanvas(wxPrintPreviewBase *preview,
                     wxWindow *parent,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,

-                    const wxString& name = "canvas");
+                    const wxString& name = wxT("canvas"));

     ~wxPreviewCanvas();
 
     void OnPaint(wxPaintEvent& event);
     ~wxPreviewCanvas();
 
     void OnPaint(wxPaintEvent& event);

+    void OnChar(wxKeyEvent &event);

 
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);


@@ -161,7 +312,9 @@ public:
 private:
     wxPrintPreviewBase* m_printPreview;
 
 private:
     wxPrintPreviewBase* m_printPreview;
 

+    DECLARE_CLASS(wxPreviewCanvas)

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxPreviewCanvas)

 };
 
 /*
 };
 
 /*


@@ -171,16 +324,14 @@ private:
 
 class WXDLLEXPORT wxPreviewFrame: public wxFrame
 {
 
 class WXDLLEXPORT wxPreviewFrame: public wxFrame
 {

-    DECLARE_CLASS(wxPreviewFrame)
-

 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,
 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,

-                   wxFrame *parent,
-                   const wxString& title = "Print Preview",
+                   wxWindow *parent,
+                   const wxString& title = wxT("Print Preview"),

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE,

-                   const wxString& name = "frame");
+                   const wxString& name = wxT("frame"));

     ~wxPreviewFrame();
 
     void OnCloseWindow(wxCloseEvent& event);
     ~wxPreviewFrame();
 
     void OnCloseWindow(wxCloseEvent& event);


@@ -188,13 +339,18 @@ public:
     virtual void CreateCanvas();
     virtual void CreateControlBar();
 
     virtual void CreateCanvas();
     virtual void CreateControlBar();
 

+    inline wxPreviewControlBar* GetControlBar() const { return m_controlBar; }
+

 protected:
 protected:

-    wxWindow*             m_previewCanvas;
+    wxPreviewCanvas*      m_previewCanvas;

     wxPreviewControlBar*  m_controlBar;
     wxPrintPreviewBase*   m_printPreview;
     wxPreviewControlBar*  m_controlBar;
     wxPrintPreviewBase*   m_printPreview;

+    wxWindowDisabler*     m_windowDisabler;

 
 private:
 
 private:

+    DECLARE_CLASS(wxPreviewFrame)

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxPreviewFrame)

 };
 
 /*
 };
 
 /*


@@ -208,8 +364,12 @@ private:
 #define wxPREVIEW_PREVIOUS     2
 #define wxPREVIEW_NEXT         4
 #define wxPREVIEW_ZOOM         8
 #define wxPREVIEW_PREVIOUS     2
 #define wxPREVIEW_NEXT         4
 #define wxPREVIEW_ZOOM         8

+#define wxPREVIEW_FIRST       16
+#define wxPREVIEW_LAST        32
+#define wxPREVIEW_GOTO        64

 
 

-#define wxPREVIEW_DEFAULT      wxPREVIEW_PREVIOUS|wxPREVIEW_NEXT|wxPREVIEW_ZOOM
+#define wxPREVIEW_DEFAULT  wxPREVIEW_PREVIOUS|wxPREVIEW_NEXT|wxPREVIEW_ZOOM\
+                          |wxPREVIEW_FIRST|wxPREVIEW_GOTO|wxPREVIEW_LAST

 
 // Ids for controls
 #define wxID_PREVIEW_CLOSE      1
 
 // Ids for controls
 #define wxID_PREVIEW_CLOSE      1


@@ -217,6 +377,9 @@ private:
 #define wxID_PREVIEW_PREVIOUS   3
 #define wxID_PREVIEW_PRINT      4
 #define wxID_PREVIEW_ZOOM       5
 #define wxID_PREVIEW_PREVIOUS   3
 #define wxID_PREVIEW_PRINT      4
 #define wxID_PREVIEW_ZOOM       5

+#define wxID_PREVIEW_FIRST      6
+#define wxID_PREVIEW_LAST       7
+#define wxID_PREVIEW_GOTO       8

 
 class WXDLLEXPORT wxPreviewControlBar: public wxPanel
 {
 
 class WXDLLEXPORT wxPreviewControlBar: public wxPanel
 {


@@ -228,8 +391,8 @@ public:
                         wxWindow *parent,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         wxWindow *parent,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,

-                        long style = 0,
-                        const wxString& name = "panel");
+                        long style = wxTAB_TRAVERSAL,
+                        const wxString& name = wxT("panel"));

     ~wxPreviewControlBar();
 
     virtual void CreateButtons();
     ~wxPreviewControlBar();
 
     virtual void CreateButtons();


@@ -238,10 +401,19 @@ public:
     virtual wxPrintPreviewBase *GetPrintPreview() const
         { return m_printPreview; }
 
     virtual wxPrintPreviewBase *GetPrintPreview() const
         { return m_printPreview; }
 

-    void OnPrint(wxCommandEvent& event);

     void OnWindowClose(wxCommandEvent& event);
     void OnWindowClose(wxCommandEvent& event);

-    void OnNext(wxCommandEvent& event);
-    void OnPrevious(wxCommandEvent& event);
+    void OnNext();
+    void OnPrevious();
+    void OnFirst();
+    void OnLast();
+    void OnGoto();
+    void OnPrint();
+    void OnPrintButton(wxCommandEvent& WXUNUSED(event)) { OnPrint(); }
+    void OnNextButton(wxCommandEvent & WXUNUSED(event)) { OnNext(); }
+    void OnPreviousButton(wxCommandEvent & WXUNUSED(event)) { OnPrevious(); }
+    void OnFirstButton(wxCommandEvent & WXUNUSED(event)) { OnFirst(); }
+    void OnLastButton(wxCommandEvent & WXUNUSED(event)) { OnLast(); }
+    void OnGotoButton(wxCommandEvent & WXUNUSED(event)) { OnGoto(); }

     void OnZoom(wxCommandEvent& event);
     void OnPaint(wxPaintEvent& event);
 
     void OnZoom(wxCommandEvent& event);
     void OnPaint(wxPaintEvent& event);
 


@@ -252,21 +424,26 @@ protected:
     wxButton*             m_previousPageButton;
     wxButton*             m_printButton;
     wxChoice*             m_zoomControl;
     wxButton*             m_previousPageButton;
     wxButton*             m_printButton;
     wxChoice*             m_zoomControl;

+    wxButton*             m_firstPageButton;
+    wxButton*             m_lastPageButton;
+    wxButton*             m_gotoPageButton;

     long                  m_buttonFlags;
 
 private:
     DECLARE_EVENT_TABLE()
     long                  m_buttonFlags;
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxPreviewControlBar)

 };
 
 };
 

+//----------------------------------------------------------------------------
+// wxPrintPreviewBase
+//----------------------------------------------------------------------------
+

 /*
 /*

- * wxPrintPreview

  * Programmer creates an object of this class to preview a wxPrintout.
  */
 
 class WXDLLEXPORT wxPrintPreviewBase: public wxObject
 {
  * Programmer creates an object of this class to preview a wxPrintout.
  */
 
 class WXDLLEXPORT wxPrintPreviewBase: public wxObject
 {

-    DECLARE_CLASS(wxPrintPreviewBase)
-

 public:
     wxPrintPreviewBase(wxPrintout *printout,
                        wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
 public:
     wxPrintPreviewBase(wxPrintout *printout,
                        wxPrintout *printoutForPrinting = (wxPrintout *) NULL,


@@ -277,37 +454,41 @@ public:
     virtual ~wxPrintPreviewBase();
 
     virtual bool SetCurrentPage(int pageNum);
     virtual ~wxPrintPreviewBase();
 
     virtual bool SetCurrentPage(int pageNum);

-    int GetCurrentPage() const { return m_currentPage; };
+    virtual int GetCurrentPage() const;

 
 

-    void SetPrintout(wxPrintout *printout) { m_previewPrintout = printout; };
-    wxPrintout *GetPrintout() const { return m_previewPrintout; };
-    wxPrintout *GetPrintoutForPrinting() const { return m_printPrintout; };
+    virtual void SetPrintout(wxPrintout *printout);
+    virtual wxPrintout *GetPrintout() const;
+    virtual wxPrintout *GetPrintoutForPrinting() const;

 
 

-    void SetFrame(wxFrame *frame) { m_previewFrame = frame; };
-    void SetCanvas(wxWindow *canvas) { m_previewCanvas = canvas; };
+    virtual void SetFrame(wxFrame *frame);
+    virtual void SetCanvas(wxPreviewCanvas *canvas);

 
 

-    virtual wxFrame *GetFrame() const { return m_previewFrame; }
-    virtual wxWindow *GetCanvas() const { return m_previewCanvas; }
+    virtual wxFrame *GetFrame() const;
+    virtual wxPreviewCanvas *GetCanvas() const;

 
     // The preview canvas should call this from OnPaint
 
     // The preview canvas should call this from OnPaint

-    virtual bool PaintPage(wxWindow *canvas, wxDC& dc);
+    virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);

 
     // This draws a blank page onto the preview canvas
 
     // This draws a blank page onto the preview canvas

-    virtual bool DrawBlankPage(wxWindow *canvas, wxDC& dc);
+    virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
+
+    // Adjusts the scrollbars for the current scale
+    virtual void AdjustScrollbars(wxPreviewCanvas *canvas);

 
     // This is called by wxPrintPreview to render a page into a wxMemoryDC.
     virtual bool RenderPage(int pageNum);
 
 
     // This is called by wxPrintPreview to render a page into a wxMemoryDC.
     virtual bool RenderPage(int pageNum);
 

-    wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }

 
     virtual void SetZoom(int percent);
 
     virtual void SetZoom(int percent);

-    int GetZoom() const { return m_currentZoom; };
+    virtual int GetZoom() const;

 
 

-    int GetMaxPage() const { return m_maxPage; }
-    int GetMinPage() const { return m_minPage; }
+    virtual wxPrintDialogData& GetPrintDialogData();
+    
+    virtual int GetMaxPage() const;
+    virtual int GetMinPage() const;

 
 

-    bool Ok() const { return m_isOk; }
-    void SetOk(bool ok) { m_isOk = ok; }
+    virtual bool Ok() const;
+    virtual void SetOk(bool ok);

 
     ///////////////////////////////////////////////////////////////////////////
     // OVERRIDES
 
     ///////////////////////////////////////////////////////////////////////////
     // OVERRIDES


@@ -324,7 +505,7 @@ public:
 
 protected:
     wxPrintDialogData m_printDialogData;
 
 protected:
     wxPrintDialogData m_printDialogData;

-    wxWindow*         m_previewCanvas;
+    wxPreviewCanvas*  m_previewCanvas;

     wxFrame*          m_previewFrame;
     wxBitmap*         m_previewBitmap;
     wxPrintout*       m_previewPrintout;
     wxFrame*          m_previewFrame;
     wxBitmap*         m_previewBitmap;
     wxPrintout*       m_previewPrintout;


@@ -340,14 +521,68 @@ protected:
     int               m_maxPage;
 
     bool              m_isOk;
     int               m_maxPage;
 
     bool              m_isOk;

+    bool              m_printingPrepared; // Called OnPreparePrinting?

 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);

+
+    DECLARE_NO_COPY_CLASS(wxPrintPreviewBase)
+    DECLARE_CLASS(wxPrintPreviewBase)

 };
 
 };
 

-/*
- * Abort dialog
- */
+//----------------------------------------------------------------------------
+// wxPrintPreview
+//----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase
+{
+public:
+    wxPrintPreview(wxPrintout *printout,
+                   wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
+                   wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+    wxPrintPreview(wxPrintout *printout,
+                   wxPrintout *printoutForPrinting,
+                   wxPrintData *data);
+    virtual ~wxPrintPreview();
+
+    virtual bool SetCurrentPage(int pageNum);
+    virtual int GetCurrentPage() const;
+    virtual void SetPrintout(wxPrintout *printout);
+    virtual wxPrintout *GetPrintout() const;
+    virtual wxPrintout *GetPrintoutForPrinting() const;
+    virtual void SetFrame(wxFrame *frame);
+    virtual void SetCanvas(wxPreviewCanvas *canvas);
+
+    virtual wxFrame *GetFrame() const;
+    virtual wxPreviewCanvas *GetCanvas() const;
+    virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);
+    virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
+    virtual void AdjustScrollbars(wxPreviewCanvas *canvas);
+    virtual bool RenderPage(int pageNum);
+    virtual void SetZoom(int percent);
+
+    virtual bool Print(bool interactive);
+    virtual void DetermineScaling();
+    
+    virtual wxPrintDialogData& GetPrintDialogData();
+    
+    virtual int GetMaxPage() const;
+    virtual int GetMinPage() const;
+
+    virtual bool Ok() const;
+    virtual void SetOk(bool ok);
+    
+private:
+    wxPrintPreviewBase *m_pimpl;
+
+private:
+    DECLARE_CLASS(wxPrintPreview)
+    DECLARE_NO_COPY_CLASS(wxPrintPreview)
+};
+
+//----------------------------------------------------------------------------
+// wxPrintAbortDialog
+//----------------------------------------------------------------------------

 
 class WXDLLEXPORT wxPrintAbortDialog: public wxDialog
 {
 
 class WXDLLEXPORT wxPrintAbortDialog: public wxDialog
 {


@@ -357,8 +592,8 @@ public:
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = 0,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
                        long style = 0,

-                       const wxString& name = "dialog")
-        : wxDialog(parent, -1, title, pos, size, style, name)
+                       const wxString& name = wxT("dialog"))
+        : wxDialog(parent, wxID_ANY, title, pos, size, style, name)

         {
         }
 
         {
         }
 


@@ -366,7 +601,10 @@ public:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxPrintAbortDialog)

 };
 
 };
 

+#endif // wxUSE_PRINTING_ARCHITECTURE
+

 #endif
     // _WX_PRNTBASEH__
 #endif
     // _WX_PRNTBASEH__