X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9134af5b50f932d73dd0ead75c36b7095cc40c08..9920ad328b7bb97ad927b9524cbe6e1b785be742:/samples/printing/printing.cpp?ds=sidebyside

diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 8e5477c0af..bfe2f16192 100644
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        printing.cpp
-// Purpose:     Printing demo for wxWindows
+// Name:        samples/printing.cpp
+// Purpose:     Printing demo for wxWidgets
 // Author:      Julian Smart
 // Modified by:
 // Created:     1995
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -36,7 +32,7 @@
 #include "wx/metafile.h"
 #include "wx/print.h"
 #include "wx/printdlg.h"
-
+#include "wx/image.h"
 #include "wx/accel.h"
 
 #if wxTEST_POSTSCRIPT_IN_MSW
@@ -44,12 +40,22 @@
 #include "wx/generic/prntdlgg.h"
 #endif
 
+#ifdef __WXMAC__
+#include "wx/mac/printdlg.h"
+#endif
+
 #include "printing.h"
 
 #ifndef __WXMSW__
 #include "mondrian.xpm"
 #endif
 
+#if wxUSE_LIBGNOMEPRINT
+#include "wx/html/forcelnk.h"
+FORCE_LINK(gnome_print)
+#endif
+
+
 // Declare a frame
 MyFrame   *frame = (MyFrame *) NULL;
 // int orientation = wxPORTRAIT;
@@ -58,32 +64,43 @@ MyFrame   *frame = (MyFrame *) NULL;
 wxPrintData *g_printData = (wxPrintData*) NULL ;
 
 // Global page setup data
-wxPageSetupData* g_pageSetupData = (wxPageSetupData*) NULL;
+wxPageSetupDialogData* g_pageSetupData = (wxPageSetupDialogData*) NULL;
 
 // Main proc
 IMPLEMENT_APP(MyApp)
 
 // Writes a header on a page. Margin units are in millimetres.
-bool WritePageHeader(wxPrintout *printout, wxDC *dc, wxChar *text, float mmToLogical);
-
-MyApp::MyApp()
-{
-}
+bool WritePageHeader(wxPrintout *printout, wxDC *dc, const wxChar *text, float mmToLogical);
 
 // The `main program' equivalent, creating the windows and returning the
 // main frame
+
 bool MyApp::OnInit(void)
 {
+    wxInitAllImageHandlers();
+
     m_testFont.Create(10, wxSWISS, wxNORMAL, wxNORMAL);
 
     g_printData = new wxPrintData;
+    // Set an initial paper size
+//    g_printData->SetPaperId(wxPAPER_LETTER); // for Americans
+    g_printData->SetPaperId(wxPAPER_A4);    // for everyone else    
+
     g_pageSetupData = new wxPageSetupDialogData;
+    // copy over initial paper size from print record
+    (*g_pageSetupData) = *g_printData;
+    // Set some initial page margins in mm. 
+    g_pageSetupData->SetMarginTopLeft(wxPoint(15, 15));
+    g_pageSetupData->SetMarginBottomRight(wxPoint(15, 15));
 
     // Create the main frame window
-    frame = new MyFrame((wxFrame *) NULL, _T("wxWindows Printing Demo"), wxPoint(0, 0), wxSize(400, 400));
+    frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Printing Demo"), 
+        wxPoint(0, 0), wxSize(400, 400));
 
+#if wxUSE_STATUSBAR
     // Give it a status line
     frame->CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
 
     // Load icon and bitmap
     frame->SetIcon( wxICON( mondrian) );
@@ -92,8 +109,10 @@ bool MyApp::OnInit(void)
     wxMenu *file_menu = new wxMenu;
 
     file_menu->Append(WXPRINT_PRINT, _T("&Print..."),              _T("Print"));
-    file_menu->Append(WXPRINT_PRINT_SETUP, _T("Print &Setup..."),              _T("Setup printer properties"));
     file_menu->Append(WXPRINT_PAGE_SETUP, _T("Page Set&up..."),              _T("Page setup"));
+#ifdef __WXMAC__
+    file_menu->Append(WXPRINT_PAGE_MARGINS, _T("Page Margins..."), _T("Page margins"));
+#endif
     file_menu->Append(WXPRINT_PREVIEW, _T("Print Pre&view"),              _T("Preview"));
 
 #if wxUSE_ACCEL
