// 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
#include "wx/defs.h"
-#ifdef __WXMSW__
-#define __GOOD_COMPILER__
-#endif
+#if wxUSE_PRINTING_ARCHITECTURE
#ifndef WX_PRECOMP
#include "wx/utils.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/printdlg.h"
+#include "wx/module.h"
#include <stdlib.h>
#include <string.h>
#ifdef __WXMSW__
-#include <windows.h>
-#include <commdlg.h>
-
-// Clash with Windows header files
-#ifdef StartDoc
-#undef StartDoc
-#endif
-
-#ifndef __WIN32__
-#include <print.h>
-#endif
+ #include "wx/msw/private.h"
+ #include <commdlg.h>
-#endif
- // End __WXMSW__
+ #ifndef __WIN32__
+ #include <print.h>
+ #endif
+#endif // __WXMSW__
-#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxPrinterBase, wxObject)
IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
IMPLEMENT_CLASS(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_CHAR(wxPreviewCanvas::OnChar)
EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
END_EVENT_TABLE()
-#endif
/*
- * Printer
- */
-
-wxPrinterBase::wxPrinterBase(wxPrintData *data)
+* Printer
+*/
+
+wxPrinterBase::wxPrinterBase(wxPrintDialogData *data)
{
- m_currentPrintout = (wxPrintout *) NULL;
- sm_abortWindow = (wxWindow *) NULL;
- sm_abortIt = FALSE;
- if (data)
- m_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::sm_abortWindow = (wxWindow *) NULL;
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;
+ 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 * printout)
{
- wxPrintAbortDialog *dialog = new wxPrintAbortDialog(parent, _("Printing"), wxPoint(0, 0), wxSize(400, 400), wxDEFAULT_DIALOG_STYLE);
- (void) new wxStaticText(dialog, -1, _("Please wait..."), wxPoint(5, 5));
+ wxPrintAbortDialog *dialog = new wxPrintAbortDialog(parent, _("Printing ") , wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
+
+ wxBoxSizer *button_sizer = new wxBoxSizer( wxVERTICAL );
+ button_sizer->Add( new wxStaticText(dialog, -1, _("Please wait while printing\n") + printout->GetTitle() ), 0, wxALL, 10 );
+ button_sizer->Add( new wxButton( dialog, wxID_CANCEL, wxT("Cancel") ), 0, wxALL | wxALIGN_CENTER, 10 );
- wxButton *button = new wxButton(dialog, wxID_CANCEL, _("Cancel"), wxPoint(5, 30));
+ dialog->SetAutoLayout( TRUE );
+ dialog->SetSizer( button_sizer );
- dialog->Fit();
- button->Centre(wxHORIZONTAL);
+ button_sizer->Fit(dialog);
+ button_sizer->SetSizeHints (dialog) ;
- dialog->Centre();
- return dialog;
+ return dialog;
}
-void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout), char *message)
+void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout), const wxString& message)
{
- wxMessageBox(message, _("Printing Error"), wxOK, parent);
+ wxMessageBox(message, _("Printing Error"), wxOK, parent);
}
/*
- * Printout class
- */
-
+* Printout class
+*/
+
wxPrintout::wxPrintout(const wxString& title)
{
- 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;
+ 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()
bool wxPrintout::OnBeginDocument(int WXUNUSED(startPage), int WXUNUSED(endPage))
{
- return GetDC()->StartDoc(_("Printing"));
+ return GetDC()->StartDoc(_("Printing ") + m_printoutTitle);
}
void wxPrintout::OnEndDocument()
{
- GetDC()->EndDoc();
+ GetDC()->EndDoc();
}
void wxPrintout::OnBeginPrinting()
bool wxPrintout::HasPage(int page)
{
- return (page == 1);
+ return (page == 1);
}
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
+*/
+
+// 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)
-{
- m_printPreview = preview;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ const wxPoint& pos, const wxSize& size, long style, const wxString& name):
+wxScrolledWindow(parent, -1, pos, size, style | wxFULL_REPAINT_ON_RESIZE, name)
+{
+ m_printPreview = preview;
+#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(40, 40, 100, 100);
+ SetScrollbars(10, 10, 100, 100);
}
wxPreviewCanvas::~wxPreviewCanvas()
void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
{
- wxPaintDC dc(this);
+ wxPaintDC dc(this);
+ PrepareDC( dc );
- if (m_printPreview)
- {
- m_printPreview->PaintPage(this, dc);
- }
+/*
+#ifdef __WXGTK__
+ if (!GetUpdateRegion().IsEmpty())
+ dc.SetClippingRegion( GetUpdateRegion() );
+#endif
+*/
+
+ if (m_printPreview)
+ {
+ m_printPreview->PaintPage(this, dc);
+ }
}
// Responds to colour changes, and passes event on to children.
void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
- Refresh();
+#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);
+ // 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
- */
+* Preview control bar
+*/
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::OnPrintButton)
+ EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPreviousButton)
+ EVT_BUTTON(wxID_PREVIEW_NEXT, wxPreviewControlBar::OnNextButton)
+ EVT_BUTTON(wxID_PREVIEW_FIRST, wxPreviewControlBar::OnFirstButton)
+ EVT_BUTTON(wxID_PREVIEW_LAST, wxPreviewControlBar::OnLastButton)
+ EVT_BUTTON(wxID_PREVIEW_GOTO, wxPreviewControlBar::OnGotoButton)
+ EVT_CHOICE(wxID_PREVIEW_ZOOM, wxPreviewControlBar::OnZoom)
EVT_PAINT(wxPreviewControlBar::OnPaint)
END_EVENT_TABLE()
-
+
wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,
- 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)
{
- 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;
+ 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;
}
wxPreviewControlBar::~wxPreviewControlBar()
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 );
+}
+
+void wxPreviewControlBar::OnWindowClose(wxCommandEvent& WXUNUSED(event))
+{
+ wxPreviewFrame *frame = (wxPreviewFrame *)GetParent();
+ frame->Close(TRUE);
+}
+
+void wxPreviewControlBar::OnPrint(void)
+{
+ wxPrintPreviewBase *preview = GetPrintPreview();
+ preview->Print(TRUE);
+}
- int w, h;
- GetSize(&w, &h);
- dc.SetPen(*wxBLACK_PEN);
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
- dc.DrawLine( 0, h-1, w, h-1 );
+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))
+ {
+ preview->SetCurrentPage(currentPage + 1);
+ }
+ }
}
-void wxPreviewControlBar::OnClose(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnPrevious(void)
{
- wxPreviewFrame *frame = (wxPreviewFrame *)GetParent();
- frame->Close(TRUE);
+ wxPrintPreviewBase *preview = GetPrintPreview();
+ if (preview)
+ {
+ int currentPage = preview->GetCurrentPage();
+ if ((preview->GetMinPage() > 0) &&
+ (currentPage > preview->GetMinPage()) &&
+ preview->GetPrintout()->HasPage(currentPage - 1))
+ {
+ preview->SetCurrentPage(currentPage - 1);
+ }
+ }
}
-void wxPreviewControlBar::OnPrint(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnFirst(void)
{
- wxPrintPreviewBase *preview = GetPrintPreview();
- preview->Print(TRUE);
+ wxPrintPreviewBase *preview = GetPrintPreview();
+ if (preview)
+ {
+ int currentPage = preview->GetMinPage();
+ if (preview->GetPrintout()->HasPage(currentPage))
+ {
+ preview->SetCurrentPage(currentPage);
+ }
+ }
}
-void wxPreviewControlBar::OnNext(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnLast(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->GetMaxPage();
+ if (preview->GetPrintout()->HasPage(currentPage))
+ {
+ preview->SetCurrentPage(currentPage);
+ }
}
- }
}
-void wxPreviewControlBar::OnPrevious(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnGoto(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);
+ long currentPage;
+
+ if (preview->GetMinPage() > 0)
+ {
+ wxString strPrompt;
+ wxString strPage;
+
+ strPrompt.Printf( _("Enter a page number between %d and %d:"),
+ preview->GetMinPage(), preview->GetMaxPage());
+ strPage.Printf( wxT("%d"), preview->GetCurrentPage() );
+
+ strPage =
+ wxGetTextFromUser( strPrompt, _("Goto Page"), strPage, GetParent());
+
+ if ( strPage.ToLong( ¤tPage ) )
+ if (preview->GetPrintout()->HasPage(currentPage))
+ {
+ preview->SetCurrentPage(currentPage);
+ }
+ }
}
- }
}
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()
{
-#ifdef __GOOD_COMPILER__ // Robert Roebling
+ SetSize(0, 0, 400, 40);
- SetSize(0, 0, 400, 40);
+ wxBoxSizer *item0 = new wxBoxSizer( wxHORIZONTAL );
-#ifdef __WXMSW__
- int fontSize = 9;
-#else
- int fontSize = 10;
-#endif
+ int smallButtonWidth = 45;
- wxFont buttonFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
- SetButtonFont(buttonFont);
-
- int buttonWidth = 65;
- int buttonHeight = 24;
-
- int x = 5;
- int y = 5;
- int gap = 5;
-
- 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, "<<", wxPoint(x, y),
- wxSize(buttonWidth, buttonHeight));
- x += gap + buttonWidth;
- }
-
- if (m_buttonFlags & wxPREVIEW_NEXT)
- {
- m_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 (m_buttonFlags & wxPREVIEW_ZOOM)
- {
- m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM, wxPoint(x, y),
- wxSize(100, -1), n, (wxString *)choices);
- SetZoomControl(m_printPreview->GetZoom());
- }
-
- m_closeButton->SetDefault();
-
-#endif
+ 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 );
+ 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 );
+ 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 );
+ 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 );
+ 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[] =
+ {
+ wxT("10%"), wxT("15%"), wxT("20%"), wxT("25%"), wxT("30%"), wxT("35%"), wxT("40%"), wxT("45%"), wxT("50%"), wxT("55%"),
+ wxT("60%"), wxT("65%"), wxT("70%"), wxT("75%"), wxT("80%"), wxT("85%"), wxT("90%"), wxT("95%"), wxT("100%"), wxT("110%"),
+ wxT("120%"), wxT("150%"), wxT("200%")
+ };
+ int n = WXSIZEOF(choices);
+
+ m_zoomControl = new wxChoice( this, wxID_PREVIEW_ZOOM, wxDefaultPosition, wxSize(70,-1), n, choices, 0 );
+ item0->Add( m_zoomControl, 0, wxALIGN_CENTRE|wxALL, 5 );
+ SetZoomControl(m_printPreview->GetZoom());
+ }
+
+ SetSizer(item0);
+ item0->Fit(this);
}
void wxPreviewControlBar::SetZoomControl(int zoom)
{
-#ifdef __GOOD_COMPILER__ // Robert Roebling
- char buf[20];
- sprintf(buf, "%d%%", zoom);
- if (m_zoomControl)
- m_zoomControl->SetStringSelection(buf);
-#endif
+ if (m_zoomControl)
+ {
+ 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()
{
-#ifdef __GOOD_COMPILER__ // Robert Roebling
- char buf[20];
- if (m_zoomControl && m_zoomControl->GetStringSelection())
- {
- strcpy(buf, m_zoomControl->GetStringSelection());
- buf[strlen(buf) - 1] = 0;
- return (int)atoi(buf);
- }
- else return 0;
-#else
- return 0;
-#endif
+ if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxEmptyString))
+ {
+ long val;
+ if (m_zoomControl->GetStringSelection().BeforeFirst(wxT('%')).ToLong(&val))
+ return int(val);
+ }
+
+ 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,
- const wxPoint& pos, const wxSize& size, long style, const wxString& name):
- wxFrame(parent, -1, title, pos, size, style, name)
+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)
{
-#ifdef __GOOD_COMPILER__ // Robert Roebling
- m_printPreview = preview;
- m_controlBar = NULL;
- m_previewCanvas = NULL;
+ m_printPreview = preview;
+ m_controlBar = NULL;
+ m_previewCanvas = NULL;
+
+ // Give the application icon
+#ifdef __WXMSW__
+ wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
+ if (topFrame)
+ SetIcon(topFrame->GetIcon());
#endif
}
{
}
-bool wxPreviewFrame::OnClose()
+void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-
- MakeModal(FALSE);
-
- // 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;
- return TRUE;
-#else
- return FALSE;
+ // MakeModal doesn't work on wxMac, especially when there
+ // are multiple top-level windows.
+#ifndef __WXMAC__
+ MakeModal(FALSE);
#endif
+
+ // Need to delete the printout and the print preview
+ wxPrintout *printout = m_printPreview->GetPrintout();
+ if (printout)
+ {
+ delete printout;
+ m_printPreview->SetPrintout(NULL);
+ m_printPreview->SetCanvas(NULL);
+ m_printPreview->SetFrame(NULL);
+ }
+ delete m_printPreview;
+
+ Destroy();
}
void wxPreviewFrame::Initialize()
{
-
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-
- CreateStatusBar();
-
- 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;
-#ifdef __WXMSW__
- h = 40;
-#else
- h = 60;
+#if wxUSE_STATUSBAR
+ CreateStatusBar();
#endif
+ CreateCanvas();
+ CreateControlBar();
- c1->left.SameAs (this, wxLeft);
- c1->top.SameAs (this, wxTop);
- c1->right.SameAs (this, wxRight);
- c1->height.Absolute (h);
+ m_printPreview->SetCanvas(m_previewCanvas);
+ m_printPreview->SetFrame(this);
- m_controlBar->SetConstraints(c1);
+ wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
- // Canvas constraints
- wxLayoutConstraints *c2 = new wxLayoutConstraints;
+ item0->Add( m_controlBar, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+ item0->Add( m_previewCanvas, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
- c2->left.SameAs (this, wxLeft);
- c2->top.Below (m_controlBar);
- c2->right.SameAs (this, wxRight);
- c2->bottom.SameAs (this, wxBottom);
+ SetAutoLayout( TRUE );
+ SetSizer( item0 );
- m_previewCanvas->SetConstraints(c2);
-
- SetAutoLayout(TRUE);
+ // MakeModal doesn't work on wxMac, especially when there
+ // are multiple top-level windows.
+#ifndef __WXMAC__
+ MakeModal(TRUE);
+#endif
- MakeModal(TRUE);
+ Layout();
- Layout();
-
-#endif
+ m_printPreview->AdjustScrollbars(m_previewCanvas);
+ m_previewCanvas->SetFocus();
+ m_controlBar->SetFocus();
}
void wxPreviewFrame::CreateCanvas()
{
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-
- m_previewCanvas = new wxPreviewCanvas(m_printPreview, this);
-
-#endif
+ m_previewCanvas = new wxPreviewCanvas(m_printPreview, this);
}
void wxPreviewFrame::CreateControlBar()
{
-#ifdef __GOOD_COMPILER__ // Robert Roebling
+ long buttons = wxPREVIEW_DEFAULT;
+ if (m_printPreview->GetPrintoutForPrinting())
+ buttons |= wxPREVIEW_PRINT;
- long buttons = wxPREVIEW_DEFAULT;
- if (m_printPreview->GetPrintoutForPrinting())
- buttons |= wxPREVIEW_PRINT;
-
- m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(0, 0), wxSize(400, 40));
- m_controlBar->CreateButtons();
-#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);
+}
- m_isOk = TRUE;
- m_previewPrintout = printout;
- if (m_previewPrintout)
- m_previewPrintout->SetIsPreview(TRUE);
-
- m_printPrintout = printoutForPrinting;
- if (data)
- m_printData = (*data);
+wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
+ wxPrintout *printoutForPrinting,
+ wxPrintDialogData *data)
+{
+ if (data)
+ m_printDialogData = (*data);
+
+ Init(printout, printoutForPrinting);
+}
- m_previewCanvas = NULL;
- m_previewFrame = NULL;
- m_previewBitmap = NULL;
- m_currentPage = 1;
- m_currentZoom = 30;
- m_topMargin = 40;
- m_leftMargin = 40;
- m_pageWidth = 0;
- m_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(&m_minPage, &m_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;
+ m_minPage = 1;
+ m_maxPage = 1;
}
wxPrintPreviewBase::~wxPrintPreviewBase()
{
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-
- if (m_previewPrintout)
- delete m_previewPrintout;
- if (m_previewBitmap)
- delete m_previewBitmap;
- if (m_printPrintout)
- delete m_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)
{
-#ifdef __GOOD_COMPILER__ // Robert Roebling
- if (m_currentPage == pageNum)
- return TRUE;
+ if (m_currentPage == pageNum)
+ return TRUE;
- m_currentPage = pageNum;
- if (m_previewBitmap)
- {
- delete m_previewBitmap;
- m_previewBitmap = NULL;
- }
-
- if (m_previewCanvas)
- {
- RenderPage(pageNum);
- m_previewCanvas->Refresh();
- }
-
-#endif
- return TRUE;
+ m_currentPage = pageNum;
+ if (m_previewBitmap)
+ {
+ delete m_previewBitmap;
+ m_previewBitmap = NULL;
+ }
+
+ if (m_previewCanvas)
+ {
+ AdjustScrollbars(m_previewCanvas);
+
+ if (!RenderPage(pageNum))
+ return FALSE;
+ m_previewCanvas->Refresh();
+ m_previewCanvas->SetFocus();
+ }
+ return TRUE;
}
-bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
+bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
{
+ DrawBlankPage(canvas, dc);
-#ifdef __GOOD_COMPILER__ // Robert Roebling
+ if (!m_previewBitmap)
+ if (!RenderPage(m_currentPage))
+ return FALSE;
- DrawBlankPage(canvas, dc);
+ if (!m_previewBitmap)
+ return FALSE;
- if (!m_previewBitmap)
- RenderPage(m_currentPage);
-
- if (!m_previewBitmap)
- return FALSE;
+ if (!canvas)
+ return FALSE;
- if (!canvas)
- return FALSE;
+ int canvasWidth, canvasHeight;
+ canvas->GetSize(&canvasWidth, &canvasHeight);
- int canvasWidth, canvasHeight;
- canvas->GetSize(&canvasWidth, &canvasHeight);
-
- double zoomScale = ((float)m_currentZoom/(float)100);
- double actualWidth = (zoomScale*m_pageWidth*m_previewScale);
-// float actualHeight = (float)(zoomScale*m_pageHeight*m_previewScale);
+ double zoomScale = ((float)m_currentZoom/(float)100);
+ double actualWidth = (zoomScale*m_pageWidth*m_previewScale);
+ // float actualHeight = (float)(zoomScale*m_pageHeight*m_previewScale);
- int x = ((canvasWidth - actualWidth)/2.0);
- if (x < m_leftMargin)
- x = m_leftMargin;
- int y = m_topMargin;
+ int x = (int) ((canvasWidth - actualWidth)/2.0);
+ if (x < m_leftMargin)
+ x = m_leftMargin;
+ int y = m_topMargin;
- wxMemoryDC temp_dc;
- temp_dc.SelectObject(*m_previewBitmap);
+ wxMemoryDC temp_dc;
+ temp_dc.SelectObject(*m_previewBitmap);
- dc.Blit(x, y, m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0);
+ dc.Blit(x, y, m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0);
- temp_dc.SelectObject(wxNullBitmap);
+ temp_dc.SelectObject(wxNullBitmap);
-#endif
-
- 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)
{
- int canvasWidth, canvasHeight;
-
-#ifdef __GOOD_COMPILER__ // Robert Roebling
-
- if (!m_previewCanvas)
- {
- wxMessageBox(_("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!"),
- _("Print Preview Failure"), wxOK);
- return FALSE;
- }
- m_previewCanvas->GetSize(&canvasWidth, &canvasHeight);
-
- double zoomScale = (m_currentZoom/100.0);
- int actualWidth = (int)(zoomScale*m_pageWidth*m_previewScale);
- int actualHeight = (int)(zoomScale*m_pageHeight*m_previewScale);
-
- int x = (int)((canvasWidth - actualWidth)/2.0);
- if (x < m_leftMargin)
- x = m_leftMargin;
-// int y = m_topMargin;
-
-
- if (!m_previewBitmap)
- {
- m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
- if (!m_previewBitmap || !m_previewBitmap->Ok())
+ wxBusyCursor busy;
+
+ int canvasWidth, canvasHeight;
+
+ if (!m_previewCanvas)
{
- if (m_previewBitmap)
- delete m_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(*m_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);
- m_previewPrintout->SetDC(&memoryDC);
- m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
+ if (!m_previewBitmap)
+ {
+ m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
+ if (!m_previewBitmap || !m_previewBitmap->Ok())
+ {
+ if (m_previewBitmap) {
+ delete m_previewBitmap;
+ m_previewBitmap = NULL;
+ }
+ wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
+ return FALSE;
+ }
+ }
- m_previewPrintout->OnBeginPrinting();
-
+ wxMemoryDC memoryDC;
+ memoryDC.SelectObject(*m_previewBitmap);
- if (!m_previewPrintout->OnBeginDocument(m_printData.GetFromPage(), m_printData.GetToPage()))
- {
- wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);
-
- memoryDC.SelectObject(wxNullBitmap);
+ memoryDC.Clear();
- delete m_previewBitmap;
- return FALSE;
- }
-
- m_previewPrintout->OnPrintPage(pageNum);
- m_previewPrintout->OnEndDocument();
- m_previewPrintout->OnEndPrinting();
-
- m_previewPrintout->SetDC(NULL);
-
- memoryDC.SelectObject(wxNullBitmap);
-#endif
+ m_previewPrintout->SetDC(&memoryDC);
+ m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
- char buf[200];
- if (m_maxPage != 0)
- sprintf(buf, _("Page %d of %d"), pageNum, m_maxPage);
- else
- sprintf(buf, _("Page %d"), pageNum);
+ // Need to delay OnPreparePrinting until here, so we have enough information.
+ if (!m_printingPrepared)
+ {
+ m_previewPrintout->OnPreparePrinting();
+ int selFrom, selTo;
+ m_previewPrintout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo);
+ m_printingPrepared = TRUE;
+ }
- if (m_previewFrame)
- m_previewFrame->SetStatusText(buf);
+ m_previewPrintout->OnBeginPrinting();
- return TRUE;
+ if (!m_previewPrintout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
+ {
+ wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);
+
+ memoryDC.SelectObject(wxNullBitmap);
+
+ delete m_previewBitmap;
+ m_previewBitmap = NULL;
+ return FALSE;
+ }
+
+ m_previewPrintout->OnPrintPage(pageNum);
+ m_previewPrintout->OnEndDocument();
+ m_previewPrintout->OnEndPrinting();
+
+ m_previewPrintout->SetDC(NULL);
+
+ memoryDC.SelectObject(wxNullBitmap);
+
+#if wxUSE_STATUSBAR
+ wxString status;
+ if (m_maxPage != 0)
+ status = wxString::Format(_("Page %d of %d"), pageNum, m_maxPage);
+ else
+ status = wxString::Format(_("Page %d"), pageNum);
+
+ if (m_previewFrame)
+ m_previewFrame->SetStatusText(status);
+#endif
+
+ return TRUE;
}
-bool wxPrintPreviewBase::DrawBlankPage(wxWindow *canvas, wxDC& dc)
+bool wxPrintPreviewBase::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)
{
+ int canvasWidth, canvasHeight;
+ canvas->GetSize(&canvasWidth, &canvasHeight);
-#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)m_currentZoom/(float)100);
- float actualWidth = zoomScale*m_pageWidth*m_previewScale;
- float actualHeight = zoomScale*m_pageHeight*m_previewScale;
+ float x = (float)((canvasWidth - actualWidth)/2.0);
+ if (x < m_leftMargin)
+ x = (float)m_leftMargin;
+ float y = (float)m_topMargin;
- float x = (float)((canvasWidth - actualWidth)/2.0);
- if (x < m_leftMargin)
- x = (float)m_leftMargin;
- float y = (float)m_topMargin;
+ // Draw shadow, allowing for 1-pixel border AROUND the actual page
+ int shadowOffset = 4;
+ dc.SetPen(*wxBLACK_PEN);
+ 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)
{
-#ifdef __GOOD_COMPILER__ // Robert Roebling
- if (m_currentZoom == percent)
- return;
-
- m_currentZoom = percent;
- if (m_previewBitmap)
- {
- delete m_previewBitmap;
- m_previewBitmap = NULL;
- }
- RenderPage(m_currentPage);
-
- if (m_previewCanvas)
- {
- m_previewCanvas->Clear();
- m_previewCanvas->Refresh();
- }
-#endif
-
+ if (m_currentZoom == percent)
+ return;
+
+ m_currentZoom = percent;
+ if (m_previewBitmap)
+ {
+ delete m_previewBitmap;
+ m_previewBitmap = NULL;
+ }
+
+ if (m_previewCanvas)
+ {
+ AdjustScrollbars(m_previewCanvas);
+ RenderPage(m_currentPage);
+ ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
+ m_previewCanvas->ClearBackground();
+ m_previewCanvas->Refresh();
+ m_previewCanvas->SetFocus();
+ }
}
+
+#endif // wxUSE_PRINTING_ARCHITECTURE
projects / wxWidgets.git / blobdiff