]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/prntbase.cpp
at least partially implemented vswscanf() -- otherwise wx apps compiled against glibc...
[wxWidgets.git] / src / common / prntbase.cpp
index 8b9498215496132d7c56932fef237bcbf0f77d2e..3ff2d387a9c35cc42e35da9d53f68f4425a823c1 100644 (file)
@@ -9,8 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "prntbase.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+  #pragma implementation "prntbase.h"
+  #pragma implementation "printdlg.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -43,6 +44,7 @@
 #include "wx/prntbase.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
+#include "wx/print.h"
 #include "wx/module.h"
 
 #include <stdlib.h>
     #endif
 #endif // __WXMSW__
 
-IMPLEMENT_CLASS(wxPrinterBase, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
-IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
-IMPLEMENT_CLASS(wxPreviewControlBar, wxWindow)
-IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
 IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
 
-BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
-    EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
-END_EVENT_TABLE()
+//----------------------------------------------------------------------------
+// wxPrintFactory
+//----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
-    EVT_PAINT(wxPreviewCanvas::OnPaint)
-    EVT_CHAR(wxPreviewCanvas::OnChar)
-    EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
-END_EVENT_TABLE()
+wxPrintFactory *wxPrintFactory::m_factory = NULL;
 
-/*
-* Printer
-*/
+void wxPrintFactory::SetPrintFactory( wxPrintFactory *factory )
+{
+    if (wxPrintFactory::m_factory)
+        delete wxPrintFactory::m_factory;
+
+    wxPrintFactory::m_factory = factory;
+}
+
+wxPrintFactory *wxPrintFactory::GetFactory()
+{
+    if (!wxPrintFactory::m_factory)
+        wxPrintFactory::m_factory = new wxNativePrintFactory;
+
+    return wxPrintFactory::m_factory;
+}
+
+//----------------------------------------------------------------------------
+// wxNativePrintFactory
+//----------------------------------------------------------------------------
+
+wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrinter( data );
+#elif defined(__WXMAC__)
+    return new wxMacPrinter( data );
+#elif defined(__WXPM__)
+    return new wxOS2Printer( data );
+#else
+    return new wxPostScriptPrinter( data );
+#endif
+};
+
+wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
+    wxPrintout *printout, wxPrintDialogData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrintPreview( preview, printout, data );
+#elif defined(__WXMAC__)
+    return new wxMacPrintPreview( preview, printout, data );
+#elif defined(__WXPM__)
+    return new wxOS2PrintPreview( preview, printout, data );
+#else
+    return new wxPostScriptPrintPreview( preview, printout, data );
+#endif
+}
+
+wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
+    wxPrintout *printout, wxPrintData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrintPreview( preview, printout, data );
+#elif defined(__WXMAC__)
+    return new wxMacPrintPreview( preview, printout, data );
+#elif defined(__WXPM__)
+    return new wxOS2PrintPreview( preview, printout, data );
+#else
+    return new wxPostScriptPrintPreview( preview, printout, data );
+#endif
+}
+
+wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, 
+                                                  wxPrintDialogData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrintDialog( parent, data );
+#elif defined(__WXMAC__)
+    return new wxMacPrintDialog( parent, data );
+#else
+    return new wxGenericPrintDialog( parent, data );
+#endif
+}
+
+wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, 
+                                                  wxPrintData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrintDialog( parent, data );
+#elif defined(__WXMAC__)
+    return new wxMacPrintDialog( parent, data );
+#else
+    return new wxGenericPrintDialog( parent, data );
+#endif
+}
+
+wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData()
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrintNativeData;
+#elif defined(__WXMAC__)
+    return new wxMacPrintNativeData;
+#else
+    return new wxPostScriptPrintNativeData;
+#endif
+}
+
+//----------------------------------------------------------------------------
+// wxPrintNativeDataBase
+//----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxPrintNativeDataBase, wxObject)
+
+wxPrintNativeDataBase::wxPrintNativeDataBase()
+{ 
+    m_ref = 1; 
+}
+
+//----------------------------------------------------------------------------
+// wxPrinterBase
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPrinterBase, wxObject)
 
 wxPrinterBase::wxPrinterBase(wxPrintDialogData *data)
 {
     m_currentPrintout = (wxPrintout *) NULL;
     sm_abortWindow = (wxWindow *) NULL;
-    sm_abortIt = FALSE;
+    sm_abortIt = false;
     if (data)
         m_printDialogData = (*data);
     sm_lastError = wxPRINTER_NO_ERROR;
 }
 
 wxWindow *wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
