gsocket.c has been replaced by gsocket.cpp

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

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index f414cb56b2ba6b676c4456504d8ac522f507d499..7d3f11bf00da145ed5702ac347279db669b3cea9 100644 (file)
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -12,7 +12,7 @@
 #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
@@ -68,7 +68,7 @@ class MyFrame : public wxFrame
         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()
 };
 
@@ -93,10 +93,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)
@@ -112,7 +112,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     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
@@ -140,18 +140,18 @@ bool MyApp::OnInit()
 #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?
-    frame->Show(TRUE);
+    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
+    // loop and the application will run. If we returned false here, the
     // application would exit immediately.
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -161,7 +161,7 @@ bool MyApp::OnInit()
 
 // 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;
@@ -189,11 +189,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
+#if wxUSE_STATUSBAR
     CreateStatusBar(1);
+#endif // wxUSE_STATUSBAR
 
     m_Html = new wxHtmlWindow(this);
     m_Html -> SetRelatedFrame(this, _("HTML : %s"));
+#if wxUSE_STATUSBAR
     m_Html -> SetRelatedStatusBar(0);
+#endif // wxUSE_STATUSBAR
     m_Name = wxT("test.htm");
     m_Html -> LoadPage(m_Name);
     
@@ -214,8 +218,8 @@ MyFrame::~MyFrame()
 
 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);
 }