leads to a double call of AddChild, if we don't see any problems, we'll remove it

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

diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 8e5d2f0526ee536672a5e89bbb2edf9b2ac43c67..827ed78269d0fc2c764b569f7f751445f7c6f328 100644 (file)
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -66,10 +66,6 @@ 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
 bool MyApp::OnInit(void)
 // The `main program' equivalent, creating the windows and returning the
 // main frame
 bool MyApp::OnInit(void)


@@ -82,8 +78,10 @@ bool MyApp::OnInit(void)
     // Create the main frame window
     frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets Printing Demo"), wxPoint(0, 0), wxSize(400, 400));
 
     // Create the main frame window
     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) );


@@ -135,7 +133,9 @@ bool MyApp::OnInit(void)
     frame->Centre(wxBOTH);
     frame->Show();
 
     frame->Centre(wxBOTH);
     frame->Show();
 

+#if wxUSE_STATUSBAR

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

+#endif // wxUSE_STATUSBAR

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 


@@ -336,10 +336,6 @@ MyCanvas::MyCanvas(wxFrame *frame, const wxPoint& pos, const wxSize& size, long
     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)
 {


@@ -547,6 +543,7 @@ dc->SetFont(headerFont);
     int pageWidthMM, pageHeightMM;
 
     printout->GetPageSizeMM(&pageWidthMM, &pageHeightMM);
     int pageWidthMM, pageHeightMM;
 
     printout->GetPageSizeMM(&pageWidthMM, &pageHeightMM);

+    wxUnusedVar(pageHeightMM);

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