better spacing

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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index be9ab9a52f7e062727c72dedc3a16857951b3fd3..4c446d7569a83de7e3fd52719c2b67d5868725cc 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -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"


@@ -34,7 +36,9 @@
 #include "wx/dcmemory.h"
 #include "wx/stattext.h"
 #include "wx/intl.h"
 #include "wx/dcmemory.h"
 #include "wx/stattext.h"
 #include "wx/intl.h"

-#endif
+#include "wx/textdlg.h"
+#include "wx/sizer.h"
+#endif // !WX_PRECOMP

 
 #include "wx/prntbase.h"
 #include "wx/dcprint.h"
 
 #include "wx/prntbase.h"
 #include "wx/dcprint.h"


@@ -45,22 +49,14 @@
 #include <string.h>
 
 #ifdef __WXMSW__
 #include <string.h>
 
 #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));
-    
-    wxButton *button = new wxButton(dialog, wxID_CANCEL, _("Cancel"), wxPoint(5, 30));
-    
-    dialog->Fit();
-    button->Centre(wxHORIZONTAL);
-    
-    dialog->Centre();
+    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 );
+
+    dialog->SetAutoLayout( TRUE );
+    dialog->SetSizer( button_sizer );
+
+    button_sizer->Fit(dialog);
+    button_sizer->SetSizeHints (dialog) ;
+

     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,8 +188,8 @@ 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);
 }
 


@@ -201,7 +201,14 @@ 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,9 +218,9 @@ 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();
     Refresh();

-    
+

     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }


@@ -223,12 +230,16 @@ void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
 */
 
 BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
 */
 
 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_CHOICE(wxID_PREVIEW_ZOOM,          wxPreviewControlBar::OnZoom)
-EVT_PAINT(wxPreviewControlBar::OnPaint)
+    EVT_BUTTON(wxID_PREVIEW_CLOSE,    wxPreviewControlBar::OnWindowClose)
+    EVT_BUTTON(wxID_PREVIEW_PRINT,    wxPreviewControlBar::OnPrint)
+    EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPreviousButton)
+    EVT_BUTTON(wxID_PREVIEW_NEXT,     wxPreviewControlBar::OnNextButton)
+    EVT_BUTTON(wxID_PREVIEW_FIRST,    wxPreviewControlBar::OnFirstButton)
+    EVT_BUTTON(wxID_PREVIEW_LAST,     wxPreviewControlBar::OnLastButton)
+    EVT_BUTTON(wxID_PREVIEW_GOTO,     wxPreviewControlBar::OnGotoButton)
+    EVT_CHAR(wxPreviewControlBar::OnChar)
+    EVT_CHOICE(wxID_PREVIEW_ZOOM,     wxPreviewControlBar::OnZoom)
+    EVT_PAINT(wxPreviewControlBar::OnPaint)

 END_EVENT_TABLE()
 
 wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,
 END_EVENT_TABLE()
 
 wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,


@@ -252,7 +263,7 @@ wxPreviewControlBar::~wxPreviewControlBar()
 void wxPreviewControlBar::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
 void wxPreviewControlBar::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);

-    
+

     int w, h;
     GetSize(&w, &h);
     dc.SetPen(*wxBLACK_PEN);
     int w, h;
     GetSize(&w, &h);
     dc.SetPen(*wxBLACK_PEN);


@@ -272,7 +283,26 @@ 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.GetKeyCode())
+   {
+   case WXK_NEXT:
+      OnNext(); break;
+   case WXK_PRIOR:
+      OnPrevious(); break;
+   case WXK_HOME:
+      OnFirst(); break;
+   case WXK_END:
+      OnLast(); break;
+   case WXK_TAB:
+      OnGoto(); break;
+   default:
+      event.Skip();
+   }
+}
+
+void wxPreviewControlBar::OnNext(void)

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


@@ -287,7 +317,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)


