Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.

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

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index db862e7b4552225309ed89c6f8385942e4a16f60..3fea8d49ebcc1952de91bbca7c8283973f2708bb 100644 (file)
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -152,11 +152,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(_("Printing test"),
         wxDefaultPosition, wxSize(640, 480));
 
     MyFrame *frame = new MyFrame(_("Printing test"),
         wxDefaultPosition, wxSize(640, 480));
 

-    // Show it and tell the application that it's our main window
-    // @@@ what does it do exactly, in fact? is it necessary here?
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);
-

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the


@@ -223,8 +220,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 // frame destructor
 MyFrame::~MyFrame()
 {
 // frame destructor
 MyFrame::~MyFrame()
 {

-    delete m_Prn;
-    m_Prn = (wxHtmlEasyPrinting *) NULL;
+    wxDELETE(m_Prn);

 }
 
 
 }