]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/prntbase.cpp
multilib mode
[wxWidgets.git] / src / common / prntbase.cpp
index be9ab9a52f7e062727c72dedc3a16857951b3fd3..8ab4583a892fbe174b9d7ad0fe04ac278a20bce6 100644 (file)
@@ -5,8 +5,8 @@
 // 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__
@@ -22,6 +22,8 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_PRINTING_ARCHITECTURE
+
 #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"
-#endif
+#include "wx/textdlg.h"
+#include "wx/sizer.h"
+#endif // !WX_PRECOMP
 
 #include "wx/prntbase.h"
 #include "wx/dcprint.h"
 #include <string.h>
 
 #ifdef __WXMSW__
-#include <windows.h>
-#include <commdlg.h>
+    #include "wx/msw/private.h"
+    #include <commdlg.h>
 
-// Clash with Windows header files
-#ifdef StartDoc
-#undef StartDoc
-#endif
-
-#ifndef __WIN32__
-#include <print.h>
-#endif
-
-#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)
@@ -69,14 +65,14 @@ IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
 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)
-EVT_PAINT(wxPreviewCanvas::OnPaint)
-EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
+    EVT_PAINT(wxPreviewCanvas::OnPaint)
+    EVT_CHAR(wxPreviewCanvas::OnChar)
+    EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
 END_EVENT_TABLE()
-#endif
 
 /*
 * Printer
@@ -89,10 +85,12 @@ wxPrinterBase::wxPrinterBase(wxPrintDialogData *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;
+wxPrinterError wxPrinterBase::sm_lastError = wxPRINTER_NO_ERROR;
 
 wxPrinterBase::~wxPrinterBase()
 {
@@ -106,21 +104,24 @@ void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     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;
 }
 
-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);
 }
@@ -150,7 +151,7 @@ wxPrintout::~wxPrintout()
 
 bool wxPrintout::OnBeginDocument(int WXUNUSED(startPage), int WXUNUSED(endPage))
 {
-    return GetDC()->StartDoc(_("Printing"));
+    return GetDC()->StartDoc(_("Printing ") + m_printoutTitle);
 }
 
 void wxPrintout::OnEndDocument()
@@ -188,9 +189,16 @@ wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
 wxScrolledWindow(parent, -1, pos, size, style, name)
 {
     m_printPreview = preview;
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
-    
-    SetScrollbars(15, 18, 100, 100);
+#ifdef __WXMAC__
+    // The app workspace colour is always white, but we should have
+    // a contrast with the page.
+    wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
+#else
+    wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
+#endif    
+    SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
+
+    SetScrollbars(10, 10, 100, 100);
 }
 
 wxPreviewCanvas::~wxPreviewCanvas()
@@ -201,7 +209,14 @@ void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
     PrepareDC( dc );
-    
+
+/*
+#ifdef __WXGTK__
+    if (!GetUpdateRegion().IsEmpty())
+        dc.SetClippingRegion( GetUpdateRegion() );
+#endif
+*/
+
     if (m_printPreview)
     {
         m_printPreview->PaintPage(this, dc);
@@ -211,24 +226,74 @@ void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 // Responds to colour changes, and passes event on to children.
 void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+#ifdef __WXMAC__
+    // The app workspace colour is always white, but we should have
+    // a contrast with the page.
+    wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
+#else
+    wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
+#endif    
+    SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
     Refresh();
-    
+
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
 
+void wxPreviewCanvas::OnChar(wxKeyEvent &event)
+{
+    wxPreviewControlBar* controlBar = ((wxPreviewFrame*) GetParent())->GetControlBar();
+    if (event.GetKeyCode() == WXK_ESCAPE)
+    {
+        ((wxPreviewFrame*) GetParent())->Close(TRUE);
+        return;
+    }    
+    else if (event.GetKeyCode() == WXK_TAB)
+    {
+        controlBar->OnGoto();
+        return;
+    }
+    else if (event.GetKeyCode() == WXK_RETURN)
+    {
+        controlBar->OnPrint();
+        return;
+    }
+
+    if (!event.ControlDown())
+    {
+        event.Skip();
+        return;
+    }
+    
+    switch(event.GetKeyCode())
+    {
+        case WXK_NEXT:
+            controlBar->OnNext(); break;
+        case WXK_PRIOR:
+            controlBar->OnPrevious(); break;
+        case WXK_HOME:
+            controlBar->OnFirst(); break;
+        case WXK_END:
+            controlBar->OnLast(); break;
+        default:
+            event.Skip();
+    }
+}
+
 /*
 * Preview control bar
 */
 
 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::OnPrintButton)
