Fixed zoom problem (Robert J.Lang)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 3da93850c31a899ae108e2039ff29abcba04ce5e..1ed5c3107c53dde224cff120a8ce9fbad7fad74e 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -155,6 +155,7 @@ All (GUI):
 - Fixed 64-bit issue in wxNotebook causing segfaults on Tru64 Unix.
 - Made it possible to associate context help to a region of a window.
 - Added support for tabs in wxRichTextCtrl (Ashish More).
+- Fixed problem with zoom setting in print preview.
 
 wxMSW:
 

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index 23b60fca7d581bbf81b90136e573d7a24e062cbc..3e39b0ea38b8ac29eea2b89dddfdb47dc53d0bfb 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -568,6 +568,7 @@ public:
     virtual void AdjustScrollbars(wxPreviewCanvas *canvas);
     virtual bool RenderPage(int pageNum);
     virtual void SetZoom(int percent);
+    virtual int GetZoom() const;
 
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 800ba84670ffa1846d5c5810ddc30448589f6329..13ddf2a44f1991733e200ce764baca8055680eb8 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -1477,6 +1477,11 @@ void wxPrintPreview::SetZoom(int percent)
     m_pimpl->SetZoom( percent );
 }
 
+int wxPrintPreview::GetZoom() const
+{
+    return m_pimpl->GetZoom();
+}
+
 wxPrintDialogData& wxPrintPreview::GetPrintDialogData()
 {
     return m_pimpl->GetPrintDialogData();