X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aff37a19e93968cb3efa64fc3949c5f02cc0a9d0..76784eecd960198bc54429a6e16d5bd7af458fce:/src/common/prntbase.cpp

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 5a95be8d6a..9c1c91ee2e 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -22,6 +22,8 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/dc.h"
@@ -45,20 +47,13 @@
 #include <string.h>
 
 #ifdef __WXMSW__
-#include <windows.h>
-#include <commdlg.h>
-
-// Clash with Windows header files
-#ifdef StartDoc
-#undef StartDoc
-#endif
-
-#ifndef __WIN32__
-#include <print.h>
-#endif
+    #include "wx/msw/private.h"
+    #include <commdlg.h>
 
-#endif
-// End __WXMSW__
+    #ifndef __WIN32__
+        #include <print.h>
+    #endif
+#endif // __WXMSW__
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterBase, wxObject)
@@ -69,12 +64,12 @@ IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
 IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
 
 BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
-EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
+    EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
-EVT_PAINT(wxPreviewCanvas::OnPaint)
-EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
+    EVT_PAINT(wxPreviewCanvas::OnPaint)
+    EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
 END_EVENT_TABLE()
 #endif
 
@@ -225,8 +220,9 @@ void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
 BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
     EVT_BUTTON(wxID_PREVIEW_CLOSE,    wxPreviewControlBar::OnWindowClose)
     EVT_BUTTON(wxID_PREVIEW_PRINT,    wxPreviewControlBar::OnPrint)
-    EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPrevious)
-    EVT_BUTTON(wxID_PREVIEW_NEXT,     wxPreviewControlBar::OnNext)
+    EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPreviousButton)
+    EVT_BUTTON(wxID_PREVIEW_NEXT,     wxPreviewControlBar::OnNextButton)
+    EVT_CHAR(wxPreviewControlBar::OnChar)
     EVT_CHOICE(wxID_PREVIEW_ZOOM,     wxPreviewControlBar::OnZoom)
     EVT_PAINT(wxPreviewControlBar::OnPaint)
 END_EVENT_TABLE()
@@ -272,7 +268,20 @@ void wxPreviewControlBar::OnPrint(wxCommandEvent& WXUNUSED(event))
     preview->Print(TRUE);
 }
 
-void wxPreviewControlBar::OnNext(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnChar(wxKeyEvent &event)
+{
+   switch(event.KeyCode())
+   {
+   case WXK_NEXT:
+      OnNext(); break;
+   case WXK_PRIOR:
+      OnPrevious(); break;
+   default:
+      event.Skip();
+   }
+}
+
+void wxPreviewControlBar::OnNext(void)
 {
     wxPrintPreviewBase *preview = GetPrintPreview();
     if (preview)
@@ -287,7 +296,7 @@ void wxPreviewControlBar::OnNext(wxCommandEvent& WXUNUSED(event))
     }
 }
 
-void wxPreviewControlBar::OnPrevious(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnPrevious(void)
 {
     wxPrintPreviewBase *preview = GetPrintPreview();
     if (preview)
@@ -366,25 +375,26 @@ void wxPreviewControlBar::CreateButtons()
         x += gap + buttonWidth;
     }
 
-    static const char *choices[] =
-    {
-        "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%",
-        "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "110%",
-        "120%", "150%", "200%"
-    };
-
     if (m_buttonFlags & wxPREVIEW_ZOOM)
     {
+        static const char *choices[] =
+        {
+            "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%",
+            "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "110%",
+            "120%", "150%", "200%"
+        };
+
         m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM,
                                      wxPoint(x, y), wxSize(100, -1));
+				     
+        // Yes, this look stupid, but this is because gcc gives up otherwise.
+        int n = WXSIZEOF(choices);
+        for ( int i = 0; i < n; i++ )
+           m_zoomControl->Append(choices[i]);
+	
         SetZoomControl(m_printPreview->GetZoom());
     }
 
-    // Yes, this look stupid, but this is because gcc gives up otherwise.
-    int n = WXSIZEOF(choices);
-    for ( int i = 0; i < n; i++ )
-        m_zoomControl->Append(choices[i]);
-
     //  m_closeButton->SetDefault();
 }
 
@@ -414,7 +424,7 @@ int wxPreviewControlBar::GetZoomControl()
 */
 
 BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
-EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
+    EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
 wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxFrame *parent, const wxString& title,
@@ -430,7 +440,7 @@ wxPreviewFrame::~wxPreviewFrame()
 {
 }
 
-void wxPreviewFrame::OnCloseWindow(wxCloseEvent& event)
+void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
     MakeModal(FALSE);
 
@@ -548,7 +558,7 @@ void wxPrintPreviewBase::Init(wxPrintout *printout,
     m_previewFrame = NULL;
     m_previewBitmap = NULL;
     m_currentPage = 1;
-    m_currentZoom = 30;
+    m_currentZoom = 70;
     m_topMargin = 40;
     m_leftMargin = 40;
     m_pageWidth = 0;
@@ -762,3 +772,4 @@ void wxPrintPreviewBase::SetZoom(int percent)
     }
 }
 
+#endif // wxUSE_PRINTING_ARCHITECTURE