Add XRC handler for wxCommandLinkButton.

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

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 73a5d466757acec105d3a3463d27657b76b431e4..8d6f7d246bbc99055c2783a34a5bb80a8ce36344 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        prntbase.h
+// Name:        wx/prntbase.h

 // Purpose:     Base classes for printing framework
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Base classes for printing framework
 // Author:      Julian Smart
 // Modified by:


@@ -22,22 +22,24 @@
 #include "wx/scrolwin.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/scrolwin.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"

-
-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxButton;
-class WXDLLEXPORT wxChoice;
-class WXDLLEXPORT wxPrintout;
-class WXDLLEXPORT wxPrinterBase;
-class WXDLLEXPORT wxPrintDialogBase;
-class WXDLLEXPORT wxPrintDialog;
-class WXDLLEXPORT wxPageSetupDialogBase;
-class WXDLLEXPORT wxPageSetupDialog;
-class WXDLLEXPORT wxPrintPreviewBase;
-class WXDLLEXPORT wxPreviewCanvas;
-class WXDLLEXPORT wxPreviewControlBar;
-class WXDLLEXPORT wxPreviewFrame;
-class WXDLLEXPORT wxPrintFactory;
-class WXDLLEXPORT wxPrintNativeDataBase;
+#include "wx/dc.h"
+
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxChoice;
+class WXDLLIMPEXP_FWD_CORE wxPrintout;
+class WXDLLIMPEXP_FWD_CORE wxPrinterBase;
+class WXDLLIMPEXP_FWD_CORE wxPrintDialogBase;
+class WXDLLIMPEXP_FWD_CORE wxPrintDialog;
+class WXDLLIMPEXP_FWD_CORE wxPageSetupDialogBase;
+class WXDLLIMPEXP_FWD_CORE wxPageSetupDialog;
+class WXDLLIMPEXP_FWD_CORE wxPrintPreviewBase;
+class WXDLLIMPEXP_FWD_CORE wxPreviewCanvas;
+class WXDLLIMPEXP_FWD_CORE wxPreviewControlBar;
+class WXDLLIMPEXP_FWD_CORE wxPreviewFrame;
+class WXDLLIMPEXP_FWD_CORE wxPrintFactory;
+class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
+class WXDLLIMPEXP_FWD_CORE wxPrintPreview;

 
 //----------------------------------------------------------------------------
 // error consts
 
 //----------------------------------------------------------------------------
 // error consts


@@ -54,7 +56,7 @@ enum wxPrinterError
 // wxPrintFactory
 //----------------------------------------------------------------------------
 
 // wxPrintFactory
 //----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPrintFactory
+class WXDLLIMPEXP_CORE wxPrintFactory

 {
 public:
     wxPrintFactory() {}
 {
 public:
     wxPrintFactory() {}


@@ -77,6 +79,8 @@ public:
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL ) = 0;
 
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL ) = 0;
 

+    virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const 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;
     // 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;


@@ -99,7 +103,7 @@ private:
     static wxPrintFactory *m_factory;
 };
 
     static wxPrintFactory *m_factory;
 };
 

-class WXDLLEXPORT wxNativePrintFactory: public wxPrintFactory
+class WXDLLIMPEXP_CORE wxNativePrintFactory: public wxPrintFactory

 {
 public:
     virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );
 {
 public:
     virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );


@@ -119,6 +123,8 @@ public:
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL );
 
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL );
 

+    virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
+

     virtual bool HasPrintSetupDialog();
     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
     virtual bool HasOwnPrintToFile();
     virtual bool HasPrintSetupDialog();
     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
     virtual bool HasOwnPrintToFile();


@@ -134,7 +140,7 @@ public:
 // wxPrintNativeDataBase
 //----------------------------------------------------------------------------
 
 // wxPrintNativeDataBase
 //----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPrintNativeDataBase: public wxObject