+    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_CHOICE(wxID_PREVIEW_ZOOM,     wxPreviewControlBar::OnZoom)
+    EVT_PAINT(wxPreviewControlBar::OnPaint)
 END_EVENT_TABLE()
 
 wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,
@@ -252,7 +317,7 @@ wxPreviewControlBar::~wxPreviewControlBar()
 void wxPreviewControlBar::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
-    
+
     int w, h;
     GetSize(&w, &h);
     dc.SetPen(*wxBLACK_PEN);
@@ -266,13 +331,13 @@ void wxPreviewControlBar::OnWindowClose(wxCommandEvent& WXUNUSED(event))
     frame->Close(TRUE);
 }
 
-void wxPreviewControlBar::OnPrint(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnPrint(void)
 {
     wxPrintPreviewBase *preview = GetPrintPreview();
     preview->Print(TRUE);
 }
 
-void wxPreviewControlBar::OnNext(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnNext(void)
 {
     wxPrintPreviewBase *preview = GetPrintPreview();
     if (preview)
@@ -287,7 +352,7 @@ void wxPreviewControlBar::OnNext(wxCommandEvent& WXUNUSED(event))
     }
 }
 
-void wxPreviewControlBar::OnPrevious(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnPrevious(void)
 {
     wxPrintPreviewBase *preview = GetPrintPreview();
     if (preview)
@@ -302,6 +367,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( _("Enter a page number between %d and %d:"),
+                preview->GetMinPage(), preview->GetMaxPage());
+            strPage.Printf( wxT("%d"), preview->GetCurrentPage() );
+
+            strPage =
+                wxGetTextFromUser( strPrompt, _("Goto Page"), strPage, GetParent());
+
+            if ( strPage.ToLong( &currentPage ) )
+                if (preview->GetPrintout()->HasPage(currentPage))
+                {
+                    preview->SetCurrentPage(currentPage);
+                }
+        }
+    }
+}
+
 void wxPreviewControlBar::OnZoom(wxCommandEvent& WXUNUSED(event))
 {
     int zoom = GetZoomControl();
@@ -312,115 +431,86 @@ void wxPreviewControlBar::OnZoom(wxCommandEvent& WXUNUSED(event))
 void wxPreviewControlBar::CreateButtons()
 {
     SetSize(0, 0, 400, 40);
+
+    wxBoxSizer *item0 = new wxBoxSizer( wxHORIZONTAL );
     
-    /*
-    #ifdef __WXMSW__
-    int fontSize = 9;
-    #else
-    int fontSize = 10;
-    #endif
-    
-      wxFont buttonFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
-      SetFont(buttonFont);
-    */
-    
-    int buttonWidth = 65;
-#ifdef __WXGTK__
-    int buttonHeight = -1;
-#else
-    int buttonHeight = 24;
-#endif
-    
-    int x = 5;
-    int y = 5;
-    
-#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));
+    int smallButtonWidth = 45;
     
-    x += gap + buttonWidth;
+    m_closeButton = new wxButton( this, wxID_PREVIEW_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( m_closeButton, 0, wxALIGN_CENTRE|wxALL, 5 );
     
     if (m_buttonFlags & wxPREVIEW_PRINT)
     {
-        m_printButton =  new wxButton(this, wxID_PREVIEW_PRINT, _("Print..."), wxPoint(x, y),
-            wxSize(buttonWidth, buttonHeight));
-        x += gap + buttonWidth;
+        m_printButton = new wxButton( this, wxID_PREVIEW_PRINT, _("&Print..."), wxDefaultPosition, wxDefaultSize, 0 );
+        item0->Add( m_printButton, 0, wxALIGN_CENTRE|wxALL, 5 );
+    }
+    
+    if (m_buttonFlags & wxPREVIEW_FIRST)
+    {
+        m_firstPageButton = new wxButton( this, wxID_PREVIEW_FIRST, _("|<<"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
+        item0->Add( m_firstPageButton, 0, wxALIGN_CENTRE|wxALL, 5 );
     }
     
     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, _("<<"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
+        item0->Add( m_previousPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
     }
     
     if (m_buttonFlags & wxPREVIEW_NEXT)
     {
-        m_nextPageButton = new wxButton(this, wxID_PREVIEW_NEXT, ">>",
-            wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
-        x += gap + buttonWidth;
+        m_nextPageButton = new wxButton( this, wxID_PREVIEW_NEXT, _(">>"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
+        item0->Add( m_nextPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
     }
     
-    // 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%";
+    if (m_buttonFlags & wxPREVIEW_LAST)
+    {
+        m_lastPageButton = new wxButton( this, wxID_PREVIEW_LAST, _(">>|"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
+        item0->Add( m_lastPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
+    }
+    
+    if (m_buttonFlags & wxPREVIEW_GOTO)
+    {
+        m_gotoPageButton = new wxButton( this, wxID_PREVIEW_GOTO, _("&Goto..."), wxDefaultPosition, wxDefaultSize, 0 );
+        item0->Add( m_gotoPageButton, 0, wxALIGN_CENTRE|wxALL, 5 );
+    }
     
-    int n = 23;
     if (m_buttonFlags & wxPREVIEW_ZOOM)
     {
-        m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM, wxPoint(x, y),
-            wxSize(100, -1), n, (wxString *)choices);
+        wxString 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);
+        
+        m_zoomControl = new wxChoice( this, wxID_PREVIEW_ZOOM, wxDefaultPosition, wxSize(70,-1), n, choices, 0 );
+        item0->Add( m_zoomControl, 0, wxALIGN_CENTRE|wxALL, 5 );
         SetZoomControl(m_printPreview->GetZoom());
     }
-    
-    delete[] choices;
-    
-    //  m_closeButton->SetDefault();
+
+    SetSizer(item0);
+    item0->Fit(this);
 }
 
 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()
 {
-    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;
 }
@@ -431,26 +521,37 @@ int wxPreviewControlBar::GetZoomControl()
 */
 
 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,
+wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxWindow *parent, const wxString& title,
                                const wxPoint& pos, const wxSize& size, long style, const wxString& name):
 wxFrame(parent, -1, title, pos, size, style, name)
 {
     m_printPreview = preview;
     m_controlBar = NULL;
     m_previewCanvas = NULL;
+
+    // Give the application icon
+#ifdef __WXMSW__
+    wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
+    if (topFrame)
+        SetIcon(topFrame->GetIcon());
+#endif    
 }
 
 wxPreviewFrame::~wxPreviewFrame()
 {
 }
 
-void wxPreviewFrame::OnCloseWindow(wxCloseEvent& event)
+void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
+    // MakeModal doesn't work on wxMac, especially when there
+    // are multiple top-level windows.
+#ifndef __WXMAC__
     MakeModal(FALSE);
-    
+#endif    
+
     // Need to delete the printout and the print preview
     wxPrintout *printout = m_printPreview->GetPrintout();
     if (printout)
@@ -461,55 +562,40 @@ void wxPreviewFrame::OnCloseWindow(wxCloseEvent& event)
         m_printPreview->SetFrame(NULL);
     }
     delete m_printPreview;
-    
+
     Destroy();
 }
 
 void wxPreviewFrame::Initialize()
 {
+#if wxUSE_STATUSBAR
     CreateStatusBar();
-    
+#endif
     CreateCanvas();
     CreateControlBar();
-    
+
     m_printPreview->SetCanvas(m_previewCanvas);
     m_printPreview->SetFrame(this);
-    
-    // Set layout constraints here
-    
-    // Control bar constraints
-    wxLayoutConstraints *c1 = new wxLayoutConstraints;
-    //  int w, h;
-    //  m_controlBar->GetSize(&w, &h);
-    int h;
-#if (defined(__WXMSW__) || defined(__WXGTK__))
-    h = 40;
-#else
-    h = 60;
-#endif
-    
-    c1->left.SameAs       (this, wxLeft);
-    c1->top.SameAs        (this, wxTop);
-    c1->right.SameAs      (this, wxRight);
-    c1->height.Absolute   (h);
-    
-    m_controlBar->SetConstraints(c1);
-    
-    // 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);
-    
-    m_previewCanvas->SetConstraints(c2);
-    
-    SetAutoLayout(TRUE);
-    
+
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+
+    item0->Add( m_controlBar, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( m_previewCanvas, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+
+    SetAutoLayout( TRUE );
+    SetSizer( item0 );
+
+    // MakeModal doesn't work on wxMac, especially when there
+    // are multiple top-level windows.
+#ifndef __WXMAC__
     MakeModal(TRUE);
-    
+#endif
+
     Layout();
+    
+    m_printPreview->AdjustScrollbars(m_previewCanvas);
+    m_previewCanvas->SetFocus();
+    m_controlBar->SetFocus();
 }
 
 void wxPreviewFrame::CreateCanvas()
@@ -522,7 +608,7 @@ void wxPreviewFrame::CreateControlBar()
     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();
 }
@@ -531,32 +617,48 @@ void wxPreviewFrame::CreateControlBar()
 * 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_printPrintout = printoutForPrinting;
-    if (data)
-        m_printDialogData = (*data);
-    
+
     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;
-    
-    printout->OnPreparePrinting();
-    
-    // Get some parameters from the printout, if defined
-    int selFrom, selTo;
-    printout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo);
+    m_printingPrepared = FALSE;
+    m_minPage = 1;
+    m_maxPage = 1;
 }
 
 wxPrintPreviewBase::~wxPrintPreviewBase()
@@ -573,7 +675,7 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
 {
     if (m_currentPage == pageNum)
         return TRUE;
-    
+
     m_currentPage = pageNum;
     if (m_previewBitmap)
     {
@@ -583,136 +685,180 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
     
     if (m_previewCanvas)
     {
-        RenderPage(pageNum);
+        AdjustScrollbars(m_previewCanvas);
+        
+        if (!RenderPage(pageNum))
+            return FALSE;
         m_previewCanvas->Refresh();
+        m_previewCanvas->SetFocus();
     }
     return TRUE;
 }
 
-bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
+bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
 {
     DrawBlankPage(canvas, dc);
-    
+
     if (!m_previewBitmap)
-        RenderPage(m_currentPage);
-    
+        if (!RenderPage(m_currentPage))
+            return FALSE;
+
     if (!m_previewBitmap)
         return FALSE;
-    
+
     if (!canvas)
         return FALSE;
-    
+
     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);
-    
+
     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);
-    
+
     dc.Blit(x, y, m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0);
-    
+
     temp_dc.SelectObject(wxNullBitmap);
-    
+
     return TRUE;
 }
 
+// Adjusts the scrollbars for the current scale
+void wxPrintPreviewBase::AdjustScrollbars(wxPreviewCanvas *canvas)
+{
+    if (!canvas)
+        return ;
+
+    int canvasWidth, canvasHeight;
+    canvas->GetSize(&canvasWidth, &canvasHeight);
+
+    double zoomScale = ((float)m_currentZoom/(float)100);
+    double actualWidth = (zoomScale*m_pageWidth*m_previewScale);
+    double actualHeight = (zoomScale*m_pageHeight*m_previewScale);
+
+    // Set the scrollbars appropriately
+    int totalWidth = (int)(actualWidth + 2*m_leftMargin);
+    int totalHeight = (int)(actualHeight + 2*m_topMargin);
+    int scrollUnitsX = totalWidth/10;
+    int scrollUnitsY = totalHeight/10;
+    wxSize virtualSize = canvas->GetVirtualSize();
+    if (virtualSize.GetWidth() != totalWidth || virtualSize.GetHeight() != totalHeight)
+        canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, TRUE);    
+}
+
 bool wxPrintPreviewBase::RenderPage(int pageNum)
 {
+    wxBusyCursor busy;
+
     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);
-    
+
     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;
-    
-    
+
+
     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;
+                m_previewBitmap = NULL;
+            }
             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()))
     {
         wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);
-        
+
         memoryDC.SelectObject(wxNullBitmap);
-        
+
         delete m_previewBitmap;
+        m_previewBitmap = NULL;
         return FALSE;
     }