-bool wxPrinterBase::sm_abortIt = FALSE;
+bool wxPrinterBase::sm_abortIt = false;
 wxPrinterError wxPrinterBase::sm_lastError = wxPRINTER_NO_ERROR;
 
 wxPrinterBase::~wxPrinterBase()
 {
 }
 
-void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-    wxPrinterBase::sm_abortIt = TRUE;
-    wxPrinterBase::sm_abortWindow->Show(FALSE);
-    wxPrinterBase::sm_abortWindow->Close(TRUE);
-    wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
-}
-
 wxWindow *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout * printout)
 {
     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 wxStaticText(dialog, wxID_ANY, _("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->SetAutoLayout( true );
     dialog->SetSizer( button_sizer );
 
     button_sizer->Fit(dialog);
@@ -126,9 +220,142 @@ void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout)
     wxMessageBox(message, _("Printing Error"), wxOK, parent);
 }
 
-/*
-* Printout class
-*/
+wxPrintDialogData& wxPrinterBase::GetPrintDialogData() const
+{
+    return (wxPrintDialogData&) m_printDialogData;
+}
+
+//----------------------------------------------------------------------------
+// wxPrinter
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPrinter, wxPrinterBase)
+
+wxPrinter::wxPrinter(wxPrintDialogData *data)
+{
+    m_pimpl = wxPrintFactory::GetFactory()->CreatePrinter( data );
+}
+
+wxPrinter::~wxPrinter()
+{
+    delete m_pimpl;
+}
+
+wxWindow *wxPrinter::CreateAbortWindow(wxWindow *parent, wxPrintout *printout)
+{
+    return m_pimpl->CreateAbortWindow( parent, printout );
+}
+
+void wxPrinter::ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message)
+{
+    m_pimpl->ReportError( parent, printout, message );
+}
+
+bool wxPrinter::Setup(wxWindow *parent)
+{
+    return m_pimpl->Setup( parent );
+}
+
+bool wxPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
+{
+    return m_pimpl->Print( parent, printout, prompt );
+}
+
+wxDC* wxPrinter::PrintDialog(wxWindow *parent)
+{
+    return m_pimpl->PrintDialog( parent );
+}
+
+wxPrintDialogData& wxPrinter::GetPrintDialogData() const
+{
+    return m_pimpl->GetPrintDialogData();
+}
+
+// ---------------------------------------------------------------------------
+// wxPrintDialogBase: the common dialog for printing.
+// ---------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxObject)
+
+wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
+                                     wxWindowID id, 
+                                     const wxString &title,
+                                     const wxPoint &pos,
+                                     const wxSize &size,
+                                     long style)
+                 : wxDialog
+                   (
+                        parent,
+                        id,
+                        title.empty() ? wxString(_("Print")) : title,
+                        pos,
+                        size,
+                        style
+                   )
+{
+}
+
+// ---------------------------------------------------------------------------
+// wxPrintDialog: the common dialog for printing.
+// ---------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPrintDialog, wxObject)
+
+wxPrintDialog::wxPrintDialog(wxWindow *parent, wxPrintDialogData* data)
+{
+    m_pimpl = wxPrintFactory::GetFactory()->CreatePrintDialog( parent, data );
+}
+
+wxPrintDialog::wxPrintDialog(wxWindow *parent, wxPrintData* data)
+{
+    m_pimpl = wxPrintFactory::GetFactory()->CreatePrintDialog( parent, data );
+}
+
+wxPrintDialog::~wxPrintDialog()
+{
+    delete m_pimpl;
+}
+
+int wxPrintDialog::ShowModal()
+{
+    return m_pimpl->ShowModal();
+}
+
+wxPrintDialogData& wxPrintDialog::GetPrintDialogData()
+{
+    return m_pimpl->GetPrintDialogData();
+}
+
+wxPrintData& wxPrintDialog::GetPrintData()
+{
+    return m_pimpl->GetPrintData();
+}
+wxDC *wxPrintDialog::GetPrintDC()
+{
+    return m_pimpl->GetPrintDC();
+}
+
+//----------------------------------------------------------------------------
+// wxPrintAbortDialog
+//----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
+    EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
+END_EVENT_TABLE()
+
+void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
+{
+    wxPrinterBase::sm_abortIt = true;
+    wxPrinterBase::sm_abortWindow->Show(false);
+    wxPrinterBase::sm_abortWindow->Close(true);
+    wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
+}
+
+//----------------------------------------------------------------------------
+// wxPrintout
+//----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
 
 wxPrintout::wxPrintout(const wxString& title)
 {
@@ -142,7 +369,7 @@ wxPrintout::wxPrintout(const wxString& title)
     m_PPIScreenY = 0;
     m_PPIPrinterX = 0;
     m_PPIPrinterY = 0;
-    m_isPreview = FALSE;
+    m_isPreview = false;
 }
 
 wxPrintout::~wxPrintout()