+class WXDLLIMPEXP_CORE wxPrintNativeDataBase: public wxObject

 {
 public:
     wxPrintNativeDataBase();
 {
 public:
     wxPrintNativeDataBase();


@@ -143,13 +149,14 @@ public:
     virtual bool TransferTo( wxPrintData &data ) = 0;
     virtual bool TransferFrom( const wxPrintData &data ) = 0;
 
     virtual bool TransferTo( wxPrintData &data ) = 0;
     virtual bool TransferFrom( const wxPrintData &data ) = 0;
 

-    virtual bool Ok() const = 0;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;

 
     int  m_ref;
 
 private:
     DECLARE_CLASS(wxPrintNativeDataBase)
 
     int  m_ref;
 
 private:
     DECLARE_CLASS(wxPrintNativeDataBase)

-    DECLARE_NO_COPY_CLASS(wxPrintNativeDataBase)
+    wxDECLARE_NO_COPY_CLASS(wxPrintNativeDataBase);

 };
 
 //----------------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------------


@@ -160,10 +167,10 @@ private:
  * Represents the printer: manages printing a wxPrintout object
  */
 
  * Represents the printer: manages printing a wxPrintout object
  */
 

-class WXDLLEXPORT wxPrinterBase: public wxObject
+class WXDLLIMPEXP_CORE wxPrinterBase: public wxObject

 {
 public:
 {
 public:

-    wxPrinterBase(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+    wxPrinterBase(wxPrintDialogData *data = NULL);

     virtual ~wxPrinterBase();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
     virtual ~wxPrinterBase();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);


@@ -193,17 +200,17 @@ public:
 
 private:
     DECLARE_CLASS(wxPrinterBase)
 
 private:
     DECLARE_CLASS(wxPrinterBase)

-    DECLARE_NO_COPY_CLASS(wxPrinterBase)
+    wxDECLARE_NO_COPY_CLASS(wxPrinterBase);

 };
 
 //----------------------------------------------------------------------------
 // wxPrinter
 //----------------------------------------------------------------------------
 
 };
 
 //----------------------------------------------------------------------------
 // wxPrinter
 //----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPrinter: public wxPrinterBase
+class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase

 {
 public:
 {
 public:

-    wxPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+    wxPrinter(wxPrintDialogData *data = NULL);

     virtual ~wxPrinter();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
     virtual ~wxPrinter();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);


@@ -220,7 +227,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxPrinter)
 
 private:
     DECLARE_CLASS(wxPrinter)

-    DECLARE_NO_COPY_CLASS(wxPrinter)
+    wxDECLARE_NO_COPY_CLASS(wxPrinter);

 };
 
 //----------------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------------


@@ -234,10 +241,10 @@ private:
  * object for previewing.
  */
 
  * object for previewing.
  */
 

