]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/prntbase.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
minor fixes to wxLocale::GetSystemLanguage(), test code for it added to the console...
[wxWidgets.git] / src / common / prntbase.cpp
diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 006d7e2f5708d05ed231182ad1f7ceb96ce51ecc..a233f0f2067fb129ed0865a580b52c9778187af9 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:       wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -22,9 +22,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 
-#ifdef __WXMSW__
-#define __GOOD_COMPILER__
-#endif
+#if wxUSE_PRINTING_ARCHITECTURE
 
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
@@ -43,43 +41,20 @@
 #include "wx/prntbase.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #include "wx/prntbase.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
+#include "wx/module.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #ifdef __WXMSW__
 
 #include <stdlib.h>
 #include <string.h>
 
 #ifdef __WXMSW__
-#include <windows.h>
-#include <commdlg.h>
-
-// Clash with Windows header files
-#ifdef StartDoc
-#undef StartDoc
-#endif
+    #include "wx/msw/private.h"
+    #include <commdlg.h>
 
 
-#ifndef __WIN32__
-#include <print.h>
-#endif
+    #ifndef __WIN32__
+        #include <print.h>
+    #endif
+#endif // __WXMSW__
 
 
-#if !defined(APIENTRY) // NT defines APIENTRY, 3.x not
-#define APIENTRY FAR PASCAL
-#endif
- 
-#ifdef __WIN32__
-#define _EXPORT /**/
-#else
-#define _EXPORT _export
-typedef signed short int SHORT ;
-#endif
- 
-#if !defined(__WIN32__)        // 3.x uses FARPROC for dialogs
-#define DLGPROC FARPROC
-#endif
-
-LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
-#endif
- // End __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)
@@ -88,703 +63,739 @@ 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)
     EVT_PAINT(wxPreviewCanvas::OnPaint)
     EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
 END_EVENT_TABLE()
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
     EVT_PAINT(wxPreviewCanvas::OnPaint)
     EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
 END_EVENT_TABLE()
-#endif
 
 /*
 
 /*
- * Printer
- */
- 
-wxPrinterBase::wxPrinterBase(wxPrintData *data)
+* Printer
+*/
+
+wxPrinterBase::wxPrinterBase(wxPrintDialogData *data)
 {
 {
-  currentPrintout = NULL;
-  abortWindow = NULL;
-  abortIt = FALSE;
-  if (data)
-    printData = (*data);
+    m_currentPrintout = (wxPrintout *) NULL;
+    sm_abortWindow = (wxWindow *) NULL;
+    sm_abortIt = FALSE;
+    if (data)
+        m_printDialogData = (*data);
+    sm_lastError = wxPRINTER_NO_ERROR;
 }
 
 }
 
-wxWindow *wxPrinterBase::abortWindow = NULL;
-bool wxPrinterBase::abortIt = FALSE;
+wxWindow *wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
+bool wxPrinterBase::sm_abortIt = FALSE;
+wxPrinterError wxPrinterBase::sm_lastError = wxPRINTER_NO_ERROR;
 
 
-wxPrinterBase::~wxPrinterBase(void)
+wxPrinterBase::~wxPrinterBase()
 {
 }
 
 void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
 {
 }
 
 void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
-  wxPrinterBase::abortIt = TRUE;
-  wxPrinterBase::abortWindow->Show(FALSE);
-  wxPrinterBase::abortWindow->Close(TRUE);
-  wxPrinterBase::abortWindow = NULL;
+    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 *WXUNUSED(printout))
 {
 }
 
 wxWindow *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout *WXUNUSED(printout))
 {
-  wxPrintAbortDialog *dialog = new wxPrintAbortDialog(parent, _("Printing"), wxPoint(0, 0), wxSize(400, 400));
-  (void) new wxStaticText(dialog, -1, _("Please wait..."), wxPoint(5, 5));
+    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));
+    wxButton *button = new wxButton(dialog, wxID_CANCEL, _("Cancel"), wxPoint(5, 30));
 
 
-  dialog->Fit();
-  button->Centre(wxHORIZONTAL);
+    dialog->Fit();
+    button->Centre(wxHORIZONTAL);
 
 
-  dialog->Centre();
-  return dialog;
+    dialog->Centre();
+    return dialog;
 }
 
 void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout), char *message)
 {
 }
 
 void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout), char *message)
 {
-  wxMessageBox(message, _("Printing Error"), wxOK, parent);
+    wxMessageBox(message, _("Printing Error"), wxOK, parent);
 }
 
 /*
 }
 
 /*
- * Printout class
- */
- 
-wxPrintout::wxPrintout(const char *title)
+* Printout class
+*/
+
+wxPrintout::wxPrintout(const wxString& title)
 {
 {
-  printoutTitle = title ? copystring(title) : NULL;
-  printoutDC = NULL;
-  pageWidthMM = 0;
-  pageHeightMM = 0;
-  pageWidthPixels = 0;
-  pageHeightPixels = 0;
-  PPIScreenX = 0;
-  PPIScreenY = 0;
-  PPIPrinterX = 0;
-  PPIPrinterY = 0;
-  isPreview = FALSE;
+    m_printoutTitle = title ;
+    m_printoutDC = (wxDC *) NULL;
+    m_pageWidthMM = 0;
+    m_pageHeightMM = 0;
+    m_pageWidthPixels = 0;
+    m_pageHeightPixels = 0;
+    m_PPIScreenX = 0;
+    m_PPIScreenY = 0;
+    m_PPIPrinterX = 0;
+    m_PPIPrinterY = 0;
+    m_isPreview = FALSE;
 }
 
 }
 
