Remove unintentionally added whitespace

[wxWidgets.git] / samples / printing / printing.cpp

diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 0ce10f7655a1143636bb7f90f030b51f9b141fe7..5315efebea2d551861308ed44bd1a2e4090e1e3f 100644 (file)
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printing.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printing.cpp

-// Purpose:     Printing demo for wxWindows
+// Purpose:     Printing demo for wxWidgets

 // Author:      Julian Smart
 // Modified by:
 // Created:     1995
 // Author:      Julian Smart
 // Modified by:
 // Created:     1995


@@ -25,7 +25,7 @@
 #endif
 
 #if !wxUSE_PRINTING_ARCHITECTURE
 #endif
 
 #if !wxUSE_PRINTING_ARCHITECTURE

-#error You must set wxUSE_PRINTING_ARCHITECTURE to 1 in setup.h to compile this demo.
+#error "You must set wxUSE_PRINTING_ARCHITECTURE to 1 in setup.h, and recompile the library."

 #endif
 
 // Set this to 1 if you want to test PostScript printing under MSW.
 #endif
 
 // Set this to 1 if you want to test PostScript printing under MSW.


@@ -36,7 +36,7 @@
 #include "wx/metafile.h"
 #include "wx/print.h"
 #include "wx/printdlg.h"
 #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
 #include "wx/accel.h"
 
 #if wxTEST_POSTSCRIPT_IN_MSW


@@ -50,6 +50,12 @@
 #include "mondrian.xpm"
 #endif
 
 #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;
 // Declare a frame
 MyFrame   *frame = (MyFrame *) NULL;
 // int orientation = wxPORTRAIT;


@@ -66,36 +72,36 @@ IMPLEMENT_APP(MyApp)
 // Writes a header on a page. Margin units are in millimetres.
 bool WritePageHeader(wxPrintout *printout, wxDC *dc, wxChar *text, float mmToLogical);
 
 // Writes a header on a page. Margin units are in millimetres.
 bool WritePageHeader(wxPrintout *printout, wxDC *dc, wxChar *text, float mmToLogical);
 

-MyApp::MyApp()
-{
-}
-

 // The `main program' equivalent, creating the windows and returning the
 // main frame
 // The `main program' equivalent, creating the windows and returning the
 // main frame

+

 bool MyApp::OnInit(void)
 {
 bool MyApp::OnInit(void)
 {

-    m_testFont = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL);
-    
+    wxInitAllImageHandlers();
+
+    m_testFont.Create(10, wxSWISS, wxNORMAL, wxNORMAL);
+

     g_printData = new wxPrintData;
     g_pageSetupData = new wxPageSetupDialogData;
     g_printData = new wxPrintData;
     g_pageSetupData = new wxPageSetupDialogData;

-    
+

     // Create the main frame window
     // 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);
     // Give it a status line
     frame->CreateStatusBar(2);

-    
+#endif // wxUSE_STATUSBAR
+

     // Load icon and bitmap
     frame->SetIcon( wxICON( mondrian) );
     // Load icon and bitmap
     frame->SetIcon( wxICON( mondrian) );

-    
+

     // Make a menubar
     wxMenu *file_menu = new wxMenu;
     // Make a menubar
     wxMenu *file_menu = new wxMenu;

-    
+

     file_menu->Append(WXPRINT_PRINT, _T("&Print..."),              _T("Print"));
     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"));
     file_menu->Append(WXPRINT_PREVIEW, _T("Print Pre&view"),              _T("Preview"));
     file_menu->Append(WXPRINT_PAGE_SETUP, _T("Page Set&up..."),              _T("Page setup"));
     file_menu->Append(WXPRINT_PREVIEW, _T("Print Pre&view"),              _T("Preview"));

-    
+

 #if wxUSE_ACCEL
     // Accelerators
     wxAcceleratorEntry entries[1];
 #if wxUSE_ACCEL
     // Accelerators
     wxAcceleratorEntry entries[1];


@@ -107,44 +113,47 @@ 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)"));
 #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->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"));
     file_menu->AppendSeparator();
     file_menu->Append(WXPRINT_QUIT, _T("E&xit"),                _T("Exit program"));