-class WXDLLEXPORT wxPrintout: public wxObject
+class WXDLLIMPEXP_CORE wxPrintout: public wxObject

 {
 public:
 {
 public:

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

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


@@ -256,23 +263,48 @@ public:
 
     wxDC *GetDC() const { return m_printoutDC; }
     void SetDC(wxDC *dc) { m_printoutDC = dc; }
 
     wxDC *GetDC() const { return m_printoutDC; }
     void SetDC(wxDC *dc) { m_printoutDC = dc; }

+
+    void FitThisSizeToPaper(const wxSize& imageSize);
+    void FitThisSizeToPage(const wxSize& imageSize);
+    void FitThisSizeToPageMargins(const wxSize& imageSize, const wxPageSetupDialogData& pageSetupData);
+    void MapScreenSizeToPaper();
+    void MapScreenSizeToPage();
+    void MapScreenSizeToPageMargins(const wxPageSetupDialogData& pageSetupData);
+    void MapScreenSizeToDevice();
+
+    wxRect GetLogicalPaperRect() const;
+    wxRect GetLogicalPageRect() const;
+    wxRect GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSetupData) const;
+
+    void SetLogicalOrigin(wxCoord x, wxCoord y);
+    void OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff);
+

     void SetPageSizePixels(int w, int  h) { m_pageWidthPixels = w; m_pageHeightPixels = h; }
     void GetPageSizePixels(int *w, int  *h) const { *w = m_pageWidthPixels; *h = m_pageHeightPixels; }
     void SetPageSizeMM(int w, int  h) { m_pageWidthMM = w; m_pageHeightMM = h; }
     void GetPageSizeMM(int *w, int  *h) const { *w = m_pageWidthMM; *h = m_pageHeightMM; }
 
     void SetPPIScreen(int x, int y) { m_PPIScreenX = x; m_PPIScreenY = y; }
     void SetPageSizePixels(int w, int  h) { m_pageWidthPixels = w; m_pageHeightPixels = h; }
     void GetPageSizePixels(int *w, int  *h) const { *w = m_pageWidthPixels; *h = m_pageHeightPixels; }
     void SetPageSizeMM(int w, int  h) { m_pageWidthMM = w; m_pageHeightMM = h; }
     void GetPageSizeMM(int *w, int  *h) const { *w = m_pageWidthMM; *h = m_pageHeightMM; }
 
     void SetPPIScreen(int x, int y) { m_PPIScreenX = x; m_PPIScreenY = y; }

+    void SetPPIScreen(const wxSize& ppi) { SetPPIScreen(ppi.x, ppi.y); }

     void GetPPIScreen(int *x, int *y) const { *x = m_PPIScreenX; *y = m_PPIScreenY; }
     void SetPPIPrinter(int x, int y) { m_PPIPrinterX = x; m_PPIPrinterY = y; }
     void GetPPIScreen(int *x, int *y) const { *x = m_PPIScreenX; *y = m_PPIScreenY; }
     void SetPPIPrinter(int x, int y) { m_PPIPrinterX = x; m_PPIPrinterY = y; }

+    void SetPPIPrinter(const wxSize& ppi) { SetPPIPrinter(ppi.x, ppi.y); }

     void GetPPIPrinter(int *x, int *y) const { *x = m_PPIPrinterX; *y = m_PPIPrinterY; }
 
     void GetPPIPrinter(int *x, int *y) const { *x = m_PPIPrinterX; *y = m_PPIPrinterY; }
 

-    virtual bool IsPreview() const { return m_isPreview; }
+    void SetPaperRectPixels(const wxRect& paperRectPixels) { m_paperRectPixels = paperRectPixels; }
+    wxRect GetPaperRectPixels() const { return m_paperRectPixels; }

 
 

-    virtual void SetIsPreview(bool p) { m_isPreview = p; }
+    // This must be called by wxPrintPreview to associate itself with the
+    // printout it uses.
+    virtual void SetPreview(wxPrintPreview *preview) { m_preview = preview; }
+
+    wxPrintPreview *GetPreview() const { return m_preview; }
+    virtual bool IsPreview() const { return GetPreview() != NULL; }

 
 private:
     wxString         m_printoutTitle;
     wxDC*            m_printoutDC;
 
 private:
     wxString         m_printoutTitle;
     wxDC*            m_printoutDC;

+    wxPrintPreview  *m_preview;

 
     int              m_pageWidthPixels;
     int              m_pageHeightPixels;
 
     int              m_pageWidthPixels;
     int              m_pageHeightPixels;


@@ -285,19 +317,22 @@ private:
     int              m_PPIPrinterX;
     int              m_PPIPrinterY;
 
     int              m_PPIPrinterX;
     int              m_PPIPrinterY;
 

-    bool             m_isPreview;
+    wxRect           m_paperRectPixels;

 
 private:
     DECLARE_ABSTRACT_CLASS(wxPrintout)
 
 private:
     DECLARE_ABSTRACT_CLASS(wxPrintout)

