#include <stdlib.h>
#include <string.h>
+#include <wx/sizer.h>
+
#ifdef __WXMSW__
#include "wx/msw/private.h"
#include <commdlg.h>
#endif
#endif // __WXMSW__
-#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxPrinterBase, wxObject)
IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
EVT_PAINT(wxPreviewCanvas::OnPaint)
EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
END_EVENT_TABLE()
-#endif
/*
* Printer
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()
{
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;
}
-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);
}
bool wxPrintout::OnBeginDocument(int WXUNUSED(startPage), int WXUNUSED(endPage))
{
- return GetDC()->StartDoc(_("Printing"));
+ return GetDC()->StartDoc(_("Printing ") + m_printoutTitle);
}
void wxPrintout::OnEndDocument()
wxScrolledWindow(parent, -1, pos, size, style, name)
{
m_printPreview = preview;
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
SetScrollbars(15, 18, 100, 100);
}
wxPaintDC dc(this);
PrepareDC( 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));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
// Propagate the event to the non-top-level children
if (m_buttonFlags & wxPREVIEW_PREVIOUS)
{
- m_previousPageButton = new wxButton(this, wxID_PREVIEW_PREVIOUS, "<<", wxPoint(x, y),
+ 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, ">>",
+ m_nextPageButton = new wxButton(this, wxID_PREVIEW_NEXT, wxT(">>"),
wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
x += gap + buttonWidth;
}
"120%", "150%", "200%"
};
- m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM,
- wxPoint(x, y), wxSize(100, -1));
-
- // Yes, this look stupid, but this is because gcc gives up otherwise.
int n = WXSIZEOF(choices);
-// Someone is calling methods that do no exist in wxChoice!! So I'll just comment out for VA for now
- for ( int i = 0; i < n; i++ )
- m_zoomControl->Append(choices[i]);
+
+ 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());
}
if (m_previewCanvas)
{
- RenderPage(pageNum);
+ if (!RenderPage(pageNum))
+ return FALSE;
m_previewCanvas->Refresh();
}
return TRUE;
DrawBlankPage(canvas, dc);
if (!m_previewBitmap)
- RenderPage(m_currentPage);
+ if (!RenderPage(m_currentPage))
+ return FALSE;
if (!m_previewBitmap)
return FALSE;
bool wxPrintPreviewBase::RenderPage(int pageNum)
{
+ wxBusyCursor busy;
+
int canvasWidth, canvasHeight;
if (!m_previewCanvas)
{
- wxMessageBox(_("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!"),
- _("Print Preview Failure"), wxOK);
+ wxFAIL_MSG(_T("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!"));
+
return FALSE;
}
m_previewCanvas->GetSize(&canvasWidth, &canvasHeight);
m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
if (!m_previewBitmap || !m_previewBitmap->Ok())
{
- if (m_previewBitmap)
+ if (m_previewBitmap) {
delete m_previewBitmap;
+ m_previewBitmap = NULL;
+ }
wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
return FALSE;
}
memoryDC.SelectObject(wxNullBitmap);
delete m_previewBitmap;
+ m_previewBitmap = NULL;
return FALSE;
}
m_previewBitmap = NULL;
}
-
if (m_previewCanvas)
{
RenderPage(m_currentPage);
+ ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
m_previewCanvas->Clear();
m_previewCanvas->Refresh();
}
projects / wxWidgets.git / blobdiff