-    
+

     wxMenu *help_menu = new wxMenu;
     help_menu->Append(WXPRINT_ABOUT, _T("&About"),              _T("About this demo"));
     wxMenu *help_menu = new wxMenu;
     help_menu->Append(WXPRINT_ABOUT, _T("&About"),              _T("About this demo"));

-    
+

     wxMenuBar *menu_bar = new wxMenuBar;
     wxMenuBar *menu_bar = new wxMenuBar;

-    
+

     menu_bar->Append(file_menu, _T("&File"));
     menu_bar->Append(help_menu, _T("&Help"));
     menu_bar->Append(file_menu, _T("&File"));
     menu_bar->Append(help_menu, _T("&Help"));

-    
+

     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);

-    
+

     MyCanvas *canvas = new MyCanvas(frame, wxPoint(0, 0), wxSize(100, 100), wxRETAINED|wxHSCROLL|wxVSCROLL);
     MyCanvas *canvas = new MyCanvas(frame, wxPoint(0, 0), wxSize(100, 100), wxRETAINED|wxHSCROLL|wxVSCROLL);

-    
+

     // Give it scrollbars: the virtual canvas is 20 * 50 = 1000 pixels in each direction
     canvas->SetScrollbars(20, 20, 50, 50);
     // Give it scrollbars: the virtual canvas is 20 * 50 = 1000 pixels in each direction
     canvas->SetScrollbars(20, 20, 50, 50);

-    
+

     frame->canvas = canvas;
     frame->canvas = canvas;

-    
+

     frame->Centre(wxBOTH);
     frame->Centre(wxBOTH);

-    frame->Show(TRUE);
-    
+    frame->Show();
+
+#if wxUSE_STATUSBAR

     frame->SetStatusText(_T("Printing demo"));
     frame->SetStatusText(_T("Printing demo"));

-    
+#endif // wxUSE_STATUSBAR
+

     SetTopWindow(frame);
     SetTopWindow(frame);

-    
-    return TRUE;
+
+    return true;

 }
 
 int MyApp::OnExit()
 {
 }
 
 int MyApp::OnExit()
 {

-    delete wxGetApp().m_testFont;

     delete g_printData;
     delete g_pageSetupData;
     return 1;
     delete g_printData;
     delete g_pageSetupData;
     return 1;


@@ -154,27 +163,37 @@ 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_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_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
 EVT_MENU(WXPRINT_PAGE_SETUP_PS, MyFrame::OnPageSetupPS)
 #endif

+EVT_MENU(WXPRINT_ANGLEUP, MyFrame::OnAngleUp)
+EVT_MENU(WXPRINT_ANGLEDOWN, MyFrame::OnAngleDown)

 END_EVENT_TABLE()
 
 // Define my frame constructor
 MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
 END_EVENT_TABLE()
 
 // Define my frame constructor
 MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):

