Some distrib updates for wxPythonOSX

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

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index 561b77f33ff985f7970c8b4ba490b981908a9ff4..c2c9f1bac9229db5f6e76cabb1c487c6c5d89037 100644 (file)
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -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);


@@ -77,7 +77,6 @@ enum
 {
     // menu items
     Minimal_Quit = 1,
 {
     // menu items
     Minimal_Quit = 1,

-    Minimal_About,

     Minimal_Print,
     Minimal_Preview,
     Minimal_PageSetup,
     Minimal_Print,
     Minimal_Preview,
     Minimal_PageSetup,


@@ -95,7 +94,7 @@ enum
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit, MyFrame::OnQuit)
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit, MyFrame::OnQuit)

-    EVT_MENU(Minimal_About, MyFrame::OnAbout)
+    EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)

     EVT_MENU(Minimal_Print, MyFrame::OnPrint)
     EVT_MENU(Minimal_Preview, MyFrame::OnPreview)
     EVT_MENU(Minimal_PageSetup, MyFrame::OnPageSetup)
     EVT_MENU(Minimal_Print, MyFrame::OnPrint)
     EVT_MENU(Minimal_Preview, MyFrame::OnPreview)
     EVT_MENU(Minimal_PageSetup, MyFrame::OnPageSetup)


@@ -163,7 +162,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuFile->Append(Minimal_Print, "Print...");
     menuFile->Append(Minimal_Preview, "Preview...");
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_Print, "Print...");
     menuFile->Append(Minimal_Preview, "Preview...");
     menuFile->AppendSeparator();

-    menuFile->Append(Minimal_About, "&About");
+    menuFile->Append(wxID_ABOUT, "&About");

     menuFile->AppendSeparator();
     menuFile->Append(Minimal_Quit, "&Exit");
 
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_Quit, "&Exit");
 


@@ -186,12 +185,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);
 }


@@ -235,7 +240,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);

     } 
 }
 
     } 
 }