-wxPrintout::~wxPrintout(void)
+wxPrintout::~wxPrintout()
 {
 {
-  if (printoutTitle)
-    delete[] printoutTitle;
 }
 
 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"));
 }
 
 }
 
-void wxPrintout::OnEndDocument(void)
+void wxPrintout::OnEndDocument()
 {
 {
-  GetDC()->EndDoc();
+    GetDC()->EndDoc();
 }
 
 }
 
-void wxPrintout::OnBeginPrinting(void)
+void wxPrintout::OnBeginPrinting()
 {
 }
 
 {
 }
 
-void wxPrintout::OnEndPrinting(void)
+void wxPrintout::OnEndPrinting()
 {
 }
 
 bool wxPrintout::HasPage(int page)
 {
 {
 }
 
 bool wxPrintout::HasPage(int page)
 {
-  return (page == 1);
+    return (page == 1);
 }
 
 void wxPrintout::GetPageInfo(int *minPage, int *maxPage, int *fromPage, int *toPage)
 {
 }
 
 void wxPrintout::GetPageInfo(int *minPage, int *maxPage, int *fromPage, int *toPage)
 {
-  *minPage = 1;
-  *maxPage = 32000;
-  *fromPage = 1;
-  *toPage = 1;
+    *minPage = 1;
+    *maxPage = 32000;
+    *fromPage = 1;
+    *toPage = 1;
 }
 
 /*
 }
 
 /*
- * Preview canvas
- */
- 
+* Preview canvas
+*/
+
 wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
 wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
-               const wxPoint& pos, const wxSize& size, long style, const wxString& name):
- wxScrolledWindow(parent, -1, pos, size, style, name)
+                                 const wxPoint& pos, const wxSize& size, long style, const wxString& name):
+wxScrolledWindow(parent, -1, pos, size, style, name)
 {
 {
-  printPreview = preview;
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+    m_printPreview = preview;
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
 
 
-  SetScrollbars(40, 40, 100, 100);
+    SetScrollbars(15, 18, 100, 100);
 }
 
 }
 
-wxPreviewCanvas::~wxPreviewCanvas(void)
+wxPreviewCanvas::~wxPreviewCanvas()
 {
 }
 
 void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
 {
 }
 
 void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-  wxPaintDC dc(this);
+    wxPaintDC dc(this);
+    PrepareDC( dc );
+
+/*
+#ifdef __WXGTK__
+    if (!GetUpdateRegion().IsEmpty())
+        dc.SetClippingRegion( GetUpdateRegion() );
+#endif
+*/
 
 
-  if (printPreview)
-  {
-    printPreview->PaintPage(this, dc);
-  }
+    if (m_printPreview)
+    {
+        m_printPreview->PaintPage(this, dc);
+    }
 }
 
 // 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));
-  Refresh();
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+    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);
 }
 
 /*
 }
 
 /*
- * Preview control bar
- */
+* Preview control bar
+*/
 
 BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
 
 BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
-       EVT_BUTTON(wxID_PREVIEW_CLOSE,          wxPreviewControlBar::OnClose)
-       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_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_CHAR(wxPreviewControlBar::OnChar)
+    EVT_CHOICE(wxID_PREVIEW_ZOOM,     wxPreviewControlBar::OnZoom)
     EVT_PAINT(wxPreviewControlBar::OnPaint)
 END_EVENT_TABLE()
     EVT_PAINT(wxPreviewControlBar::OnPaint)
 END_EVENT_TABLE()
- 
+
 wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,
 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)
