fixed compilation for wxUSE_STATUSBAR w/o wxUSE_MENUS

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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index a2cf6496206ce20c21f4b4827ad8b1ed0723cccf..13ddf2a44f1991733e200ce764baca8055680eb8 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        prntbase.cpp
+// Name:        src/common/prntbase.cpp

 // Purpose:     Printing framework base class implementation
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Printing framework base class implementation
 // Author:      Julian Smart
 // Modified by:


@@ -9,40 +9,34 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "prntbase.h"
-  #pragma implementation "printdlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #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"
+    #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"

 #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/module.h"
 #include "wx/printdlg.h"
 #include "wx/print.h"
 #include "wx/module.h"


@@ -103,7 +97,7 @@ wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data )
 #else
     return new wxPostScriptPrinter( data );
 #endif
 #else
     return new wxPostScriptPrinter( data );
 #endif

-};
+}

 
 wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
     wxPrintout *printout, wxPrintDialogData *data )
 
 wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
     wxPrintout *printout, wxPrintDialogData *data )


@@ -659,9 +653,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;


@@ -1141,17 +1135,17 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
 }
 
 int wxPrintPreviewBase::GetCurrentPage() const
 }
 
 int wxPrintPreviewBase::GetCurrentPage() const

-    { return m_currentPage; };
+    { return m_currentPage; }

 void wxPrintPreviewBase::SetPrintout(wxPrintout *printout)
 void wxPrintPreviewBase::SetPrintout(wxPrintout *printout)

-    { m_previewPrintout = printout; };
+    { m_previewPrintout = printout; }

 wxPrintout *wxPrintPreviewBase::GetPrintout() const
 wxPrintout *wxPrintPreviewBase::GetPrintout() const

-    { return m_previewPrintout; };
+    { return m_previewPrintout; }

 wxPrintout *wxPrintPreviewBase::GetPrintoutForPrinting() const
 wxPrintout *wxPrintPreviewBase::GetPrintoutForPrinting() const

-    { return m_printPrintout; };
+    { return m_printPrintout; }

 void wxPrintPreviewBase::SetFrame(wxFrame *frame)
 void wxPrintPreviewBase::SetFrame(wxFrame *frame)

-    { m_previewFrame = frame; };
+    { m_previewFrame = frame; }

 void wxPrintPreviewBase::SetCanvas(wxPreviewCanvas *canvas)
 void wxPrintPreviewBase::SetCanvas(wxPreviewCanvas *canvas)

-    { m_previewCanvas = canvas; };
+    { m_previewCanvas = canvas; }

 wxFrame *wxPrintPreviewBase::GetFrame() const
     { return m_previewFrame; }
 wxPreviewCanvas *wxPrintPreviewBase::GetCanvas() const
 wxFrame *wxPrintPreviewBase::GetFrame() const
     { return m_previewFrame; }
 wxPreviewCanvas *wxPrintPreviewBase::GetCanvas() const


@@ -1483,6 +1477,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();


@@ -1518,5 +1517,4 @@ void wxPrintPreview::DetermineScaling()
     m_pimpl->DetermineScaling();
 }
 
     m_pimpl->DetermineScaling();
 }
 

-

 #endif // wxUSE_PRINTING_ARCHITECTURE
 #endif // wxUSE_PRINTING_ARCHITECTURE