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 937f48bd93158e3f50526862b7194e9bf7861098..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

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

-#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"
 
 // 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,6 +26,10 @@
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -55,7 +60,7 @@ public:
     void OnForward(wxCommandEvent& event);
 
 private:
     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()
 };
 
     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)
 // 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()
 
     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
 // 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()
 {
 // `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_LIBPNG
     wxImage::AddHandler(new wxPNGHandler);
 #endif


@@ -113,12 +121,10 @@ bool MyApp::OnInit()
 
     // Create the main application window
     MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
 
     // 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?
+    // Show it

     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
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the


@@ -135,8 +141,10 @@ wxHtmlWindow *html;
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)

-: wxFrame((wxFrame *)NULL, wxID_ANY, 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;
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
     wxMenu *menuNav = new wxMenu;


@@ -153,14 +161,16 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 

+#if wxUSE_STATUSBAR

     CreateStatusBar(1);
     CreateStatusBar(1);

+#endif // wxUSE_STATUSBAR

 
 

-    {

     html = new wxHtmlWindow(this);
     html -> SetRelatedFrame(this, _("HTML : %s"));
     html = new wxHtmlWindow(this);
     html -> SetRelatedFrame(this, _("HTML : %s"));

+#if wxUSE_STATUSBAR

     html -> SetRelatedStatusBar(0);
     html -> SetRelatedStatusBar(0);

+#endif // wxUSE_STATUSBAR

     html -> LoadPage(wxT("start.htm"));
     html -> LoadPage(wxT("start.htm"));

-    }

 }
 
 
 }