@@ -107,10 +126,13 @@ bool MyApp::OnInit(void)
 #if defined(__WXMSW__) && wxTEST_POSTSCRIPT_IN_MSW
     file_menu->AppendSeparator();
     file_menu->Append(WXPRINT_PRINT_PS, _T("Print PostScript..."),              _T("Print (PostScript)"));
-    file_menu->Append(WXPRINT_PRINT_SETUP_PS, _T("Print Setup PostScript..."),              _T("Setup printer properties (PostScript)"));
     file_menu->Append(WXPRINT_PAGE_SETUP_PS, _T("Page Setup PostScript..."),              _T("Page setup (PostScript)"));
     file_menu->Append(WXPRINT_PREVIEW_PS, _T("Print Preview PostScript"),              _T("Preview (PostScript)"));
 #endif
+
+    file_menu->AppendSeparator();
+    file_menu->Append(WXPRINT_ANGLEUP, _T("Angle up\tAlt-U"),                _T("Raise rotated text angle"));
+    file_menu->Append(WXPRINT_ANGLEDOWN, _T("Angle down\tAlt-D"),            _T("Lower rotated text angle"));
     file_menu->AppendSeparator();
     file_menu->Append(WXPRINT_QUIT, _T("E&xit"),                _T("Exit program"));
 
@@ -135,7 +157,9 @@ bool MyApp::OnInit(void)
     frame->Centre(wxBOTH);
     frame->Show();
 
+#if wxUSE_STATUSBAR
     frame->SetStatusText(_T("Printing demo"));
+#endif // wxUSE_STATUSBAR
 
     SetTopWindow(frame);
 
@@ -153,15 +177,18 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 EVT_MENU(WXPRINT_QUIT, MyFrame::OnExit)
 EVT_MENU(WXPRINT_PRINT, MyFrame::OnPrint)
 EVT_MENU(WXPRINT_PREVIEW, MyFrame::OnPrintPreview)
-EVT_MENU(WXPRINT_PRINT_SETUP, MyFrame::OnPrintSetup)
 EVT_MENU(WXPRINT_PAGE_SETUP, MyFrame::OnPageSetup)
 EVT_MENU(WXPRINT_ABOUT, MyFrame::OnPrintAbout)
 #if defined(__WXMSW__) && wxTEST_POSTSCRIPT_IN_MSW
 EVT_MENU(WXPRINT_PRINT_PS, MyFrame::OnPrintPS)
 EVT_MENU(WXPRINT_PREVIEW_PS, MyFrame::OnPrintPreviewPS)
-EVT_MENU(WXPRINT_PRINT_SETUP_PS, MyFrame::OnPrintSetupPS)
 EVT_MENU(WXPRINT_PAGE_SETUP_PS, MyFrame::OnPageSetupPS)
 #endif
+#ifdef __WXMAC__
+EVT_MENU(WXPRINT_PAGE_MARGINS, MyFrame::OnPageMargins)
+#endif
+EVT_MENU(WXPRINT_ANGLEUP, MyFrame::OnAngleUp)
+EVT_MENU(WXPRINT_ANGLEDOWN, MyFrame::OnAngleDown)
 END_EVENT_TABLE()
 
 // Define my frame constructor
@@ -169,6 +196,16 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, cons
 wxFrame(frame, wxID_ANY, title, pos, size)
 {
     canvas = NULL;
+    m_angle = 30;
+#if 0
+    wxImage image( wxT("test.jpg") );
+    image.SetAlpha();
+    int i,j;
+    for (i = 0; i < image.GetWidth(); i++)
+       for (j = 0; j < image.GetHeight(); j++)
+          image.SetAlpha( i, j, 50 );
+    m_bitmap = image;
+#endif
 }
 
 void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
@@ -213,26 +250,15 @@ void MyFrame::OnPrintPreview(wxCommandEvent& WXUNUSED(event))
     frame->Show();
 }
 
