X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/788233da909b0f6bc684a99200c614e3dee2aa20..bc9d3d911cfb51f612a699d7fb00f57eb5b2097c:/samples/html/zip/zip.cpp?ds=sidebyside

diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index 3eb2d0daa4..37c5f2377e 100644
--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@@ -1,13 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        test.cpp
-// Purpose:     wxHtml testing example
+// Name:        zip.cpp
+// Purpose:     wxHtml sample
+// Author:      ?
+// Modified by:
+// Created:     ?
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#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 +17,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
@@ -25,6 +26,10 @@
 #include "wx/html/htmlwin.h"
 #include "wx/fs_zip.h"
 
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../../sample.xpm"
+#endif
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -55,7 +60,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 +78,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 +90,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
@@ -102,6 +107,9 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
 #if wxUSE_LIBPNG
     wxImage::AddHandler(new wxPNGHandler);
 #endif
@@ -112,19 +120,17 @@ bool MyApp::OnInit()
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
     // Create the main application window
-    MyFrame *frame = new MyFrame( "wxHtmlWindow testing application",
-        wxPoint(50, 50), wxSize(640, 480) );
+    MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
+        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);
-    SetTopWindow(frame);
+    // Show it
+    frame->Show(true);
 
     // 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;
 }
 
 // ----------------------------------------------------------------------------
@@ -135,32 +141,36 @@ wxHtmlWindow *html;
 
 // 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)
 {
+    SetIcon(wxICON(sample));
+
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
     wxMenu *menuNav = new wxMenu;
 
-    menuFile->Append(Minimal_Quit, "E&xit");
-    menuNav->Append(Minimal_Back, "Go &BACK");
-    menuNav->Append(Minimal_Forward, "Go &FORWARD");
+    menuFile->Append(Minimal_Quit, _("E&xit"));
+    menuNav->Append(Minimal_Back, _("Go &BACK"));
+    menuNav->Append(Minimal_Forward, _("Go &FORWARD"));
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append(menuFile, "&File");
-    menuBar->Append(menuNav, "&Navigate");
+    menuBar->Append(menuFile, _("&File"));
+    menuBar->Append(menuNav, _("&Navigate"));
 
     // ... 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");
+    html -> SetRelatedFrame(this, _("HTML : %s"));
+#if wxUSE_STATUSBAR
     html -> SetRelatedStatusBar(0);
-    html -> LoadPage("start.htm");
-    }
+#endif // wxUSE_STATUSBAR
+    html -> LoadPage(wxT("start.htm"));
 }
 
 
@@ -168,16 +178,16 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 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);
 }
 
 void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
 {
-    if (!html -> HistoryBack()) wxMessageBox("You reached prehistory era!");
+    if (!html -> HistoryBack()) wxMessageBox(_("You reached prehistory era!"));
 }
 
 void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event))
 {
-    if (!html -> HistoryForward()) wxMessageBox("No more items in history!");
+    if (!html -> HistoryForward()) wxMessageBox(_("No more items in history!"));
 }