Commited FRM's stockitem patch (empty stock items).

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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index b3f2e48a3ddcaca8c5e37815eec22717f3f52b3e..eb1b10958326cfa944d4adf1c4c53f7a4427d202 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,43 +9,37 @@
 // 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"
+    #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>


@@ -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 )


@@ -567,6 +561,9 @@ BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
     EVT_PAINT(wxPreviewCanvas::OnPaint)
     EVT_CHAR(wxPreviewCanvas::OnChar)
     EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
     EVT_PAINT(wxPreviewCanvas::OnPaint)
     EVT_CHAR(wxPreviewCanvas::OnChar)
     EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)

+#if wxUSE_MOUSEWHEEL
+    EVT_MOUSEWHEEL(wxPreviewCanvas::OnMouseWheel)
+#endif

 END_EVENT_TABLE()
 
 // VZ: the current code doesn't refresh properly without
 END_EVENT_TABLE()
 
 // VZ: the current code doesn't refresh properly without


@@ -656,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;


@@ -669,6 +666,50 @@ void wxPreviewCanvas::OnChar(wxKeyEvent &event)
     }
 }
 
     }
 }
 

+#if wxUSE_MOUSEWHEEL
+
+void wxPreviewCanvas::OnMouseWheel(wxMouseEvent& event)
+{
+    wxPreviewControlBar *
+        controlBar = wxStaticCast(GetParent(), wxPreviewFrame)->GetControlBar();
+
+    if ( controlBar )
+    {
+        if ( event.ControlDown() && event.GetWheelRotation() != 0 )
+        {
+            int currentZoom = controlBar->GetZoomControl();
+
+            int delta;
+            if ( currentZoom < 100 )
+                delta = 5;
+            else if ( currentZoom <= 120 )
+                delta = 10;
+            else
+                delta = 50;
+
+            if ( event.GetWheelRotation() > 0 )
+                delta = -delta;
+
+            int newZoom = currentZoom + delta;
+            if ( newZoom < 10 )
+                newZoom = 10;
+            if ( newZoom > 200 )
+                newZoom = 200;
+            if ( newZoom != currentZoom )
+            {
+                controlBar->SetZoomControl(newZoom);
+                m_printPreview->SetZoom(newZoom);
+                Refresh();
+            }
+            return;
+        }
+    }
+
+    event.Skip();
+}
+
+#endif // wxUSE_MOUSEWHEEL
+

 //----------------------------------------------------------------------------
 // wxPreviewControlBar
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // wxPreviewControlBar
 //----------------------------------------------------------------------------


@@ -1094,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


@@ -1436,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();


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

-

 #endif // wxUSE_PRINTING_ARCHITECTURE
 #endif // wxUSE_PRINTING_ARCHITECTURE