-wxFrame(frame, -1, title, pos, size)
+wxFrame(frame, wxID_ANY, title, pos, size)

 {
 {

-    canvas = (MyCanvas *) NULL;
+    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))
 {
 }
 
 void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 {

-    Close(TRUE);
+    Close(true /*force closing*/);

 }
 
 void MyFrame::OnPrint(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnPrint(wxCommandEvent& WXUNUSED(event))


@@ -183,7 +202,7 @@ void MyFrame::OnPrint(wxCommandEvent& WXUNUSED(event))
 
     wxPrinter printer(& printDialogData);
     MyPrintout printout(_T("My printout"));
 
     wxPrinter printer(& printDialogData);
     MyPrintout printout(_T("My printout"));

-    if (!printer.Print(this, &printout, TRUE))
+    if (!printer.Print(this, &printout, true /*prompt*/))

     {
         if (wxPrinter::GetLastError() == wxPRINTER_ERROR)
             wxMessageBox(_T("There was a problem printing.\nPerhaps your current printer is not set correctly?"), _T("Printing"), wxOK);
     {
         if (wxPrinter::GetLastError() == wxPRINTER_ERROR)
             wxMessageBox(_T("There was a problem printing.\nPerhaps your current printer is not set correctly?"), _T("Printing"), wxOK);


@@ -207,31 +226,20 @@ void MyFrame::OnPrintPreview(wxCommandEvent& WXUNUSED(event))
         wxMessageBox(_T("There was a problem previewing.\nPerhaps your current printer is not set correctly?"), _T("Previewing"), wxOK);
         return;
     }
         wxMessageBox(_T("There was a problem previewing.\nPerhaps your current printer is not set correctly?"), _T("Previewing"), wxOK);
         return;
     }

-    
+

     wxPreviewFrame *frame = new wxPreviewFrame(preview, this, _T("Demo Print Preview"), wxPoint(100, 100), wxSize(600, 650));
     frame->Centre(wxBOTH);
     frame->Initialize();
     wxPreviewFrame *frame = new wxPreviewFrame(preview, this, _T("Demo Print Preview"), wxPoint(100, 100), wxSize(600, 650));
     frame->Centre(wxBOTH);
     frame->Initialize();

-    frame->Show(TRUE);
-}
-
-void MyFrame::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
-{
-    wxPrintDialogData printDialogData(* g_printData);
-    wxPrintDialog printerDialog(this, & printDialogData);
-    
-    printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
-    printerDialog.ShowModal();
-
-    (*g_printData) = printerDialog.GetPrintDialogData().GetPrintData();
+    frame->Show();

 }
 
 void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 {

-    (*g_pageSetupData) = * g_printData;
+    (*g_pageSetupData) = *g_printData;

 
     wxPageSetupDialog pageSetupDialog(this, g_pageSetupData);
     pageSetupDialog.ShowModal();
 
     wxPageSetupDialog pageSetupDialog(this, g_pageSetupData);
     pageSetupDialog.ShowModal();

-    
+

     (*g_printData) = pageSetupDialog.GetPageSetupData().GetPrintData();
     (*g_pageSetupData) = pageSetupDialog.GetPageSetupData();
 }
     (*g_printData) = pageSetupDialog.GetPageSetupData().GetPrintData();
     (*g_pageSetupData) = pageSetupDialog.GetPageSetupData();
 }


@@ -241,7 +249,7 @@ void MyFrame::OnPrintPS(wxCommandEvent& WXUNUSED(event))
 {
     wxPostScriptPrinter printer(g_printData);
     MyPrintout printout(_T("My printout"));
 {
     wxPostScriptPrinter printer(g_printData);
     MyPrintout printout(_T("My printout"));

-    printer.Print(this, &printout, TRUE);
+    printer.Print(this, &printout, true/*prompt*/);

 
     (*g_printData) = printer.GetPrintData();
 }
 
     (*g_printData) = printer.GetPrintData();
 }


@@ -254,18 +262,7 @@ void MyFrame::OnPrintPreviewPS(wxCommandEvent& WXUNUSED(event))
     wxPreviewFrame *frame = new wxPreviewFrame(preview, this, _T("Demo Print Preview"), wxPoint(100, 100), wxSize(600, 650));
     frame->Centre(wxBOTH);
     frame->Initialize();
     wxPreviewFrame *frame = new wxPreviewFrame(preview, this, _T("Demo Print Preview"), wxPoint(100, 100), wxSize(600, 650));
     frame->Centre(wxBOTH);
     frame->Initialize();

-    frame->Show(TRUE);
-}
-
-void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
-{
-    wxPrintDialogData printDialogData(* g_printData);
-    wxGenericPrintDialog printerDialog(this, & printDialogData);
-
-    printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
-    printerDialog.ShowModal();
-
-    (*g_printData) = printerDialog.GetPrintDialogData().GetPrintData();
+    frame->Show();

 }
 
 void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))


