fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 112f818218391c69017265aa23bc196437999155..d4aa30278a2eaa568576c2f48088cf076f1cf1b1 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -52,9 +52,14 @@
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
 #include "wx/msw/printdlg.h"
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
 #include "wx/msw/printdlg.h"

+#include "wx/msw/dcprint.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/printdlg.h"
-#include "wx/mac/private/print.h"
+#include "wx/osx/printdlg.h"
+#include "wx/osx/private/print.h"
+#include "wx/osx/dcprint.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dcprint.h"
+#include "wx/generic/prntdlgg.h"

 #else
 #include "wx/generic/prntdlgg.h"
 #include "wx/dcps.h"
 #else
 #include "wx/generic/prntdlgg.h"
 #include "wx/dcps.h"


@@ -205,34 +210,15 @@ wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent,
 #endif
 }
 
 #endif
 }
 

-#if wxUSE_NEW_DC
-
-wxImplDC* wxNativePrintFactory::CreatePrinterImplDC( wxPrinterDC *owner, const wxPrintData& data )
-{
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    return new wxWindowsPrinterDCImpl( owner, data );
-#elif defined(__WXMAC__)
-    return new wxMacPrinterDCImpl( owner, data );
-#else
-    return new wxPostScriptImplDC( owner, data );
-#endif
-}
-
-#else
-
-wxDC* wxNativePrintFactory::CreatePrinterDC( const wxPrintData& data )
+wxDCImpl* wxNativePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )

 {
 {

-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    return new wxPrinterDC(data);
-#elif defined(__WXMAC__)
-    return new wxPrinterDC(data);
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || ( defined(__WXUNIVERSAL__) && !defined(__WXMAC__) )
+    return new wxPostScriptDCImpl( owner, data );

 #else
 #else

-    return new wxPostScriptDC(data);
+    return new wxPrinterDCImpl( owner, data );

 #endif
 }
 
 #endif
 }
 

