Rebake after bakefile changes.

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

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index 7d3f11bf00da145ed5702ac347279db669b3cea9..036aa8912ffea370340edbb7fa5de67ea4b18517 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

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


@@ -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);


@@ -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,


@@ -105,7 +104,6 @@ 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_Open, MyFrame::OnOpen)
     EVT_MENU(Minimal_PrintSmall, MyFrame::OnPrintSmall)
     EVT_MENU(Minimal_PrintNormal, MyFrame::OnPrintNormal)


@@ -127,8 +125,12 @@ 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()
 {
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

 #if wxUSE_LIBPNG
     wxImage::AddHandler(new wxPNGHandler);
 #endif
 #if wxUSE_LIBPNG
     wxImage::AddHandler(new wxPNGHandler);
 #endif


@@ -168,7 +170,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     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"));

-    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();


@@ -204,6 +205,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     m_Prn = new wxHtmlEasyPrinting(_("Easy Printing Demo"), this);
     m_Prn -> SetHeader(m_Name + wxT("(@PAGENUM@/@PAGESCNT@)<hr>"), wxPAGE_ALL);
 
     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


@@ -229,12 +233,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();


@@ -268,17 +266,15 @@ void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnPrintSmall(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnPrintSmall(wxCommandEvent& WXUNUSED(event))
 {

-    int fontsizes[] = { 4, 6, 8, 10, 12, 20, 24 }; 
-    m_Prn->SetFonts(wxEmptyString, wxEmptyString, fontsizes);
+    m_Prn->SetStandardFonts(8);

 }
 
 void MyFrame::OnPrintNormal(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnPrintNormal(wxCommandEvent& WXUNUSED(event))
 {

-    m_Prn->SetFonts(wxEmptyString, wxEmptyString, 0);
+    m_Prn->SetStandardFonts(12);

 }
 
 void MyFrame::OnPrintHuge(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnPrintHuge(wxCommandEvent& WXUNUSED(event))
 {

-    int fontsizes[] = { 20, 26, 28, 30, 32, 40, 44 }; 
-    m_Prn->SetFonts(wxEmptyString, wxEmptyString, fontsizes);
+    m_Prn->SetStandardFonts(28);

 }
 }