-void MyFrame::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
-{
-    wxPrintDialogData printDialogData(* g_printData);
-    wxPrintDialog printerDialog(this, & printDialogData);
-
-    printerDialog.GetPrintDialogData().SetSetupDialog(true /*show print setup dialog*/);
-    printerDialog.ShowModal();
-
-    (*g_printData) = printerDialog.GetPrintDialogData().GetPrintData();
-}
-
 void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 {
-    (*g_pageSetupData) = * g_printData;
+    (*g_pageSetupData) = *g_printData;
 
     wxPageSetupDialog pageSetupDialog(this, g_pageSetupData);
     pageSetupDialog.ShowModal();
 
-    (*g_printData) = pageSetupDialog.GetPageSetupData().GetPrintData();
-    (*g_pageSetupData) = pageSetupDialog.GetPageSetupData();
+    (*g_printData) = pageSetupDialog.GetPageSetupDialogData().GetPrintData();
+    (*g_pageSetupData) = pageSetupDialog.GetPageSetupDialogData();
 }
 
 #if defined(__WXMSW__) && wxTEST_POSTSCRIPT_IN_MSW
@@ -256,68 +282,132 @@ void MyFrame::OnPrintPreviewPS(wxCommandEvent& WXUNUSED(event))
     frame->Show();
 }
 
-void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
 {
-    wxPrintDialogData printDialogData(* g_printData);
-    wxGenericPrintDialog printerDialog(this, & printDialogData);
+    (*g_pageSetupData) = * g_printData;
 
-    printerDialog.GetPrintDialogData().SetSetupDialog(true /*show print setup dialog*/);
-    printerDialog.ShowModal();
+    wxGenericPageSetupDialog pageSetupDialog(this, g_pageSetupData);
+    pageSetupDialog.ShowModal();
 
-    (*g_printData) = printerDialog.GetPrintDialogData().GetPrintData();
+    (*g_printData) = pageSetupDialog.GetPageSetupDialogData().GetPrintData();
+    (*g_pageSetupData) = pageSetupDialog.GetPageSetupDialogData();
 }
+#endif
 
-void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
+
+#ifdef __WXMAC__
+void MyFrame::OnPageMargins(wxCommandEvent& WXUNUSED(event))
 {
-    (*g_pageSetupData) = * g_printData;
+    (*g_pageSetupData) = *g_printData;
 
-    wxGenericPageSetupDialog pageSetupDialog(this, g_pageSetupData);
-    pageSetupDialog.ShowModal();
+    wxMacPageMarginsDialog pageMarginsDialog(this, g_pageSetupData);
+    pageMarginsDialog.ShowModal();
 
-    (*g_printData) = pageSetupDialog.GetPageSetupData().GetPrintData();
-    (*g_pageSetupData) = pageSetupDialog.GetPageSetupData();
+    (*g_printData) = pageMarginsDialog.GetPageSetupDialogData().GetPrintData();
+    (*g_pageSetupData) = pageMarginsDialog.GetPageSetupDialogData();
 }
 #endif
 
 
 void MyFrame::OnPrintAbout(wxCommandEvent& WXUNUSED(event))
 {
-    (void)wxMessageBox(_T("wxWindows printing demo\nAuthor: Julian Smart"),
-        _T("About wxWindows printing demo"), wxOK|wxCENTRE);
+    (void)wxMessageBox(_T("wxWidgets printing demo\nAuthor: Julian Smart"),
+        _T("About wxWidgets printing demo"), wxOK|wxCENTRE);
+}
+
+void MyFrame::OnAngleUp(wxCommandEvent& WXUNUSED(event))
+{
+    m_angle += 5;
+    canvas->Refresh();
+}
+
+void MyFrame::OnAngleDown(wxCommandEvent& WXUNUSED(event))
+{
+    m_angle -= 5;
+    canvas->Refresh();
 }
 
 void MyFrame::Draw(wxDC& dc)
 {
+    // This routine just draws a bunch of random stuff on the screen so that we
+    // can check that different types of object are being drawn consistently
+    // between the screen image, the print preview image (at various zoom
+    // levels), and the printed page.
     dc.SetBackground(*wxWHITE_BRUSH);
     dc.Clear();
     dc.SetFont(wxGetApp().m_testFont);
 
     dc.SetBackgroundMode(wxTRANSPARENT);
 
-    dc.SetBrush(* wxCYAN_BRUSH);
-    dc.SetPen(* wxRED_PEN);
+    dc.SetPen(*wxBLACK_PEN);
+    dc.SetBrush(*wxLIGHT_GREY_BRUSH);
+    dc.DrawRectangle(0, 0, 230, 350);
+    dc.DrawLine(0, 0, 229, 349);
+    dc.DrawLine(229, 0, 0, 349);
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
-    dc.DrawRectangle(0, 30, 200, 100);
+    dc.SetBrush(*wxCYAN_BRUSH);
+    dc.SetPen(*wxRED_PEN);
 
-    dc.DrawText( wxT("Rectangle 200 by 100"), 40, 40);
+    dc.DrawRoundedRectangle(0, 20, 200, 80, 20);
 
+    dc.DrawText( wxT("Rectangle 200 by 80"), 40, 40);
+
+    dc.SetPen( wxPen(*wxBLACK,0,wxDOT_DASH) );
     dc.DrawEllipse(50, 140, 100, 50);
+    dc.SetPen(*wxRED_PEN);
 
     dc.DrawText( wxT("Test message: this is in 10 point text"), 10, 180);
-
+    
 #if wxUSE_UNICODE
     char *test = "Hebrew    שלום -- Japanese (日本語)";
     wxString tmp = wxConvUTF8.cMB2WC( test );
     dc.DrawText( tmp, 10, 200 );
 #endif
 
-    dc.SetPen(* wxBLACK_PEN);
-    dc.DrawLine(0, 0, 200, 200);
-    dc.DrawLine(200, 0, 0, 200);
+    wxPoint points[5];
+    points[0].x = 0;
+    points[0].y = 0;
+    points[1].x = 20;
+    points[1].y = 0;
+    points[2].x = 20;
+    points[2].y = 20;
+    points[3].x = 10;
+    points[3].y = 20;
+    points[4].x = 10;
+    points[4].y = -20;
+    dc.DrawPolygon( 5, points, 20, 250, wxODDEVEN_RULE );
+    dc.DrawPolygon( 5, points, 50, 250, wxWINDING_RULE );
+
+    dc.DrawEllipticArc( 80, 250, 60, 30, 0.0, 270.0 );
+
+    points[0].x = 150;
+    points[0].y = 250;
+    points[1].x = 180;
+    points[1].y = 250;
+    points[2].x = 180;
+    points[2].y = 220;
+    points[3].x = 200;
+    points[3].y = 220;
+    dc.DrawSpline( 4, points );
+
+    dc.DrawArc( 20,10, 10,10, 25,40 );
+        
+    wxString str;
+    int i = 0;
+    str.Printf( wxT("---- Text at angle %d ----"), i );
+    dc.DrawRotatedText( str, 100, 300, i );
+
+    i = m_angle;
+    str.Printf( wxT("---- Text at angle %d ----"), i );
+    dc.DrawRotatedText( str, 100, 300, i );
 
     wxIcon my_icon = wxICON(mondrian) ;
 
     dc.DrawIcon( my_icon, 100, 100);
+
+    if (m_bitmap.Ok())
+        dc.DrawBitmap( m_bitmap, 10, 10 );
 }
 
 void MyFrame::OnSize(wxSizeEvent& event )