@@ -283,42 +280,68 @@ void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnPrintAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 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)
 {
     dc.SetBackground(*wxWHITE_BRUSH);
     dc.Clear();
 }
 
 void MyFrame::Draw(wxDC& dc)
 {
     dc.SetBackground(*wxWHITE_BRUSH);
     dc.Clear();

-    dc.SetFont(* wxGetApp().m_testFont);
-    
+    dc.SetFont(wxGetApp().m_testFont);
+

     dc.SetBackgroundMode(wxTRANSPARENT);
     dc.SetBackgroundMode(wxTRANSPARENT);

-    
-    dc.SetBrush(* wxCYAN_BRUSH);
-    dc.SetPen(* wxRED_PEN);
-    
-    dc.DrawRectangle(0, 30, 200, 100);
-    
+
+    dc.SetBrush(*wxCYAN_BRUSH);
+    dc.SetPen(*wxRED_PEN);
+
+    dc.DrawRoundedRectangle(0, 30, 200, 100, 20);
+

     dc.DrawText( wxT("Rectangle 200 by 100"), 40, 40);
     dc.DrawText( wxT("Rectangle 200 by 100"), 40, 40);

-    
+
+    dc.SetPen( wxPen(*wxBLACK,0,wxDOT_DASH) );

     dc.DrawEllipse(50, 140, 100, 50);
     dc.DrawEllipse(50, 140, 100, 50);

-    
+    dc.SetPen(*wxRED_PEN);
+

     dc.DrawText( wxT("Test message: this is in 10 point text"), 10, 180);
     dc.DrawText( wxT("Test message: this is in 10 point text"), 10, 180);

-    
+

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    char *test = "Greek (Ελληνικά) Γειά σας -- Hebrew    שלום -- Japanese (日本語)";
+    char *test = "Hebrew    שלום -- Japanese (日本語)";

     wxString tmp = wxConvUTF8.cMB2WC( test );
     wxString tmp = wxConvUTF8.cMB2WC( test );

-    dc.DrawText( tmp, 10, 200 ); 
+    dc.DrawText( tmp, 10, 200 );

 #endif
 #endif

-    
+
+    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 );
+

     dc.SetPen(* wxBLACK_PEN);
     dc.DrawLine(0, 0, 200, 200);
     dc.DrawLine(200, 0, 0, 200);
     dc.SetPen(* wxBLACK_PEN);
     dc.DrawLine(0, 0, 200, 200);
     dc.DrawLine(200, 0, 0, 200);

-    
+

     wxIcon my_icon = wxICON(mondrian) ;
     wxIcon my_icon = wxICON(mondrian) ;

-    
+

     dc.DrawIcon( my_icon, 100, 100);
     dc.DrawIcon( my_icon, 100, 100);

+
+    if (m_bitmap.Ok())
+        dc.DrawBitmap( m_bitmap, 10, 10 );

 }
 
 void MyFrame::OnSize(wxSizeEvent& event )
 }
 
 void MyFrame::OnSize(wxSizeEvent& event )


@@ -332,15 +355,11 @@ END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxFrame *frame, const wxPoint& pos, const wxSize& size, long style):
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxFrame *frame, const wxPoint& pos, const wxSize& size, long style):

-    wxScrolledWindow(frame, -1, pos, size, style)
+    wxScrolledWindow(frame, wxID_ANY, pos, size, style)

 {
     SetBackgroundColour(* wxWHITE);
 }
 
 {
     SetBackgroundColour(* wxWHITE);
 }
 

-MyCanvas::~MyCanvas(void)
-{
-}
-

 // Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {
 // Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {


@@ -360,26 +379,26 @@ bool MyPrintout::OnPrintPage(int page)
             DrawPageOne(dc);
         else if (page == 2)
             DrawPageTwo(dc);
             DrawPageOne(dc);
         else if (page == 2)
             DrawPageTwo(dc);

-        
+

         dc->SetDeviceOrigin(0, 0);
         dc->SetUserScale(1.0, 1.0);
         dc->SetDeviceOrigin(0, 0);
         dc->SetUserScale(1.0, 1.0);

-        
+

         wxChar buf[200];
         wxSprintf(buf, wxT("PAGE %d"), page);
         wxChar buf[200];
         wxSprintf(buf, wxT("PAGE %d"), page);

-        // dc->DrawText(buf, 10, 10);
-        
-        return TRUE;
+        dc->DrawText(buf, 10, 10);
+
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 bool MyPrintout::OnBeginDocument(int startPage, int endPage)
 {
     if (!wxPrintout::OnBeginDocument(startPage, endPage))
 }
 
 bool MyPrintout::OnBeginDocument(int startPage, int endPage)
 {
     if (!wxPrintout::OnBeginDocument(startPage, endPage))

-        return FALSE;
-    
-    return TRUE;
+        return false;
+
+    return true;

 }
 
 void MyPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
 }
 
 void MyPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)


