Updated list of subprojects.

[wxWidgets.git] / src / common / prntbase.cpp

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 0f2e0784669aed1bb8ee71243cb2226717f2de3d..9bb2f18a2fe38f64c415a8e5de2bbcc3981ea239 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -13,34 +13,36 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_PRINTING_ARCHITECTURE
 
 #if wxUSE_PRINTING_ARCHITECTURE
 

+#include "wx/dcprint.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/utils.h"
-#include "wx/dc.h"
-#include "wx/app.h"
-#include "wx/msgdlg.h"
-#include "wx/layout.h"
-#include "wx/choice.h"
-#include "wx/button.h"
-#include "wx/settings.h"
-#include "wx/dcmemory.h"
-#include "wx/stattext.h"
-#include "wx/intl.h"
-#include "wx/textdlg.h"
-#include "wx/sizer.h"
+    #if defined(__WXMSW__)
+        #include "wx/msw/wrapcdlg.h"
+    #endif // MSW
+    #include "wx/utils.h"
+    #include "wx/dc.h"
+    #include "wx/app.h"
+    #include "wx/msgdlg.h"
+    #include "wx/layout.h"
+    #include "wx/choice.h"
+    #include "wx/button.h"
+    #include "wx/settings.h"
+    #include "wx/dcmemory.h"
+    #include "wx/stattext.h"
+    #include "wx/intl.h"
+    #include "wx/textdlg.h"
+    #include "wx/sizer.h"
+    #include "wx/module.h"

 #endif // !WX_PRECOMP
 
 #include "wx/prntbase.h"
 #endif // !WX_PRECOMP
 
 #include "wx/prntbase.h"

-#include "wx/dcprint.h"

 #include "wx/printdlg.h"
 #include "wx/print.h"
 #include "wx/printdlg.h"
 #include "wx/print.h"

-#include "wx/module.h"

 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>


@@ -55,7 +57,6 @@
 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__

-    #include "wx/msw/wrapcdlg.h"

     #ifndef __WIN32__
         #include <print.h>
     #endif
     #ifndef __WIN32__
         #include <print.h>
     #endif


@@ -654,9 +655,9 @@ void wxPreviewCanvas::OnChar(wxKeyEvent &event)
 
     switch(event.GetKeyCode())
     {
 
     switch(event.GetKeyCode())
     {

-        case WXK_NEXT:
+        case WXK_PAGEDOWN:

             controlBar->OnNext(); break;
             controlBar->OnNext(); break;

-        case WXK_PRIOR:
+        case WXK_PAGEUP:

             controlBar->OnPrevious(); break;
         case WXK_HOME:
             controlBar->OnFirst(); break;
             controlBar->OnPrevious(); break;
         case WXK_HOME:
             controlBar->OnFirst(); break;


@@ -1370,7 +1371,7 @@ int wxPrintPreviewBase::GetMaxPage() const
 { return m_maxPage; }
 int wxPrintPreviewBase::GetMinPage() const
 { return m_minPage; }
 { return m_maxPage; }
 int wxPrintPreviewBase::GetMinPage() const
 { return m_minPage; }

-bool wxPrintPreviewBase::Ok() const
+bool wxPrintPreviewBase::IsOk() const

 { return m_isOk; }
 void wxPrintPreviewBase::SetOk(bool ok)
 { m_isOk = ok; }
 { return m_isOk; }
 void wxPrintPreviewBase::SetOk(bool ok)
 { m_isOk = ok; }


@@ -1478,6 +1479,11 @@ void wxPrintPreview::SetZoom(int percent)
     m_pimpl->SetZoom( percent );
 }
 
     m_pimpl->SetZoom( percent );
 }
 

+int wxPrintPreview::GetZoom() const
+{
+    return m_pimpl->GetZoom();
+}
+

 wxPrintDialogData& wxPrintPreview::GetPrintDialogData()
 {
     return m_pimpl->GetPrintDialogData();
 wxPrintDialogData& wxPrintPreview::GetPrintDialogData()
 {
     return m_pimpl->GetPrintDialogData();


@@ -1493,7 +1499,7 @@ int wxPrintPreview::GetMinPage() const
     return m_pimpl->GetMinPage();
 }
 
     return m_pimpl->GetMinPage();
 }
 

-bool wxPrintPreview::Ok() const
+bool wxPrintPreview::IsOk() const

 {
     return m_pimpl->Ok();
 }
 {
     return m_pimpl->Ok();
 }