Introducing wxBase for borland based on Michael Fieldings patch 598106

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

diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index b2943926a1e3194a7dbf73eafac0bc6a8ba0ce13..274b222b20a3624b4aa2863b6a23d16baacc572a 100644 (file)
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -79,16 +79,6 @@ bool MyApp::OnInit(void)
     g_printData = new wxPrintData;
     g_pageSetupData = new wxPageSetupDialogData;
     
-    // wxGetenv( wxT("HOME") );
-
-    // Compatibility with old system. In fact, we might keep wxThePrintSetupData
-    // just for useful default values which we can optionally assign to our
-    // own print data object.
-
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-    (*g_printData) = * wxThePrintSetupData;
-#endif
-    
     // Create the main frame window
     frame = new MyFrame((wxFrame *) NULL, (char *) "wxWindows Printing Demo", wxPoint(0, 0), wxSize(400, 400));
     
@@ -293,7 +283,7 @@ void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnPrintAbout(wxCommandEvent& WXUNUSED(event))
 {
-    (void)wxMessageBox("wxWindows printing demo\nAuthor: Julian Smart julian.smart@ukonline.co.uk",
+    (void)wxMessageBox("wxWindows printing demo\nAuthor: Julian Smart",
         "About wxWindows printing demo", wxOK|wxCENTRE);
 }
 
@@ -492,8 +482,6 @@ void MyPrintout::DrawPageTwo(wxDC *dc)
     dc->DrawLine(50, 250, (long)(50.0 + logUnits), 250);
     dc->DrawLine(50, 250, 50, (long)(250.0 + logUnits));
     
-    return;
-    
     dc->SetFont(* wxGetApp().m_testFont);
     dc->SetBackgroundMode(wxTRANSPARENT);