reverted Julian's unintentional breakage of wxChoice

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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 5a95be8d6acfbf5b790d0ee4c193a3c357fe6209..2c878ff2dd50c99c0af1b818fc042fb0b3a06756 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -22,6 +22,8 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/dc.h"
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/dc.h"


@@ -44,23 +46,17 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

+#include <wx/sizer.h>
+                                                                            

 #ifdef __WXMSW__
 #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)
 IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
 IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
 IMPLEMENT_CLASS(wxPrinterBase, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
 IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)


@@ -69,14 +65,13 @@ IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
 IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
 
 BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
 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)
 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()
 END_EVENT_TABLE()

-#endif

 
 /*
 * Printer
 
 /*
 * Printer


@@ -89,10 +84,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()
 {


@@ -106,21 +103,24 @@ void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
 }
 
     wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
 }
 

-wxWindow *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout *WXUNUSED(printout))
+wxWindow *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout * printout)

 {
 {

-    wxPrintAbortDialog *dialog = new wxPrintAbortDialog(parent, _("Printing"), wxPoint(0, 0), wxSize(400, 400), wxDEFAULT_DIALOG_STYLE);
-    (void) new wxStaticText(dialog, -1, _("Please wait..."), wxPoint(5, 5));
+    wxPrintAbortDialog *dialog = new wxPrintAbortDialog(parent, _("Printing ") , wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
+
+    wxBoxSizer *button_sizer = new wxBoxSizer( wxVERTICAL );
+    button_sizer->Add( new wxStaticText(dialog, -1, _("Please wait while printing\n") + printout->GetTitle() ), 0, wxALL, 10 );
+    button_sizer->Add( new wxButton( dialog, wxID_CANCEL, wxT("Cancel") ), 0, wxALL | wxALIGN_CENTER, 10 );

 
 

-    wxButton *button = new wxButton(dialog, wxID_CANCEL, _("Cancel"), wxPoint(5, 30));
+    dialog->SetAutoLayout( TRUE );
+    dialog->SetSizer( button_sizer );

 
 

-    dialog->Fit();
-    button->Centre(wxHORIZONTAL);
+    button_sizer->Fit(dialog);
+    button_sizer->SetSizeHints (dialog) ;

 
 

-    dialog->Centre();

     return dialog;
 }
 
     return dialog;
 }
 

-void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout), char *message)
+void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout), const wxString& message)

 {
     wxMessageBox(message, _("Printing Error"), wxOK, parent);
 }
 {
     wxMessageBox(message, _("Printing Error"), wxOK, parent);
 }


@@ -150,7 +150,7 @@ wxPrintout::~wxPrintout()
 
 bool wxPrintout::OnBeginDocument(int WXUNUSED(startPage), int WXUNUSED(endPage))
 {
 
 bool wxPrintout::OnBeginDocument(int WXUNUSED(startPage), int WXUNUSED(endPage))
 {

-    return GetDC()->StartDoc(_("Printing"));
+    return GetDC()->StartDoc(_("Printing ") + m_printoutTitle);

 }
 
 void wxPrintout::OnEndDocument()
 }
 
 void wxPrintout::OnEndDocument()


@@ -188,7 +188,7 @@ wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
 wxScrolledWindow(parent, -1, pos, size, style, name)
 {
     m_printPreview = preview;
 wxScrolledWindow(parent, -1, pos, size, style, name)
 {
     m_printPreview = preview;

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

 
     SetScrollbars(15, 18, 100, 100);
 }
 
     SetScrollbars(15, 18, 100, 100);
 }


@@ -202,6 +202,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);


@@ -211,7 +218,7 @@ void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 // 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)
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

     Refresh();
 
     // Propagate the event to the non-top-level children
     Refresh();
 
     // Propagate the event to the non-top-level children


@@ -225,8 +232,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)
 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()
     EVT_CHOICE(wxID_PREVIEW_ZOOM,     wxPreviewControlBar::OnZoom)
     EVT_PAINT(wxPreviewControlBar::OnPaint)
 END_EVENT_TABLE()


@@ -272,7 +280,20 @@ void wxPreviewControlBar::OnPrint(wxCommandEvent& WXUNUSED(event))
     preview->Print(TRUE);
 }
 
     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)
 {
     wxPrintPreviewBase *preview = GetPrintPreview();
     if (preview)


@@ -287,7 +308,7 @@ void wxPreviewControlBar::OnNext(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

-void wxPreviewControlBar::OnPrevious(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnPrevious(void)

 {
     wxPrintPreviewBase *preview = GetPrintPreview();
     if (preview)
 {
     wxPrintPreviewBase *preview = GetPrintPreview();
     if (preview)


@@ -354,37 +375,45 @@ 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;
     }
 

-    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)
     {
     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%"
+        };
+
+        int n = WXSIZEOF(choices);
+
+        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,
         m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM,

-                                     wxPoint(x, y), wxSize(100, -1));
+                                     wxPoint(x, y),
+                                     wxSize(100, -1),
+                                     n,
+                                     strings
+                                    );
+        delete[] strings;
+

         SetZoomControl(m_printPreview->GetZoom());
     }
 
         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();
 }
 
     //  m_closeButton->SetDefault();
 }
 


@@ -392,6 +421,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);
 }


@@ -399,7 +429,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;


@@ -414,7 +444,7 @@ int wxPreviewControlBar::GetZoomControl()
 */
 
 BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
 */
 
 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,
 END_EVENT_TABLE()
 
 wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxFrame *parent, const wxString& title,


