1. fixed (?) blitting bitmaps with mask

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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 5003ec570afdcab50cf57f1b7b4d1087e5dd7abe..8ca74fb4d8881fc7c1008268b612ee82e3a6e0e3 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -55,7 +55,6 @@
     #endif
 #endif // __WXMSW__
 
     #endif
 #endif // __WXMSW__
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_CLASS(wxPrinterBase, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
 IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
 IMPLEMENT_CLASS(wxPrinterBase, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
 IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)


@@ -71,7 +70,6 @@ BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
     EVT_PAINT(wxPreviewCanvas::OnPaint)
     EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
 END_EVENT_TABLE()
     EVT_PAINT(wxPreviewCanvas::OnPaint)
     EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
 END_EVENT_TABLE()

-#endif

 
 /*
 * Printer
 
 /*
 * Printer


@@ -780,10 +778,10 @@ void wxPrintPreviewBase::SetZoom(int percent)
         m_previewBitmap = NULL;
     }
 
         m_previewBitmap = NULL;
     }
 

-

     if (m_previewCanvas)
     {
         RenderPage(m_currentPage);
     if (m_previewCanvas)
     {
         RenderPage(m_currentPage);

+        ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);

         m_previewCanvas->Clear();
         m_previewCanvas->Refresh();
     }
         m_previewCanvas->Clear();
         m_previewCanvas->Refresh();
     }