@@ -329,18 +419,12 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 EVT_MOUSE_EVENTS(MyCanvas::OnEvent)
 END_EVENT_TABLE()
 
-// Define a constructor for my canvas
 MyCanvas::MyCanvas(wxFrame *frame, const wxPoint& pos, const wxSize& size, long style):
     wxScrolledWindow(frame, wxID_ANY, pos, size, style)
 {
     SetBackgroundColour(* wxWHITE);
 }
 
-MyCanvas::~MyCanvas(void)
-{
-}
-
-// Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {
     frame->Draw(dc);
@@ -356,16 +440,16 @@ bool MyPrintout::OnPrintPage(int page)
     if (dc)
     {
         if (page == 1)
-            DrawPageOne(dc);
+            DrawPageOne();
         else if (page == 2)
-            DrawPageTwo(dc);
-
-        dc->SetDeviceOrigin(0, 0);
-        dc->SetUserScale(1.0, 1.0);
+            DrawPageTwo();
 
+        // Draw page numbers at top left corner of printable area, sized so that
+        // screen size of text matches paper size.
+        MapScreenSizeToPage();
         wxChar buf[200];
         wxSprintf(buf, wxT("PAGE %d"), page);
-        dc->DrawText(buf, 10, 10);
+        dc->DrawText(buf, 0, 0);
 
         return true;
     }
@@ -394,94 +478,131 @@ bool MyPrintout::HasPage(int pageNum)
     return (pageNum == 1 || pageNum == 2);
 }
 
