X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/348469c284a35f66819c10819feff0ae91b5fde2..6e2717981772a139d3cd9e51d497b13792fe662d:/samples/html/zip/zip.cpp?ds=inline

diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index 937f48bd93..3707e4f6f7 100644
--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@@ -3,11 +3,6 @@
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation "test.cpp"
-    #pragma interface "test.cpp"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -16,7 +11,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
@@ -55,7 +50,7 @@ public:
     void OnForward(wxCommandEvent& event);
 
 private:
-    // 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()
 };
 
@@ -73,10 +68,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)
@@ -85,7 +80,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Forward, MyFrame::OnForward)
 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
@@ -113,7 +108,7 @@ bool MyApp::OnInit()
 
     // Create the main application window
     MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
-        wxPoint(50, 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?
@@ -153,14 +148,16 @@ 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
 
-    {
     html = new wxHtmlWindow(this);
     html -> SetRelatedFrame(this, _("HTML : %s"));
+#if wxUSE_STATUSBAR
     html -> SetRelatedStatusBar(0);
+#endif // wxUSE_STATUSBAR
     html -> LoadPage(wxT("start.htm"));
-    }
 }