-#endif
-

 bool wxNativePrintFactory::HasOwnPrintToFile()
 {
     // Only relevant for PostScript and here the
 bool wxNativePrintFactory::HasOwnPrintToFile()
 {
     // Only relevant for PostScript and here the


@@ -275,7 +261,7 @@ wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData()
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     return new wxWindowsPrintNativeData;
 #elif defined(__WXMAC__)
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     return new wxWindowsPrintNativeData;
 #elif defined(__WXMAC__)

-    return new wxMacCarbonPrintData;
+    return wxOSXCreatePrintData();

 #else
     return new wxPostScriptPrintNativeData;
 #endif
 #else
     return new wxPostScriptPrintNativeData;
 #endif


@@ -317,15 +303,15 @@ IMPLEMENT_CLASS(wxPrinterBase, wxObject)
 
 wxPrinterBase::wxPrinterBase(wxPrintDialogData *data)
 {
 
 wxPrinterBase::wxPrinterBase(wxPrintDialogData *data)
 {

-    m_currentPrintout = (wxPrintout *) NULL;
-    sm_abortWindow = (wxWindow *) NULL;
+    m_currentPrintout = NULL;
+    sm_abortWindow = NULL;

     sm_abortIt = false;
     if (data)
         m_printDialogData = (*data);
     sm_lastError = wxPRINTER_NO_ERROR;
 }
 
     sm_abortIt = false;
     if (data)
         m_printDialogData = (*data);
     sm_lastError = wxPRINTER_NO_ERROR;
 }
 

-wxWindow *wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
+wxWindow *wxPrinterBase::sm_abortWindow = NULL;

 bool wxPrinterBase::sm_abortIt = false;
 wxPrinterError wxPrinterBase::sm_lastError = wxPRINTER_NO_ERROR;
 
 bool wxPrinterBase::sm_abortIt = false;
 wxPrinterError wxPrinterBase::sm_lastError = wxPRINTER_NO_ERROR;
 


@@ -526,7 +512,8 @@ void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     wxPrinterBase::sm_abortIt = true;
     wxPrinterBase::sm_abortWindow->Show(false);
     wxPrinterBase::sm_abortWindow->Close(true);
     wxPrinterBase::sm_abortIt = true;
     wxPrinterBase::sm_abortWindow->Show(false);
     wxPrinterBase::sm_abortWindow->Close(true);

-    wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
+    wxPrinterBase::sm_abortWindow->Destroy();
+    wxPrinterBase::sm_abortWindow = NULL;

 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------


@@ -538,7 +525,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
 wxPrintout::wxPrintout(const wxString& title)
 {
     m_printoutTitle = title ;
 wxPrintout::wxPrintout(const wxString& title)
 {
     m_printoutTitle = title ;

-    m_printoutDC = (wxDC *) NULL;
+    m_printoutDC = NULL;

     m_pageWidthMM = 0;
     m_pageHeightMM = 0;
     m_pageWidthPixels = 0;
     m_pageWidthMM = 0;
     m_pageHeightMM = 0;
     m_pageWidthPixels = 0;


@@ -822,6 +809,7 @@ IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
 BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
     EVT_PAINT(wxPreviewCanvas::OnPaint)
     EVT_CHAR(wxPreviewCanvas::OnChar)
 BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
     EVT_PAINT(wxPreviewCanvas::OnPaint)
     EVT_CHAR(wxPreviewCanvas::OnChar)

+    EVT_IDLE(wxPreviewCanvas::OnIdle)

     EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
 #if wxUSE_MOUSEWHEEL
     EVT_MOUSEWHEEL(wxPreviewCanvas::OnMouseWheel)
     EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
 #if wxUSE_MOUSEWHEEL
     EVT_MOUSEWHEEL(wxPreviewCanvas::OnMouseWheel)


@@ -873,6 +861,25 @@ void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void wxPreviewCanvas::OnIdle(wxIdleEvent& event)
+{
+    event.Skip();
+
+    // prevent UpdatePageRendering() from being called recursively:
+    static bool s_inIdle = false;
+    if ( s_inIdle )
+        return;
+    s_inIdle = true;
+
+    if ( m_printPreview )
+    {
+        if ( m_printPreview->UpdatePageRendering() )
+            Refresh();
+    }
+
+    s_inIdle = false;
+}
+

 // Responds to colour changes, and passes event on to children.
 void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes, and passes event on to children.
 void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
 {


@@ -994,11 +1001,11 @@ wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long butto
 wxPanel(parent, wxID_ANY, pos, size, style, name)
 {
     m_printPreview = preview;
 wxPanel(parent, wxID_ANY, pos, size, style, name)
 {
     m_printPreview = preview;

-    m_closeButton = (wxButton *) NULL;
-    m_nextPageButton = (wxButton *) NULL;
-    m_previousPageButton = (wxButton *) NULL;
-    m_printButton = (wxButton *) NULL;
-    m_zoomControl = (wxChoice *) NULL;
+    m_closeButton = NULL;
+    m_nextPageButton = NULL;
+    m_previousPageButton = NULL;
+    m_printButton = NULL;
+    m_zoomControl = NULL;

     m_buttonFlags = buttons;
 }
 
     m_buttonFlags = buttons;
 }
 


@@ -1286,7 +1293,9 @@ void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
         m_printPreview->SetCanvas(NULL);
         m_printPreview->SetFrame(NULL);
     }
         m_printPreview->SetCanvas(NULL);
         m_printPreview->SetFrame(NULL);
     }

-    delete m_printPreview;
+
+    m_previewCanvas->SetPreview(NULL);
+    wxDELETE(m_printPreview);

 
     Destroy();
 }
 
     Destroy();
 }


@@ -1373,6 +1382,7 @@ void wxPrintPreviewBase::Init(wxPrintout *printout,
     m_previewCanvas = NULL;
     m_previewFrame = NULL;
     m_previewBitmap = NULL;
     m_previewCanvas = NULL;
     m_previewFrame = NULL;
     m_previewBitmap = NULL;

+    m_previewFailed = false;

     m_currentPage = 1;
     m_currentZoom = 70;
     m_topMargin = 40;
     m_currentPage = 1;
     m_currentZoom = 70;
     m_topMargin = 40;


@@ -1400,18 +1410,13 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
         return true;
 
     m_currentPage = pageNum;
         return true;
 
     m_currentPage = pageNum;

-    if (m_previewBitmap)
-    {
-        delete m_previewBitmap;
-        m_previewBitmap = NULL;
-    }
+
+    InvalidatePreviewBitmap();

 
     if (m_previewCanvas)
     {
         AdjustScrollbars(m_previewCanvas);
 
 
     if (m_previewCanvas)
     {
         AdjustScrollbars(m_previewCanvas);
 

-        if (!RenderPage(pageNum))
-            return false;

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


@@ -1468,13 +1473,35 @@ void wxPrintPreviewBase::CalcRects(wxPreviewCanvas *canvas, wxRect& pageRect, wx
 }
 
 
 }
 
 

+void wxPrintPreviewBase::InvalidatePreviewBitmap()
+{
+    wxDELETE(m_previewBitmap);
+    // if there was a problem with rendering the preview, try again now
+    // that it changed in some way (less memory may be needed, for example):
+    m_previewFailed = false;
+}
+
+bool wxPrintPreviewBase::UpdatePageRendering()
+{
+    if ( m_previewBitmap )
+        return false;
+
+    if ( m_previewFailed )
+        return false;
+
+    if ( !RenderPage(m_currentPage) )
+    {
+        m_previewFailed = true; // don't waste time failing again
+        return false;
+    }
+
+    return true;
+}
+

 bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
 {
     DrawBlankPage(canvas, dc);
 
 bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
 {
     DrawBlankPage(canvas, dc);
 

-    if (!m_previewBitmap)
-        if (!RenderPage(m_currentPage))
-            return false;

     if (!m_previewBitmap)
         return false;
     if (!canvas)
     if (!m_previewBitmap)
         return false;
     if (!canvas)


@@ -1509,6 +1536,47 @@ void wxPrintPreviewBase::AdjustScrollbars(wxPreviewCanvas *canvas)
         canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, true);
 }
 
         canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, true);
 }
 

+bool wxPrintPreviewBase::RenderPageIntoDC(wxDC& dc, int pageNum)
+{
+    m_previewPrintout->SetDC(&dc);
+    m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
+
+    // Need to delay OnPreparePrinting() until here, so we have enough
+    // information.
+    if (!m_printingPrepared)
+    {
+        m_previewPrintout->OnPreparePrinting();
+        int selFrom, selTo;
+        m_previewPrintout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo);
+        m_printingPrepared = true;
+    }
+
+    m_previewPrintout->OnBeginPrinting();
+
+    if (!m_previewPrintout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
+    {
+        wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);
+        return false;
+    }
+
+    m_previewPrintout->OnPrintPage(pageNum);
+    m_previewPrintout->OnEndDocument();
+    m_previewPrintout->OnEndPrinting();
+
+    m_previewPrintout->SetDC(NULL);
+
+    return true;
+}
+
+bool wxPrintPreviewBase::RenderPageIntoBitmap(wxBitmap& bmp, int pageNum)
+{
+    wxMemoryDC memoryDC;
+    memoryDC.SelectObject(bmp);
+    memoryDC.Clear();
+
+    return RenderPageIntoDC(memoryDC, pageNum);
+}
+

 bool wxPrintPreviewBase::RenderPage(int pageNum)
 {
     wxBusyCursor busy;
 bool wxPrintPreviewBase::RenderPage(int pageNum)
 {
     wxBusyCursor busy;


@@ -1528,53 +1596,19 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
 
         if (!m_previewBitmap || !m_previewBitmap->Ok())
         {
 
         if (!m_previewBitmap || !m_previewBitmap->Ok())
         {

-            if (m_previewBitmap) {
-                delete m_previewBitmap;
-                m_previewBitmap = NULL;
-            }
+            InvalidatePreviewBitmap();

             wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
             return false;
         }
     }
 
             wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
             return false;
         }
     }
 