@@ -302,6 +332,60 @@ void wxPreviewControlBar::OnPrevious(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void wxPreviewControlBar::OnFirst(void)
+{
+    wxPrintPreviewBase *preview = GetPrintPreview();
+    if (preview)
+    {
+        int currentPage = preview->GetMinPage();
+        if (preview->GetPrintout()->HasPage(currentPage))
+        {
+            preview->SetCurrentPage(currentPage);
+        }
+    }
+}
+
+void wxPreviewControlBar::OnLast(void)
+{
+    wxPrintPreviewBase *preview = GetPrintPreview();
+    if (preview)
+    {
+        int currentPage = preview->GetMaxPage();
+        if (preview->GetPrintout()->HasPage(currentPage))
+        {
+            preview->SetCurrentPage(currentPage);
+        }
+    }
+}
+
+void wxPreviewControlBar::OnGoto(void)
+{
+    wxPrintPreviewBase *preview = GetPrintPreview();
+    if (preview)
+    {
+        long currentPage;
+
+        if (preview->GetMinPage() > 0)
+        {
+            wxString strPrompt;
+            wxString strPage;
+
+            strPrompt.Printf( wxT("%d...%d"),
+                preview->GetMinPage(), preview->GetMaxPage());
+            strPage.Printf( wxT("%d"), preview->GetCurrentPage() );
+
+            strPage =
+                wxGetTextFromUser( strPrompt, _("Goto Page"), strPage);
+
+            if ( strPage.ToLong( &currentPage ) )
+                if (preview->GetPrintout()->HasPage(currentPage))
+                {
+                    preview->SetCurrentPage(currentPage);
+                }
+        }
+    }
+}
+

 void wxPreviewControlBar::OnZoom(wxCommandEvent& WXUNUSED(event))
 {
     int zoom = GetZoomControl();
 void wxPreviewControlBar::OnZoom(wxCommandEvent& WXUNUSED(event))
 {
     int zoom = GetZoomControl();


@@ -312,115 +396,129 @@ void wxPreviewControlBar::OnZoom(wxCommandEvent& WXUNUSED(event))
 void wxPreviewControlBar::CreateButtons()
 {
     SetSize(0, 0, 400, 40);
 void wxPreviewControlBar::CreateButtons()
 {
     SetSize(0, 0, 400, 40);

-    
+

     /*
     #ifdef __WXMSW__
     int fontSize = 9;
     #else
     int fontSize = 10;
     #endif
     /*
     #ifdef __WXMSW__
     int fontSize = 9;
     #else
     int fontSize = 10;
     #endif

-    
+

       wxFont buttonFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
       SetFont(buttonFont);
     */
       wxFont buttonFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
       SetFont(buttonFont);
     */

-    
-    int buttonWidth = 65;
+
+    int buttonWidth = 60;
+    int buttonNavigation = 30;

 #ifdef __WXGTK__
     int buttonHeight = -1;
 #else
     int buttonHeight = 24;
 #endif
 #ifdef __WXGTK__
     int buttonHeight = -1;
 #else
     int buttonHeight = 24;
 #endif

-    
+

     int x = 5;
     int y = 5;
     int x = 5;
     int y = 5;

-    
+

 #ifdef __WXMOTIF__
     int gap = 15;
 #else
     int gap = 5;
 #endif
 #ifdef __WXMOTIF__
     int gap = 15;
 #else
     int gap = 5;
 #endif

-    
+

     m_closeButton = new wxButton(this, wxID_PREVIEW_CLOSE, _("Close"),
         wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
     m_closeButton = new wxButton(this, wxID_PREVIEW_CLOSE, _("Close"),
         wxPoint(x, y), wxSize(buttonWidth, buttonHeight));

-    
+

     x += gap + buttonWidth;
     x += gap + buttonWidth;

-    
+

     if (m_buttonFlags & wxPREVIEW_PRINT)
     {
         m_printButton =  new wxButton(this, wxID_PREVIEW_PRINT, _("Print..."), wxPoint(x, y),
             wxSize(buttonWidth, buttonHeight));
         x += gap + buttonWidth;
     }
     if (m_buttonFlags & wxPREVIEW_PRINT)
     {
         m_printButton =  new wxButton(this, wxID_PREVIEW_PRINT, _("Print..."), wxPoint(x, y),
             wxSize(buttonWidth, buttonHeight));
         x += gap + buttonWidth;
     }

-    
+
+    if (m_buttonFlags & wxPREVIEW_FIRST)
+    {
+        m_firstPageButton = new wxButton(this, wxID_PREVIEW_FIRST, wxT("|<<"), wxPoint(x, y),
+            wxSize(buttonNavigation, buttonHeight));
+        x += gap + buttonNavigation;
+    }
+

     if (m_buttonFlags & wxPREVIEW_PREVIOUS)
     {
     if (m_buttonFlags & wxPREVIEW_PREVIOUS)
     {

-        m_previousPageButton = new wxButton(this, wxID_PREVIEW_PREVIOUS, "<<", wxPoint(x, y),
-            wxSize(buttonWidth, buttonHeight));
-        x += gap + buttonWidth;
+        m_previousPageButton = new wxButton(this, wxID_PREVIEW_PREVIOUS, wxT("<<"), wxPoint(x, y),
+            wxSize(buttonNavigation, buttonHeight));
+        x += gap + buttonNavigation;

     }
     }

-    
+

     if (m_buttonFlags & wxPREVIEW_NEXT)
     {
     if (m_buttonFlags & wxPREVIEW_NEXT)
     {

-        m_nextPageButton = new wxButton(this, wxID_PREVIEW_NEXT, ">>",
-            wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
+        m_nextPageButton = new wxButton(this, wxID_PREVIEW_NEXT, wxT(">>"),
+            wxPoint(x, y), wxSize(buttonNavigation, buttonHeight));
+        x += gap + buttonNavigation;
+    }
+
+    if (m_buttonFlags & wxPREVIEW_LAST)
+    {
+        m_lastPageButton = new wxButton(this, wxID_PREVIEW_LAST, wxT(">>|"), wxPoint(x, y),
+            wxSize(buttonNavigation, buttonHeight));
+        x += gap + buttonNavigation;
+    }
+
+    if (m_buttonFlags & wxPREVIEW_GOTO)
+    {
+        m_gotoPageButton = new wxButton(this, wxID_PREVIEW_GOTO, _("Goto..."), wxPoint(x, y),
+            wxSize(buttonWidth, buttonHeight));

         x += gap + buttonWidth;
     }
         x += gap + buttonWidth;
     }

-    
-    // Yes, this look stupid, but this is because gcc gives up otherwise.
-    wxString *choices = new wxString[23];
-    choices[0] = "10%";
-    choices[1] = "15%";
-    choices[2] = "20%";
-    choices[3] = "25%";
-    choices[4] = "30%";
-    choices[5] = "35%";
-    choices[6] = "40%";
-    choices[7] = "45%";
-    choices[8] = "50%";
-    choices[9] = "55%";
-    choices[10] = "60%";
-    choices[11] = "65%";
-    choices[12] = "70%";
-    choices[13] = "75%";
-    choices[14] = "80%";
-    choices[15] = "85%";
-    choices[16] = "90%";
-    choices[17] = "95%";
-    choices[18] = "100%";
-    choices[19] = "110%";
-    choices[20] = "120%";
-    choices[21] = "150%";
-    choices[22] = "200%";
-    
-    int n = 23;
+

     if (m_buttonFlags & wxPREVIEW_ZOOM)
     {
     if (m_buttonFlags & wxPREVIEW_ZOOM)
     {

-        m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM, wxPoint(x, y),
-            wxSize(100, -1), n, (wxString *)choices);
+        static const wxChar *choices[] =
+        {
+            wxT("10%"), wxT("15%"), wxT("20%"), wxT("25%"), wxT("30%"), wxT("35%"), wxT("40%"), wxT("45%"), wxT("50%"), wxT("55%"),
+            wxT("60%"), wxT("65%"), wxT("70%"), wxT("75%"), wxT("80%"), wxT("85%"), wxT("90%"), wxT("95%"), wxT("100%"), wxT("110%"),
+            wxT("120%"), wxT("150%"), wxT("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,
+                                     wxPoint(x, y),
+                                     wxSize(100, -1),
+                                     n,
+                                     strings
+                                    );
+        delete[] strings;
+

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

-    
-    delete[] choices;
-    
+

     //  m_closeButton->SetDefault();
 }
 
 void wxPreviewControlBar::SetZoomControl(int zoom)
 {
     //  m_closeButton->SetDefault();
 }
 
 void wxPreviewControlBar::SetZoomControl(int zoom)
 {

-    char buf[20];
-    sprintf(buf, "%d%%", zoom);
+    wxChar buf[20];
+    wxSprintf( buf, wxT("%d%%"), zoom );
+

     if (m_zoomControl)
         m_zoomControl->SetStringSelection(buf);
 }
 
 int wxPreviewControlBar::GetZoomControl()
 {
     if (m_zoomControl)
         m_zoomControl->SetStringSelection(buf);
 }
 
 int wxPreviewControlBar::GetZoomControl()
 {

-    char buf[20];
-    if (m_zoomControl && (m_zoomControl->GetStringSelection() != ""))
+    wxChar buf[20];
+    if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxT("")))

     {
     {

-        strcpy(buf, m_zoomControl->GetStringSelection());
-        buf[strlen(buf) - 1] = 0;
-        return (int)atoi(buf);
+        wxStrcpy(buf, m_zoomControl->GetStringSelection());
+        buf[wxStrlen(buf) - 1] = 0;
+        return (int)wxAtoi(buf);

     }
     else return 0;
 }
     }
     else return 0;
 }


@@ -431,7 +529,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,


@@ -447,10 +545,10 @@ wxPreviewFrame::~wxPreviewFrame()
 {
 }
 
 {
 }
 

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

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

-    
+

     // Need to delete the printout and the print preview
     wxPrintout *printout = m_printPreview->GetPrintout();
     if (printout)
     // Need to delete the printout and the print preview
     wxPrintout *printout = m_printPreview->GetPrintout();
     if (printout)


@@ -461,22 +559,22 @@ void wxPreviewFrame::OnCloseWindow(wxCloseEvent& event)
         m_printPreview->SetFrame(NULL);
     }
     delete m_printPreview;
         m_printPreview->SetFrame(NULL);
     }
     delete m_printPreview;

-    
+

     Destroy();
 }
 
 void wxPreviewFrame::Initialize()
 {
     CreateStatusBar();
     Destroy();
 }
 
 void wxPreviewFrame::Initialize()
 {
     CreateStatusBar();

-    
+

     CreateCanvas();
     CreateControlBar();
     CreateCanvas();
     CreateControlBar();

-    
+

     m_printPreview->SetCanvas(m_previewCanvas);
     m_printPreview->SetFrame(this);
     m_printPreview->SetCanvas(m_previewCanvas);
     m_printPreview->SetFrame(this);

-    
+

     // Set layout constraints here
     // Set layout constraints here

-    
+

     // Control bar constraints
     wxLayoutConstraints *c1 = new wxLayoutConstraints;
     //  int w, h;
     // Control bar constraints
     wxLayoutConstraints *c1 = new wxLayoutConstraints;
     //  int w, h;


@@ -487,28 +585,28 @@ void wxPreviewFrame::Initialize()
 #else
     h = 60;
 #endif
 #else
     h = 60;
 #endif

-    
+

     c1->left.SameAs       (this, wxLeft);
     c1->top.SameAs        (this, wxTop);
     c1->right.SameAs      (this, wxRight);
     c1->height.Absolute   (h);
     c1->left.SameAs       (this, wxLeft);
     c1->top.SameAs        (this, wxTop);
     c1->right.SameAs      (this, wxRight);
     c1->height.Absolute   (h);

-    
+

     m_controlBar->SetConstraints(c1);
     m_controlBar->SetConstraints(c1);

-    
+

     // Canvas constraints
     wxLayoutConstraints *c2 = new wxLayoutConstraints;
     // Canvas constraints
     wxLayoutConstraints *c2 = new wxLayoutConstraints;

-    
+

     c2->left.SameAs       (this, wxLeft);
     c2->top.Below         (m_controlBar);
     c2->right.SameAs      (this, wxRight);
     c2->bottom.SameAs     (this, wxBottom);
     c2->left.SameAs       (this, wxLeft);
     c2->top.Below         (m_controlBar);
     c2->right.SameAs      (this, wxRight);
     c2->bottom.SameAs     (this, wxBottom);

-    
+

     m_previewCanvas->SetConstraints(c2);
     m_previewCanvas->SetConstraints(c2);

-    
+

     SetAutoLayout(TRUE);
     SetAutoLayout(TRUE);

-    
+

     MakeModal(TRUE);
     MakeModal(TRUE);

-    
+

     Layout();
 }
 
     Layout();
 }
 


@@ -522,7 +620,7 @@ void wxPreviewFrame::CreateControlBar()
     long buttons = wxPREVIEW_DEFAULT;
     if (m_printPreview->GetPrintoutForPrinting())
         buttons |= wxPREVIEW_PRINT;
     long buttons = wxPREVIEW_DEFAULT;
     if (m_printPreview->GetPrintoutForPrinting())
         buttons |= wxPREVIEW_PRINT;

-    
+

     m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(0, 0), wxSize(400, 40));
     m_controlBar->CreateButtons();
 }
     m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(0, 0), wxSize(400, 40));
     m_controlBar->CreateButtons();
 }


