#include "wx/defs.h"
+#if wxUSE_PRINTING_ARCHITECTURE
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dc.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
-
-#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_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
+ EVT_PAINT(wxPreviewCanvas::OnPaint)
+ EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
END_EVENT_TABLE()
-#endif
/*
* Printer
BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
EVT_BUTTON(wxID_PREVIEW_CLOSE, wxPreviewControlBar::OnWindowClose)
EVT_BUTTON(wxID_PREVIEW_PRINT, wxPreviewControlBar::OnPrint)
- EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPrevious)
- EVT_BUTTON(wxID_PREVIEW_NEXT, wxPreviewControlBar::OnNext)
+ 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()
preview->Print(TRUE);
}
-void wxPreviewControlBar::OnNext(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnChar(wxKeyEvent &event)
+{
+ switch(event.KeyCode())
+ {
+ case WXK_NEXT:
+ OnNext(); break;
+ case WXK_PRIOR:
+ OnPrevious(); break;
+ default:
+ event.Skip();
+ }
+}
+
+void wxPreviewControlBar::OnNext(void)
{
wxPrintPreviewBase *preview = GetPrintPreview();
if (preview)
}
}
-void wxPreviewControlBar::OnPrevious(wxCommandEvent& WXUNUSED(event))
+void wxPreviewControlBar::OnPrevious(void)
{
wxPrintPreviewBase *preview = GetPrintPreview();
if (preview)
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;
}
- 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%"
- };
-
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));
+ wxPoint(x, y),
+ wxSize(100, -1),
+ n,
+ strings
+ );
+ delete[] strings;
+
SetZoomControl(m_printPreview->GetZoom());
}
- // Yes, this look stupid, but this is because gcc gives up otherwise.
- int n = WXSIZEOF(choices);
- for ( int i = 0; i < n; i++ )
- m_zoomControl->Append(choices[i]);
-
// m_closeButton->SetDefault();
}
{
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()
{
- char buf[20];
- if (m_zoomControl && (m_zoomControl->GetStringSelection() != ""))
+ wxChar buf[20];
+ if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxT("")))
{
- strcpy(buf, m_zoomControl->GetStringSelection());
- buf[strlen(buf) - 1] = 0;
- return (int)atoi(buf);
+ wxStrcpy(buf, m_zoomControl->GetStringSelection());
+ buf[wxStrlen(buf) - 1] = 0;
+ return (int)wxAtoi(buf);
}
else return 0;
}
*/
BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
-EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
+ EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
END_EVENT_TABLE()
wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxFrame *parent, const wxString& title,
{
}
-void wxPreviewFrame::OnCloseWindow(wxCloseEvent& event)
+void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
MakeModal(FALSE);
m_previewFrame = NULL;
m_previewBitmap = NULL;
m_currentPage = 1;
- m_currentZoom = 30;
+ m_currentZoom = 70;
m_topMargin = 40;
m_leftMargin = 40;
m_pageWidth = 0;
m_pageHeight = 0;
+ m_printingPrepared = FALSE;
- printout->OnPreparePrinting();
+ // Too soon! Moved to RenderPage.
+ // printout->OnPreparePrinting();
// Get some parameters from the printout, if defined
int selFrom, selTo;
m_previewPrintout->SetDC(&memoryDC);
m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
+ // Need to delay OnPreparePrinting until here, so we have enough information.
+ if (!m_printingPrepared)
+ {
+ m_previewPrintout->OnPreparePrinting();
+ m_printingPrepared = TRUE;
+ }
+
m_previewPrintout->OnBeginPrinting();
if (!m_previewPrintout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
memoryDC.SelectObject(wxNullBitmap);
- char buf[200];
+ wxChar buf[200];
if (m_maxPage != 0)
- sprintf(buf, _("Page %d of %d"), pageNum, m_maxPage);
+ wxSprintf(buf, _("Page %d of %d"), pageNum, m_maxPage);
else
- sprintf(buf, _("Page %d"), pageNum);
+ wxSprintf(buf, _("Page %d"), pageNum);
if (m_previewFrame)
m_previewFrame->SetStatusText(buf);
delete m_previewBitmap;
m_previewBitmap = NULL;
}
- RenderPage(m_currentPage);
if (m_previewCanvas)
{
+ RenderPage(m_currentPage);
+ ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
m_previewCanvas->Clear();
m_previewCanvas->Refresh();
}
}
+#endif // wxUSE_PRINTING_ARCHITECTURE
projects / wxWidgets.git / blobdiff