@@ -180,13 +407,25 @@ void wxPrintout::GetPageInfo(int *minPage, int *maxPage, int *fromPage, int *toP
     *toPage = 1;
 }
 
-/*
-* Preview canvas
-*/
+//----------------------------------------------------------------------------
+// wxPreviewCanvas
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
+
+BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
+    EVT_PAINT(wxPreviewCanvas::OnPaint)
+    EVT_CHAR(wxPreviewCanvas::OnChar)
+    EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
+END_EVENT_TABLE()
 
+// VZ: the current code doesn't refresh properly without
+//     wxFULL_REPAINT_ON_RESIZE, this must be fixed as otherwise we have
+//     really horrible flicker when resizing the preview frame, but without
+//     this style it simply doesn't work correctly at all...
 wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
                                  const wxPoint& pos, const wxSize& size, long style, const wxString& name):
-wxScrolledWindow(parent, -1, pos, size, style, name)
+wxScrolledWindow(parent, wxID_ANY, pos, size, style | wxFULL_REPAINT_ON_RESIZE, name)
 {
     m_printPreview = preview;
 #ifdef __WXMAC__
@@ -195,7 +434,7 @@ wxScrolledWindow(parent, -1, pos, size, style, name)
     wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
 #else
     wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
-#endif    
+#endif
     SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
 
     SetScrollbars(10, 10, 100, 100);
@@ -232,7 +471,7 @@ void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
 #else
     wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
-#endif    
+#endif
     SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
     Refresh();
 
@@ -242,43 +481,53 @@ void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
 
 void wxPreviewCanvas::OnChar(wxKeyEvent &event)
 {
+    wxPreviewControlBar* controlBar = ((wxPreviewFrame*) GetParent())->GetControlBar();
     if (event.GetKeyCode() == WXK_ESCAPE)
     {
-        ((wxPreviewFrame*) GetParent())->Close(TRUE);
+        ((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;
     }
 
-    wxPreviewControlBar* controlBar = ((wxPreviewFrame*) GetParent())->GetControlBar();
-   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;
-   case WXK_TAB:
-      controlBar->OnGoto(); break;
-   default:
-      event.Skip();
-   }
+    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
-*/
+//----------------------------------------------------------------------------
+// wxPreviewControlBar
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPreviewControlBar, wxWindow)
 
 BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
     EVT_BUTTON(wxID_PREVIEW_CLOSE,    wxPreviewControlBar::OnWindowClose)
-    EVT_BUTTON(wxID_PREVIEW_PRINT,    wxPreviewControlBar::OnPrint)
+    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)
@@ -291,7 +540,7 @@ END_EVENT_TABLE()
 wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,
                                          wxWindow *parent, const wxPoint& pos, const wxSize& size,
                                          long style, const wxString& name):