-    
+
     m_previewPrintout->OnPrintPage(pageNum);
     m_previewPrintout->OnEndDocument();
     m_previewPrintout->OnEndPrinting();
-    
+
     m_previewPrintout->SetDC(NULL);
-    
+
     memoryDC.SelectObject(wxNullBitmap);
-    
-    char buf[200];
+
+#if wxUSE_STATUSBAR
+    wxString status;
     if (m_maxPage != 0)
-        sprintf(buf, _("Page %d of %d"), pageNum, m_maxPage);
+               status = wxString::Format(_("Page %d of %d"), pageNum, m_maxPage);
     else
-        sprintf(buf, _("Page %d"), pageNum);
-    
+               status = wxString::Format(_("Page %d"), pageNum);
+
     if (m_previewFrame)
-        m_previewFrame->SetStatusText(buf);
-    
+        m_previewFrame->SetStatusText(status);
+#endif
+
     return TRUE;
 }
 
 
-bool wxPrintPreviewBase::DrawBlankPage(wxWindow *canvas, wxDC& dc)
+bool wxPrintPreviewBase::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)
 {
     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 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);
@@ -722,20 +868,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));
-    
+
     // 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();
-    
+
       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));
-    
+
     return TRUE;
 }
 
@@ -743,19 +889,23 @@ void wxPrintPreviewBase::SetZoom(int percent)
 {
     if (m_currentZoom == percent)
         return;
-    
+
     m_currentZoom = percent;
     if (m_previewBitmap)
     {
         delete m_previewBitmap;
         m_previewBitmap = NULL;
     }
-    RenderPage(m_currentPage);
-    
+
     if (m_previewCanvas)
     {
+        AdjustScrollbars(m_previewCanvas);
+        RenderPage(m_currentPage);
+        ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
         m_previewCanvas->Clear();
         m_previewCanvas->Refresh();
+        m_previewCanvas->SetFocus();
     }
 }
 
+#endif // wxUSE_PRINTING_ARCHITECTURE