@@ -430,7 +460,7 @@ wxPreviewFrame::~wxPreviewFrame()
 {
 }
 
 {
 }
 

-void wxPreviewFrame::OnCloseWindow(wxCloseEvent& event)
+void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
     MakeModal(FALSE);
 
 {
     MakeModal(FALSE);
 


@@ -548,13 +578,15 @@ void wxPrintPreviewBase::Init(wxPrintout *printout,
     m_previewFrame = NULL;
     m_previewBitmap = NULL;
     m_currentPage = 1;
     m_previewFrame = NULL;
     m_previewBitmap = NULL;
     m_currentPage = 1;

-    m_currentZoom = 30;
+    m_currentZoom = 70;

     m_topMargin = 40;
     m_leftMargin = 40;
     m_pageWidth = 0;
     m_pageHeight = 0;
     m_topMargin = 40;
     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;


@@ -585,7 +617,8 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
 
     if (m_previewCanvas)
     {
 
     if (m_previewCanvas)
     {

-        RenderPage(pageNum);
+        if (!RenderPage(pageNum))
+               return FALSE;

         m_previewCanvas->Refresh();
     }
     return TRUE;
         m_previewCanvas->Refresh();
     }
     return TRUE;


@@ -596,7 +629,8 @@ bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
     DrawBlankPage(canvas, dc);
 
     if (!m_previewBitmap)
     DrawBlankPage(canvas, dc);
 
     if (!m_previewBitmap)

-        RenderPage(m_currentPage);
+        if (!RenderPage(m_currentPage))
+               return FALSE;

 
     if (!m_previewBitmap)
         return FALSE;
 
     if (!m_previewBitmap)
         return FALSE;


@@ -628,12 +662,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);


@@ -653,8 +689,10 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
         m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
         if (!m_previewBitmap || !m_previewBitmap->Ok())
         {
         m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
         if (!m_previewBitmap || !m_previewBitmap->Ok())
         {

-            if (m_previewBitmap)
+            if (m_previewBitmap) {

                 delete m_previewBitmap;
                 delete m_previewBitmap;

+                m_previewBitmap = NULL;
+            }

             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;
         }


@@ -668,6 +706,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()))


@@ -677,6 +722,7 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
         memoryDC.SelectObject(wxNullBitmap);
 
         delete m_previewBitmap;
         memoryDC.SelectObject(wxNullBitmap);
 
         delete m_previewBitmap;

+        m_previewBitmap = NULL;

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -753,12 +799,13 @@ 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();
     }
 }
 

+#endif // wxUSE_PRINTING_ARCHITECTURE