-    DECLARE_NO_COPY_CLASS(wxPrintout)
+    wxDECLARE_NO_COPY_CLASS(wxPrintout);

 };
 
 };
 

+//----------------------------------------------------------------------------
+// wxPreviewCanvas
+//----------------------------------------------------------------------------
+

 /*
 /*

- * wxPreviewCanvas

  * Canvas upon which a preview is drawn.
  */
 
  * Canvas upon which a preview is drawn.
  */
 

-class WXDLLEXPORT wxPreviewCanvas: public wxScrolledWindow
+class WXDLLIMPEXP_CORE wxPreviewCanvas: public wxScrolledWindow

 {
 public:
     wxPreviewCanvas(wxPrintPreviewBase *preview,
 {
 public:
     wxPreviewCanvas(wxPrintPreviewBase *preview,


@@ -308,6 +343,8 @@ public:
                     const wxString& name = wxT("canvas"));
     virtual ~wxPreviewCanvas();
 
                     const wxString& name = wxT("canvas"));
     virtual ~wxPreviewCanvas();
 

+    void SetPreview(wxPrintPreviewBase *preview) { m_printPreview = preview; }
+

     void OnPaint(wxPaintEvent& event);
     void OnChar(wxKeyEvent &event);
     // Responds to colour changes
     void OnPaint(wxPaintEvent& event);
     void OnChar(wxKeyEvent &event);
     // Responds to colour changes


@@ -317,29 +354,33 @@ private:
 #if wxUSE_MOUSEWHEEL
     void OnMouseWheel(wxMouseEvent& event);
 #endif // wxUSE_MOUSEWHEEL
 #if wxUSE_MOUSEWHEEL
     void OnMouseWheel(wxMouseEvent& event);
 #endif // wxUSE_MOUSEWHEEL

+    void OnIdle(wxIdleEvent& event);

 
     wxPrintPreviewBase* m_printPreview;
 
     DECLARE_CLASS(wxPreviewCanvas)
     DECLARE_EVENT_TABLE()
 
     wxPrintPreviewBase* m_printPreview;
 
     DECLARE_CLASS(wxPreviewCanvas)
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxPreviewCanvas)
+    wxDECLARE_NO_COPY_CLASS(wxPreviewCanvas);

 };
 
 };
 

+//----------------------------------------------------------------------------
+// wxPreviewFrame
+//----------------------------------------------------------------------------
+

 /*
 /*

- * wxPreviewFrame

  * Default frame for showing preview.
  */
 
  * Default frame for showing preview.
  */
 

-class WXDLLEXPORT wxPreviewFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxPreviewFrame: public wxFrame

 {
 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,
                    wxWindow *parent,
 {
 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,
                    wxWindow *parent,

-                   const wxString& title = wxT("Print Preview"),
+                   const wxString& title = _("Print Preview"),

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,

-                   long style = wxDEFAULT_FRAME_STYLE,
-                   const wxString& name = wxT("frame"));
+                   long style = wxDEFAULT_FRAME_STYLE | wxFRAME_FLOAT_ON_PARENT,
+                   const wxString& name = wxFrameNameStr);

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


@@ -356,13 +397,18 @@ protected:
     wxWindowDisabler*     m_windowDisabler;
 
 private:
     wxWindowDisabler*     m_windowDisabler;
 
 private:

-    DECLARE_CLASS(wxPreviewFrame)
+    void OnChar(wxKeyEvent& event);
+

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxPreviewFrame)
+    DECLARE_CLASS(wxPreviewFrame)
+    wxDECLARE_NO_COPY_CLASS(wxPreviewFrame);

 };
 
 };
 