@@ -397,77 +416,75 @@ bool MyPrintout::HasPage(int pageNum)
 
 void MyPrintout::DrawPageOne(wxDC *dc)
 {
 
 void MyPrintout::DrawPageOne(wxDC *dc)
 {

-/* You might use THIS code if you were scaling
-* graphics of known size to fit on the page.
-    */
-    int w, h;
-    
+    // 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;
     // 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;
     // 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);
     // Add the margin to the graphic size
     maxX += (2*marginX);
     maxY += (2*marginY);

-    
+

     // Get the size of the DC in pixels
     // Get the size of the DC in pixels

+    int w, h;

     dc->GetSize(&w, &h);
     dc->GetSize(&w, &h);

-    
+

     // Calculate a suitable scaling factor
     float scaleX=(float)(w/maxX);
     float scaleY=(float)(h/maxY);
     // 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);
     // 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);
     // 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 );
     // Set the scale and origin
     dc->SetUserScale(actualScale, actualScale);
     dc->SetDeviceOrigin( (long)posX, (long)posY );

-    //dc->SetUserScale(1.0, 1.0);
-    
+

     frame->Draw(*dc);
 }
 
 void MyPrintout::DrawPageTwo(wxDC *dc)
 {
     frame->Draw(*dc);
 }
 
 void MyPrintout::DrawPageTwo(wxDC *dc)
 {

-/* 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.
-    */
+    // 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.
+

     // Get the logical pixels per inch of screen and printer
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
     // 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.
     float scale = (float)((float)ppiPrinterX/(float)ppiScreenX);
     // 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)
     int pageWidth, pageHeight;
     int w, h;
     dc->GetSize(&w, &h);
     GetPageSizePixels(&pageWidth, &pageHeight);
     // 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.
     float overallScale = scale * (float)(w/(float)pageWidth);
     dc->SetUserScale(overallScale, overallScale);
     // 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
     // Calculate conversion factor for converting millimetres into
     // logical units.
     // There are approx. 25.1 mm to the inch. There are ppi


@@ -475,57 +492,63 @@ void MyPrintout::DrawPageTwo(wxDC *dc)
     // ppi/25.1 device units. We also divide by the
     // screen-to-printer scaling factor, because we need to
     // unscale to pass logical units to DrawLine.
     // ppi/25.1 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 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));
     // Draw 50 mm by 50 mm L shape
     float logUnitsFactor = (float)(ppiPrinterX/(scale*25.1));
     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->SetFont(* wxGetApp().m_testFont);
+

     dc->SetBackgroundMode(wxTRANSPARENT);
     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!")};
         long w, h;
         long x = 200, y= 250;
         wxFont fnt(15, wxSWISS, wxNORMAL, wxNORMAL);
     { // GetTextExtent demo:
         wxString words[7] = {_T("This "), _T("is "), _T("GetTextExtent "), _T("testing "), _T("string. "), _T("Enjoy "), _T("it!")};
         long w, h;
         long x = 200, y= 250;
         wxFont fnt(15, wxSWISS, wxNORMAL, wxNORMAL);

-        
+

         dc->SetFont(fnt);
         dc->SetFont(fnt);

-        for (int i = 0; i < 7; i++) {
-            dc->GetTextExtent(words[i], &w, &h);
+
+        for (int i = 0; i < 7; i++)
+        {
+            wxString word = words[i];
+            word.Remove( word.Len()-1, 1 );
+            dc->GetTextExtent(word, &w, &h);

             dc->DrawRectangle(x, y, w, h);
             dc->DrawRectangle(x, y, w, h);

+            dc->GetTextExtent(words[i], &w, &h);

             dc->DrawText(words[i], x, y);
             x += w;
         }
             dc->DrawText(words[i], x, y);
             x += w;
         }

-        dc->SetFont(* wxGetApp().m_testFont);
+

     }
     }

-    
+
+    dc->SetFont(wxGetApp().m_testFont);
+

     dc->DrawText(_T("Some test text"), 200, 300 );
 
     // TESTING
     dc->DrawText(_T("Some test text"), 200, 300 );
 
     // TESTING

-    
+

     int leftMargin = 20;
     int rightMargin = 20;
     int topMargin = 20;
     int bottomMargin = 20;
     int leftMargin = 20;
     int rightMargin = 20;
     int topMargin = 20;
     int bottomMargin = 20;

-    
+

     int pageWidthMM, pageHeightMM;
     GetPageSizeMM(&pageWidthMM, &pageHeightMM);
     int pageWidthMM, pageHeightMM;
     GetPageSizeMM(&pageWidthMM, &pageHeightMM);

-    
+

     float leftMarginLogical = (float)(logUnitsFactor*leftMargin);
     float topMarginLogical = (float)(logUnitsFactor*topMargin);
     float bottomMarginLogical = (float)(logUnitsFactor*(pageHeightMM - bottomMargin));
     float rightMarginLogical = (float)(logUnitsFactor*(pageWidthMM - rightMargin));
     float leftMarginLogical = (float)(logUnitsFactor*leftMargin);
     float topMarginLogical = (float)(logUnitsFactor*topMargin);
     float bottomMarginLogical = (float)(logUnitsFactor*(pageHeightMM - bottomMargin));
     float rightMarginLogical = (float)(logUnitsFactor*(pageWidthMM - rightMargin));

-    
+

     dc->SetPen(* wxRED_PEN);
     dc->SetPen(* wxRED_PEN);

-    dc->DrawLine( (long)leftMarginLogical, (long)topMarginLogical, 
+    dc->DrawLine( (long)leftMarginLogical, (long)topMarginLogical,

         (long)rightMarginLogical, (long)topMarginLogical);
         (long)rightMarginLogical, (long)topMarginLogical);

-    dc->DrawLine( (long)leftMarginLogical, (long)bottomMarginLogical, 
+    dc->DrawLine( (long)leftMarginLogical, (long)bottomMarginLogical,

         (long)rightMarginLogical,  (long)bottomMarginLogical);
         (long)rightMarginLogical,  (long)bottomMarginLogical);

-    
+

     WritePageHeader(this, dc, _T("A header"), logUnitsFactor);
 }
 
     WritePageHeader(this, dc, _T("A header"), logUnitsFactor);
 }
 