+                                         wxWindow *parent, const wxPoint& pos, const wxSize& size,
+                                         long style, const wxString& name):
+wxPanel(parent, -1, pos, size, style, name)
 {
 {
-  printPreview = preview;
-  closeButton = NULL;
-  nextPageButton = NULL;
-  previousPageButton = NULL;
-  printButton = NULL;
-  zoomControl = NULL;
-  buttonFlags = buttons;
+    m_printPreview = preview;
+    m_closeButton = (wxButton *) NULL;
+    m_nextPageButton = (wxButton *) NULL;
+    m_previousPageButton = (wxButton *) NULL;
+    m_printButton = (wxButton *) NULL;
+    m_zoomControl = (wxChoice *) NULL;
+    m_buttonFlags = buttons;
 }
 
 }
 
-wxFont *wxPreviewControlBar::buttonFont = NULL;
-
-wxPreviewControlBar::~wxPreviewControlBar(void)
+wxPreviewControlBar::~wxPreviewControlBar()
 {
 }
 
 void wxPreviewControlBar::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
 {
 }
 
 void wxPreviewControlBar::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
-  wxPaintDC dc(this);
+    wxPaintDC dc(this);
 
 
-  int w, h;
-  GetSize(&w, &h);
-  dc.SetPen(*wxBLACK_PEN);
-  dc.SetBrush(*wxTRANSPARENT_BRUSH);
-  dc.DrawLine( 0, h-1, w, h-1 );
+    int w, h;
+    GetSize(&w, &h);
+    dc.SetPen(*wxBLACK_PEN);
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    dc.DrawLine( 0, h-1, w, h-1 );
 }
 
 }
 
