/////////////////////////////////////////////////////////////////////////////
-// 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"
#include "wx/html/htmlwin.h"
#include "wx/fs_zip.h"
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+ #include "../../sample.xpm"
+#endif
+
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
// `Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit()
{
+ if ( !wxApp::OnInit() )
+ return false;
+
#if wxUSE_LIBPNG
wxImage::AddHandler(new wxPNGHandler);
#endif
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?
+ // Show it
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
// 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;