@@ -531,29 +629,50 @@ void wxPreviewFrame::CreateControlBar()
 * Print preview
 */
 
 * Print preview
 */
 

-wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintDialogData *data)
+wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
+                                       wxPrintout *printoutForPrinting,
+                                       wxPrintData *data)
+{
+    if (data)
+        m_printDialogData = (*data);
+
+    Init(printout, printoutForPrinting);
+}
+
+wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
+                                       wxPrintout *printoutForPrinting,
+                                       wxPrintDialogData *data)
+{
+    if (data)
+        m_printDialogData = (*data);
+
+    Init(printout, printoutForPrinting);
+}
+
+void wxPrintPreviewBase::Init(wxPrintout *printout,
+                              wxPrintout *printoutForPrinting)

 {
     m_isOk = TRUE;
     m_previewPrintout = printout;
     if (m_previewPrintout)
         m_previewPrintout->SetIsPreview(TRUE);
 {
     m_isOk = TRUE;
     m_previewPrintout = printout;
     if (m_previewPrintout)
         m_previewPrintout->SetIsPreview(TRUE);

-    
+

     m_printPrintout = printoutForPrinting;
     m_printPrintout = printoutForPrinting;

-    if (data)
-        m_printDialogData = (*data);
-    
+

     m_previewCanvas = NULL;
     m_previewFrame = NULL;
     m_previewBitmap = NULL;
     m_currentPage = 1;
     m_previewCanvas = NULL;
     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;

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

     // Get some parameters from the printout, if defined
     int selFrom, selTo;
     printout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo);
     // Get some parameters from the printout, if defined
     int selFrom, selTo;
     printout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo);