-void MyPrintout::DrawPageOne(wxDC *dc)
+void MyPrintout::DrawPageOne()
 {
-    // You might use THIS code if you were scaling
-    // graphics of known size to fit on the page.
-
-    // We know the graphic is 200x200. If we didn't know this,
-    // we'd need to calculate it.
-    float maxX = 200;
-    float maxY = 200;
-
-    // Let's have at least 50 device units margin
-    float marginX = 50;
-    float marginY = 50;
-
-    // Add the margin to the graphic size
-    maxX += (2*marginX);
-    maxY += (2*marginY);
-
-    // Get the size of the DC in pixels
-    int w, h;
-    dc->GetSize(&w, &h);
-
-    // Calculate a suitable scaling factor
-    float scaleX=(float)(w/maxX);
-    float scaleY=(float)(h/maxY);
-
-    // Use x or y scaling factor, whichever fits on the DC
-    float actualScale = wxMin(scaleX,scaleY);
-
-    // Calculate the position on the DC for centring the graphic
-    float posX = (float)((w - (200*actualScale))/2.0);
-    float posY = (float)((h - (200*actualScale))/2.0);
-
-    // Set the scale and origin
-    dc->SetUserScale(actualScale, actualScale);
-    dc->SetDeviceOrigin( (long)posX, (long)posY );
-
-    frame->Draw(*dc);
+    // You might use THIS code if you were scaling graphics of known size to fit
+    // on the page. The commented-out code illustrates different ways of scaling
+    // the graphics.
+
+    // We know the graphic is 230x350. If we didn't know this, we'd need to
+    // calculate it.
+    wxCoord maxX = 230;
+    wxCoord maxY = 350;
+
+    // This sets the user scale and origin of the DC so that the image fits
+    // within the paper rectangle (but the edges could be cut off by printers
+    // that can't print to the edges of the paper -- which is most of them. Use
+    // this if your image already has its own margins.
+//    FitThisSizeToPaper(wxSize(maxX, maxY));
+//    wxRect fitRect = GetLogicalPaperRect();
+
+    // This sets the user scale and origin of the DC so that the image fits
+    // within the page rectangle, which is the printable area on Mac and MSW
+    // and is the entire page on other platforms.
+//    FitThisSizeToPage(wxSize(maxX, maxY));
+//    wxRect fitRect = GetLogicalPageRect();
+
+    // This sets the user scale and origin of the DC so that the image fits
+    // within the page margins as specified by g_PageSetupData, which you can
+    // change (on some platforms, at least) in the Page Setup dialog. Note that
+    // on Mac, the native Page Setup dialog doesn't let you change the margins
+    // of a wxPageSetupDialogData object, so you'll have to write your own dialog or
+    // use the Mac-only wxMacPageMarginsDialog, as we do in this program.
+    FitThisSizeToPageMargins(wxSize(maxX, maxY), *g_pageSetupData);
+    wxRect fitRect = GetLogicalPageMarginsRect(*g_pageSetupData);
+
+    // This sets the user scale and origin of the DC so that the image appears
+    // on the paper at the same size that it appears on screen (i.e., 10-point
+    // type on screen is 10-point on the printed page) and is positioned in the
+    // top left corner of the page rectangle (just as the screen image appears
+    // in the top left corner of the window).
+//    MapScreenSizeToPage();
+//    wxRect fitRect = GetLogicalPageRect();
+
+    // You could also map the screen image to the entire paper at the same size
+    // as it appears on screen.
+//    MapScreenSizeToPaper();
+//    wxRect fitRect = GetLogicalPaperRect();
+
+    // You might also wish to do you own scaling in order to draw objects at
+    // full native device resolution. In this case, you should do the following.
+    // Note that you can use the GetLogicalXXXRect() commands to obtain the
+    // appropriate rect to scale to.
+//    MapScreenSizeToDevice();
+//    wxRect fitRect = GetLogicalPageRect();
+
+    // Each of the preceding Fit or Map routines positions the origin so that
+    // the drawn image is positioned at the top left corner of the reference
+    // rectangle. You can easily center or right- or bottom-justify the image as
+    // follows.
+
+    // This offsets the image so that it is centered within the reference
+    // rectangle defined above.
+    wxCoord xoff = (fitRect.width - maxX) / 2;
+    wxCoord yoff = (fitRect.height - maxY) / 2;
+    OffsetLogicalOrigin(xoff, yoff);
+
+    // This offsets the image so that it is positioned at the bottom right of
+    // the reference rectangle defined above.
+//    wxCoord xoff = (fitRect.width - maxX);
+//    wxCoord yoff = (fitRect.height - maxY);
+//    OffsetLogicalOrigin(xoff, yoff);
+
+    frame->Draw(*GetDC());
 }
 