-void wxPreviewControlBar::OnClose(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnWindowClose(wxCommandEvent& WXUNUSED(event))
 {
 {
-  wxPreviewFrame *frame = (wxPreviewFrame *)GetParent();
-  frame->Close(TRUE);
+    wxPreviewFrame *frame = (wxPreviewFrame *)GetParent();
+    frame->Close(TRUE);
 }
 
 void wxPreviewControlBar::OnPrint(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxPreviewControlBar::OnPrint(wxCommandEvent& WXUNUSED(event))
 {
-  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;
+   default:
+      event.Skip();
+   }
 }
 
 }
 
-void wxPreviewControlBar::OnNext(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnNext(void)
 {
 {
-  wxPrintPreviewBase *preview = GetPrintPreview();
-  if (preview)
-  {
-    int currentPage = preview->GetCurrentPage();
-    if ((preview->GetMaxPage() > 0) &&
-        (currentPage < preview->GetMaxPage()) &&
-        preview->GetPrintout()->HasPage(currentPage + 1))
+    wxPrintPreviewBase *preview = GetPrintPreview();
+    if (preview)
     {
     {
-      preview->SetCurrentPage(currentPage + 1);
+        int currentPage = preview->GetCurrentPage();
+        if ((preview->GetMaxPage() > 0) &&
+            (currentPage < preview->GetMaxPage()) &&
+            preview->GetPrintout()->HasPage(currentPage + 1))
+        {
+            preview->SetCurrentPage(currentPage + 1);
+        }
     }
     }
-  }
 }
 
 }
 
-void wxPreviewControlBar::OnPrevious(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnPrevious(void)
 {
 {
-  wxPrintPreviewBase *preview = GetPrintPreview();
-  if (preview)
-  {
-    int currentPage = preview->GetCurrentPage();
-    if ((preview->GetMinPage() > 0) &&
-        (currentPage > preview->GetMinPage()) &&
-        preview->GetPrintout()->HasPage(currentPage - 1))
+    wxPrintPreviewBase *preview = GetPrintPreview();
+    if (preview)
     {
     {
-      preview->SetCurrentPage(currentPage - 1);
+        int currentPage = preview->GetCurrentPage();
+        if ((preview->GetMinPage() > 0) &&
+            (currentPage > preview->GetMinPage()) &&
+            preview->GetPrintout()->HasPage(currentPage - 1))
+        {
+            preview->SetCurrentPage(currentPage - 1);
+        }
     }
     }
-  }
 }
 
 void wxPreviewControlBar::OnZoom(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxPreviewControlBar::OnZoom(wxCommandEvent& WXUNUSED(event))
 {
-  int zoom = GetZoomControl();
-  if (GetPrintPreview())
-    GetPrintPreview()->SetZoom(zoom);
+    int zoom = GetZoomControl();
+    if (GetPrintPreview())
+        GetPrintPreview()->SetZoom(zoom);
 }
 
 }
 
-void wxPreviewControlBar::CreateButtons(void)
+void wxPreviewControlBar::CreateButtons()
 {
 {
-#ifdef __GOOD_COMPILER__ // Robert Roebling
+    SetSize(0, 0, 400, 40);
 
 
-  SetSize(0, 0, 400, 40);
+    /*
+    #ifdef __WXMSW__
+    int fontSize = 9;
+    #else
+    int fontSize = 10;
+    #endif
 
 
-#ifdef __WXMSW__
-  int fontSize = 9;
+      wxFont buttonFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
+      SetFont(buttonFont);
+    */
+
+    int buttonWidth = 65;
+#ifdef __WXGTK__
+    int buttonHeight = -1;
 #else
 #else
-  int fontSize = 10;
+    int buttonHeight = 24;
 #endif
 
 #endif
 
-  if (!buttonFont)
-    buttonFont = wxTheFontList->FindOrCreateFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
-  SetButtonFont(*buttonFont);
-
-  int buttonWidth = 65;
-  int buttonHeight = 24;
-
-  int x = 5;
-  int y = 5;
-  int gap = 5;
-
-  closeButton = new wxButton(this, wxID_PREVIEW_CLOSE, _("Close"),
-       wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
-
-  x += gap + buttonWidth;
-  
-  if (buttonFlags & wxPREVIEW_PRINT)
-  {
-    printButton =  new wxButton(this, wxID_PREVIEW_PRINT, _("Print..."), wxPoint(x, y),
-               wxSize(buttonWidth, buttonHeight));
-       x += gap + buttonWidth;
-  }
-
-  if (buttonFlags & wxPREVIEW_PREVIOUS)
-  {
-    previousPageButton = new wxButton(this, wxID_PREVIEW_PREVIOUS, "<<", wxPoint(x, y),
-               wxSize(buttonWidth, buttonHeight));
-       x += gap + buttonWidth;
-  }
-
-  if (buttonFlags & wxPREVIEW_NEXT)
-  {
-    nextPageButton = new wxButton(this, wxID_PREVIEW_NEXT, ">>",
-               wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
-       x += gap + buttonWidth;
-  }
-
-  static wxString choices[] = { "10%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%", "60%",
-    "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "110%", "120%", "150%", "200%" };
-  int n = 22;
-  if (buttonFlags & wxPREVIEW_ZOOM)
-  {
-    zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM, wxPoint(x, y),
-               wxSize(100, -1), n, (wxString *)choices);
-    SetZoomControl(printPreview->GetZoom());
-  }
-
-  closeButton->SetDefault();
-  
+    int x = 5;
+    int y = 5;
+
+#ifdef __WXMOTIF__
+    int gap = 15;
+#else
+    int gap = 5;
 #endif
 #endif
+
+    m_closeButton = new wxButton(this, wxID_PREVIEW_CLOSE, _("Close"),
+        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_PREVIOUS)
+    {
+        m_previousPageButton = new wxButton(this, wxID_PREVIEW_PREVIOUS, wxT("<<"), wxPoint(x, y),
+            wxSize(buttonWidth, buttonHeight));
+        x += gap + buttonWidth;
+    }
+
+    if (m_buttonFlags & wxPREVIEW_NEXT)
+    {
+        m_nextPageButton = new wxButton(this, wxID_PREVIEW_NEXT, wxT(">>"),
+            wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
+        x += gap + buttonWidth;
+    }
+
+    if (m_buttonFlags & wxPREVIEW_ZOOM)
+    {
+        static const char *choices[] =
+        {
+            "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%",
+            "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "110%",
+            "120%", "150%", "200%"
+        };
+
+        int n = WXSIZEOF(choices);
+
+        wxString* strings = new wxString[n];
+        int i;
+        for (i = 0; i < n; i++ )
+           strings[i] = choices[i];
+
+        m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM,
+                                     wxPoint(x, y),
+                                     wxSize(100, -1),
+                                     n,
+                                     strings
+                                    );
+        delete[] strings;
+
+        SetZoomControl(m_printPreview->GetZoom());
+    }
+
+    //  m_closeButton->SetDefault();
 }
 
 void wxPreviewControlBar::SetZoomControl(int zoom)
 {
 }
 
 void wxPreviewControlBar::SetZoomControl(int zoom)
 {
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-  char buf[20];
-  sprintf(buf, "%d%%", zoom);
-  if (zoomControl)
-    zoomControl->SetStringSelection(buf);
-#endif
+    char buf[20];
+    sprintf(buf, "%d%%", zoom);
+// Someone is calling methods that do no exist in wxChoice!! So I'll just comment out for VA for now
+    if (m_zoomControl)
+        m_zoomControl->SetStringSelection(buf);
 }
 
 }
 
-int wxPreviewControlBar::GetZoomControl(void)
+int wxPreviewControlBar::GetZoomControl()
 {
 {
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-  char buf[20];
-  if (zoomControl && zoomControl->GetStringSelection())
-  {
-    strcpy(buf, zoomControl->GetStringSelection());
-    buf[strlen(buf) - 1] = 0;
-    return (int)atoi(buf);
-  }
-  else return 0;
-#else
-  return 0;
-#endif
+    wxChar buf[20];
+    if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxT("")))
+    {
+        wxStrcpy(buf, m_zoomControl->GetStringSelection());
+        buf[wxStrlen(buf) - 1] = 0;
+        return (int)wxAtoi(buf);
+    }
+    else return 0;
 }
 
 
 /*
 }
 
 
 /*
- * Preview frame
- */
+* Preview frame
+*/
+
+BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
+    EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
+END_EVENT_TABLE()
 
 wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxFrame *parent, const wxString& title,
 
 wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxFrame *parent, const wxString& title,
-    const wxPoint& pos, const wxSize& size, long style, const wxString& name):
- wxFrame(parent, -1, title, pos, size, style, name)
+                               const wxPoint& pos, const wxSize& size, long style, const wxString& name):
+wxFrame(parent, -1, title, pos, size, style, name)
 {
 {
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-
-  printPreview = preview;
-  controlBar = NULL;
-  previewCanvas = NULL;
-#endif
+    m_printPreview = preview;
+    m_controlBar = NULL;
+    m_previewCanvas = NULL;
 }
 
 }
 
-wxPreviewFrame::~wxPreviewFrame(void)
+wxPreviewFrame::~wxPreviewFrame()
 {
 }
 
 {
 }
 
-bool wxPreviewFrame::OnClose(void)
+void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
 {
-#ifdef __GOOD_COMPILER__ // Robert Roebling
+    MakeModal(FALSE);
 
 
-  MakeModal(FALSE);
-  
-  // Need to delete the printout and the print preview
-  wxPrintout *printout = printPreview->GetPrintout();
-  if (printout)
-  {
-    delete printout;
-    printPreview->SetPrintout(NULL);
-    printPreview->SetCanvas(NULL);
-    printPreview->SetFrame(NULL);
-  }
-  delete printPreview;
-  return TRUE;
-#else
-  return FALSE;
-#endif
+    // Need to delete the printout and the print preview
+    wxPrintout *printout = m_printPreview->GetPrintout();
+    if (printout)
+    {
+        delete printout;
+        m_printPreview->SetPrintout(NULL);
+        m_printPreview->SetCanvas(NULL);
+        m_printPreview->SetFrame(NULL);
+    }
+    delete m_printPreview;
+
+    Destroy();
 }
 
 }
 
-void wxPreviewFrame::Initialize(void)
+void wxPreviewFrame::Initialize()
 {
 {
+    CreateStatusBar();
 
 
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-
-  CreateStatusBar();
-  
-  CreateCanvas();
-  CreateControlBar();
+    CreateCanvas();
+    CreateControlBar();
 
 
-  printPreview->SetCanvas(previewCanvas);
-  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;
-//  controlBar->GetSize(&w, &h);
-  int h;
-#ifdef __WXMSW__
-  h = 40;
+    // 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
 #else
-  h = 60;
+    h = 60;
 #endif
 
 #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);
 
 
-  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         (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);
 
 
-  previewCanvas->SetConstraints(c2);
+    m_previewCanvas->SetConstraints(c2);
 
 
-  SetAutoLayout(TRUE);
+    SetAutoLayout(TRUE);
 
 
-  MakeModal(TRUE);
+    MakeModal(TRUE);
 
 
-  Layout();
-  
-#endif  
+    Layout();
 }
 
 }
 
-void wxPreviewFrame::CreateCanvas(void)
+void wxPreviewFrame::CreateCanvas()
 {
 {
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-
-  previewCanvas = new wxPreviewCanvas(printPreview, this);
-  
-#endif
+    m_previewCanvas = new wxPreviewCanvas(m_printPreview, this);
 }
 
 }
 
-void wxPreviewFrame::CreateControlBar(void)
+void wxPreviewFrame::CreateControlBar()
 {
 {
-#ifdef __GOOD_COMPILER__ // Robert Roebling
+    long buttons = wxPREVIEW_DEFAULT;
+    if (m_printPreview->GetPrintoutForPrinting())
+        buttons |= wxPREVIEW_PRINT;
 
 
-  long buttons = wxPREVIEW_DEFAULT;
-  if (printPreview->GetPrintoutForPrinting())
-    buttons |= wxPREVIEW_PRINT;
-    
-  controlBar = new wxPreviewControlBar(printPreview, buttons, this, wxPoint(0, 0), wxSize(400, 40));
-  controlBar->CreateButtons();
-#endif
+    m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(0, 0), wxSize(400, 40));
+    m_controlBar->CreateButtons();
 }
 }
- 
+
 /*
 /*
- * Print preview
- */
+* Print preview
+*/
 
 
-wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data)
+wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
+                                       wxPrintout *printoutForPrinting,
+                                       wxPrintData *data)
 {
 {
+    if (data)
+        m_printDialogData = (*data);
 
 
-#ifdef __GOOD_COMPILER__ // Robert Roebling
+    Init(printout, printoutForPrinting);
+}
 
 
-  isOk = TRUE;
-  previewPrintout = printout;
-  if (previewPrintout)
-    previewPrintout->SetIsPreview(TRUE);
-    
-  printPrintout = printoutForPrinting;
-  if (data)
-    printData = (*data);
+wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
+                                       wxPrintout *printoutForPrinting,
+                                       wxPrintDialogData *data)
+{
+    if (data)
+        m_printDialogData = (*data);
+
+    Init(printout, printoutForPrinting);
+}
 
 
-  previewCanvas = NULL;
-  previewFrame = NULL;
-  previewBitmap = NULL;
-  currentPage = 1;
-  currentZoom = 30;
-  topMargin = 40;
-  leftMargin = 40;
-  pageWidth = 0;
-  pageHeight = 0;
+void wxPrintPreviewBase::Init(wxPrintout *printout,
+                              wxPrintout *printoutForPrinting)
+{
+    m_isOk = TRUE;
+    m_previewPrintout = printout;
+    if (m_previewPrintout)
+        m_previewPrintout->SetIsPreview(TRUE);
 
 
-  printout->OnPreparePrinting();
+    m_printPrintout = printoutForPrinting;
 
 
-  // Get some parameters from the printout, if defined
-  int selFrom, selTo;
-  printout->GetPageInfo(&minPage, &maxPage, &selFrom, &selTo);
-  
-#endif  
+    m_previewCanvas = NULL;
+    m_previewFrame = NULL;
+    m_previewBitmap = NULL;
+    m_currentPage = 1;
+    m_currentZoom = 70;
+    m_topMargin = 40;
+    m_leftMargin = 40;
+    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);
 }
 
 }
 
