reverted DEBUG_INFO change

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

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index f414cb56b2ba6b676c4456504d8ac522f507d499..6ce878f0a5364f492f9d2a9ccc320a6b358ad00c 100644 (file)
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -1,6 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printimg.cpp
 // Purpose:     wxHtmlEasyPrinting testing example
 /////////////////////////////////////////////////////////////////////////////
 // Name:        printimg.cpp
 // Purpose:     wxHtmlEasyPrinting testing example

+// Licence:     wxWindows Licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -12,7 +13,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 #endif
 
 // for all others, include the necessary headers (this file is usually all you

-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers

 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif


@@ -53,7 +54,6 @@ class MyFrame : public wxFrame
         void OnQuit(wxCommandEvent& event);
         void OnAbout(wxCommandEvent& event);
 
         void OnQuit(wxCommandEvent& event);
         void OnAbout(wxCommandEvent& event);
 

-        void OnPrintSetup(wxCommandEvent& event);

         void OnPageSetup(wxCommandEvent& event);
         void OnPrint(wxCommandEvent& event);
         void OnPreview(wxCommandEvent& event);
         void OnPageSetup(wxCommandEvent& event);
         void OnPrint(wxCommandEvent& event);
         void OnPreview(wxCommandEvent& event);


@@ -68,7 +68,7 @@ class MyFrame : public wxFrame
         wxHtmlWindow *m_Html;
         wxHtmlEasyPrinting *m_Prn;
         wxString m_Name;
         wxHtmlWindow *m_Html;
         wxHtmlEasyPrinting *m_Prn;
         wxString m_Name;

-        // any class wishing to process wxWindows events must use this macro
+        // any class wishing to process wxWidgets events must use this macro

         DECLARE_EVENT_TABLE()
 };
 
         DECLARE_EVENT_TABLE()
 };
 


@@ -84,7 +84,6 @@ enum
     Minimal_Print,
     Minimal_Preview,
     Minimal_PageSetup,
     Minimal_Print,
     Minimal_Preview,
     Minimal_PageSetup,

-    Minimal_PrintSetup,

     Minimal_Open,
     Minimal_PrintSmall,
     Minimal_PrintNormal,
     Minimal_Open,
     Minimal_PrintSmall,
     Minimal_PrintNormal,


@@ -93,10 +92,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

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

-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event

 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)


@@ -105,14 +104,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     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)

-    EVT_MENU(Minimal_PrintSetup, MyFrame::OnPrintSetup)

     EVT_MENU(Minimal_Open, MyFrame::OnOpen)
     EVT_MENU(Minimal_PrintSmall, MyFrame::OnPrintSmall)
     EVT_MENU(Minimal_PrintNormal, MyFrame::OnPrintNormal)
     EVT_MENU(Minimal_PrintHuge, MyFrame::OnPrintHuge)
 END_EVENT_TABLE()
 
     EVT_MENU(Minimal_Open, MyFrame::OnOpen)
     EVT_MENU(Minimal_PrintSmall, MyFrame::OnPrintSmall)
     EVT_MENU(Minimal_PrintNormal, MyFrame::OnPrintNormal)
     EVT_MENU(Minimal_PrintHuge, MyFrame::OnPrintHuge)
 END_EVENT_TABLE()
 

-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create

 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and


@@ -127,6 +125,7 @@ IMPLEMENT_APP(MyApp)
 // the application class
 // ----------------------------------------------------------------------------
 // `Main program' equivalent: the program execution "starts" here
 // the application class
 // ----------------------------------------------------------------------------
 // `Main program' equivalent: the program execution "starts" here

+

 bool MyApp::OnInit()
 {
 #if wxUSE_LIBPNG
 bool MyApp::OnInit()
 {
 #if wxUSE_LIBPNG


@@ -140,18 +139,18 @@ bool MyApp::OnInit()
 #endif
 
     MyFrame *frame = new MyFrame(_("Printing test"),
 #endif
 
     MyFrame *frame = new MyFrame(_("Printing test"),

-                                 wxPoint(150, 50), wxSize(640, 480));
+        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 and tell the application that it's our main window
     // @@@ what does it do exactly, in fact? is it necessary here?

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

     SetTopWindow(frame);
 
 
     // success: wxApp::OnRun() will be called which will enter the main message
     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
+    // loop and the application will run. If we returned false here, the

     // application would exit immediately.
     // application would exit immediately.

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -161,14 +160,13 @@ bool MyApp::OnInit()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)

-        : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+        : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)

 {
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
     menuFile->Append(Minimal_Open, _("Open...\tCtrl-O"));
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_PageSetup, _("Page Setup"));
 {
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
     menuFile->Append(Minimal_Open, _("Open...\tCtrl-O"));
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_PageSetup, _("Page Setup"));

-    menuFile->Append(Minimal_PrintSetup, _("Printer Setup"));

     menuFile->Append(Minimal_Print, _("Print..."));
     menuFile->Append(Minimal_Preview, _("Preview..."));
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_Print, _("Print..."));
     menuFile->Append(Minimal_Preview, _("Preview..."));
     menuFile->AppendSeparator();


@@ -189,17 +187,24 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(1);
     CreateStatusBar(1);

+#endif // wxUSE_STATUSBAR

 
     m_Html = new wxHtmlWindow(this);
     m_Html -> SetRelatedFrame(this, _("HTML : %s"));
 
     m_Html = new wxHtmlWindow(this);
     m_Html -> SetRelatedFrame(this, _("HTML : %s"));

+#if wxUSE_STATUSBAR

     m_Html -> SetRelatedStatusBar(0);
     m_Html -> SetRelatedStatusBar(0);

+#endif // wxUSE_STATUSBAR

     m_Name = wxT("test.htm");
     m_Html -> LoadPage(m_Name);
     
     m_Prn = new wxHtmlEasyPrinting(_("Easy Printing Demo"), this);
     m_Prn -> SetHeader(m_Name + wxT("(@PAGENUM@/@PAGESCNT@)<hr>"), wxPAGE_ALL);
 
     m_Name = wxT("test.htm");
     m_Html -> LoadPage(m_Name);
     
     m_Prn = new wxHtmlEasyPrinting(_("Easy Printing Demo"), this);
     m_Prn -> SetHeader(m_Name + wxT("(@PAGENUM@/@PAGESCNT@)<hr>"), wxPAGE_ALL);
 

+    // To specify where the AFM files are kept on Unix,
+    // you may wish to do something like this
+    // m_Prn->GetPrintData()->SetFontMetricPath(wxT("/home/julians/afm"));

 }
 
 // frame destructor
 }
 
 // frame destructor


@@ -214,8 +219,8 @@ MyFrame::~MyFrame()
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);

 }
 
 
 }
 
 


@@ -225,12 +230,6 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 }
 
 
 }
 
 

-void MyFrame::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
-{
-    m_Prn -> PrinterSetup();
-}
-
-

 void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 {
     m_Prn -> PageSetup();
 void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 {
     m_Prn -> PageSetup();