-    wxMemoryDC memoryDC;
-    memoryDC.SelectObject(*m_previewBitmap);
-
-    memoryDC.Clear();
-
-    m_previewPrintout->SetDC(&memoryDC);
-    m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
-
-    // Need to delay OnPreparePrinting until here, so we have enough information.
-    if (!m_printingPrepared)
-    {
-        m_previewPrintout->OnPreparePrinting();
-        int selFrom, selTo;
-        m_previewPrintout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo);
-        m_printingPrepared = true;
-    }
-
-    m_previewPrintout->OnBeginPrinting();
-
-    if (!m_previewPrintout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
+    if ( !RenderPageIntoBitmap(*m_previewBitmap, pageNum) )

     {
     {

-        wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);
-
-        memoryDC.SelectObject(wxNullBitmap);
-
-        delete m_previewBitmap;
-        m_previewBitmap = NULL;
+        InvalidatePreviewBitmap();
+        wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);

         return false;
     }
 
         return false;
     }
 

-    m_previewPrintout->OnPrintPage(pageNum);
-    m_previewPrintout->OnEndDocument();
-    m_previewPrintout->OnEndPrinting();
-
-    m_previewPrintout->SetDC(NULL);
-
-    memoryDC.SelectObject(wxNullBitmap);
-

 #if wxUSE_STATUSBAR
     wxString status;
     if (m_maxPage != 0)
 #if wxUSE_STATUSBAR
     wxString status;
     if (m_maxPage != 0)


@@ -1621,16 +1655,12 @@ void wxPrintPreviewBase::SetZoom(int percent)
         return;
 
     m_currentZoom = percent;
         return;
 
     m_currentZoom = percent;

-    if (m_previewBitmap)
-    {
-        delete m_previewBitmap;
-        m_previewBitmap = NULL;
-    }
+
+    InvalidatePreviewBitmap();

 
     if (m_previewCanvas)
     {
         AdjustScrollbars(m_previewCanvas);
 
     if (m_previewCanvas)
     {
         AdjustScrollbars(m_previewCanvas);

-        RenderPage(m_currentPage);

         ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
         m_previewCanvas->ClearBackground();
         m_previewCanvas->Refresh();
         ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
         m_previewCanvas->ClearBackground();
         m_previewCanvas->Refresh();


@@ -1738,6 +1768,11 @@ bool wxPrintPreview::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
     return m_pimpl->PaintPage( canvas, dc );
 }
 
     return m_pimpl->PaintPage( canvas, dc );
 }
 

+bool wxPrintPreview::UpdatePageRendering()
+{
+    return m_pimpl->UpdatePageRendering();
+}
+

 bool wxPrintPreview::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)
 {
     return m_pimpl->DrawBlankPage( canvas, dc );
 bool wxPrintPreview::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)
 {
     return m_pimpl->DrawBlankPage( canvas, dc );