X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32eda62d164dc93b03fbd26dbf9b0f130632a40f..11e3c6ef36393fb5863ea2f9601d8facd73acb12:/samples/html/printing/printing.cpp?ds=sidebyside diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp index db862e7b45..7d6458d9f9 100644 --- a/samples/html/printing/printing.cpp +++ b/samples/html/printing/printing.cpp @@ -25,7 +25,7 @@ #include "wx/html/htmlwin.h" #include "wx/html/htmprint.h" -#ifndef __WXMSW__ +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../../sample.xpm" #endif @@ -152,11 +152,8 @@ bool MyApp::OnInit() 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); - 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 @@ -223,8 +220,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // frame destructor MyFrame::~MyFrame() { - delete m_Prn; - m_Prn = (wxHtmlEasyPrinting *) NULL; + wxDELETE(m_Prn); }