-void MyPrintout::DrawPageTwo(wxDC *dc)
+void MyPrintout::DrawPageTwo()
 {
     // You might use THIS code to set the printer DC to ROUGHLY reflect
     // the screen text size. This page also draws lines of actual length
     // 5cm on the page.
 
+    // Compare this to DrawPageOne(), which uses the really convenient routines
+    // from wxPrintout to fit the screen image onto the printed page. This page
+    // illustrates how to do all the scaling calculations yourself, if you're so
+    // inclined.
+
+    wxDC *dc = GetDC();
+
     // Get the logical pixels per inch of screen and printer
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
 
-    // This scales the DC so that the printout roughly represents the
-    // the screen scaling. The text point size _should_ be the right size
-    // but in fact is too small for some reason. This is a detail that will
-    // need to be addressed at some point but can be fudged for the
-    // moment.
+    // This scales the DC so that the printout roughly represents the the screen
+    // scaling. The text point size _should_ be the right size but in fact is
+    // too small for some reason. This is a detail that will need to be
+    // addressed at some point but can be fudged for the moment.
     float scale = (float)((float)ppiPrinterX/(float)ppiScreenX);
 
-    // Now we have to check in case our real page size is reduced
-    // (e.g. because we're drawing to a print preview memory DC)
+    // Now we have to check in case our real page size is reduced (e.g. because
+    // we're drawing to a print preview memory DC)
     int pageWidth, pageHeight;
     int w, h;
     dc->GetSize(&w, &h);
     GetPageSizePixels(&pageWidth, &pageHeight);
 
-    // If printer pageWidth == current DC width, then this doesn't
-    // change. But w might be the preview bitmap width, so scale down.
+    // If printer pageWidth == current DC width, then this doesn't change. But w
+    // might be the preview bitmap width, so scale down.
     float overallScale = scale * (float)(w/(float)pageWidth);
     dc->SetUserScale(overallScale, overallScale);
 
-    // Calculate conversion factor for converting millimetres into
-    // logical units.
-    // There are approx. 25.1 mm to the inch. There are ppi
-    // device units to the inch. Therefore 1 mm corresponds to
-    // ppi/25.1 device units. We also divide by the
-    // screen-to-printer scaling factor, because we need to
+    // Calculate conversion factor for converting millimetres into logical
+    // units. There are approx. 25.4 mm to the inch. There are ppi device units
+    // to the inch. Therefore 1 mm corresponds to ppi/25.4 device units. We also
+    // divide by the screen-to-printer scaling factor, because we need to
     // unscale to pass logical units to DrawLine.
 
     // Draw 50 mm by 50 mm L shape
-    float logUnitsFactor = (float)(ppiPrinterX/(scale*25.1));
+    float logUnitsFactor = (float)(ppiPrinterX/(scale*25.4));
     float logUnits = (float)(50*logUnitsFactor);
     dc->SetPen(* wxBLACK_PEN);
     dc->DrawLine(50, 250, (long)(50.0 + logUnits), 250);
     dc->DrawLine(50, 250, 50, (long)(250.0 + logUnits));
 
     dc->SetBackgroundMode(wxTRANSPARENT);
-
+    dc->SetBrush(*wxTRANSPARENT_BRUSH);
 
     { // GetTextExtent demo:
         wxString words[7] = {_T("This "), _T("is "), _T("GetTextExtent "), _T("testing "), _T("string. "), _T("Enjoy "), _T("it!")};
@@ -533,7 +654,7 @@ void MyPrintout::DrawPageTwo(wxDC *dc)
 }
 
 // Writes a header on a page. Margin units are in millimetres.
-bool WritePageHeader(wxPrintout *printout, wxDC *dc, wxChar *text, float mmToLogical)
+bool WritePageHeader(wxPrintout *printout, wxDC *dc, const wxChar *text, float mmToLogical)
 {
 /*
 static wxFont *headerFont = (wxFont *) NULL;
@@ -547,6 +668,7 @@ dc->SetFont(headerFont);
     int pageWidthMM, pageHeightMM;
 
     printout->GetPageSizeMM(&pageWidthMM, &pageHeightMM);
+    wxUnusedVar(pageHeightMM);
 
     int leftMargin = 10;
     int topMargin = 10;