@@ -540,27 +563,28 @@ headerFont = wxTheFontList->FindOrCreateFont(16, wxSWISS, wxNORMAL, wxBOLD);
 }
 dc->SetFont(headerFont);
     */
 }
 dc->SetFont(headerFont);
     */

-    
+

     int pageWidthMM, pageHeightMM;
     int pageWidthMM, pageHeightMM;

-    
+

     printout->GetPageSizeMM(&pageWidthMM, &pageHeightMM);
     printout->GetPageSizeMM(&pageWidthMM, &pageHeightMM);

-    
+    wxUnusedVar(pageHeightMM);
+

     int leftMargin = 10;
     int topMargin = 10;
     int rightMargin = 10;
     int leftMargin = 10;
     int topMargin = 10;
     int rightMargin = 10;

-    
+

     float leftMarginLogical = (float)(mmToLogical*leftMargin);
     float topMarginLogical = (float)(mmToLogical*topMargin);
     float rightMarginLogical = (float)(mmToLogical*(pageWidthMM - rightMargin));
     float leftMarginLogical = (float)(mmToLogical*leftMargin);
     float topMarginLogical = (float)(mmToLogical*topMargin);
     float rightMarginLogical = (float)(mmToLogical*(pageWidthMM - rightMargin));

-    
+

     long xExtent, yExtent;
     dc->GetTextExtent(text, &xExtent, &yExtent);
     float xPos = (float)(((((pageWidthMM - leftMargin - rightMargin)/2.0)+leftMargin)*mmToLogical) - (xExtent/2.0));
     dc->DrawText(text, (long)xPos, (long)topMarginLogical);
     long xExtent, yExtent;
     dc->GetTextExtent(text, &xExtent, &yExtent);
     float xPos = (float)(((((pageWidthMM - leftMargin - rightMargin)/2.0)+leftMargin)*mmToLogical) - (xExtent/2.0));
     dc->DrawText(text, (long)xPos, (long)topMarginLogical);

-    
+

     dc->SetPen(* wxBLACK_PEN);
     dc->SetPen(* wxBLACK_PEN);

-    dc->DrawLine( (long)leftMarginLogical, (long)(topMarginLogical+yExtent), 
+    dc->DrawLine( (long)leftMarginLogical, (long)(topMarginLogical+yExtent),

         (long)rightMarginLogical, (long)topMarginLogical+yExtent );
         (long)rightMarginLogical, (long)topMarginLogical+yExtent );

-    
-    return TRUE;
+
+    return true;

 }
 }