+//----------------------------------------------------------------------------
+// wxPreviewControlBar
+//----------------------------------------------------------------------------
+

 /*
 /*

- * wxPreviewControlBar

  * A panel with buttons for controlling a print preview.
  * The programmer may wish to use other means for controlling
  * the print preview.
  * A panel with buttons for controlling a print preview.
  * The programmer may wish to use other means for controlling
  * the print preview.


@@ -389,7 +435,7 @@ private:
 #define wxID_PREVIEW_LAST       7
 #define wxID_PREVIEW_GOTO       8
 
 #define wxID_PREVIEW_LAST       7
 #define wxID_PREVIEW_GOTO       8
 

-class WXDLLEXPORT wxPreviewControlBar: public wxPanel
+class WXDLLIMPEXP_CORE wxPreviewControlBar: public wxPanel

 {
     DECLARE_CLASS(wxPreviewControlBar)
 
 {
     DECLARE_CLASS(wxPreviewControlBar)
 


@@ -439,7 +485,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxPreviewControlBar)
+    wxDECLARE_NO_COPY_CLASS(wxPreviewControlBar);

 };
 
 //----------------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------------


@@ -450,12 +496,12 @@ private:
  * Programmer creates an object of this class to preview a wxPrintout.
  */
 
  * Programmer creates an object of this class to preview a wxPrintout.
  */
 

-class WXDLLEXPORT wxPrintPreviewBase: public wxObject
+class WXDLLIMPEXP_CORE wxPrintPreviewBase: public wxObject

 {
 public:
     wxPrintPreviewBase(wxPrintout *printout,
 {
 public:
     wxPrintPreviewBase(wxPrintout *printout,

-                       wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
-                       wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+                       wxPrintout *printoutForPrinting = NULL,
+                       wxPrintDialogData *data = NULL);

     wxPrintPreviewBase(wxPrintout *printout,
                        wxPrintout *printoutForPrinting,
                        wxPrintData *data);
     wxPrintPreviewBase(wxPrintout *printout,
                        wxPrintout *printoutForPrinting,
                        wxPrintData *data);


@@ -474,9 +520,17 @@ public:
     virtual wxFrame *GetFrame() const;
     virtual wxPreviewCanvas *GetCanvas() const;
 
     virtual wxFrame *GetFrame() const;
     virtual wxPreviewCanvas *GetCanvas() const;
 

+    // This is a helper routine, used by the next 4 routines.
+
+    virtual void CalcRects(wxPreviewCanvas *canvas, wxRect& printableAreaRect, wxRect& paperRect);
+

     // The preview canvas should call this from OnPaint
     virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);
 
     // The preview canvas should call this from OnPaint
     virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);
 

+    // Updates rendered page by calling RenderPage() if needed, returns true
+    // if there was some change. Preview canvas should call it at idle time
+    virtual bool UpdatePageRendering();
+

     // This draws a blank page onto the preview canvas
     virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
 
     // This draws a blank page onto the preview canvas
     virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
 


@@ -495,7 +549,8 @@ public:
     virtual int GetMaxPage() const;
     virtual int GetMinPage() const;
 
     virtual int GetMaxPage() const;
     virtual int GetMinPage() const;
 

-    virtual bool Ok() const;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

     virtual void SetOk(bool ok);
 
     ///////////////////////////////////////////////////////////////////////////
     virtual void SetOk(bool ok);
 
     ///////////////////////////////////////////////////////////////////////////


@@ -511,16 +566,26 @@ public:
     // the currently selected printer.
     virtual void DetermineScaling() = 0;
 
     // the currently selected printer.
     virtual void DetermineScaling() = 0;
 

+protected:
+    // helpers for RenderPage():
+    virtual bool RenderPageIntoDC(wxDC& dc, int pageNum);
+    // renders preview into m_previewBitmap
+    virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
+
+    void InvalidatePreviewBitmap();
+

 protected:
     wxPrintDialogData m_printDialogData;
     wxPreviewCanvas*  m_previewCanvas;
     wxFrame*          m_previewFrame;
     wxBitmap*         m_previewBitmap;
 protected:
     wxPrintDialogData m_printDialogData;
     wxPreviewCanvas*  m_previewCanvas;
     wxFrame*          m_previewFrame;
     wxBitmap*         m_previewBitmap;

+    bool              m_previewFailed;

     wxPrintout*       m_previewPrintout;
     wxPrintout*       m_printPrintout;
     int               m_currentPage;
     int               m_currentZoom;
     wxPrintout*       m_previewPrintout;
     wxPrintout*       m_printPrintout;
     int               m_currentPage;
     int               m_currentZoom;

-    float             m_previewScale;
+    float             m_previewScaleX;
+    float             m_previewScaleY;

     int               m_topMargin;
     int               m_leftMargin;
     int               m_pageWidth;
     int               m_topMargin;
     int               m_leftMargin;
     int               m_pageWidth;


@@ -534,7 +599,7 @@ protected:
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
 

-    DECLARE_NO_COPY_CLASS(wxPrintPreviewBase)
+    wxDECLARE_NO_COPY_CLASS(wxPrintPreviewBase);

     DECLARE_CLASS(wxPrintPreviewBase)
 };
 
     DECLARE_CLASS(wxPrintPreviewBase)
 };
 