@@ -573,17 +692,18 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
 {
     if (m_currentPage == pageNum)
         return TRUE;
 {
     if (m_currentPage == pageNum)
         return TRUE;

-    
+

     m_currentPage = pageNum;
     if (m_previewBitmap)
     {
         delete m_previewBitmap;
         m_previewBitmap = NULL;
     }
     m_currentPage = pageNum;
     if (m_previewBitmap)
     {
         delete m_previewBitmap;
         m_previewBitmap = NULL;
     }

-    
+

     if (m_previewCanvas)
     {
     if (m_previewCanvas)
     {

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

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


@@ -592,109 +712,122 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
 bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
 {
     DrawBlankPage(canvas, dc);
 bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
 {
     DrawBlankPage(canvas, dc);

-    
+

     if (!m_previewBitmap)
     if (!m_previewBitmap)

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

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

-    
+

     if (!canvas)
         return FALSE;
     if (!canvas)
         return FALSE;

-    
+

     int canvasWidth, canvasHeight;
     canvas->GetSize(&canvasWidth, &canvasHeight);
     int canvasWidth, canvasHeight;
     canvas->GetSize(&canvasWidth, &canvasHeight);

-    
+

     double zoomScale = ((float)m_currentZoom/(float)100);
     double actualWidth = (zoomScale*m_pageWidth*m_previewScale);
     //  float actualHeight = (float)(zoomScale*m_pageHeight*m_previewScale);
     double zoomScale = ((float)m_currentZoom/(float)100);
     double actualWidth = (zoomScale*m_pageWidth*m_previewScale);
     //  float actualHeight = (float)(zoomScale*m_pageHeight*m_previewScale);

-    
+

     int x = (int) ((canvasWidth - actualWidth)/2.0);
     if (x < m_leftMargin)
         x = m_leftMargin;
     int y = m_topMargin;
     int x = (int) ((canvasWidth - actualWidth)/2.0);
     if (x < m_leftMargin)
         x = m_leftMargin;
     int y = m_topMargin;

-    
+

     wxMemoryDC temp_dc;
     temp_dc.SelectObject(*m_previewBitmap);
     wxMemoryDC temp_dc;
     temp_dc.SelectObject(*m_previewBitmap);

-    
+

     dc.Blit(x, y, m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0);
     dc.Blit(x, y, m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0);

-    
+

     temp_dc.SelectObject(wxNullBitmap);
     temp_dc.SelectObject(wxNullBitmap);

-    
+

     return TRUE;
 }
 
 bool wxPrintPreviewBase::RenderPage(int pageNum)
 {
     return TRUE;
 }
 
 bool wxPrintPreviewBase::RenderPage(int pageNum)
 {

+    wxBusyCursor busy;
+

     int canvasWidth, canvasHeight;
     int canvasWidth, canvasHeight;

-    
+

     if (!m_previewCanvas)
     {
     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);

-    
+

     double zoomScale = (m_currentZoom/100.0);
     int actualWidth = (int)(zoomScale*m_pageWidth*m_previewScale);
     int actualHeight = (int)(zoomScale*m_pageHeight*m_previewScale);
     double zoomScale = (m_currentZoom/100.0);
     int actualWidth = (int)(zoomScale*m_pageWidth*m_previewScale);
     int actualHeight = (int)(zoomScale*m_pageHeight*m_previewScale);

-    
+

     int x = (int)((canvasWidth - actualWidth)/2.0);
     if (x < m_leftMargin)
         x = m_leftMargin;
     //  int y = m_topMargin;
     int x = (int)((canvasWidth - actualWidth)/2.0);
     if (x < m_leftMargin)
         x = m_leftMargin;
     //  int y = m_topMargin;

-    
-    
+
+

     if (!m_previewBitmap)
     {
         m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
         if (!m_previewBitmap || !m_previewBitmap->Ok())
         {
     if (!m_previewBitmap)
     {
         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;
         }
     }

-    
+

     wxMemoryDC memoryDC;
     memoryDC.SelectObject(*m_previewBitmap);
     wxMemoryDC memoryDC;
     memoryDC.SelectObject(*m_previewBitmap);

-    
+

     memoryDC.Clear();
     memoryDC.Clear();

-    
+

     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()))
     {
         wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);
     m_previewPrintout->OnBeginPrinting();
 
     if (!m_previewPrintout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
     {
         wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);

-        
+

         memoryDC.SelectObject(wxNullBitmap);
         memoryDC.SelectObject(wxNullBitmap);

-        
+

         delete m_previewBitmap;
         delete m_previewBitmap;

+        m_previewBitmap = NULL;

         return FALSE;
     }
         return FALSE;
     }

-    
+

     m_previewPrintout->OnPrintPage(pageNum);
     m_previewPrintout->OnEndDocument();
     m_previewPrintout->OnEndPrinting();
     m_previewPrintout->OnPrintPage(pageNum);
     m_previewPrintout->OnEndDocument();
     m_previewPrintout->OnEndPrinting();

-    
+

     m_previewPrintout->SetDC(NULL);
     m_previewPrintout->SetDC(NULL);

-    
+

     memoryDC.SelectObject(wxNullBitmap);
     memoryDC.SelectObject(wxNullBitmap);

-    
-    char buf[200];
+
+    wxChar buf[200];

     if (m_maxPage != 0)
     if (m_maxPage != 0)

-        sprintf(buf, _("Page %d of %d"), pageNum, m_maxPage);
+        wxSprintf(buf, _("Page %d of %d"), pageNum, m_maxPage);

     else
     else

-        sprintf(buf, _("Page %d"), pageNum);
-    
+        wxSprintf(buf, _("Page %d"), pageNum);
+

     if (m_previewFrame)
         m_previewFrame->SetStatusText(buf);
     if (m_previewFrame)
         m_previewFrame->SetStatusText(buf);

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -703,16 +836,16 @@ bool wxPrintPreviewBase::DrawBlankPage(wxWindow *canvas, wxDC& dc)
 {
     int canvasWidth, canvasHeight;
     canvas->GetSize(&canvasWidth, &canvasHeight);
 {
     int canvasWidth, canvasHeight;
     canvas->GetSize(&canvasWidth, &canvasHeight);

-    
+

     float zoomScale = (float)((float)m_currentZoom/(float)100);
     float actualWidth = zoomScale*m_pageWidth*m_previewScale;
     float actualHeight = zoomScale*m_pageHeight*m_previewScale;
     float zoomScale = (float)((float)m_currentZoom/(float)100);
     float actualWidth = zoomScale*m_pageWidth*m_previewScale;
     float actualHeight = zoomScale*m_pageHeight*m_previewScale;

-    
+

     float x = (float)((canvasWidth - actualWidth)/2.0);
     if (x < m_leftMargin)
         x = (float)m_leftMargin;
     float y = (float)m_topMargin;
     float x = (float)((canvasWidth - actualWidth)/2.0);
     if (x < m_leftMargin)
         x = (float)m_leftMargin;
     float y = (float)m_topMargin;

-    
+

     // Draw shadow, allowing for 1-pixel border AROUND the actual page
     int shadowOffset = 4;
     dc.SetPen(*wxBLACK_PEN);
     // Draw shadow, allowing for 1-pixel border AROUND the actual page
     int shadowOffset = 4;
     dc.SetPen(*wxBLACK_PEN);


@@ -722,20 +855,20 @@ bool wxPrintPreviewBase::DrawBlankPage(wxWindow *canvas, wxDC& dc)
     */
     dc.DrawRectangle((int)(x + shadowOffset), (int)(y + actualHeight+1), (int)(actualWidth), shadowOffset);
     dc.DrawRectangle((int)(x + actualWidth), (int)(y + shadowOffset), shadowOffset, (int)(actualHeight));
     */
     dc.DrawRectangle((int)(x + shadowOffset), (int)(y + actualHeight+1), (int)(actualWidth), shadowOffset);
     dc.DrawRectangle((int)(x + actualWidth), (int)(y + shadowOffset), shadowOffset, (int)(actualHeight));

-    
+

     // Draw blank page allowing for 1-pixel border AROUND the actual page
     dc.SetPen(*wxBLACK_PEN);
     dc.SetBrush(*wxWHITE_BRUSH);
     // Draw blank page allowing for 1-pixel border AROUND the actual page
     dc.SetPen(*wxBLACK_PEN);
     dc.SetBrush(*wxWHITE_BRUSH);

-    
+

     /*
     wxRegion update_region = canvas->GetUpdateRegion();
     wxRect r = update_region.GetBox();
     /*
     wxRegion update_region = canvas->GetUpdateRegion();
     wxRect r = update_region.GetBox();

-    
+

       printf( "x: %d y: %d w: %d h: %d.\n", (int)r.x, (int)r.y, (int)r.width, (int)r.height );
     */
       printf( "x: %d y: %d w: %d h: %d.\n", (int)r.x, (int)r.y, (int)r.width, (int)r.height );
     */

-    
+

     dc.DrawRectangle((int)(x-2), (int)(y-1), (int)(actualWidth+3), (int)(actualHeight+2));
     dc.DrawRectangle((int)(x-2), (int)(y-1), (int)(actualWidth+3), (int)(actualHeight+2));

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -743,19 +876,21 @@ void wxPrintPreviewBase::SetZoom(int percent)
 {
     if (m_currentZoom == percent)
         return;
 {
     if (m_currentZoom == percent)
         return;

-    
+

     m_currentZoom = percent;
     if (m_previewBitmap)
     {
         delete m_previewBitmap;
         m_previewBitmap = NULL;
     }
     m_currentZoom = percent;
     if (m_previewBitmap)
     {
         delete m_previewBitmap;
         m_previewBitmap = NULL;
     }

-    RenderPage(m_currentPage);
-    
+

     if (m_previewCanvas)
     {
     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