wxBitmap compilation fix for BCC enforced typecast in resource.cpp

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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 9c1c91ee2e3dd74937a70c034199bdb1876b250b..a233f0f2067fb129ed0865a580b52c9778187af9 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


@@ -84,10 +82,12 @@ wxPrinterBase::wxPrinterBase(wxPrintDialogData *data)
     sm_abortIt = FALSE;
     if (data)
         m_printDialogData = (*data);
     sm_abortIt = FALSE;
     if (data)
         m_printDialogData = (*data);

+    sm_lastError = wxPRINTER_NO_ERROR;

 }
 
 wxWindow *wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
 bool wxPrinterBase::sm_abortIt = FALSE;
 }
 
 wxWindow *wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
 bool wxPrinterBase::sm_abortIt = FALSE;

+wxPrinterError wxPrinterBase::sm_lastError = wxPRINTER_NO_ERROR;

 
 wxPrinterBase::~wxPrinterBase()
 {
 
 wxPrinterBase::~wxPrinterBase()
 {


@@ -197,6 +197,13 @@ void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
     wxPaintDC dc(this);
     PrepareDC( dc );
 
     wxPaintDC dc(this);
     PrepareDC( dc );
 

+/*
+#ifdef __WXGTK__
+    if (!GetUpdateRegion().IsEmpty())
+        dc.SetClippingRegion( GetUpdateRegion() );
+#endif
+*/
+

     if (m_printPreview)
     {
         m_printPreview->PaintPage(this, dc);
     if (m_printPreview)
     {
         m_printPreview->PaintPage(this, dc);


@@ -363,14 +370,14 @@ void wxPreviewControlBar::CreateButtons()
 
     if (m_buttonFlags & wxPREVIEW_PREVIOUS)
     {
 
     if (m_buttonFlags & wxPREVIEW_PREVIOUS)
     {

-        m_previousPageButton = new wxButton(this, wxID_PREVIEW_PREVIOUS, "<<", wxPoint(x, y),
+        m_previousPageButton = new wxButton(this, wxID_PREVIEW_PREVIOUS, wxT("<<"), wxPoint(x, y),

             wxSize(buttonWidth, buttonHeight));
         x += gap + buttonWidth;
     }
 
     if (m_buttonFlags & wxPREVIEW_NEXT)
     {
             wxSize(buttonWidth, buttonHeight));
         x += gap + buttonWidth;
     }
 
     if (m_buttonFlags & wxPREVIEW_NEXT)
     {

-        m_nextPageButton = new wxButton(this, wxID_PREVIEW_NEXT, ">>",
+        m_nextPageButton = new wxButton(this, wxID_PREVIEW_NEXT, wxT(">>"),

             wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
         x += gap + buttonWidth;
     }
             wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
         x += gap + buttonWidth;
     }


@@ -384,14 +391,21 @@ void wxPreviewControlBar::CreateButtons()
             "120%", "150%", "200%"
         };
 
             "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);
         int n = WXSIZEOF(choices);

-        for ( int i = 0; i < n; i++ )
-           m_zoomControl->Append(choices[i]);
-       
+
+        wxString* strings = new wxString[n];
+        int i;
+        for (i = 0; i < n; i++ )
+           strings[i] = choices[i];
+
+        m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM,
+                                     wxPoint(x, y),
+                                     wxSize(100, -1),
+                                     n,
+                                     strings
+                                    );
+        delete[] strings;
+

         SetZoomControl(m_printPreview->GetZoom());
     }
 
         SetZoomControl(m_printPreview->GetZoom());
     }
 


@@ -402,6 +416,7 @@ void wxPreviewControlBar::SetZoomControl(int zoom)
 {
     char buf[20];
     sprintf(buf, "%d%%", zoom);
 {
     char buf[20];
     sprintf(buf, "%d%%", zoom);

+// Someone is calling methods that do no exist in wxChoice!! So I'll just comment out for VA for now

     if (m_zoomControl)
         m_zoomControl->SetStringSelection(buf);
 }
     if (m_zoomControl)
         m_zoomControl->SetStringSelection(buf);
 }


@@ -409,7 +424,7 @@ void wxPreviewControlBar::SetZoomControl(int zoom)
 int wxPreviewControlBar::GetZoomControl()
 {
     wxChar buf[20];
 int wxPreviewControlBar::GetZoomControl()
 {
     wxChar buf[20];

-    if (m_zoomControl && (m_zoomControl->GetStringSelection() != _T("")))
+    if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxT("")))

     {
         wxStrcpy(buf, m_zoomControl->GetStringSelection());
         buf[wxStrlen(buf) - 1] = 0;
     {
         wxStrcpy(buf, m_zoomControl->GetStringSelection());
         buf[wxStrlen(buf) - 1] = 0;


@@ -563,8 +578,10 @@ void wxPrintPreviewBase::Init(wxPrintout *printout,
     m_leftMargin = 40;
     m_pageWidth = 0;
     m_pageHeight = 0;
     m_leftMargin = 40;
     m_pageWidth = 0;
     m_pageHeight = 0;

+    m_printingPrepared = FALSE;

 
 

-    printout->OnPreparePrinting();
+    // Too soon! Moved to RenderPage.
+    // printout->OnPreparePrinting();

 
     // Get some parameters from the printout, if defined
     int selFrom, selTo;
 
     // Get some parameters from the printout, if defined
     int selFrom, selTo;


@@ -638,12 +655,14 @@ bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
 
 bool wxPrintPreviewBase::RenderPage(int pageNum)
 {
 
 bool wxPrintPreviewBase::RenderPage(int pageNum)
 {

+    wxBusyCursor busy;
+

     int canvasWidth, canvasHeight;
 
     if (!m_previewCanvas)
     {
     int canvasWidth, canvasHeight;
 
     if (!m_previewCanvas)
     {

-        wxMessageBox(_("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!"),
-            _("Print Preview Failure"), wxOK);
+        wxFAIL_MSG(_T("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!"));
+

         return FALSE;
     }
     m_previewCanvas->GetSize(&canvasWidth, &canvasHeight);
         return FALSE;
     }
     m_previewCanvas->GetSize(&canvasWidth, &canvasHeight);


@@ -678,6 +697,13 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
     m_previewPrintout->SetDC(&memoryDC);
     m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
 
     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();
+        m_printingPrepared = TRUE;
+    }
+

     m_previewPrintout->OnBeginPrinting();
 
     if (!m_previewPrintout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
     m_previewPrintout->OnBeginPrinting();
 
     if (!m_previewPrintout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))


@@ -763,10 +789,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();
     }