X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4de6207afa9a78be63fe93df44ff5b90cecd2781..e66474166b164b9e11f9881e79d531bc5182ea31:/src/common/prntbase.cpp

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 1df630e380..0c2aba22e5 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
+    #include "wx/msw/private.h"
+    #include <commdlg.h>
 
-#ifndef __WIN32__
-#include <print.h>
-#endif
-
-#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
 
@@ -366,25 +361,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();
 }
 
@@ -430,7 +426,7 @@ wxPreviewFrame::~wxPreviewFrame()
 {
 }
 
-void wxPreviewFrame::OnCloseWindow(wxCloseEvent& event)
+void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
     MakeModal(FALSE);
 
@@ -548,7 +544,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;
@@ -752,12 +748,14 @@ void wxPrintPreviewBase::SetZoom(int percent)
         delete m_previewBitmap;
         m_previewBitmap = NULL;
     }
-    RenderPage(m_currentPage);
+
 
     if (m_previewCanvas)
     {
+        RenderPage(m_currentPage);
         m_previewCanvas->Clear();
         m_previewCanvas->Refresh();
     }
 }
 
+#endif // wxUSE_PRINTING_ARCHITECTURE