Don't use GetThreadId() in wxMSW code.

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

diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index b8baea95c47f99145849768a94c315f676fe1a73..37c5f2377edf9740aaefe9052f910558f6dde955 100644 (file)
--- 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

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

-#ifdef __GNUG__
-    #pragma implementation "test.cpp"
-    #pragma interface "test.cpp"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // 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
 #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
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif


@@ -25,109 +26,112 @@
 #include "wx/html/htmlwin.h"
 #include "wx/fs_zip.h"
 
 #include "wx/html/htmlwin.h"
 #include "wx/fs_zip.h"
 

+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../../sample.xpm"
+#endif
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 
 // Define a new application type, each program should derive a class from wxApp
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 
 // Define a new application type, each program should derive a class from wxApp

-   class MyApp : public wxApp
-   {
-   public:
+class MyApp : public wxApp
+{
+public:

     // override base class virtuals
     // ----------------------------
 
     // this one is called on application startup and is a good place for the app
     // initialization (doing it here and not in the ctor allows to have an error
     // return: if OnInit() returns false, the application terminates)
     // override base class virtuals
     // ----------------------------
 
     // this one is called on application startup and is a good place for the app
     // initialization (doing it here and not in the ctor allows to have an error
     // return: if OnInit() returns false, the application terminates)

-      virtual bool OnInit();
-   };
+    virtual bool OnInit();
+};

 
 // Define a new frame type: this is going to be our main frame
 
 // Define a new frame type: this is going to be our main frame

-   class MyFrame : public wxFrame
-   {
-   public:
+class MyFrame : public wxFrame
+{
+public:

     // ctor(s)
     // ctor(s)

-      MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);

 
     // event handlers (these functions should _not_ be virtual)
 
     // event handlers (these functions should _not_ be virtual)

-      void OnQuit(wxCommandEvent& event);
-      void OnAbout(wxCommandEvent& event);
-      void OnBack(wxCommandEvent& event);
-      void OnForward(wxCommandEvent& event);
+    void OnQuit(wxCommandEvent& event);
+    void OnBack(wxCommandEvent& event);
+    void OnForward(wxCommandEvent& event);

 
 

-   private:
-    // any class wishing to process wxWindows events must use this macro
+private:
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

-   };
+};

 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 // IDs for the controls and the menu commands
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 // IDs for the controls and the menu commands

-   enum
-   {
+enum
+{

     // menu items
     // menu items

-   Minimal_Quit = 1,
-   Minimal_About,
-   Minimal_Back,
-   Minimal_Forward
-   };
+    Minimal_Quit = 1,
+    Minimal_Back,
+    Minimal_Forward
+};

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// 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.
 // 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)
-   EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
-   EVT_MENU(Minimal_About, MyFrame::OnAbout)
-   EVT_MENU(Minimal_Back, MyFrame::OnBack)
-   EVT_MENU(Minimal_Forward, MyFrame::OnForward)
-   END_EVENT_TABLE()
-
-   // Create a new application object: this macro will allow wxWindows 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
-   // not wxApp)
-   IMPLEMENT_APP(MyApp)
-
-   // ============================================================================
-   // implementation
-   // ============================================================================
-
-   // ----------------------------------------------------------------------------
-   // the application class
-   // ----------------------------------------------------------------------------
-   // `Main program' equivalent: the program execution "starts" here
-   bool MyApp::OnInit()
-   {
-     #if wxUSE_LIBPNG
-     wxImage::AddHandler(new wxPNGHandler);
-     #endif
-     #if wxUSE_LIBJPEG
-     wxImage::AddHandler(new wxJPEGHandler);
-     #endif
-
-     wxFileSystem::AddHandler(new wxZipFSHandler);
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
+    EVT_MENU(Minimal_Back, MyFrame::OnBack)
+    EVT_MENU(Minimal_Forward, MyFrame::OnForward)
+END_EVENT_TABLE()
+
+// 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
+// not wxApp)
+IMPLEMENT_APP(MyApp)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// the application class
+// ----------------------------------------------------------------------------
+// `Main program' equivalent: the program execution "starts" here
+bool MyApp::OnInit()
+{
+    if ( !wxApp::OnInit() )
+        return false;
+
+#if wxUSE_LIBPNG
+    wxImage::AddHandler(new wxPNGHandler);
+#endif
+#if wxUSE_LIBJPEG
+    wxImage::AddHandler(new wxJPEGHandler);
+#endif
+
+    wxFileSystem::AddHandler(new wxZipFSHandler);

 
     // Create the main application window
 
     // 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
 
     // 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.
     // application would exit immediately.

-      return TRUE;
-   }
+
+    return true;
+}

 
 // ----------------------------------------------------------------------------
 // main frame
 
 // ----------------------------------------------------------------------------
 // main frame


@@ -136,57 +140,54 @@
 wxHtmlWindow *html;
 
 // frame constructor
 wxHtmlWindow *html;
 
 // frame constructor

-   MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-   : wxFrame((wxFrame *)NULL, -1, title, pos, size)
-   {
+MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
+    : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
+{
+    SetIcon(wxICON(sample));
+

     // create a menu bar
     // create a menu bar

-      wxMenu *menuFile = new wxMenu;
-      wxMenu *menuNav = new wxMenu;
+    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...
 
     // now append the freshly created menu to the menu bar...

-      wxMenuBar *menuBar = new wxMenuBar;
-      menuBar->Append(menuFile, "&File");
-      menuBar->Append(menuNav, "&Navigate");
+    wxMenuBar *menuBar = new wxMenuBar;
+    menuBar->Append(menuFile, _("&File"));
+    menuBar->Append(menuNav, _("&Navigate"));

 
     // ... and attach this menu bar to the frame
 
     // ... and attach this menu bar to the frame

-      SetMenuBar(menuBar);
+    SetMenuBar(menuBar);

 
 

-      CreateStatusBar(1);
+#if wxUSE_STATUSBAR
+    CreateStatusBar(1);
+#endif // wxUSE_STATUSBAR

 
 

-      {
-      html = new wxHtmlWindow(this);
-      html -> SetRelatedFrame(this, "HTML : %s");
-      html -> SetRelatedStatusBar(0);
-      html -> LoadPage("start.htm");
-      }
-   }
+    html = new wxHtmlWindow(this);
+    html -> SetRelatedFrame(this, _("HTML : %s"));
+#if wxUSE_STATUSBAR
+    html -> SetRelatedStatusBar(0);
+#endif // wxUSE_STATUSBAR
+    html -> LoadPage(wxT("start.htm"));
+}

 
 
 // event handlers
 
 
 
 // event handlers
 

-   void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-   {
-    // TRUE is to force the frame to close
-      Close(TRUE);
-   }
-
-   void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-   {
-   }
-
-
-
-   void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
-   {
-   if (!html -> HistoryBack()) wxMessageBox("You reached prehistory era!");
-   }
-
-
-   void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event))
-   {
-   if (!html -> HistoryForward()) wxMessageBox("No more items in history!");
-   }
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+    // true is to force the frame to close
+    Close(true);
+}
+
+void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
+{
+    if (!html -> HistoryBack()) wxMessageBox(_("You reached prehistory era!"));
+}
+
+void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event))
+{
+    if (!html -> HistoryForward()) wxMessageBox(_("No more items in history!"));
+}