-wxPrintPreviewBase::~wxPrintPreviewBase(void)
+wxPrintPreviewBase::~wxPrintPreviewBase()
 {
 {
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-
-  if (previewPrintout)
-    delete previewPrintout;
-  if (previewBitmap)
-    delete previewBitmap;
-  if (printPrintout)
-    delete printPrintout;
-    
-#endif
+    if (m_previewPrintout)
+        delete m_previewPrintout;
+    if (m_previewBitmap)
+        delete m_previewBitmap;
+    if (m_printPrintout)
+        delete m_printPrintout;
 }
 
 bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
 {
 }
 
 bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
 {
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-  if (currentPage == pageNum)
-    return TRUE;
+    if (m_currentPage == pageNum)
+        return TRUE;
 
 
-  currentPage = pageNum;
-  if (previewBitmap)
-  {
-    delete previewBitmap;
-    previewBitmap = NULL;
-  }
-
-  if (previewCanvas)
-  {
-    RenderPage(pageNum);
-    previewCanvas->Refresh();
-  }
-  
-#endif
-  return TRUE;
+    m_currentPage = pageNum;
+    if (m_previewBitmap)
+    {
+        delete m_previewBitmap;
+        m_previewBitmap = NULL;
+    }
+
+    if (m_previewCanvas)
+    {
+        RenderPage(pageNum);
+        m_previewCanvas->Refresh();
+    }
+    return TRUE;
 }
 
 bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
 {
 }
 
 bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
 {
+    DrawBlankPage(canvas, dc);
 
 
-#ifdef __GOOD_COMPILER__  // Robert Roebling
+    if (!m_previewBitmap)
+        RenderPage(m_currentPage);
 
 
-  DrawBlankPage(canvas, dc);
+    if (!m_previewBitmap)
+        return FALSE;
 
 
-  if (!previewBitmap)
-    RenderPage(currentPage);
-    
-  if (!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);
-  
-  float zoomScale = (float)((float)currentZoom/(float)100);
-  float actualWidth = (float)(zoomScale*pageWidth*previewScale);
-//  float actualHeight = (float)(zoomScale*pageHeight*previewScale);
+    double zoomScale = ((float)m_currentZoom/(float)100);
+    double actualWidth = (zoomScale*m_pageWidth*m_previewScale);
+    //  float actualHeight = (float)(zoomScale*m_pageHeight*m_previewScale);
 
 
-  float x = (float)((canvasWidth - actualWidth)/2.0);
-  if (x < leftMargin)
-    x = (float)leftMargin;
-  float y = (float)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(*previewBitmap);
+    wxMemoryDC temp_dc;
+    temp_dc.SelectObject(*m_previewBitmap);
 
 
-  dc.Blit((float)x, (float)y, (float)previewBitmap->GetWidth(), (float)previewBitmap->GetHeight(), &temp_dc, (float)0, (float)0);
+    dc.Blit(x, y, m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0);
 
 
-  temp_dc.SelectObject(wxNullBitmap);
+    temp_dc.SelectObject(wxNullBitmap);
 
 
-#endif  
-  
-  return TRUE;
+    return TRUE;
 }
 
 bool wxPrintPreviewBase::RenderPage(int pageNum)
 {
 }
 
 bool wxPrintPreviewBase::RenderPage(int pageNum)
 {
-  int canvasWidth, canvasHeight;
-  
-#ifdef __GOOD_COMPILER__  // Robert Roebling
-
-  if (!previewCanvas)
-  {
-    wxMessageBox(_("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!"),
-      _("Print Preview Failure"), wxOK);
-    return FALSE;
-  }
-  previewCanvas->GetSize(&canvasWidth, &canvasHeight);
-  
-  float zoomScale = (float)((float)currentZoom/(float)100);
-  float actualWidth = (float)(zoomScale*pageWidth*previewScale);
-  float actualHeight = (float)(zoomScale*pageHeight*previewScale);
-
-  float x = (float)((canvasWidth - actualWidth)/2.0);
-  if (x < leftMargin)
-    x = (float)leftMargin;
-//  float y = topMargin;
-
-
-  if (!previewBitmap)
-  {
-    previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
-    if (!previewBitmap || !previewBitmap->Ok())
+    wxBusyCursor busy;
+
+    int canvasWidth, canvasHeight;
+
+    if (!m_previewCanvas)
     {
     {
-      if (previewBitmap)
-        delete previewBitmap;
-      wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
-      return FALSE;
+        wxFAIL_MSG(_T("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!"));
+
+        return FALSE;
     }
     }
-  }
-  
-  wxMemoryDC memoryDC;
-  memoryDC.SelectObject(*previewBitmap);
+    m_previewCanvas->GetSize(&canvasWidth, &canvasHeight);
 
 
-  memoryDC.Clear();
+    double zoomScale = (m_currentZoom/100.0);
+    int actualWidth = (int)(zoomScale*m_pageWidth*m_previewScale);
+    int actualHeight = (int)(zoomScale*m_pageHeight*m_previewScale);
 
 
-  previewPrintout->SetDC(&memoryDC);
-  previewPrintout->SetPageSizePixels(pageWidth, pageHeight);
+    int x = (int)((canvasWidth - actualWidth)/2.0);
+    if (x < m_leftMargin)
+        x = m_leftMargin;
+    //  int y = m_topMargin;
 
 
-  previewPrintout->OnBeginPrinting();
-  
 
 
-  if (!previewPrintout->OnBeginDocument(printData.GetFromPage(), printData.GetToPage()))
-  {
-    wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);
-    
-    memoryDC.SelectObject(wxNullBitmap);
+    if (!m_previewBitmap)
+    {
+        m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
+        if (!m_previewBitmap || !m_previewBitmap->Ok())
+        {
+            if (m_previewBitmap)
+                delete m_previewBitmap;
+            wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
+            return FALSE;
+        }
+    }
 
 
-    delete previewBitmap;
-    return FALSE;
-  }
-  
-  previewPrintout->OnPrintPage(pageNum);
-  previewPrintout->OnEndDocument();
-  previewPrintout->OnEndPrinting();
-
-  previewPrintout->SetDC(NULL);
-  
-  memoryDC.SelectObject(wxNullBitmap);
-#endif
+    wxMemoryDC memoryDC;
+    memoryDC.SelectObject(*m_previewBitmap);
+
+    memoryDC.Clear();
 
 
-  char buf[200];
-  if (maxPage != 0)
-    sprintf(buf, _("Page %d of %d"), pageNum, maxPage);
-  else
-    sprintf(buf, _("Page %d"), pageNum);
+    m_previewPrintout->SetDC(&memoryDC);
+    m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
 
 
-  if (previewFrame)
-    previewFrame->SetStatusText(buf);
+    // Need to delay OnPreparePrinting until here, so we have enough information.
+    if (!m_printingPrepared)
+    {
+        m_previewPrintout->OnPreparePrinting();
+        m_printingPrepared = TRUE;
+    }
 
 
-  return 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;
+        return FALSE;
+    }
+
+    m_previewPrintout->OnPrintPage(pageNum);
+    m_previewPrintout->OnEndDocument();
+    m_previewPrintout->OnEndPrinting();
+
+    m_previewPrintout->SetDC(NULL);
+
+    memoryDC.SelectObject(wxNullBitmap);
+
+    wxChar buf[200];
+    if (m_maxPage != 0)
+        wxSprintf(buf, _("Page %d of %d"), pageNum, m_maxPage);
+    else
+        wxSprintf(buf, _("Page %d"), pageNum);
+
+    if (m_previewFrame)
+        m_previewFrame->SetStatusText(buf);
+
+    return TRUE;
 }
 
 
 bool wxPrintPreviewBase::DrawBlankPage(wxWindow *canvas, wxDC& dc)
 {
 }
 
 
 bool wxPrintPreviewBase::DrawBlankPage(wxWindow *canvas, wxDC& dc)
 {
+    int canvasWidth, canvasHeight;
+    canvas->GetSize(&canvasWidth, &canvasHeight);
 
 
-#ifdef __GOOD_COMPILER__ // Robert Roebling
+    float zoomScale = (float)((float)m_currentZoom/(float)100);
+    float actualWidth = zoomScale*m_pageWidth*m_previewScale;
+    float actualHeight = zoomScale*m_pageHeight*m_previewScale;
 
 
-  int canvasWidth, canvasHeight;
-  canvas->GetSize(&canvasWidth, &canvasHeight);
-  
-  float zoomScale = (float)((float)currentZoom/(float)100);
-  float actualWidth = zoomScale*pageWidth*previewScale;
-  float actualHeight = zoomScale*pageHeight*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 < leftMargin)
-    x = (float)leftMargin;
-  float y = (float)topMargin;
+    // Draw shadow, allowing for 1-pixel border AROUND the actual page
+    int shadowOffset = 4;
+    dc.SetPen(*wxBLACK_PEN);
+    dc.SetBrush(*wxBLACK_BRUSH);
+    /*
+    dc.DrawRectangle((int)(x-1 + shadowOffset), (int)(y-1 + shadowOffset), (int)(actualWidth+2), (int)(actualHeight+2));
+    */
+    dc.DrawRectangle((int)(x + shadowOffset), (int)(y + actualHeight+1), (int)(actualWidth), shadowOffset);
+    dc.DrawRectangle((int)(x + actualWidth), (int)(y + shadowOffset), shadowOffset, (int)(actualHeight));
 
 
-  // Draw shadow, allowing for 1-pixel border AROUND the actual page
-  int shadowOffset = 4;
-  dc.SetPen(*wxBLACK_PEN);
-  dc.SetBrush(*wxBLACK_BRUSH);
-  dc.DrawRectangle(x-1 + shadowOffset, y-1 + shadowOffset, actualWidth+2, actualHeight+2);
+    // 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();
 
 
-  dc.DrawRectangle(x-1, y-1, actualWidth+2, actualHeight+2);
-  
-#endif
+      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;
+    return TRUE;
 }
 
 void wxPrintPreviewBase::SetZoom(int percent)
 {
 }
 
 void wxPrintPreviewBase::SetZoom(int percent)
 {
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-  if (currentZoom == percent)
-    return;
-    
-  currentZoom = percent;
-  if (previewBitmap)
-  {
-    delete previewBitmap;
-    previewBitmap = NULL;
-  }
-  RenderPage(currentPage);
-  
-  if (previewCanvas)
-  {
-    previewCanvas->Clear();
-    previewCanvas->Refresh();
-  }
-#endif  
-  
+    if (m_currentZoom == percent)
+        return;
+
+    m_currentZoom = percent;
+    if (m_previewBitmap)
+    {
+        delete m_previewBitmap;
+        m_previewBitmap = NULL;
+    }
+
+    if (m_previewCanvas)
+    {
+        RenderPage(m_currentPage);
+        ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
+        m_previewCanvas->Clear();
+        m_previewCanvas->Refresh();
+    }
 }
 }
+
+#endif // wxUSE_PRINTING_ARCHITECTURE
wxWidgets (Impactor)