Fix compilation error due to recent typedef changes

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

diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index 8152667459542f60fd692203f1e4734ed2891ad8..655715c590b44c1fe32fd02bbe996a7ce3f7eb93 100644 (file)
--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma implementation "test.cpp"
     #pragma interface "test.cpp"
 #endif
@@ -112,7 +112,7 @@ bool MyApp::OnInit()
     wxFileSystem::AddHandler(new wxZipFSHandler);
 
     // Create the main application window
-    MyFrame *frame = new MyFrame( "wxHtmlWindow testing application",
+    MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
         wxPoint(50, 50), wxSize(640, 480) );
 
     // Show it and tell the application that it's our main window
@@ -141,14 +141,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     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);
@@ -157,9 +157,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     {
     html = new wxHtmlWindow(this);
-    html -> SetRelatedFrame(this, "HTML : %s");
+    html -> SetRelatedFrame(this, _("HTML : %s"));
     html -> SetRelatedStatusBar(0);
-    html -> LoadPage("start.htm");
+    html -> LoadPage(wxT("start.htm"));
     }
 }
 
@@ -174,10 +174,10 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 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!"));
 }