Committing in .

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

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index 4b5b1d7b1e46c8e36510c255b88e1c3c35495d8b..fe6db85c7560ac8e5ffc938e44fc3a5a7440bb1a 100644 (file)
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -5,7 +5,7 @@
 
 
 // For compilers that support precompilation, includes "wx/wx.h".
 
 
 // For compilers that support precompilation, includes "wx/wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop


@@ -14,13 +14,12 @@
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP

-#include <wx/wx.h>
+#include "wx/wx.h"

 #endif
 
 #endif
 

-#include <wx/image.h>
-#include <wx/html/htmlwin.h>
-
-#include <wx/html/htmprint.h>
+#include "wx/image.h"
+#include "wx/html/htmlwin.h"
+#include "wx/html/htmprint.h"

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -45,9 +44,10 @@ class MyApp : public wxApp
 class MyFrame : public wxFrame
 {
     public:
 class MyFrame : public wxFrame
 {
     public:

-        // ctor(s)
+        // ctor and dtor

 
         MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
 
         MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);

+        virtual ~MyFrame();

 
         // event handlers (these functions should _not_ be virtual)
         void OnQuit(wxCommandEvent& event);
 
         // event handlers (these functions should _not_ be virtual)
         void OnQuit(wxCommandEvent& event);


@@ -156,8 +156,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 {
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 {
     // create a menu bar
     wxMenu *menuFile = new wxMenu;

-    wxMenu *menuNav = new wxMenu;
-

     menuFile->Append(Minimal_Open, "Open...\tCtrl-O");
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_PageSetup, "Page Setup");
     menuFile->Append(Minimal_Open, "Open...\tCtrl-O");
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_PageSetup, "Page Setup");


@@ -188,12 +186,18 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     m_Prn -> SetHeader(m_Name + "(@PAGENUM@/@PAGESCNT@)<hr>", wxPAGE_ALL);
 }
 
     m_Prn -> SetHeader(m_Name + "(@PAGENUM@/@PAGESCNT@)<hr>", wxPAGE_ALL);
 }
 

+// frame destructor
+MyFrame::~MyFrame()
+{
+    delete m_Prn;
+    m_Prn = (wxHtmlEasyPrinting *) NULL;
+}
+

 
 // event handlers
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 // event handlers
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    delete m_Prn;    

     // TRUE is to force the frame to close
     Close(TRUE);
 }
     // TRUE is to force the frame to close
     Close(TRUE);
 }


@@ -237,7 +241,7 @@ void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
     {
         m_Name = dialog.GetPath();
         m_Html -> LoadPage(m_Name);
     {
         m_Name = dialog.GetPath();
         m_Html -> LoadPage(m_Name);

-       m_Prn -> SetHeader(m_Name + "(@PAGENUM@/@PAGESCNT@)<hr>", wxPAGE_ALL);
+        m_Prn -> SetHeader(m_Name + "(@PAGENUM@/@PAGESCNT@)<hr>", wxPAGE_ALL);

     } 
 }
 
     } 
 }