-wxPanel(parent, -1, pos, size, style, name)
+wxPanel(parent, wxID_ANY, pos, size, style, name)
 {
     m_printPreview = preview;
     m_closeButton = (wxButton *) NULL;
@@ -320,13 +569,13 @@ void wxPreviewControlBar::OnPaint(wxPaintEvent& WXUNUSED(event))
 void wxPreviewControlBar::OnWindowClose(wxCommandEvent& WXUNUSED(event))
 {
     wxPreviewFrame *frame = (wxPreviewFrame *)GetParent();
-    frame->Close(TRUE);
+    frame->Close(true);
 }
 
-void wxPreviewControlBar::OnPrint(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnPrint(void)
 {
     wxPrintPreviewBase *preview = GetPrintPreview();
-    preview->Print(TRUE);
+    preview->Print(true);
 }
 
 void wxPreviewControlBar::OnNext(void)
@@ -425,59 +674,57 @@ void wxPreviewControlBar::CreateButtons()
     SetSize(0, 0, 400, 40);
 
     wxBoxSizer *item0 = new wxBoxSizer( wxHORIZONTAL );
-    
-    int smallButtonWidth = 45;
-    
+
     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..."), 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 );
+        m_firstPageButton = new wxButton( this, wxID_PREVIEW_FIRST, _("|<<"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
         item0->Add( m_firstPageButton, 0, wxALIGN_CENTRE|wxALL, 5 );
     }
-    
+
     if (m_buttonFlags & wxPREVIEW_PREVIOUS)
     {
-        m_previousPageButton = new wxButton( this, wxID_PREVIEW_PREVIOUS, _("<<"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
+        m_previousPageButton = new wxButton( this, wxID_PREVIEW_PREVIOUS, _("<<"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
         item0->Add( m_previousPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
     }
-    
+
     if (m_buttonFlags & wxPREVIEW_NEXT)
     {
-        m_nextPageButton = new wxButton( this, wxID_PREVIEW_NEXT, _(">>"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
+        m_nextPageButton = new wxButton( this, wxID_PREVIEW_NEXT, _(">>"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
         item0->Add( m_nextPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
     }
-    
+
     if (m_buttonFlags & wxPREVIEW_LAST)
     {
-        m_lastPageButton = new wxButton( this, wxID_PREVIEW_LAST, _(">>|"), wxDefaultPosition, wxSize(smallButtonWidth,-1), 0 );
+        m_lastPageButton = new wxButton( this, wxID_PREVIEW_LAST, _(">>|"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
         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 );
     }
-    
+
     if (m_buttonFlags & wxPREVIEW_ZOOM)
     {
-        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 );
+
+        m_zoomControl = new wxChoice( this, wxID_PREVIEW_ZOOM, wxDefaultPosition, wxSize(70,wxDefaultCoord), n, choices, 0 );
         item0->Add( m_zoomControl, 0, wxALIGN_CENTRE|wxALL, 5 );
         SetZoomControl(m_printPreview->GetZoom());
     }
@@ -488,23 +735,34 @@ void wxPreviewControlBar::CreateButtons()
 
 void wxPreviewControlBar::SetZoomControl(int zoom)
 {
-    wxChar buf[20];
-    wxSprintf( buf, wxT("%d%%"), zoom );
-
     if (m_zoomControl)
-        m_zoomControl->SetStringSelection(buf);
+    {
+        int n, count = m_zoomControl->GetCount();
+        long val;
+        for (n=0; n<count; n++)
+        {
+            if (m_zoomControl->GetString(n).BeforeFirst(wxT('%')).ToLong(&val) &&
+                (val >= long(zoom)))
+            {
+                m_zoomControl->SetSelection(n);
+                return;
+            }
+        }
+
+        m_zoomControl->SetSelection(count-1);
+    }
 }
 
 int wxPreviewControlBar::GetZoomControl()
 {
-    wxChar buf[20];
-    if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxT("")))
+    if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxEmptyString))
     {
-        wxStrcpy(buf, m_zoomControl->GetStringSelection());
-        buf[wxStrlen(buf) - 1] = 0;
-        return (int)wxAtoi(buf);
+        long val;
+        if (m_zoomControl->GetStringSelection().BeforeFirst(wxT('%')).ToLong(&val))
+            return int(val);
     }
-    else return 0;
+
+    return 0;
 }
 
 
@@ -512,24 +770,27 @@ int wxPreviewControlBar::GetZoomControl()
 * Preview frame
 */
 
+IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
+
 BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
     EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
 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)
+wxFrame(parent, wxID_ANY, title, pos, size, style, name)
 {
     m_printPreview = preview;
     m_controlBar = NULL;
     m_previewCanvas = NULL;
+    m_windowDisabler = NULL;
 
     // Give the application icon
 #ifdef __WXMSW__
     wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
     if (topFrame)
         SetIcon(topFrame->GetIcon());
-#endif    
+#endif
 }
 
 wxPreviewFrame::~wxPreviewFrame()
@@ -538,11 +799,8 @@ wxPreviewFrame::~wxPreviewFrame()
 
 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    
+    if (m_windowDisabler)
+        delete m_windowDisabler;
 
     // Need to delete the printout and the print preview
     wxPrintout *printout = m_printPreview->GetPrintout();
@@ -574,17 +832,13 @@ void wxPreviewFrame::Initialize()
     item0->Add( m_controlBar, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
     item0->Add( m_previewCanvas, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    SetAutoLayout( TRUE );
+    SetAutoLayout( true );
     SetSizer( item0 );
 
-    // MakeModal doesn't work on wxMac, especially when there
-    // are multiple top-level windows.
-#ifndef __WXMAC__
-    MakeModal(TRUE);
-#endif
+    m_windowDisabler = new wxWindowDisabler(this);
 
     Layout();
-    
+
     m_printPreview->AdjustScrollbars(m_previewCanvas);
     m_previewCanvas->SetFocus();
     m_controlBar->SetFocus();
@@ -632,10 +886,10 @@ wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
 void wxPrintPreviewBase::Init(wxPrintout *printout,
                               wxPrintout *printoutForPrinting)
 {
-    m_isOk = TRUE;
+    m_isOk = true;
     m_previewPrintout = printout;
     if (m_previewPrintout)
-        m_previewPrintout->SetIsPreview(TRUE);
+        m_previewPrintout->SetIsPreview(true);
 
     m_printPrintout = printoutForPrinting;
 
@@ -648,7 +902,7 @@ void wxPrintPreviewBase::Init(wxPrintout *printout,
     m_leftMargin = 40;
     m_pageWidth = 0;
     m_pageHeight = 0;
-    m_printingPrepared = FALSE;
+    m_printingPrepared = false;
     m_minPage = 1;
     m_maxPage = 1;
 }
@@ -666,7 +920,7 @@ wxPrintPreviewBase::~wxPrintPreviewBase()
 bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
 {
     if (m_currentPage == pageNum)
-        return TRUE;
+        return true;
 
     m_currentPage = pageNum;
     if (m_previewBitmap)
@@ -674,32 +928,49 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
         delete m_previewBitmap;
         m_previewBitmap = NULL;
     }
-    
+
     if (m_previewCanvas)
     {
         AdjustScrollbars(m_previewCanvas);
-        
+
         if (!RenderPage(pageNum))
-            return FALSE;
+            return false;
         m_previewCanvas->Refresh();
         m_previewCanvas->SetFocus();
     }
-    return TRUE;
+    return true;
 }
 
+int wxPrintPreviewBase::GetCurrentPage() const
+    { return m_currentPage; };
+void wxPrintPreviewBase::SetPrintout(wxPrintout *printout)
+    { m_previewPrintout = printout; };
+wxPrintout *wxPrintPreviewBase::GetPrintout() const
+    { return m_previewPrintout; };
+wxPrintout *wxPrintPreviewBase::GetPrintoutForPrinting() const
+    { return m_printPrintout; };
+void wxPrintPreviewBase::SetFrame(wxFrame *frame)
+    { m_previewFrame = frame; };
+void wxPrintPreviewBase::SetCanvas(wxPreviewCanvas *canvas)
+    { m_previewCanvas = canvas; };
+wxFrame *wxPrintPreviewBase::GetFrame() const
+    { return m_previewFrame; }
+wxPreviewCanvas *wxPrintPreviewBase::GetCanvas() const
+    { return m_previewCanvas; }
+
 bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
 {
     DrawBlankPage(canvas, dc);
 
     if (!m_previewBitmap)
         if (!RenderPage(m_currentPage))
-            return FALSE;
+            return false;
 
     if (!m_previewBitmap)
-        return FALSE;
+        return false;
 
     if (!canvas)
-        return FALSE;
+        return false;
 
     int canvasWidth, canvasHeight;
     canvas->GetSize(&canvasWidth, &canvasHeight);
@@ -720,7 +991,7 @@ bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
 
     temp_dc.SelectObject(wxNullBitmap);
 
-    return TRUE;
+    return true;
 }
 
 // Adjusts the scrollbars for the current scale
@@ -743,7 +1014,7 @@ void wxPrintPreviewBase::AdjustScrollbars(wxPreviewCanvas *canvas)
     int scrollUnitsY = totalHeight/10;
     wxSize virtualSize = canvas->GetVirtualSize();
     if (virtualSize.GetWidth() != totalWidth || virtualSize.GetHeight() != totalHeight)
-        canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, TRUE);    
+        canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, true);
 }
 
 bool wxPrintPreviewBase::RenderPage(int pageNum)
@@ -756,7 +1027,7 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
     {
         wxFAIL_MSG(_T("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!"));
 
-        return FALSE;
+        return false;
     }
     m_previewCanvas->GetSize(&canvasWidth, &canvasHeight);
 
@@ -764,12 +1035,6 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
     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);
@@ -780,7 +1045,7 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
                 m_previewBitmap = NULL;
             }
             wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
-            return FALSE;
+            return false;
         }
     }
 
@@ -798,7 +1063,7 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
         m_previewPrintout->OnPreparePrinting();
         int selFrom, selTo;
         m_previewPrintout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo);
-        m_printingPrepared = TRUE;
+        m_printingPrepared = true;
     }
 
     m_previewPrintout->OnBeginPrinting();
@@ -811,7 +1076,7 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
 
         delete m_previewBitmap;
         m_previewBitmap = NULL;
-        return FALSE;
+        return false;
     }
 
     m_previewPrintout->OnPrintPage(pageNum);
@@ -825,15 +1090,15 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
 #if wxUSE_STATUSBAR
     wxString status;
     if (m_maxPage != 0)
-               status = wxString::Format(_("Page %d of %d"), pageNum, m_maxPage);
+        status = wxString::Format(_("Page %d of %d"), pageNum, m_maxPage);
     else
-               status = wxString::Format(_("Page %d"), pageNum);
+        status = wxString::Format(_("Page %d"), pageNum);
 
     if (m_previewFrame)
         m_previewFrame->SetStatusText(status);
 #endif
 
-    return TRUE;
+    return true;
 }
 
 
@@ -874,7 +1139,7 @@ bool wxPrintPreviewBase::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)
 
     dc.DrawRectangle((int)(x-2), (int)(y-1), (int)(actualWidth+3), (int)(actualHeight+2));
 
-    return TRUE;
+    return true;
 }
 
 void wxPrintPreviewBase::SetZoom(int percent)
@@ -894,10 +1159,165 @@ void wxPrintPreviewBase::SetZoom(int percent)
         AdjustScrollbars(m_previewCanvas);
         RenderPage(m_currentPage);
         ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
-        m_previewCanvas->Clear();
+        m_previewCanvas->ClearBackground();
         m_previewCanvas->Refresh();
         m_previewCanvas->SetFocus();
     }
 }
 
+wxPrintDialogData& wxPrintPreviewBase::GetPrintDialogData()
+{
+    return m_printDialogData;
+}
+
+int wxPrintPreviewBase::GetZoom() const
+{ return m_currentZoom; }
+int wxPrintPreviewBase::GetMaxPage() const
+{ return m_maxPage; }
+int wxPrintPreviewBase::GetMinPage() const
+{ return m_minPage; }
+bool wxPrintPreviewBase::Ok() const
+{ return m_isOk; }
+void wxPrintPreviewBase::SetOk(bool ok)
+{ m_isOk = ok; }
+//----------------------------------------------------------------------------
+// wxPrintPreview
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
+
+wxPrintPreview::wxPrintPreview(wxPrintout *printout,
+                   wxPrintout *printoutForPrinting,
+                   wxPrintDialogData *data) :
+    wxPrintPreviewBase( printout, printoutForPrinting, data )
+{
+    m_pimpl = wxPrintFactory::GetFactory()->
+        CreatePrintPreview( printout, printoutForPrinting, data );
+}
+
+wxPrintPreview::wxPrintPreview(wxPrintout *printout,
+                   wxPrintout *printoutForPrinting,
+                   wxPrintData *data ) :
+    wxPrintPreviewBase( printout, printoutForPrinting, data )
+{
+    m_pimpl = wxPrintFactory::GetFactory()->
+        CreatePrintPreview( printout, printoutForPrinting, data );
+}
+
+wxPrintPreview::~wxPrintPreview()
+{
+    delete m_pimpl;
+
+    // don't delete twice
+    m_printPrintout = NULL;
+    m_previewPrintout = NULL;
+    m_previewBitmap = NULL;
+}
+
+bool wxPrintPreview::SetCurrentPage(int pageNum)
+{
+    return m_pimpl->SetCurrentPage( pageNum );
+}
+
+int wxPrintPreview::GetCurrentPage() const
+{
+    return m_pimpl->GetCurrentPage();
+}
+
+void wxPrintPreview::SetPrintout(wxPrintout *printout)
+{
+    m_pimpl->SetPrintout( printout );
+}
+
+wxPrintout *wxPrintPreview::GetPrintout() const
+{
+    return m_pimpl->GetPrintout();
+}
+
+wxPrintout *wxPrintPreview::GetPrintoutForPrinting() const
+{
+    return m_pimpl->GetPrintoutForPrinting();
+}
+
+void wxPrintPreview::SetFrame(wxFrame *frame)
+{
+    m_pimpl->SetFrame( frame );
+}
+
+void wxPrintPreview::SetCanvas(wxPreviewCanvas *canvas)
+{
+    m_pimpl->SetCanvas( canvas );
+}
+
+wxFrame *wxPrintPreview::GetFrame() const
+{
+    return m_pimpl->GetFrame();
+}
+
+wxPreviewCanvas *wxPrintPreview::GetCanvas() const
+{
+    return m_pimpl->GetCanvas();
+}
+
+bool wxPrintPreview::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
+{
+    return m_pimpl->PaintPage( canvas, dc );
+}
+
+bool wxPrintPreview::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)
+{
+    return m_pimpl->DrawBlankPage( canvas, dc );
+}
+
+void wxPrintPreview::AdjustScrollbars(wxPreviewCanvas *canvas)
+{
+    m_pimpl->AdjustScrollbars( canvas );
+}
+
+bool wxPrintPreview::RenderPage(int pageNum)
+{
+    return m_pimpl->RenderPage( pageNum );
+}
+
+void wxPrintPreview::SetZoom(int percent)
+{
+    m_pimpl->SetZoom( percent );
+}
+
+wxPrintDialogData& wxPrintPreview::GetPrintDialogData()
+{
+    return m_pimpl->GetPrintDialogData();
+}
+
+int wxPrintPreview::GetMaxPage() const
+{
+    return m_pimpl->GetMaxPage();
+}
+
+int wxPrintPreview::GetMinPage() const
+{
+    return m_pimpl->GetMinPage();
+}
+
+bool wxPrintPreview::Ok() const
+{
+    return m_pimpl->Ok();
+}
+
+void wxPrintPreview::SetOk(bool ok)
+{
+    m_pimpl->SetOk( ok );
+}
+
+bool wxPrintPreview::Print(bool interactive)
+{
+    return m_pimpl->Print( interactive );
+}
+
+void wxPrintPreview::DetermineScaling()
+{
+    m_pimpl->DetermineScaling();
+}
+
+
 #endif // wxUSE_PRINTING_ARCHITECTURE