@@ -542,12 +607,12 @@ private:
 // wxPrintPreview
 //----------------------------------------------------------------------------
 
 // wxPrintPreview
 //----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase
+class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase

 {
 public:
     wxPrintPreview(wxPrintout *printout,
 {
 public:
     wxPrintPreview(wxPrintout *printout,

-                   wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
-                   wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+                   wxPrintout *printoutForPrinting = NULL,
+                   wxPrintDialogData *data = NULL);

     wxPrintPreview(wxPrintout *printout,
                    wxPrintout *printoutForPrinting,
                    wxPrintData *data);
     wxPrintPreview(wxPrintout *printout,
                    wxPrintout *printoutForPrinting,
                    wxPrintData *data);


@@ -564,6 +629,7 @@ public:
     virtual wxFrame *GetFrame() const;
     virtual wxPreviewCanvas *GetCanvas() const;
     virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);
     virtual wxFrame *GetFrame() const;
     virtual wxPreviewCanvas *GetCanvas() const;
     virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);

+    virtual bool UpdatePageRendering();

     virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
     virtual void AdjustScrollbars(wxPreviewCanvas *canvas);
     virtual bool RenderPage(int pageNum);
     virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
     virtual void AdjustScrollbars(wxPreviewCanvas *canvas);
     virtual bool RenderPage(int pageNum);


@@ -578,7 +644,8 @@ public:
     virtual int GetMaxPage() const;
     virtual int GetMinPage() const;
 
     virtual int GetMaxPage() const;
     virtual int GetMinPage() const;
 

-    virtual bool Ok() const;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

     virtual void SetOk(bool ok);
 
 private:
     virtual void SetOk(bool ok);
 
 private:


@@ -586,14 +653,14 @@ private:
 
 private:
     DECLARE_CLASS(wxPrintPreview)
 
 private:
     DECLARE_CLASS(wxPrintPreview)

-    DECLARE_NO_COPY_CLASS(wxPrintPreview)
+    wxDECLARE_NO_COPY_CLASS(wxPrintPreview);

 };
 
 //----------------------------------------------------------------------------
 // wxPrintAbortDialog
 //----------------------------------------------------------------------------
 
 };
 
 //----------------------------------------------------------------------------
 // wxPrintAbortDialog
 //----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPrintAbortDialog: public wxDialog
+class WXDLLIMPEXP_CORE wxPrintAbortDialog: public wxDialog

 {
 public:
     wxPrintAbortDialog(wxWindow *parent,
 {
 public:
     wxPrintAbortDialog(wxWindow *parent,


@@ -610,7 +677,7 @@ public:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxPrintAbortDialog)
+    wxDECLARE_NO_COPY_CLASS(wxPrintAbortDialog);

 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE