updated license info: Remstar gace permission to change it to wxWindows License with...

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

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index c1a6732be559ddfbb58bee9b45810aa620feea0f..bb29c3e968d9eb0633cbf6db171fe534310bb25c 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -5,11 +5,11 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "prntbase.h"
 #endif
 
 #pragma implementation "prntbase.h"
 #endif
 


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


@@ -46,8 +48,6 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include <wx/sizer.h>
-                                         

 #ifdef __WXMSW__
     #include "wx/msw/private.h"
     #include <commdlg.h>
 #ifdef __WXMSW__
     #include "wx/msw/private.h"
     #include <commdlg.h>


@@ -70,6 +70,7 @@ END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
     EVT_PAINT(wxPreviewCanvas::OnPaint)
 
 BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
     EVT_PAINT(wxPreviewCanvas::OnPaint)

+    EVT_CHAR(wxPreviewCanvas::OnChar)

     EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
 END_EVENT_TABLE()
 
     EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
 END_EVENT_TABLE()
 


@@ -183,14 +184,25 @@ void wxPrintout::GetPageInfo(int *minPage, int *maxPage, int *fromPage, int *toP
 * Preview canvas
 */
 
 * Preview canvas
 */
 

+// 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):
 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, -1, pos, size, style | wxFULL_REPAINT_ON_RESIZE, name)

 {
     m_printPreview = preview;
 {
     m_printPreview = preview;

-    SetBackgroundColour(wxSystemSettings::GetColour(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));

 
 

-    SetScrollbars(15, 18, 100, 100);
+    SetScrollbars(10, 10, 100, 100);

 }
 
 wxPreviewCanvas::~wxPreviewCanvas()
 }
 
 wxPreviewCanvas::~wxPreviewCanvas()


@@ -218,26 +230,72 @@ 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::GetColour(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);
 }
 
     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)
 /*
 * 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_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_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()
     EVT_CHOICE(wxID_PREVIEW_ZOOM,     wxPreviewControlBar::OnZoom)
     EVT_PAINT(wxPreviewControlBar::OnPaint)
 END_EVENT_TABLE()


@@ -277,31 +335,12 @@ void wxPreviewControlBar::OnWindowClose(wxCommandEvent& WXUNUSED(event))
     frame->Close(TRUE);
 }
 
     frame->Close(TRUE);
 }
 

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

 {
     wxPrintPreviewBase *preview = GetPrintPreview();
     preview->Print(TRUE);
 }
 
 {
     wxPrintPreviewBase *preview = GetPrintPreview();
     preview->Print(TRUE);
 }
 

-void wxPreviewControlBar::OnChar(wxKeyEvent &event)
-{
-   switch(event.KeyCode())
-   {
-   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();
 void wxPreviewControlBar::OnNext(void)
 {
     wxPrintPreviewBase *preview = GetPrintPreview();


@@ -370,12 +409,12 @@ void wxPreviewControlBar::OnGoto(void)
             wxString strPrompt;
             wxString strPage;
 
             wxString strPrompt;
             wxString strPage;
 

-            strPrompt.Printf( _("%d...%d"),
+            strPrompt.Printf( _("Enter a page number between %d and %d:"),

                 preview->GetMinPage(), preview->GetMaxPage());
                 preview->GetMinPage(), preview->GetMaxPage());

-            strPage.Printf( _("%d"), preview->GetCurrentPage() );
+            strPage.Printf( wxT("%d"), preview->GetCurrentPage() );

 
             strPage =
 
             strPage =

-                wxGetTextFromUser( strPrompt, _("Goto Page"), strPage);
+                wxGetTextFromUser( strPrompt, _("Goto Page"), strPage, GetParent());

 
             if ( strPage.ToLong( &currentPage ) )
                 if (preview->GetPrintout()->HasPage(currentPage))
 
             if ( strPage.ToLong( &currentPage ) )
                 if (preview->GetPrintout()->HasPage(currentPage))


@@ -397,130 +436,96 @@ void wxPreviewControlBar::CreateButtons()
 {
     SetSize(0, 0, 400, 40);
 
 {
     SetSize(0, 0, 400, 40);
 

-    /*
-    #ifdef __WXMSW__
-    int fontSize = 9;
-    #else
-    int fontSize = 10;
-    #endif
-
-      wxFont buttonFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
-      SetFont(buttonFont);
-    */
-
-    int buttonWidth = 60;
-    int buttonNavigation = 30;
-#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));
+    wxBoxSizer *item0 = new wxBoxSizer( wxHORIZONTAL );

 
 

-    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)
     {
 
     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)
     {
     }
 
     if (m_buttonFlags & wxPREVIEW_FIRST)
     {

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

-        m_previousPageButton = new wxButton(this, wxID_PREVIEW_PREVIOUS, wxT("<<"), wxPoint(x, y),
-            wxSize(buttonNavigation, buttonHeight));
-        x += gap + buttonNavigation;
+        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)
     {
     }
 
     if (m_buttonFlags & wxPREVIEW_NEXT)
     {

-        m_nextPageButton = new wxButton(this, wxID_PREVIEW_NEXT, wxT(">>"),
-            wxPoint(x, y), wxSize(buttonNavigation, buttonHeight));
-        x += gap + buttonNavigation;
+        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)
     {
     }
 
     if (m_buttonFlags & wxPREVIEW_LAST)
     {

-        m_lastPageButton = new wxButton(this, wxID_PREVIEW_LAST, wxT(">>|"), wxPoint(x, y),
-            wxSize(buttonNavigation, buttonHeight));
-        x += gap + buttonNavigation;
+        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)
     {
     }
 
     if (m_buttonFlags & wxPREVIEW_GOTO)
     {

-        m_gotoPageButton = new wxButton(this, wxID_PREVIEW_GOTO, wxT("Goto..."), wxPoint(x, y),
-            wxSize(buttonWidth, buttonHeight));
-        x += gap + buttonWidth;
+        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)
     {
     }
 
     if (m_buttonFlags & wxPREVIEW_ZOOM)
     {

-        static const char *choices[] =
+        wxString choices[] =

         {
         {

-            "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%",
-            "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "110%",
-            "120%", "150%", "200%"
+            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);
 
         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;
-
+        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());
     }
 
         SetZoomControl(m_printPreview->GetZoom());
     }
 

-    //  m_closeButton->SetDefault();
+    SetSizer(item0);
+    item0->Fit(this);

 }
 
 void wxPreviewControlBar::SetZoomControl(int zoom)
 {
 }
 
 void wxPreviewControlBar::SetZoomControl(int zoom)
 {

-    char buf[20];
-    sprintf(buf, "%d%%", zoom);
-// Someone is calling methods that do no exist in wxChoice!! So I'll just comment out for VA for now

     if (m_zoomControl)
     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()
 {
 }
 
 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;

 }
 
 
 }
 
 


@@ -532,13 +537,21 @@ BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
     EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
     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;
                                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;

+    m_windowDisabler = NULL;
+
+    // Give the application icon
+#ifdef __WXMSW__
+    wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
+    if (topFrame)
+        SetIcon(topFrame->GetIcon());
+#endif

 }
 
 wxPreviewFrame::~wxPreviewFrame()
 }
 
 wxPreviewFrame::~wxPreviewFrame()


@@ -547,7 +560,8 @@ wxPreviewFrame::~wxPreviewFrame()
 
 void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
 
 void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {

-    MakeModal(FALSE);
+    if (m_windowDisabler)
+        delete m_windowDisabler;

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


@@ -565,49 +579,30 @@ void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
 void wxPreviewFrame::Initialize()
 {
 
 void wxPreviewFrame::Initialize()
 {

+#if wxUSE_STATUSBAR

     CreateStatusBar();
     CreateStatusBar();

-
+#endif

     CreateCanvas();
     CreateControlBar();
 
     m_printPreview->SetCanvas(m_previewCanvas);
     m_printPreview->SetFrame(this);
 
     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);
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );

 
 

-    m_previewCanvas->SetConstraints(c2);
+    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(TRUE);
+    m_windowDisabler = new wxWindowDisabler(this);

 
     Layout();
 
     Layout();

+
+    m_printPreview->AdjustScrollbars(m_previewCanvas);
+    m_previewCanvas->SetFocus();
+    m_controlBar->SetFocus();

 }
 
 void wxPreviewFrame::CreateCanvas()
 }
 
 void wxPreviewFrame::CreateCanvas()


@@ -669,13 +664,8 @@ void wxPrintPreviewBase::Init(wxPrintout *printout,
     m_pageWidth = 0;
     m_pageHeight = 0;
     m_printingPrepared = FALSE;
     m_pageWidth = 0;
     m_pageHeight = 0;
     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);
+    m_minPage = 1;
+    m_maxPage = 1;

 }
 
 wxPrintPreviewBase::~wxPrintPreviewBase()
 }
 
 wxPrintPreviewBase::~wxPrintPreviewBase()


@@ -702,14 +692,17 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
 
     if (m_previewCanvas)
     {
 
     if (m_previewCanvas)
     {

+        AdjustScrollbars(m_previewCanvas);
+

         if (!RenderPage(pageNum))
             return FALSE;
         m_previewCanvas->Refresh();
         if (!RenderPage(pageNum))
             return FALSE;
         m_previewCanvas->Refresh();

+        m_previewCanvas->SetFocus();

     }
     return TRUE;
 }
 
     }
     return TRUE;
 }
 

-bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
+bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)

 {
     DrawBlankPage(canvas, dc);
 
 {
     DrawBlankPage(canvas, dc);
 


@@ -745,6 +738,29 @@ bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
     return TRUE;
 }
 
     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;
 bool wxPrintPreviewBase::RenderPage(int pageNum)
 {
     wxBusyCursor busy;


@@ -763,12 +779,6 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
     int actualWidth = (int)(zoomScale*m_pageWidth*m_previewScale);
     int actualHeight = (int)(zoomScale*m_pageHeight*m_previewScale);
 
     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 = new wxBitmap((int)actualWidth, (int)actualHeight);


@@ -795,6 +805,8 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
     if (!m_printingPrepared)
     {
         m_previewPrintout->OnPreparePrinting();
     if (!m_printingPrepared)
     {
         m_previewPrintout->OnPreparePrinting();

+        int selFrom, selTo;
+        m_previewPrintout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo);

         m_printingPrepared = TRUE;
     }
 
         m_printingPrepared = TRUE;
     }
 


@@ -819,20 +831,22 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
 
     memoryDC.SelectObject(wxNullBitmap);
 
 
     memoryDC.SelectObject(wxNullBitmap);
 

-    wxChar buf[200];
+#if wxUSE_STATUSBAR
+    wxString status;

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

-        wxSprintf(buf, _("Page %d of %d"), pageNum, m_maxPage);
+               status = wxString::Format(_("Page %d of %d"), pageNum, m_maxPage);

     else
     else

-        wxSprintf(buf, _("Page %d"), pageNum);
+               status = wxString::Format(_("Page %d"), pageNum);

 
     if (m_previewFrame)
 
     if (m_previewFrame)

-        m_previewFrame->SetStatusText(buf);
+        m_previewFrame->SetStatusText(status);
+#endif

 
     return TRUE;
 }
 
 
 
     return TRUE;
 }
 
 

-bool wxPrintPreviewBase::DrawBlankPage(wxWindow *canvas, wxDC& dc)
+bool wxPrintPreviewBase::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)

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


@@ -886,10 +900,12 @@ void wxPrintPreviewBase::SetZoom(int percent)
 
     if (m_previewCanvas)
     {
 
     if (m_previewCanvas)
     {

+        AdjustScrollbars(m_previewCanvas);

         RenderPage(m_currentPage);
         ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
         RenderPage(m_currentPage);
         ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);

-        m_previewCanvas->Clear();
+        m_previewCanvas->ClearBackground();

         m_previewCanvas->Refresh();
         m_previewCanvas->Refresh();

+        m_previewCanvas->SetFocus();

     }
 }
 
     }
 }